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-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Oct 2017 14:47:32 -0000 Devin Teske writes: >> 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 favorites when it comes to history actions in an interactive > shell... > > How about Esc-P and Esc-N? In continuation of the tangent --- I use ESC-P / ESC-N a lot; it's a neat feature that tcsh has had for a long time, maybe since the beginning. However it's a tcsh feature, not sh, bash, or csh IIRC. But csh is actually tcsh on FreeBSD but I'm sure most people already know this on this list. To emulate this behaviour in bash, I simply create a .inputrc file in my $HOME with the following contents: # .inputrc field "\ep": history-search-backward "\en": history-search-forward Works for me. Dan From owner-svn-src-all@freebsd.org Mon Oct 30 15:02: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 64F45E5F3A6; Mon, 30 Oct 2017 15:02:43 +0000 (UTC) (envelope-from eugen@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 3481965EB1; Mon, 30 Oct 2017 15:02:43 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9UF2gXt018181; Mon, 30 Oct 2017 15:02:42 GMT (envelope-from eugen@FreeBSD.org) Received: (from eugen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9UF2gHt018180; Mon, 30 Oct 2017 15:02:42 GMT (envelope-from eugen@FreeBSD.org) Message-Id: <201710301502.v9UF2gHt018180@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eugen set sender to eugen@FreeBSD.org using -f From: Eugene Grosbein Date: Mon, 30 Oct 2017 15:02:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325157 - head/usr.sbin/ppp X-SVN-Group: head X-SVN-Commit-Author: eugen X-SVN-Commit-Paths: head/usr.sbin/ppp X-SVN-Commit-Revision: 325157 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 15:02:43 -0000 Author: eugen (ports committer) Date: Mon Oct 30 15:02:42 2017 New Revision: 325157 URL: https://svnweb.freebsd.org/changeset/base/325157 Log: Fix ppp(8) to add RTF_HOST flag to created host route. Reported by: Mike Tancsa Approved by: avg (mentor) MFC After: 1 week Modified: head/usr.sbin/ppp/route.c Modified: head/usr.sbin/ppp/route.c ============================================================================== --- head/usr.sbin/ppp/route.c Mon Oct 30 13:54:54 2017 (r325156) +++ head/usr.sbin/ppp/route.c Mon Oct 30 15:02:42 2017 (r325157) @@ -802,6 +802,8 @@ rt_Set(struct bundle *bundle, int cmd, const struct nc cp += memcpy_roundup(cp, &samask, samask.ss_len); rtmes.m_rtm.rtm_addrs |= RTA_NETMASK; } + else + rtmes.m_rtm.rtm_flags |= RTF_HOST; nb = cp - (char *)&rtmes; rtmes.m_rtm.rtm_msglen = nb; @@ -906,6 +908,8 @@ rt_Update(struct bundle *bundle, const struct sockaddr rtmes.m_rtm.rtm_addrs |= RTA_NETMASK; p += memcpy_roundup(p, mask, mask->sa_len); } + else + rtmes.m_rtm.rtm_flags |= RTF_HOST; if (ifa && ifp && ifp->sa_family == AF_LINK) { rtmes.m_rtm.rtm_addrs |= RTA_IFP; From owner-svn-src-all@freebsd.org Mon Oct 30 15:15: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 CF97FE5F6F5; Mon, 30 Oct 2017 15:15:20 +0000 (UTC) (envelope-from bapt@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 A653F664DD; Mon, 30 Oct 2017 15:15:20 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: by freefall.freebsd.org (Postfix, from userid 1235) id 0C61CFEEC; Mon, 30 Oct 2017 15:15:20 +0000 (UTC) Date: Mon, 30 Oct 2017 16:15:19 +0100 From: Baptiste Daroussin To: Eitan Adler Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r325092 - head/usr.bin/fortune/datfiles Message-ID: <20171030151519.lbda66rwlkcmhprp@ivaldir.net> References: <201710290453.v9T4rX3E060010@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="g2rwtvn4ssec6mso" Content-Disposition: inline In-Reply-To: <201710290453.v9T4rX3E060010@repo.freebsd.org> User-Agent: NeoMutt/20171013 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 15:15:20 -0000 --g2rwtvn4ssec6mso Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Oct 29, 2017 at 04:53:33AM +0000, 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 > =20 > - Prefer UTF-8 over ISO-8859-1 > - Remove some references to printing man pages Why? it was still valid. Bapt --g2rwtvn4ssec6mso Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEgOTj3suS2urGXVU3Y4mL3PG3PloFAln3QgUACgkQY4mL3PG3 Plrl4w/6AgJbYmtec5RSRtzk0yCgeUXKqZXb4B+UgRobYGUM7EZx9ABzkKwQfIok AzNr7OpV7fLyhcavwDjHn8EtEnYwngGSDKgUOmbHs+GQOuPGdtv3xoraG8lJDUCI YZC5C3dErHAiVh/HrA96lcTanb7zsp8XEoSF5MVSpYvoHBZO0v/QFEGlbvO5D/jE OtMHtIXSjCCQALRQl3UZedtm+GXFpNbll0dbCsxMx1XCMszb8t+Fft2BvpLz2O3r WozO1ou1RUxEiLPTFx0VS/iyVafKBq2VsN/PQD/tC87hnZbqCI/Yd3F/J4APWMO+ sfSakVFRWi2endf5U3nBm0eMpcXuOdhVNUwDlTl9e7E5xTRxSmDzciecYpWI2Qpa 5OMxpinbDbzTWV+JLTaSovX/7VdOXQlDe4EKIMrivXbVIvPXHb35oYXfmHRuS0gK gPziezi7fdEzlcswFSFwM3HuaDFCmX+dAO3TA8ySCcdmkoVVlZ8a9Rq7c6aE84sM 2vo/tu4Gte/Fg0rNiQUwtS0U41v17H0h2Z78WbYSiQNthPXes4HAOloj2NxfCR6a KyGqVxZsy+tTngmXWysEMOPEp+FNZ9qoAnaHxiAz0fDx4kiLiD1dAu50Wik9clH4 nsmRqRRQ1pfSNMJmBmn7iHemVBFoACMcN8DakoFKwi0siT2wwUE= =ElBY -----END PGP SIGNATURE----- --g2rwtvn4ssec6mso-- From owner-svn-src-all@freebsd.org Mon Oct 30 15:16: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 C1DE3E5F769; Mon, 30 Oct 2017 15:16:28 +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 9F9C366632; Mon, 30 Oct 2017 15:16:28 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1033) id E0C4510019; Mon, 30 Oct 2017 15:16:27 +0000 (UTC) Date: Mon, 30 Oct 2017 15:16:27 +0000 From: Alexey Dokuchaev To: Dan Mack Cc: Devin Teske , "src-committers@freebsd.org" , Eitan Adler , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" , Cy Schubert , Ed Maste , Warner Losh Subject: Re: svn commit: r325092 - head/usr.bin/fortune/datfiles Message-ID: <20171030151627.GA74374@FreeBSD.org> References: <201710291851.v9TIpM0I073542@slippy.cwsent.com> 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 15:16:28 -0000 On Mon, Oct 30, 2017 at 09:47:22AM -0500, Dan Mack wrote: > ... > I use ESC-P / ESC-N a lot; it's a neat feature that tcsh has had for a > long time, maybe since the beginning. However it's a tcsh feature, not > sh, bash, or csh IIRC. But csh is actually tcsh on FreeBSD but I'm sure > most people already know this on this list. It is the same as up/down arrows? Yeah, one of the best tcsh(1) features! > To emulate this behaviour in bash, I simply create a .inputrc file in my > $HOME with the following contents: > > # .inputrc field > "\ep": history-search-backward > "\en": history-search-forward On GNU/Linux boxes mine has: "\e[A": history-search-backward "\e[B": history-search-forward ./danfe From owner-svn-src-all@freebsd.org Mon Oct 30 15:19: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 4C696E5F7F5; Mon, 30 Oct 2017 15:19:30 +0000 (UTC) (envelope-from eugen@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 8CE40667C4; Mon, 30 Oct 2017 15:19:29 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9UFJS74022478; Mon, 30 Oct 2017 15:19:28 GMT (envelope-from eugen@FreeBSD.org) Received: (from eugen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9UFJSjf022477; Mon, 30 Oct 2017 15:19:28 GMT (envelope-from eugen@FreeBSD.org) Message-Id: <201710301519.v9UFJSjf022477@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eugen set sender to eugen@FreeBSD.org using -f From: Eugene Grosbein Date: Mon, 30 Oct 2017 15:19:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325158 - head/usr.sbin/ppp X-SVN-Group: head X-SVN-Commit-Author: eugen X-SVN-Commit-Paths: head/usr.sbin/ppp X-SVN-Commit-Revision: 325158 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 15:19:30 -0000 Author: eugen (ports committer) Date: Mon Oct 30 15:19:28 2017 New Revision: 325158 URL: https://svnweb.freebsd.org/changeset/base/325158 Log: ppp(8): style(9) fix after r325157 Approved by: mav (mentor) Modified: head/usr.sbin/ppp/route.c Modified: head/usr.sbin/ppp/route.c ============================================================================== --- head/usr.sbin/ppp/route.c Mon Oct 30 15:02:42 2017 (r325157) +++ head/usr.sbin/ppp/route.c Mon Oct 30 15:19:28 2017 (r325158) @@ -801,8 +801,7 @@ rt_Set(struct bundle *bundle, int cmd, const struct nc if (!ncprange_ishost(dst)) { cp += memcpy_roundup(cp, &samask, samask.ss_len); rtmes.m_rtm.rtm_addrs |= RTA_NETMASK; - } - else + } else rtmes.m_rtm.rtm_flags |= RTF_HOST; nb = cp - (char *)&rtmes; @@ -907,8 +906,7 @@ rt_Update(struct bundle *bundle, const struct sockaddr if (mask) { rtmes.m_rtm.rtm_addrs |= RTA_NETMASK; p += memcpy_roundup(p, mask, mask->sa_len); - } - else + } else rtmes.m_rtm.rtm_flags |= RTF_HOST; if (ifa && ifp && ifp->sa_family == AF_LINK) { From owner-svn-src-all@freebsd.org Mon Oct 30 15:56:19 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 082D0E605B2; Mon, 30 Oct 2017 15:56:19 +0000 (UTC) (envelope-from philip@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 8E1A667D76; Mon, 30 Oct 2017 15:56:18 +0000 (UTC) (envelope-from philip@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9UFuHi1039433; Mon, 30 Oct 2017 15:56:17 GMT (envelope-from philip@FreeBSD.org) Received: (from philip@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9UFuHeB039426; Mon, 30 Oct 2017 15:56:17 GMT (envelope-from philip@FreeBSD.org) Message-Id: <201710301556.v9UFuHeB039426@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: philip set sender to philip@FreeBSD.org using -f From: Philip Paeps Date: Mon, 30 Oct 2017 15:56:17 +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: r325159 - stable/11/contrib/tzdata X-SVN-Group: stable-11 X-SVN-Commit-Author: philip X-SVN-Commit-Paths: stable/11/contrib/tzdata X-SVN-Commit-Revision: 325159 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 15:56:19 -0000 Author: philip Date: Mon Oct 30 15:56:17 2017 New Revision: 325159 URL: https://svnweb.freebsd.org/changeset/base/325159 Log: MFC r325059: import tzdata 2017c Added: stable/11/contrib/tzdata/calendars - copied unchanged from r325059, head/contrib/tzdata/calendars stable/11/contrib/tzdata/theory.html - copied unchanged from r325059, head/contrib/tzdata/theory.html stable/11/contrib/tzdata/zishrink.awk - copied unchanged from r325059, head/contrib/tzdata/zishrink.awk Deleted: stable/11/contrib/tzdata/Theory Modified: stable/11/contrib/tzdata/CONTRIBUTING stable/11/contrib/tzdata/LICENSE stable/11/contrib/tzdata/Makefile stable/11/contrib/tzdata/NEWS stable/11/contrib/tzdata/africa stable/11/contrib/tzdata/antarctica stable/11/contrib/tzdata/asia stable/11/contrib/tzdata/australasia stable/11/contrib/tzdata/backward stable/11/contrib/tzdata/backzone stable/11/contrib/tzdata/checklinks.awk stable/11/contrib/tzdata/europe stable/11/contrib/tzdata/leap-seconds.list stable/11/contrib/tzdata/leapseconds stable/11/contrib/tzdata/leapseconds.awk stable/11/contrib/tzdata/northamerica stable/11/contrib/tzdata/southamerica stable/11/contrib/tzdata/version stable/11/contrib/tzdata/zone.tab stable/11/contrib/tzdata/zone1970.tab Directory Properties: stable/11/ (props changed) Modified: stable/11/contrib/tzdata/CONTRIBUTING ============================================================================== --- stable/11/contrib/tzdata/CONTRIBUTING Mon Oct 30 15:19:28 2017 (r325158) +++ stable/11/contrib/tzdata/CONTRIBUTING Mon Oct 30 15:56:17 2017 (r325159) @@ -5,20 +5,26 @@ change timekeeping rules erratically and sometimes wit warning, the data entries do not cover all of civil time before 1970, and undoubtedly errors remain in the code and data. Feel free to fill gaps or fix mistakes, and please email improvements -to tz@iana.org for use in the future. +to tz@iana.org for use in the future. In your email, please give +reliable sources that reviewers can check. +----- + +Developers can contribute technical changes to the source code and +data as follows. + To email small changes, please run a POSIX shell command like 'diff -u old/europe new/europe >myfix.patch', and attach myfix.patch to the email. -For more-elaborate changes, please read the Theory file and browse -the mailing list archives for -examples of patches that tend to work well. Ideally, additions to +For more-elaborate changes, please read the theory.html file and browse +the mailing list archives for +examples of patches that tend to work well. Additions to data should contain commentary citing reliable sources as -justification. +justification. Citations should use https: URLs if available. Please submit changes against either the latest release in - or the master branch of the development + or the master branch of the development repository. If you use Git the following workflow may be helpful: * Copy the development repository. Modified: stable/11/contrib/tzdata/LICENSE ============================================================================== --- stable/11/contrib/tzdata/LICENSE Mon Oct 30 15:19:28 2017 (r325158) +++ stable/11/contrib/tzdata/LICENSE Mon Oct 30 15:56:17 2017 (r325159) @@ -1,4 +1,5 @@ -With a few exceptions, all files in the tz code and data (including -this one) are in the public domain. The exceptions are date.c, -newstrftime.3, and strftime.c, which contain material derived from BSD -and which use the BSD 3-clause license. +Unless specified below, all files in the tz code and data (including +this LICENSE file) are in the public domain. + +If the files date.c, newstrftime.3, and strftime.c are present, they +contain material derived from BSD and use the BSD 3-clause license. Modified: stable/11/contrib/tzdata/Makefile ============================================================================== --- stable/11/contrib/tzdata/Makefile Mon Oct 30 15:19:28 2017 (r325158) +++ stable/11/contrib/tzdata/Makefile Mon Oct 30 15:56:17 2017 (r325159) @@ -49,6 +49,7 @@ TOPDIR= /usr/local # "Compiled" time zone information is placed in the "TZDIR" directory # (and subdirectories). # Use an absolute path name for TZDIR unless you're just testing the software. +# TZDIR_BASENAME should not contain "/" and should not be ".", ".." or empty. TZDIR_BASENAME= zoneinfo TZDIR= $(TOPDIR)/etc/$(TZDIR_BASENAME) @@ -75,7 +76,7 @@ LIBDIR= $(TOPDIR)/lib # If you want only POSIX time, with time values interpreted as # seconds since the epoch (not counting leap seconds), use # REDO= posix_only -# below. If you want want only "right" time, with values interpreted +# below. If you want only "right" time, with values interpreted # as seconds since the epoch (counting leap seconds), use # REDO= right_only # below. If you want both sets of data available, with leap seconds not @@ -92,6 +93,24 @@ LIBDIR= $(TOPDIR)/lib REDO= posix_right +# To install data in text form that has all the information of the binary data, +# (optionally incorporating leap second information), use +# TZDATA_TEXT= tzdata.zi leapseconds +# To install text data without leap second information (e.g., because +# REDO='posix_only'), use +# TZDATA_TEXT= tzdata.zi +# To avoid installing text data, use +# TZDATA_TEXT= + +TZDATA_TEXT= leapseconds tzdata.zi + +# For backward-compatibility links for old zone names, use +# BACKWARD= backward pacificnew +# To omit these links, use +# BACKWARD= + +BACKWARD= backward pacificnew + # If you want out-of-scope and often-wrong data from the file 'backzone', use # PACKRATDATA= backzone # To omit this data, use @@ -99,6 +118,11 @@ REDO= posix_right PACKRATDATA= +# The name of a locale using the UTF-8 encoding, used during self-tests. +# The tests are skipped if the name does not appear to work on this system. + +UTF8_LOCALE= en_US.utf8 + # Since "." may not be in PATH... YEARISTYPE= ./yearistype @@ -106,50 +130,53 @@ YEARISTYPE= ./yearistype # Non-default libraries needed to link. LDLIBS= -# Add the following to the end of the "CFLAGS=" line as needed. +# Add the following to the end of the "CFLAGS=" line as needed to override +# defaults specified in the source code. "-DFOO" is equivalent to "-DFOO=1". # -DBIG_BANG=-9999999LL if the Big Bang occurred at time -9999999 (see zic.c) +# -DDEPRECATE_TWO_DIGIT_YEARS for optional runtime warnings about strftime +# formats that generate only the last two digits of year numbers +# -DEPOCH_LOCAL if the 'time' function returns local time not UT +# -DEPOCH_OFFSET=N if the 'time' function returns a value N greater +# than what POSIX specifies, assuming local time is UT. +# For example, N is 252460800 on AmigaOS. # -DHAVE_DECL_ASCTIME_R=0 if does not declare asctime_r +# -DHAVE_DECL_ENVIRON if declares 'environ' # -DHAVE_DIRECT_H if mkdir needs (MS-Windows) -# -DHAVE_DOS_FILE_NAMES if file names have drive specifiers etc. (MS-DOS) -# -DHAVE_GETTEXT=1 if 'gettext' works (e.g., GNU/Linux, FreeBSD, Solaris) -# -DHAVE_INCOMPATIBLE_CTIME_R=1 if your system's time.h declares +# -DHAVE_GENERIC=0 if _Generic does not work +# -DHAVE_GETTEXT if 'gettext' works (e.g., GNU/Linux, FreeBSD, Solaris) +# -DHAVE_INCOMPATIBLE_CTIME_R if your system's time.h declares # ctime_r and asctime_r incompatibly with the POSIX standard # (Solaris when _POSIX_PTHREAD_SEMANTICS is not defined). -# -DHAVE_INTTYPES_H=1 if you have a pre-C99 compiler with "inttypes.h" +# -DHAVE_INTTYPES_H if you have a non-C99 compiler with # -DHAVE_LINK=0 if your system lacks a link function # -DHAVE_LOCALTIME_R=0 if your system lacks a localtime_r function # -DHAVE_LOCALTIME_RZ=0 if you do not want zdump to use localtime_rz -# This defaults to 1 if a working localtime_rz seems to be available. # localtime_rz can make zdump significantly faster, but is nonstandard. # -DHAVE_POSIX_DECLS=0 if your system's include files do not declare # functions like 'link' or variables like 'tzname' required by POSIX -# -DHAVE_STDINT_H=1 if you have a pre-C99 compiler with "stdint.h" -# -DHAVE_STRFTIME_L=1 if declares locale_t and strftime_l -# This defaults to 0 if _POSIX_VERSION < 200809, 1 otherwise. +# -DHAVE_SNPRINTF=0 if your system lacks the snprintf function +# -DHAVE_STDBOOL_H if you have a non-C99 compiler with +# -DHAVE_STDINT_H if you have a non-C99 compiler with +# -DHAVE_STRFTIME_L if declares locale_t and strftime_l # -DHAVE_STRDUP=0 if your system lacks the strdup function # -DHAVE_SYMLINK=0 if your system lacks the symlink function -# -DHAVE_SYS_STAT_H=0 if your compiler lacks a "sys/stat.h" -# -DHAVE_SYS_WAIT_H=0 if your compiler lacks a "sys/wait.h" +# -DHAVE_SYS_STAT_H=0 if your compiler lacks a +# -DHAVE_SYS_WAIT_H=0 if your compiler lacks a # -DHAVE_TZSET=0 if your system lacks a tzset function -# -DHAVE_UNISTD_H=0 if your compiler lacks a "unistd.h" (Microsoft C++ 7?) -# -DEPOCH_LOCAL=1 if the 'time' function returns local time not UT -# -DEPOCH_OFFSET=N if the 'time' function returns a value N greater -# than what POSIX specifies, assuming local time is UT. -# For example, N is 252460800 on AmigaOS. -# -DNO_RUN_TIME_WARNINGS_ABOUT_YEAR_2000_PROBLEMS_THANK_YOU=1 -# if you do not want run time warnings about formats that may cause -# year 2000 grief -# -Dssize_t=long on ancient hosts that lack ssize_t -# -DTHREAD_SAFE=1 to make localtime.c thread-safe, as POSIX requires; +# -DHAVE_UNISTD_H=0 if your compiler lacks a +# -Dlocale_t=XXX if your system uses XXX instead of locale_t +# -Dssize_t=long on hosts like MS-Windows that lack ssize_t +# -DTHREAD_SAFE to make localtime.c thread-safe, as POSIX requires; # not needed by the main-program tz code, which is single-threaded. # Append other compiler flags as needed, e.g., -pthread on GNU/Linux. # -Dtime_tz=\"T\" to use T as the time_t type, rather than the system time_t +# This is intended for internal use only; it mangles external names. # -DTZ_DOMAIN=\"foo\" to use "foo" for gettext domain name; default is "tz" # -DTZ_DOMAINDIR=\"/path\" to use "/path" for gettext directory; # the default is system-supplied, typically "/usr/lib/locale" # -DTZDEFRULESTRING=\",date/time,date/time\" to default to the specified # DST transitions if the time zone files cannot be accessed -# -DUNINIT_TRAP=1 if reading uninitialized storage can cause problems +# -DUNINIT_TRAP if reading uninitialized storage can cause problems # other than simply getting garbage data # -DUSE_LTZ=0 to build zdump with the system time zone library # Also set TZDOBJS=zdump.o and CHECK_TIME_T_ALTERNATIVES= below. @@ -157,27 +184,28 @@ LDLIBS= # (or some other number) to set the maximum time zone abbreviation length # that zic will accept without a warning (the default is 6) # $(GCC_DEBUG_FLAGS) if you are using recent GCC and want lots of checking -GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-common -fstrict-aliasing \ - -Wall -Wextra \ - -Wbad-function-cast -Wcast-align -Wdate-time \ - -Wdeclaration-after-statement \ - -Wdouble-promotion \ - -Wformat=2 -Winit-self -Wjump-misses-init \ - -Wlogical-op -Wmissing-prototypes -Wnested-externs \ - -Wold-style-definition -Woverlength-strings -Wpointer-arith \ - -Wshadow -Wstrict-prototypes -Wsuggest-attribute=const \ - -Wsuggest-attribute=format -Wsuggest-attribute=noreturn \ - -Wsuggest-attribute=pure -Wtrampolines \ - -Wundef -Wunused -Wwrite-strings \ - -Wno-address -Wno-format-nonliteral -Wno-sign-compare \ - -Wno-type-limits -Wno-unused-parameter +# Select instrumentation via "make GCC_INSTRUMENT='whatever'". +GCC_INSTRUMENT = \ + -fsanitize=undefined -fsanitize-address-use-after-scope \ + -fsanitize-undefined-trap-on-error -fstack-protector +GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \ + $(GCC_INSTRUMENT) \ + -Wall -Wextra \ + -Walloc-size-larger-than=100000 -Warray-bounds=2 \ + -Wbad-function-cast -Wcast-align -Wdate-time \ + -Wdeclaration-after-statement -Wdouble-promotion \ + -Wformat=2 -Wformat-overflow=2 -Wformat-signedness -Wformat-truncation \ + -Winit-self -Wjump-misses-init -Wlogical-op \ + -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ + -Wold-style-definition -Woverlength-strings -Wpointer-arith \ + -Wshadow -Wshift-overflow=2 -Wstrict-prototypes -Wstringop-overflow=5 \ + -Wsuggest-attribute=const -Wsuggest-attribute=format \ + -Wsuggest-attribute=noreturn -Wsuggest-attribute=pure \ + -Wtrampolines -Wundef -Wuninitialized -Wunused \ + -Wvariadic-macros -Wvla -Wwrite-strings \ + -Wno-address -Wno-format-nonliteral -Wno-sign-compare \ + -Wno-type-limits -Wno-unused-parameter # -# If you want to use System V compatibility code, add -# -DUSG_COMPAT -# to the end of the "CFLAGS=" line. This arrange for "timezone" and "daylight" -# variables to be kept up-to-date by the time conversion functions. Neither -# "timezone" nor "daylight" is described in X3J11's work. -# # If your system has a "GMT offset" field in its "struct tm"s # (or if you decide to add such a field in your system's "time.h" file), # add the name to a define such as @@ -189,6 +217,31 @@ GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-common -fstrict- # and define NO_TM_ZONE to suppress any guessing. These two fields are not # required by POSIX, but are widely available on GNU/Linux and BSD systems. # +# The next batch of options control support for external variables +# exported by tzcode. In practice these variables are less useful +# than TM_GMTOFF and TM_ZONE. However, most of them are standardized. +# # +# # To omit or support the external variable "tzname", add one of: +# # -DHAVE_TZNAME=0 +# # -DHAVE_TZNAME=1 +# # to the "CFLAGS=" line. "tzname" is required by POSIX 1988 and later. +# # If not defined, the code attempts to guess HAVE_TZNAME from other macros. +# # Warning: unless time_tz is also defined, HAVE_TZNAME=1 can cause +# # crashes when combined with some platforms' standard libraries, +# # presumably due to memory allocation issues. +# # +# # To omit or support the external variables "timezone" and "daylight", add +# # -DUSG_COMPAT=0 +# # -DUSG_COMPAT=1 +# # to the "CFLAGS=" line; "timezone" and "daylight" are inspired by +# # Unix Systems Group code and are required by POSIX 2008 (with XSI) and later. +# # If not defined, the code attempts to guess USG_COMPAT from other macros. +# # +# # To support the external variable "altzone", add +# # -DALTZONE +# # to the end of the "CFLAGS=" line; although "altzone" appeared in +# # System V Release 3.1 it has not been standardized. +# # If you want functions that were inspired by early versions of X3J11's work, # add # -DSTD_INSPIRED @@ -226,11 +279,6 @@ GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-common -fstrict- # -DALL_STATE # to the end of the "CFLAGS=" line. Storage is obtained by calling malloc. # -# If you want an "altzone" variable (a la System V Release 3.1), add -# -DALTZONE -# to the end of the "CFLAGS=" line. -# This variable is not described in X3J11's work. -# # NIST-PCTS:151-2, Version 1.4, (1993-12-03) is a test suite put # out by the National Institute of Standards and Technology # which claims to test C and Posix conformance. If you want to pass PCTS, add @@ -240,8 +288,8 @@ GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-common -fstrict- # If you want strict compliance with XPG4 as of 1994-04-09, add # -DXPG4_1994_04_09 # to the end of the "CFLAGS=" line. This causes "strftime" to always return -# 53 as a week number (rather than 52 or 53) for those days in January that -# before the first Monday in January when a "%V" format is used and January 1 +# 53 as a week number (rather than 52 or 53) for January days before +# January's first Monday when a "%V" format is used and January 1 # falls on a Friday, Saturday, or Sunday. CFLAGS= @@ -265,7 +313,7 @@ ZFLAGS= # How to use zic to install tz binary files. -ZIC_INSTALL= $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) $(LEAPSECONDS) +ZIC_INSTALL= $(ZIC) -d $(DESTDIR)$(TZDIR) $(LEAPSECONDS) # The name of a Posix-compliant 'awk' on your system. AWK= awk @@ -289,6 +337,7 @@ SGML_CATALOG_FILES= \ # The name, arguments and environment of a program to validate your web pages. # See for a validator, and # for a validation library. +# Set VALIDATE=':' if you do not have such a program. VALIDATE = nsgmls VALIDATE_FLAGS = -s -B -wall -wno-unused-param VALIDATE_ENV = \ @@ -355,7 +404,7 @@ AR= ar RANLIB= : TZCOBJS= zic.o -TZDOBJS= zdump.o localtime.o asctime.o +TZDOBJS= zdump.o localtime.o asctime.o strftime.o DATEOBJS= date.o localtime.o strftime.o asctime.o LIBSRCS= localtime.c asctime.c difftime.c LIBOBJS= localtime.o asctime.o difftime.o @@ -370,33 +419,35 @@ MANTXTS= newctime.3.txt newstrftime.3.txt newtzset.3.t time2posix.3.txt \ tzfile.5.txt tzselect.8.txt zic.8.txt zdump.8.txt \ date.1.txt -COMMON= CONTRIBUTING LICENSE Makefile NEWS README Theory version +COMMON= calendars CONTRIBUTING LICENSE Makefile \ + NEWS README theory.html version WEB_PAGES= tz-art.htm tz-how-to.html tz-link.htm DOCS= $(MANS) date.1 $(MANTXTS) $(WEB_PAGES) PRIMARY_YDATA= africa antarctica asia australasia \ europe northamerica southamerica -YDATA= $(PRIMARY_YDATA) pacificnew etcetera backward +YDATA= $(PRIMARY_YDATA) etcetera $(BACKWARD) NDATA= systemv factory TDATA= $(YDATA) $(NDATA) ZONETABLES= zone1970.tab zone.tab -TABDATA= iso3166.tab leapseconds $(ZONETABLES) +TABDATA= iso3166.tab $(TZDATA_TEXT) $(ZONETABLES) LEAP_DEPS= leapseconds.awk leap-seconds.list -DATA= $(YDATA) $(NDATA) backzone $(TABDATA) \ - leap-seconds.list yearistype.sh -AWK_SCRIPTS= checklinks.awk checktab.awk leapseconds.awk +TZDATA_ZI_DEPS= zishrink.awk $(TDATA) $(PACKRATDATA) +DATA= $(YDATA) $(NDATA) backzone iso3166.tab leap-seconds.list \ + leapseconds yearistype.sh $(ZONETABLES) +AWK_SCRIPTS= checklinks.awk checktab.awk leapseconds.awk zishrink.awk MISC= $(AWK_SCRIPTS) zoneinfo2tdf.pl TZS_YEAR= 2050 TZS= to$(TZS_YEAR).tzs TZS_NEW= to$(TZS_YEAR)new.tzs TZS_DEPS= $(PRIMARY_YDATA) asctime.c localtime.c \ private.h tzfile.h zdump.c zic.c -ENCHILADA= $(COMMON) $(DOCS) $(SOURCES) $(DATA) $(MISC) $(TZS) +ENCHILADA= $(COMMON) $(DOCS) $(SOURCES) $(DATA) $(MISC) $(TZS) tzdata.zi # Consult these files when deciding whether to rebuild the 'version' file. # This list is not the same as the output of 'git ls-files', since # .gitignore is not distributed. VERSION_DEPS= \ - CONTRIBUTING LICENSE Makefile NEWS README Theory \ + calendars CONTRIBUTING LICENSE Makefile NEWS README \ africa antarctica asctime.c asia australasia \ backward backzone \ checklinks.awk checktab.awk \ @@ -405,7 +456,7 @@ VERSION_DEPS= \ leap-seconds.list leapseconds.awk localtime.c \ newctime.3 newstrftime.3 newtzset.3 northamerica \ pacificnew private.h \ - southamerica strftime.c systemv \ + southamerica strftime.c systemv theory.html \ time2posix.3 tz-art.htm tz-how-to.html tz-link.htm \ tzfile.5 tzfile.h tzselect.8 tzselect.ksh \ workman.sh yearistype.sh \ @@ -427,7 +478,7 @@ install: all $(DATA) $(REDO) $(MANS) $(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \ $(DESTDIR)$(MANDIR)/man8 $(ZIC_INSTALL) -l $(LOCALTIME) -p $(POSIXRULES) - cp -f iso3166.tab $(ZONETABLES) $(DESTDIR)$(TZDIR)/. + cp -f $(TABDATA) $(DESTDIR)$(TZDIR)/. cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/. cp libtz.a $(DESTDIR)$(LIBDIR)/. $(RANLIB) $(DESTDIR)$(LIBDIR)/libtz.a @@ -448,6 +499,11 @@ version: $(VERSION_DEPS) printf '%s\n' "$$V" >$@.out mv $@.out $@ +# This file can be tailored by setting BACKWARD, PACKRATDATA, etc. +tzdata.zi: $(TZDATA_ZI_DEPS) + LC_ALL=C $(AWK) -f zishrink.awk $(TDATA) $(PACKRATDATA) >$@.out + mv $@.out $@ + version.h: version VERSION=`cat version` && printf '%s\n' \ 'static char const PKGVERSION[]="($(PACKAGE)) ";' \ @@ -473,6 +529,7 @@ leapseconds: $(LEAP_DEPS) # Arguments to pass to submakes of install_data. # They can be overridden by later submake arguments. INSTALLARGS = \ + BACKWARD=$(BACKWARD) \ DESTDIR=$(DESTDIR) \ LEAPSECONDS='$(LEAPSECONDS)' \ PACKRATDATA='$(PACKRATDATA)' \ @@ -481,10 +538,8 @@ INSTALLARGS = \ ZIC='$(ZIC)' # 'make install_data' installs one set of tz binary files. -# It can be tailored by setting LEAPSECONDS, PACKRATDATA, etc. -install_data: zic leapseconds yearistype $(PACKRATDATA) $(TDATA) - $(ZIC_INSTALL) $(TDATA) - $(AWK) '/^Rule/' $(TDATA) | $(ZIC_INSTALL) - $(PACKRATDATA) +install_data: zic leapseconds yearistype tzdata.zi + $(ZIC_INSTALL) tzdata.zi posix_only: $(MAKE) $(INSTALLARGS) LEAPSECONDS= install_data @@ -521,14 +576,14 @@ posix_packrat: zones: $(REDO) -$(TZS_NEW): $(TDATA) zdump zic +$(TZS_NEW): tzdata.zi zdump zic mkdir -p tzs.dir - $(zic) -d tzs.dir $(TDATA) - $(AWK) '/^Link/{print $$1 "\t" $$2 "\t" $$3}' \ - $(TDATA) | LC_ALL=C sort >$@.out + $(zic) -d tzs.dir tzdata.zi + $(AWK) '/^L/{print "Link\t" $$2 "\t" $$3}' \ + tzdata.zi | LC_ALL=C sort >$@.out wd=`pwd` && \ zones=`$(AWK) -v wd="$$wd" \ - '/^Zone/{print wd "/tzs.dir/" $$2}' $(TDATA) \ + '/^Z/{print wd "/tzs.dir/" $$2}' tzdata.zi \ | LC_ALL=C sort` && \ ./zdump -i -c $(TZS_YEAR) $$zones >>$@.out sed 's,^TZ=".*tzs\.dir/,TZ=",' $@.out >$@.sed.out @@ -564,24 +619,37 @@ tzselect: tzselect.ksh version chmod +x $@.out mv $@.out $@ -check: check_character_set check_white_space check_links check_sorted \ - check_tables check_tzs check_web +check: check_character_set check_white_space check_links \ + check_name_lengths check_sorted \ + check_tables check_web check_zishrink check_tzs check_character_set: $(ENCHILADA) - LC_ALL=en_US.utf8 && export LC_ALL && \ + test ! '$(UTF8_LOCALE)' || \ + ! printf 'A\304\200B\n' | \ + LC_ALL='$(UTF8_LOCALE)' grep -q '^A.B$$' >/dev/null 2>&1 || { \ + LC_ALL='$(UTF8_LOCALE)' && export LC_ALL && \ sharp='#' && \ ! grep -Env $(SAFE_LINE) $(MANS) date.1 $(MANTXTS) \ $(MISC) $(SOURCES) $(WEB_PAGES) \ - CONTRIBUTING LICENSE Makefile README version && \ + CONTRIBUTING LICENSE Makefile README \ + version tzdata.zi && \ ! grep -Env $(SAFE_SHARP_LINE) $(TDATA) backzone \ leapseconds yearistype.sh zone.tab && \ - ! grep -Env $(OK_LINE) $(ENCHILADA) + ! grep -Env $(OK_LINE) $(ENCHILADA); \ + } check_white_space: $(ENCHILADA) patfmt=' \t|[\f\r\v]' && pat=`printf "$$patfmt\\n"` && \ ! grep -En "$$pat" $(ENCHILADA) ! grep -n '[[:space:]]$$' $(ENCHILADA) +PRECEDES_FILE_NAME = ^(Zone|Link[[:space:]]+[^[:space:]]+)[[:space:]]+ +FILE_NAME_COMPONENT_TOO_LONG = \ + $(PRECEDES_FILE_NAME)[^[:space:]]*[^/[:space:]]{15} + +check_name_lengths: $(TDATA) backzone + ! grep -En '$(FILE_NAME_COMPONENT_TOO_LONG)' $(TDATA) backzone + CHECK_CC_LIST = { n = split($$1,a,/,/); for (i=2; i<=n; i++) print a[1], a[i]; } check_sorted: backward backzone iso3166.tab zone.tab zone1970.tab @@ -596,6 +664,7 @@ check_sorted: backward backzone iso3166.tab zone.tab z check_links: checklinks.awk $(TDATA) $(AWK) -f checklinks.awk $(TDATA) + $(AWK) -f checklinks.awk tzdata.zi check_tables: checktab.awk $(PRIMARY_YDATA) $(ZONETABLES) for tab in $(ZONETABLES); do \ @@ -606,14 +675,32 @@ check_tables: checktab.awk $(PRIMARY_YDATA) $(ZONETABL check_tzs: $(TZS) $(TZS_NEW) diff -u $(TZS) $(TZS_NEW) -check_web: $(WEB_PAGES) - $(VALIDATE_ENV) $(VALIDATE) $(VALIDATE_FLAGS) $(WEB_PAGES) +# This checks only the HTML 4.01 strict page. +# To check the the other pages, use . +check_web: tz-how-to.html + $(VALIDATE_ENV) $(VALIDATE) $(VALIDATE_FLAGS) tz-how-to.html +# Check that tzdata.zi generates the same binary data that its sources do. +check_zishrink: tzdata.zi zic leapseconds $(PACKRATDATA) $(TDATA) + for type in posix right; do \ + mkdir -p time_t.dir/$$type time_t.dir/$$type-shrunk && \ + case $$type in \ + right) leap='-L leapseconds';; \ + *) leap=;; \ + esac && \ + $(ZIC) $$leap -d time_t.dir/$$type $(TDATA) && \ + $(AWK) '/^Rule/' $(TDATA) | \ + $(ZIC) $$leap -d time_t.dir/$$type - $(PACKRATDATA) && \ + $(ZIC) $$leap -d time_t.dir/$$type-shrunk tzdata.zi && \ + diff -r time_t.dir/$$type time_t.dir/$$type-shrunk || exit; \ + done + rm -fr time_t.dir + clean_misc: rm -f core *.o *.out \ date tzselect version.h zdump zic yearistype libtz.a clean: clean_misc - rm -fr *.dir tzdb-*/ $(TZS_NEW) + rm -fr *.dir tzdata.zi tzdb-*/ $(TZS_NEW) maintainer-clean: clean @echo 'This command is intended for maintainers to use; it' @@ -667,6 +754,7 @@ set-timestamps.out: $(ENCHILADA) touch -cmr `ls -t $$file workman.sh | sed 1q` $$file.txt || \ exit; \ done + touch -cmr `ls -t $(TZDATA_ZI_DEPS) | sed 1q` tzdata.zi touch -cmr `ls -t $(TZS_DEPS) | sed 1q` $(TZS) touch -cmr `ls -t $(VERSION_DEPS) | sed 1q` version touch $@ @@ -678,7 +766,7 @@ check_public: $(MAKE) maintainer-clean $(MAKE) "CFLAGS=$(GCC_DEBUG_FLAGS)" ALL mkdir -p public.dir - for i in $(TDATA) ; do \ + for i in $(TDATA) tzdata.zi; do \ $(zic) -v -d public.dir $$i 2>&1 || exit; \ done $(zic) -v -d public.dir $(TDATA) @@ -772,8 +860,8 @@ typecheck: $(MAKE) clean ; \ done -zonenames: $(TDATA) - @$(AWK) '/^Zone/ { print $$2 } /^Link/ { print $$3 }' $(TDATA) +zonenames: tzdata.zi + @$(AWK) '/^Z/ { print $$2 } /^L/ { print $$3 }' tzdata.zi asctime.o: private.h tzfile.h date.o: private.h @@ -789,6 +877,7 @@ zic.o: private.h tzfile.h version.h .PHONY: check check_character_set check_links .PHONY: check_public check_sorted check_tables .PHONY: check_time_t_alternatives check_tzs check_web check_white_space +.PHONY: check_zishrink .PHONY: clean clean_misc force_tzs .PHONY: install install_data maintainer-clean names .PHONY: posix_only posix_packrat posix_right Modified: stable/11/contrib/tzdata/NEWS ============================================================================== --- stable/11/contrib/tzdata/NEWS Mon Oct 30 15:19:28 2017 (r325158) +++ stable/11/contrib/tzdata/NEWS Mon Oct 30 15:56:17 2017 (r325159) @@ -1,5 +1,169 @@ News for the tz database +Release 2017c - 2017-10-20 14:49:34 -0700 + + Briefly: + Northern Cyprus switches from +03 to +02/+03 on 2017-10-29. + Fiji ends DST 2018-01-14, not 2018-01-21. + Namibia switches from +01/+02 to +02 on 2018-04-01. + Sudan switches from +03 to +02 on 2017-11-01. + Tonga likely switches from +13/+14 to +13 on 2017-11-05. + Turks & Caicos switches from -04 to -05/-04 on 2018-11-04. + A new file tzdata.zi now holds a small text copy of all data. + The zic input format has been regularized slightly. + + Changes to future time stamps + + Northern Cyprus has decided to resume EU rules starting + 2017-10-29, thus reinstituting winter time. + + Fiji ends DST 2018-01-14 instead of the 2018-01-21 previously + predicted. (Thanks to Dominic Fok.) Adjust future predictions + accordingly. + + Namibia will switch from +01 with DST to +02 all year on + 2017-09-03 at 02:00. This affects UT offsets starting 2018-04-01 + at 02:00. (Thanks to Steffen Thorsen.) + + Sudan will switch from +03 to +02 on 2017-11-01. (Thanks to Ahmed + Atyya and Yahia Abdalla.) South Sudan is not switching, so + Africa/Juba is no longer a link to Africa/Khartoum. + + Tonga has likely ended its experiment with DST, and will not + adjust its clocks on 2017-11-05. Although Tonga has not announced + whether it will continue to observe DST, the IATA is assuming that + it will not. (Thanks to David Wade.) + + Turks & Caicos will switch from -04 all year to -05 with US DST on + 2018-03-11 at 03:00. This affects UT offsets starting 2018-11-04 + at 02:00. (Thanks to Steffen Thorsen.) + + Changes to past time stamps + + Namibia switched from +02 to +01 on 1994-03-21, not 1994-04-03. + (Thanks to Arthur David Olson.) + + Detroit did not observe DST in 1967. + + Use railway time for Asia/Kolkata before 1941, by switching to + Madras local time (UT +052110) in 1870, then to IST (UT +0530) in + 1906. Also, treat 1941-2's +0630 as DST, like 1942-5. + + Europe/Dublin's 1946 and 1947 fallback transitions occurred at + 02:00 standard time, not 02:00 DST. (Thanks to Michael Deckers.) + + Pacific/Apia and Pacific/Pago_Pago switched from Antipodean to + American time in 1892, not 1879. (Thanks to Michael Deckers.) + + Adjust the 1867 transition in Alaska to better reflect the + historical record, by changing it to occur on 1867-10-18 at 15:30 + Sitka time rather than at the start of 1867-10-17 local time. + Although strictly speaking this is accurate only for Sitka, + the rest of Alaska's blanks need to be filled in somehow. + + Fix off-by-one errors in UT offsets for Adak and Nome before 1867. + (Thanks to Michael Deckers.) + + Add 7 s to the UT offset in Asia/Yangon before 1920. + + Changes to zone names + + Remove Canada/East-Saskatchewan from the 'backward' file, as it + exceeded the 14-character limit and was an unused misnomer anyway. + + Changes to build procedure + + To support applications that prefer to read time zone data in text + form, two zic input files tzdata.zi and leapseconds are now + installed by default. The commands 'zic tzdata.zi' and 'zic -L + leapseconds tzdata.zi' can reproduce the tzdata binary files + without and with leap seconds, respectively. To prevent these two + new files from being installed, use 'make TZDATA_TEXT=', and to + suppress leap seconds from the tzdata text installation, use 'make + TZDATA_TEXT=tzdata.zi'. + + 'make BACKWARD=' now suppresses backward-compatibility names + like 'US/Pacific' that are defined in the 'backward' and + 'pacificnew' files. + + 'make check' now works on systems that lack a UTF-8 locale, + or that lack the nsgmls program. Set UTF8_LOCALE to configure + the name of a UTF-8 locale, if you have one. + + Y2K runtime checks are no longer enabled by default. Add + -DDEPRECATE_TWO_DIGIT_YEARS to CFLAGS to enable them, instead of + adding -DNO_RUN_TIME_WARNINGS_ABOUT_YEAR_2000_PROBLEMS_THANK_YOU + to disable them. (New name suggested by Brian Inglis.) + + The build procedure for zdump now works on AIX 7.1. + (Problem reported by Kees Dekker.) + + Changes to code + + zic and the reference runtime now reject multiple leap seconds + within 28 days of each other, or leap seconds before the Epoch. + As a result, support for double leap seconds, which was + obsolescent and undocumented, has been removed. Double leap + seconds were an error in the C89 standard; they have never existed + in civil timekeeping. (Thanks to Robert Elz and Bradley White for + noticing glitches in the code that uncovered this problem.) + + zic now warns about use of the obsolescent and undocumented -y + option, and about use of the obsolescent TYPE field of Rule lines. + + zic now allows unambiguous abbreviations like "Sa" and "Su" for + weekdays; formerly it rejected them due to a bug. Conversely, zic + no longer considers non-prefixes to be abbreviations; for example, + it no longer accepts "lF" as an abbreviation for "lastFriday". + Also, zic warns about the undocumented usage with a "last-" + prefix, e.g., "last-Fri". + + Similarly, zic now accepts the unambiguous abbreviation "L" for + "Link" in ordinary context and for "Leap" in leap-second context. + Conversely, zic no longer accepts non-prefixes such as "La" as + abbreviations for words like "Leap". + + zic no longer accepts leap second lines in ordinary input, or + ordinary lines in leap second input. Formerly, zic sometimes + warned about this undocumented usage and handled it incorrectly. + + The new macro HAVE_TZNAME governs whether the tzname external + variable is exported, instead of USG_COMPAT. USG_COMPAT now + governs only the external variables "timezone" and "daylight". + This change is needed because the three variables are not in the + same category: although POSIX requires tzname, it specifies the + other two variables as optional. Also, USG_COMPAT is now 1 or 0: + if not defined, the code attempts to guess it from other macros. + + localtime.c and difftime.c no longer require stdio.h, and .c files + other than zic.c no longer require sys/wait.h. + + zdump.c no longer assumes snprintf. (Reported by Jonathan Leffler.) + + Calculation of time_t extrema works around a bug in GCC 4.8.4 + (Reported by Stan Shebs and Joseph Myers.) + + zic.c no longer mistranslates formats of line numbers in non-English + locales. (Problem reported by Benno Schulenberg.) + + Several minor changes have been made to the code to make it a + bit easier to port to MS-Windows and Solaris. (Thanks to Kees + Dekker for reporting the problems.) + + Changes to documentation and commentary + + The two new files 'theory.html' and 'calendars' contain the + contents of the removed file 'Theory'. The goal is to document + tzdb theory more accessibly. + + The zic man page now documents abbreviation rules. + + tz-link.htm now covers how to apply tzdata changes to clients. + (Thanks to Jorge Fábregas for the AIX link.) It also mentions MySQL. + + The leap-seconds.list URL has been updated to something that is + more reliable for tzdb. (Thanks to Tim Parenti and Brian Inglis.) + Release 2017b - 2017-03-17 07:30:38 -0700 Briefly: Haiti has resumed DST. @@ -15,7 +179,17 @@ Release 2017b - 2017-03-17 07:30:38 -0700 Use "MMT" to abbreviate Liberia's time zone before 1972, as "-004430" is one byte over the POSIX limit. (Problem reported by Derick Rethans.) + Changes to code + The reference localtime implementation now falls back on the + current US daylight-saving transition rules rather than the + 1987-2006 rules. This fallback occurs only when (1) the TZ + environment variable's value has a name like "AST4ADT" that asks + for daylight saving time but does not specify the rules, (2) there + is no file by that name, and (3) the TZDEFRULES file cannot be + loaded. (Thanks to Tom Lane.) + + Release 2017a - 2017-02-28 00:05:36 -0800 Briefly: Southern Chile moves from -04/-03 to -03, and Mongolia @@ -1981,7 +2155,7 @@ Release 2013e - 2013-09-19 23:50:04 -0700 The 'leapseconds' file is now generated automatically from a new file 'leap-seconds.list', which is a copy of - . + A new source file 'leapseconds.awk' implements this. The goal is simplification of the future maintenance of 'leapseconds'. @@ -2187,7 +2361,7 @@ Release 2013a - 2013-02-27 09:20:35 -0800 Many changes affect historical timestamps before 1940. These were deduced from: Milne J. Civil time. Geogr J. 1899 - Feb;13(2):173-94 . + Feb;13(2):173-94 . Changes affecting the code: Modified: stable/11/contrib/tzdata/africa ============================================================================== --- stable/11/contrib/tzdata/africa Mon Oct 30 15:19:28 2017 (r325158) +++ stable/11/contrib/tzdata/africa Mon Oct 30 15:56:17 2017 (r325159) @@ -26,7 +26,7 @@ # # For data circa 1899, a common source is: # Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94. -# http://www.jstor.org/stable/1774359 +# https://www.jstor.org/stable/1774359 # # A reliable and entertaining source about time zones is # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997). @@ -218,7 +218,7 @@ Rule Egypt 2006 only - Sep 21 24:00 0 - # saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07. # From Jesper Nørgaard Welen (2007-08-15): [The following agree:] # http://www.nentjes.info/Bill/bill5.htm -# http://www.timeanddate.com/worldclock/city.html?n=53 +# https://www.timeanddate.com/worldclock/city.html?n=53 # From Steffen Thorsen (2007-09-04): The official information...: # http://www.sis.gov.eg/En/EgyptOnline/Miscellaneous/000002/0207000000000000001580.htm Rule Egypt 2007 only - Sep Thu>=1 24:00 0 - @@ -256,8 +256,8 @@ Rule Egypt 2007 only - Sep Thu>=1 24:00 0 - # timeanddate[2] and another site I've found[3] also support that. # # [1] https://bugzilla.redhat.com/show_bug.cgi?id=492263 -# [2] http://www.timeanddate.com/worldclock/clockchange.html?n=53 -# [3] http://wwp.greenwichmeantime.com/time-zone/africa/egypt/ +# [2] https://www.timeanddate.com/worldclock/clockchange.html?n=53 +# [3] https://wwp.greenwichmeantime.com/time-zone/africa/egypt/ # From Arthur David Olson (2009-04-20): # In 2009 (and for the next several years), Ramadan ends before the fourth @@ -267,10 +267,10 @@ Rule Egypt 2007 only - Sep Thu>=1 24:00 0 - # From Steffen Thorsen (2009-08-11): # We have been able to confirm the August change with the Egyptian Cabinet # Information and Decision Support Center: -# http://www.timeanddate.com/news/time/egypt-dst-ends-2009.html +# https://www.timeanddate.com/news/time/egypt-dst-ends-2009.html # # The Middle East News Agency -# http://www.mena.org.eg/index.aspx +# https://www.mena.org.eg/index.aspx # also reports "Egypt starts winter time on August 21" # today in article numbered "71, 11/08/2009 12:25 GMT." # Only the title above is available without a subscription to their service, @@ -320,7 +320,7 @@ Rule Egypt 2007 only - Sep Thu>=1 24:00 0 - # Thursday of April.... Clocks will still be turned back for Ramadan, but # dates not yet announced.... # http://almogaz.com/news/weird-news/2015/04/05/1947105 ... -# http://www.timeanddate.com/news/time/egypt-starts-dst-2015.html +# https://www.timeanddate.com/news/time/egypt-starts-dst-2015.html # From Ahmed Nazmy (2015-04-20): # Egypt's ministers cabinet just announced ... that it will cancel DST at @@ -447,11 +447,11 @@ Zone Africa/Monrovia -0:43:08 - LMT 1882 # From Even Scharning (2012-11-10): # Libya set their time one hour back at 02:00 on Saturday November 10. -# http://www.libyaherald.com/2012/11/04/clocks-to-go-back-an-hour-on-saturday/ +# https://www.libyaherald.com/2012/11/04/clocks-to-go-back-an-hour-on-saturday/ # Here is an official source [in Arabic]: http://ls.ly/fb6Yc # # Steffen Thorsen forwarded a translation (2012-11-10) in -# http://mm.icann.org/pipermail/tz/2012-November/018451.html +# https://mm.icann.org/pipermail/tz/2012-November/018451.html # # From Tim Parenti (2012-11-11): # Treat the 2012-11-10 change as a zone change from UTC+2 to UTC+1. @@ -462,7 +462,7 @@ Zone Africa/Monrovia -0:43:08 - LMT 1882 # From Even Scharning (2013-10-25): # The scheduled end of DST in Libya on Friday, October 25, 2013 was # cancelled yesterday.... -# http://www.libyaherald.com/2013/10/24/correction-no-time-change-tomorrow/ +# https://www.libyaherald.com/2013/10/24/correction-no-time-change-tomorrow/ # # From Paul Eggert (2013-10-25): # For now, assume they're reverting to the pre-2012 rules of permanent UT +02. @@ -515,7 +515,7 @@ Zone Africa/Tripoli 0:52:44 - LMT 1920 # basis.... # It seems that Mauritius observed daylight saving time from 1982-10-10 to # 1983-03-20 as well, but that was not successful.... -# http://www.timeanddate.com/news/time/mauritius-daylight-saving-time.html +# https://www.timeanddate.com/news/time/mauritius-daylight-saving-time.html # From Alex Krivenyshev (2008-06-25): # http://economicdevelopment.gov.mu/portal/site/Mainhomepage/menuitem.a42b24128104d9845dabddd154508a0c/?content_id=0a7cee8b5d69a110VgnVCM1000000a04a8c0RCRD @@ -583,7 +583,7 @@ Zone Africa/Tripoli 0:52:44 - LMT 1920 # http://lexpress.mu/Story/3398~Beebeejaun---Les-objectifs-d-%C3%A9conomie-d-%C3%A9nergie-de-l-heure-d-%C3%A9t%C3%A9-ont-%C3%A9t%C3%A9-atteints- # # Our wrap-up: -# http://www.timeanddate.com/news/time/mauritius-dst-will-not-repeat.html +# https://www.timeanddate.com/news/time/mauritius-dst-will-not-repeat.html # From Arthur David Olson (2009-07-11): # The "mauritius-dst-will-not-repeat" wrapup includes this: @@ -615,7 +615,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # be one hour ahead of GMT between 1 June and 27 September, according to # Communication Minister and Government Spokesman, Khalid Naciri...." # -# http://www.worldtimezone.net/dst_news/dst_news_morocco01.html +# http://www.worldtimezone.com/dst_news/dst_news_morocco01.html # http://en.afrik.com/news11892.html # From Alex Krivenyshev (2008-05-09): @@ -628,7 +628,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # From Patrice Scattolin (2008-05-09): # According to this article: -# http://www.avmaroc.com/actualite/heure-dete-comment-a127896.html +# https://www.avmaroc.com/actualite/heure-dete-comment-a127896.html # (and republished here: ) # the changes occur at midnight: # @@ -650,7 +650,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # posted in English). # # The following Google query will generate many relevant hits: -# http://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search +# https://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search # From Steffen Thorsen (2008-08-27): # Morocco will change the clocks back on the midnight between August 31 @@ -661,7 +661,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # http://www.menara.ma/fr/Actualites/Maroc/Societe/ci.retour_a_l_heure_gmt_a_partir_du_dimanche_31_aout_a_minuit_officiel_.default # # We have some further details posted here: -# http://www.timeanddate.com/news/time/morocco-ends-dst-early-2008.html +# https://www.timeanddate.com/news/time/morocco-ends-dst-early-2008.html # From Steffen Thorsen (2009-03-17): # Morocco will observe DST from 2009-06-01 00:00 to 2009-08-21 00:00 according @@ -671,7 +671,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # (French) # # Our summary: -# http://www.timeanddate.com/news/time/morocco-starts-dst-2009.html +# https://www.timeanddate.com/news/time/morocco-starts-dst-2009.html # From Alexander Krivenyshev (2009-03-17): # Here is a link to official document from Royaume du Maroc Premier Ministre, @@ -694,7 +694,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # http://www.lavieeco.com/actualites/4099-le-maroc-passera-a-l-heure-d-ete-gmt1-le-2-mai.html # (French) # Our page: -# http://www.timeanddate.com/news/time/morocco-starts-dst-2010.html +# https://www.timeanddate.com/news/time/morocco-starts-dst-2010.html # From Dan Abitol (2011-03-30): # ...Rules for Africa/Casablanca are the following (24h format) @@ -711,7 +711,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # They said that the decision was already taken. # # More articles in the press -# http://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-leve.html +# https://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-leve.html # http://www.lematin.ma/Actualite/Express/Article.asp?id=148923 # http://www.lavieeco.com/actualite/Le-Maroc-passe-sur-GMT%2B1-a-partir-de-dim @@ -803,7 +803,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # 1433 (18 April 2012) and the decision of the Head of Government of # 16 N. 3-29-15 Chaaban 1435 (4 June 2015). # Source (french): -# http://lnt.ma/le-maroc-reculera-dune-heure-le-dimanche-14-juin/ +# https://lnt.ma/le-maroc-reculera-dune-heure-le-dimanche-14-juin/ # # From Milamber (2015-06-09): # http://www.mmsp.gov.ma/fr/actualites.aspx?id=863 @@ -812,7 +812,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # [The gov.ma announcement] would (probably) make the switch on 2015-07-19 go # from 03:00 to 04:00 rather than from 02:00 to 03:00, as in the patch.... # I think the patch is correct and the quoted text is wrong; the text in -# agrees +# agrees # with the patch. # From Paul Eggert (2015-06-08): @@ -937,10 +937,18 @@ Link Africa/Maputo Africa/Kigali # Rwanda Link Africa/Maputo Africa/Lubumbashi # E Dem. Rep. of Congo Link Africa/Maputo Africa/Lusaka # Zambia + # Namibia -# The 1994-04-03 transition is from Shanks & Pottenger. -# Shanks & Pottenger report no DST after 1998-04; go with IATA. +# From Arthur David Olson (2017-08-09): +# The text of the "Namibia Time Act, 1994" is available online at +# www.lac.org.na/laws/1994/811.pdf +# and includes this nugget: +# Notwithstanding the provisions of subsection (2) of section 1, the +# first winter period after the commencement of this Act shall +# commence at OOhOO on Monday 21 March 1994 and shall end at 02h00 on +# Sunday 4 September 1994. + # From Petronella Sibeene (2007-03-30): # http://allafrica.com/stories/200703300178.html # While the entire country changes its time, Katima Mulilo and other @@ -955,19 +963,30 @@ Link Africa/Maputo Africa/Lusaka # Zambia # observes Botswana time, we have no details about historical practice. # In the meantime people there can use Africa/Gaborone. # See: Immanuel S. The Namibian. 2017-02-23. -# http://www.namibian.com.na/51480/read/Time-change-divides-lawmakers +# https://www.namibian.com.na/51480/read/Time-change-divides-lawmakers +# From Steffen Thorsen (2017-08-09): +# Namibia is going to change their time zone to what is now their DST: +# https://www.newera.com.na/2017/02/23/namibias-winter-time-might-be-repealed/ +# This video is from the government decision: +# https://www.nbc.na/news/na-passes-namibia-time-bill-repealing-1994-namibia-time-act.8665 +# We have made the assumption so far that they will change their time zone at +# the same time they would normally start DST, the first Sunday in September: +# https://www.timeanddate.com/news/time/namibia-new-time-zone.html + # RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S -Rule Namibia 1994 max - Sep Sun>=1 2:00 1:00 S -Rule Namibia 1995 max - Apr Sun>=1 2:00 0 - +Rule Namibia 1994 only - Mar 21 0:00 0 - +Rule Namibia 1994 2016 - Sep Sun>=1 2:00 1:00 S +Rule Namibia 1995 2017 - Apr Sun>=1 2:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Windhoek 1:08:24 - LMT 1892 Feb 8 1:30 - +0130 1903 Mar 2:00 - SAST 1942 Sep 20 2:00 2:00 1:00 SAST 1943 Mar 21 2:00 2:00 - SAST 1990 Mar 21 # independence - 2:00 - CAT 1994 Apr 3 - 1:00 Namibia WA%sT + 2:00 - CAT 1994 Mar 21 0:00 + 1:00 Namibia WA%sT 2017 Sep 3 2:00 + 2:00 - CAT # Niger # See Africa/Lagos. @@ -1054,14 +1073,24 @@ Link Africa/Johannesburg Africa/Mbabane # Swaziland # no information # Sudan -# + # From # Sudan News Agency (2000-01-13), # also reported by Michaël De Beukelaer-Dossche via Steffen Thorsen: # Clocks will be moved ahead for 60 minutes all over the Sudan as of noon # Saturday.... This was announced Thursday by Caretaker State Minister for # Manpower Abdul-Rahman Nur-Eddin. + *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Mon Oct 30 15:57: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 EAB19E6063F; Mon, 30 Oct 2017 15:57:40 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 BB4F567ED6; Mon, 30 Oct 2017 15:57:40 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (unknown [127.0.1.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id 0EAAF10C2D; Mon, 30 Oct 2017 15:57:40 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id 0D86B9C4C; Mon, 30 Oct 2017 15:57:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id Qr7z0WG6fZPL; Mon, 30 Oct 2017 15:57:36 +0000 (UTC) Subject: Re: svn commit: r322951 - head DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com 499CB9C47 To: "Ngie Cooper (yaneurabeya)" Cc: Ngie Cooper , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201708271615.v7RGFcKs033967@repo.freebsd.org> From: Bryan Drewery Organization: FreeBSD Message-ID: <34af7231-29ff-5ebe-44d1-0a7ae0dea235@FreeBSD.org> Date: Mon, 30 Oct 2017 08:57:10 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="6X0UANm7l0OUS0U2mC2ftqR4H2e2FPehs" 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 15:57:41 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --6X0UANm7l0OUS0U2mC2ftqR4H2e2FPehs Content-Type: multipart/mixed; boundary="XrhXVkibhNwKBAIQLLAal3wFKaJdAIGoK"; protected-headers="v1" From: Bryan Drewery To: "Ngie Cooper (yaneurabeya)" Cc: Ngie Cooper , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <34af7231-29ff-5ebe-44d1-0a7ae0dea235@FreeBSD.org> Subject: Re: svn commit: r322951 - head References: <201708271615.v7RGFcKs033967@repo.freebsd.org> In-Reply-To: --XrhXVkibhNwKBAIQLLAal3wFKaJdAIGoK Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 10/30/17 1:44 AM, Ngie Cooper (yaneurabeya) wrote: >=20 >> On Oct 25, 2017, at 13:34, Bryan Drewery wrote:= >=20 > =E2=80=A6 >=20 >> I don't understand what you're saying here. If I build with MK_TCSH=3D= yes >> 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? >> >> The change here is to build-tools which just calls 'make build-tools' = in >> bin/csh which just builds 'gethost'. >=20 > Yes. The relnotes concerns I mentioned are bogus. >=20 > Yeah, a ~400 line C file isn=E2=80=99t that bad, I agree. >=20 > 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. I wasn't trying to argue or anything, just trying to understand if there was a big issue here. Thanks! >=20 --=20 Regards, Bryan Drewery --XrhXVkibhNwKBAIQLLAal3wFKaJdAIGoK-- --6X0UANm7l0OUS0U2mC2ftqR4H2e2FPehs Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQEzBAEBCgAdFiEE+Rc8ssOq6npcih8JNddxu25Gl88FAln3S9gACgkQNddxu25G l89uqQgAnZsdszqHGmfjv7IiN3IbeNB0QYtfbs3hPhKXmtxvaM0dc1WvX0Ch3FtN 0ECaKc/Z8dzcRX/Q6wZ/SK2SE++oRd6TEVqgQeeZxiRkUt3agN242eKBfJvAvPlM jfqgxd8IG7NfAtQFCy8+KwHEeF2Th2seIxwatSTBSSmRPd3HtdC/NHmagM9nb7bU +WlJ9Nj/8lEkDE5SguU8fi+beEmzg0WHlDmPPDH818T2OFMPJu0TSgHs1ApKnhfP KulZvWlQTQPR9VHgtqbJeL17egNY4RFSEsyDqm7BVC9znNTOWWbkTbyKMVrc2Czt NTub5X8F2twtX7xD6kbpQ+7urjUD2Q== =V/3U -----END PGP SIGNATURE----- --6X0UANm7l0OUS0U2mC2ftqR4H2e2FPehs-- From owner-svn-src-all@freebsd.org Mon Oct 30 15:57: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 33401E60681; Mon, 30 Oct 2017 15:57:50 +0000 (UTC) (envelope-from philip@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 CC51668057; Mon, 30 Oct 2017 15:57:49 +0000 (UTC) (envelope-from philip@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9UFvmUh039540; Mon, 30 Oct 2017 15:57:48 GMT (envelope-from philip@FreeBSD.org) Received: (from philip@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9UFvmZc039534; Mon, 30 Oct 2017 15:57:48 GMT (envelope-from philip@FreeBSD.org) Message-Id: <201710301557.v9UFvmZc039534@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: philip set sender to philip@FreeBSD.org using -f From: Philip Paeps Date: Mon, 30 Oct 2017 15:57:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r325160 - stable/10/contrib/tzdata X-SVN-Group: stable-10 X-SVN-Commit-Author: philip X-SVN-Commit-Paths: stable/10/contrib/tzdata X-SVN-Commit-Revision: 325160 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 15:57:50 -0000 Author: philip Date: Mon Oct 30 15:57:48 2017 New Revision: 325160 URL: https://svnweb.freebsd.org/changeset/base/325160 Log: MFC r325059: import tzdata 2017c Added: stable/10/contrib/tzdata/calendars - copied unchanged from r325059, head/contrib/tzdata/calendars stable/10/contrib/tzdata/theory.html - copied unchanged from r325059, head/contrib/tzdata/theory.html stable/10/contrib/tzdata/zishrink.awk - copied unchanged from r325059, head/contrib/tzdata/zishrink.awk Deleted: stable/10/contrib/tzdata/Theory Modified: stable/10/contrib/tzdata/CONTRIBUTING stable/10/contrib/tzdata/LICENSE stable/10/contrib/tzdata/Makefile stable/10/contrib/tzdata/NEWS stable/10/contrib/tzdata/africa stable/10/contrib/tzdata/antarctica stable/10/contrib/tzdata/asia stable/10/contrib/tzdata/australasia stable/10/contrib/tzdata/backward stable/10/contrib/tzdata/backzone stable/10/contrib/tzdata/checklinks.awk stable/10/contrib/tzdata/europe stable/10/contrib/tzdata/leap-seconds.list stable/10/contrib/tzdata/leapseconds stable/10/contrib/tzdata/leapseconds.awk stable/10/contrib/tzdata/northamerica stable/10/contrib/tzdata/southamerica stable/10/contrib/tzdata/version stable/10/contrib/tzdata/zone.tab stable/10/contrib/tzdata/zone1970.tab Directory Properties: stable/10/ (props changed) Modified: stable/10/contrib/tzdata/CONTRIBUTING ============================================================================== --- stable/10/contrib/tzdata/CONTRIBUTING Mon Oct 30 15:56:17 2017 (r325159) +++ stable/10/contrib/tzdata/CONTRIBUTING Mon Oct 30 15:57:48 2017 (r325160) @@ -5,20 +5,26 @@ change timekeeping rules erratically and sometimes wit warning, the data entries do not cover all of civil time before 1970, and undoubtedly errors remain in the code and data. Feel free to fill gaps or fix mistakes, and please email improvements -to tz@iana.org for use in the future. +to tz@iana.org for use in the future. In your email, please give +reliable sources that reviewers can check. +----- + +Developers can contribute technical changes to the source code and +data as follows. + To email small changes, please run a POSIX shell command like 'diff -u old/europe new/europe >myfix.patch', and attach myfix.patch to the email. -For more-elaborate changes, please read the Theory file and browse -the mailing list archives for -examples of patches that tend to work well. Ideally, additions to +For more-elaborate changes, please read the theory.html file and browse +the mailing list archives for +examples of patches that tend to work well. Additions to data should contain commentary citing reliable sources as -justification. +justification. Citations should use https: URLs if available. Please submit changes against either the latest release in - or the master branch of the development + or the master branch of the development repository. If you use Git the following workflow may be helpful: * Copy the development repository. Modified: stable/10/contrib/tzdata/LICENSE ============================================================================== --- stable/10/contrib/tzdata/LICENSE Mon Oct 30 15:56:17 2017 (r325159) +++ stable/10/contrib/tzdata/LICENSE Mon Oct 30 15:57:48 2017 (r325160) @@ -1,4 +1,5 @@ -With a few exceptions, all files in the tz code and data (including -this one) are in the public domain. The exceptions are date.c, -newstrftime.3, and strftime.c, which contain material derived from BSD -and which use the BSD 3-clause license. +Unless specified below, all files in the tz code and data (including +this LICENSE file) are in the public domain. + +If the files date.c, newstrftime.3, and strftime.c are present, they +contain material derived from BSD and use the BSD 3-clause license. Modified: stable/10/contrib/tzdata/Makefile ============================================================================== --- stable/10/contrib/tzdata/Makefile Mon Oct 30 15:56:17 2017 (r325159) +++ stable/10/contrib/tzdata/Makefile Mon Oct 30 15:57:48 2017 (r325160) @@ -49,6 +49,7 @@ TOPDIR= /usr/local # "Compiled" time zone information is placed in the "TZDIR" directory # (and subdirectories). # Use an absolute path name for TZDIR unless you're just testing the software. +# TZDIR_BASENAME should not contain "/" and should not be ".", ".." or empty. TZDIR_BASENAME= zoneinfo TZDIR= $(TOPDIR)/etc/$(TZDIR_BASENAME) @@ -75,7 +76,7 @@ LIBDIR= $(TOPDIR)/lib # If you want only POSIX time, with time values interpreted as # seconds since the epoch (not counting leap seconds), use # REDO= posix_only -# below. If you want want only "right" time, with values interpreted +# below. If you want only "right" time, with values interpreted # as seconds since the epoch (counting leap seconds), use # REDO= right_only # below. If you want both sets of data available, with leap seconds not @@ -92,6 +93,24 @@ LIBDIR= $(TOPDIR)/lib REDO= posix_right +# To install data in text form that has all the information of the binary data, +# (optionally incorporating leap second information), use +# TZDATA_TEXT= tzdata.zi leapseconds +# To install text data without leap second information (e.g., because +# REDO='posix_only'), use +# TZDATA_TEXT= tzdata.zi +# To avoid installing text data, use +# TZDATA_TEXT= + +TZDATA_TEXT= leapseconds tzdata.zi + +# For backward-compatibility links for old zone names, use +# BACKWARD= backward pacificnew +# To omit these links, use +# BACKWARD= + +BACKWARD= backward pacificnew + # If you want out-of-scope and often-wrong data from the file 'backzone', use # PACKRATDATA= backzone # To omit this data, use @@ -99,6 +118,11 @@ REDO= posix_right PACKRATDATA= +# The name of a locale using the UTF-8 encoding, used during self-tests. +# The tests are skipped if the name does not appear to work on this system. + +UTF8_LOCALE= en_US.utf8 + # Since "." may not be in PATH... YEARISTYPE= ./yearistype @@ -106,50 +130,53 @@ YEARISTYPE= ./yearistype # Non-default libraries needed to link. LDLIBS= -# Add the following to the end of the "CFLAGS=" line as needed. +# Add the following to the end of the "CFLAGS=" line as needed to override +# defaults specified in the source code. "-DFOO" is equivalent to "-DFOO=1". # -DBIG_BANG=-9999999LL if the Big Bang occurred at time -9999999 (see zic.c) +# -DDEPRECATE_TWO_DIGIT_YEARS for optional runtime warnings about strftime +# formats that generate only the last two digits of year numbers +# -DEPOCH_LOCAL if the 'time' function returns local time not UT +# -DEPOCH_OFFSET=N if the 'time' function returns a value N greater +# than what POSIX specifies, assuming local time is UT. +# For example, N is 252460800 on AmigaOS. # -DHAVE_DECL_ASCTIME_R=0 if does not declare asctime_r +# -DHAVE_DECL_ENVIRON if declares 'environ' # -DHAVE_DIRECT_H if mkdir needs (MS-Windows) -# -DHAVE_DOS_FILE_NAMES if file names have drive specifiers etc. (MS-DOS) -# -DHAVE_GETTEXT=1 if 'gettext' works (e.g., GNU/Linux, FreeBSD, Solaris) -# -DHAVE_INCOMPATIBLE_CTIME_R=1 if your system's time.h declares +# -DHAVE_GENERIC=0 if _Generic does not work +# -DHAVE_GETTEXT if 'gettext' works (e.g., GNU/Linux, FreeBSD, Solaris) +# -DHAVE_INCOMPATIBLE_CTIME_R if your system's time.h declares # ctime_r and asctime_r incompatibly with the POSIX standard # (Solaris when _POSIX_PTHREAD_SEMANTICS is not defined). -# -DHAVE_INTTYPES_H=1 if you have a pre-C99 compiler with "inttypes.h" +# -DHAVE_INTTYPES_H if you have a non-C99 compiler with # -DHAVE_LINK=0 if your system lacks a link function # -DHAVE_LOCALTIME_R=0 if your system lacks a localtime_r function # -DHAVE_LOCALTIME_RZ=0 if you do not want zdump to use localtime_rz -# This defaults to 1 if a working localtime_rz seems to be available. # localtime_rz can make zdump significantly faster, but is nonstandard. # -DHAVE_POSIX_DECLS=0 if your system's include files do not declare # functions like 'link' or variables like 'tzname' required by POSIX -# -DHAVE_STDINT_H=1 if you have a pre-C99 compiler with "stdint.h" -# -DHAVE_STRFTIME_L=1 if declares locale_t and strftime_l -# This defaults to 0 if _POSIX_VERSION < 200809, 1 otherwise. +# -DHAVE_SNPRINTF=0 if your system lacks the snprintf function +# -DHAVE_STDBOOL_H if you have a non-C99 compiler with +# -DHAVE_STDINT_H if you have a non-C99 compiler with +# -DHAVE_STRFTIME_L if declares locale_t and strftime_l # -DHAVE_STRDUP=0 if your system lacks the strdup function # -DHAVE_SYMLINK=0 if your system lacks the symlink function -# -DHAVE_SYS_STAT_H=0 if your compiler lacks a "sys/stat.h" -# -DHAVE_SYS_WAIT_H=0 if your compiler lacks a "sys/wait.h" +# -DHAVE_SYS_STAT_H=0 if your compiler lacks a +# -DHAVE_SYS_WAIT_H=0 if your compiler lacks a # -DHAVE_TZSET=0 if your system lacks a tzset function -# -DHAVE_UNISTD_H=0 if your compiler lacks a "unistd.h" (Microsoft C++ 7?) -# -DEPOCH_LOCAL=1 if the 'time' function returns local time not UT -# -DEPOCH_OFFSET=N if the 'time' function returns a value N greater -# than what POSIX specifies, assuming local time is UT. -# For example, N is 252460800 on AmigaOS. -# -DNO_RUN_TIME_WARNINGS_ABOUT_YEAR_2000_PROBLEMS_THANK_YOU=1 -# if you do not want run time warnings about formats that may cause -# year 2000 grief -# -Dssize_t=long on ancient hosts that lack ssize_t -# -DTHREAD_SAFE=1 to make localtime.c thread-safe, as POSIX requires; +# -DHAVE_UNISTD_H=0 if your compiler lacks a +# -Dlocale_t=XXX if your system uses XXX instead of locale_t +# -Dssize_t=long on hosts like MS-Windows that lack ssize_t +# -DTHREAD_SAFE to make localtime.c thread-safe, as POSIX requires; # not needed by the main-program tz code, which is single-threaded. # Append other compiler flags as needed, e.g., -pthread on GNU/Linux. # -Dtime_tz=\"T\" to use T as the time_t type, rather than the system time_t +# This is intended for internal use only; it mangles external names. # -DTZ_DOMAIN=\"foo\" to use "foo" for gettext domain name; default is "tz" # -DTZ_DOMAINDIR=\"/path\" to use "/path" for gettext directory; # the default is system-supplied, typically "/usr/lib/locale" # -DTZDEFRULESTRING=\",date/time,date/time\" to default to the specified # DST transitions if the time zone files cannot be accessed -# -DUNINIT_TRAP=1 if reading uninitialized storage can cause problems +# -DUNINIT_TRAP if reading uninitialized storage can cause problems # other than simply getting garbage data # -DUSE_LTZ=0 to build zdump with the system time zone library # Also set TZDOBJS=zdump.o and CHECK_TIME_T_ALTERNATIVES= below. @@ -157,27 +184,28 @@ LDLIBS= # (or some other number) to set the maximum time zone abbreviation length # that zic will accept without a warning (the default is 6) # $(GCC_DEBUG_FLAGS) if you are using recent GCC and want lots of checking -GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-common -fstrict-aliasing \ - -Wall -Wextra \ - -Wbad-function-cast -Wcast-align -Wdate-time \ - -Wdeclaration-after-statement \ - -Wdouble-promotion \ - -Wformat=2 -Winit-self -Wjump-misses-init \ - -Wlogical-op -Wmissing-prototypes -Wnested-externs \ - -Wold-style-definition -Woverlength-strings -Wpointer-arith \ - -Wshadow -Wstrict-prototypes -Wsuggest-attribute=const \ - -Wsuggest-attribute=format -Wsuggest-attribute=noreturn \ - -Wsuggest-attribute=pure -Wtrampolines \ - -Wundef -Wunused -Wwrite-strings \ - -Wno-address -Wno-format-nonliteral -Wno-sign-compare \ - -Wno-type-limits -Wno-unused-parameter +# Select instrumentation via "make GCC_INSTRUMENT='whatever'". +GCC_INSTRUMENT = \ + -fsanitize=undefined -fsanitize-address-use-after-scope \ + -fsanitize-undefined-trap-on-error -fstack-protector +GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \ + $(GCC_INSTRUMENT) \ + -Wall -Wextra \ + -Walloc-size-larger-than=100000 -Warray-bounds=2 \ + -Wbad-function-cast -Wcast-align -Wdate-time \ + -Wdeclaration-after-statement -Wdouble-promotion \ + -Wformat=2 -Wformat-overflow=2 -Wformat-signedness -Wformat-truncation \ + -Winit-self -Wjump-misses-init -Wlogical-op \ + -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ + -Wold-style-definition -Woverlength-strings -Wpointer-arith \ + -Wshadow -Wshift-overflow=2 -Wstrict-prototypes -Wstringop-overflow=5 \ + -Wsuggest-attribute=const -Wsuggest-attribute=format \ + -Wsuggest-attribute=noreturn -Wsuggest-attribute=pure \ + -Wtrampolines -Wundef -Wuninitialized -Wunused \ + -Wvariadic-macros -Wvla -Wwrite-strings \ + -Wno-address -Wno-format-nonliteral -Wno-sign-compare \ + -Wno-type-limits -Wno-unused-parameter # -# If you want to use System V compatibility code, add -# -DUSG_COMPAT -# to the end of the "CFLAGS=" line. This arrange for "timezone" and "daylight" -# variables to be kept up-to-date by the time conversion functions. Neither -# "timezone" nor "daylight" is described in X3J11's work. -# # If your system has a "GMT offset" field in its "struct tm"s # (or if you decide to add such a field in your system's "time.h" file), # add the name to a define such as @@ -189,6 +217,31 @@ GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-common -fstrict- # and define NO_TM_ZONE to suppress any guessing. These two fields are not # required by POSIX, but are widely available on GNU/Linux and BSD systems. # +# The next batch of options control support for external variables +# exported by tzcode. In practice these variables are less useful +# than TM_GMTOFF and TM_ZONE. However, most of them are standardized. +# # +# # To omit or support the external variable "tzname", add one of: +# # -DHAVE_TZNAME=0 +# # -DHAVE_TZNAME=1 +# # to the "CFLAGS=" line. "tzname" is required by POSIX 1988 and later. +# # If not defined, the code attempts to guess HAVE_TZNAME from other macros. +# # Warning: unless time_tz is also defined, HAVE_TZNAME=1 can cause +# # crashes when combined with some platforms' standard libraries, +# # presumably due to memory allocation issues. +# # +# # To omit or support the external variables "timezone" and "daylight", add +# # -DUSG_COMPAT=0 +# # -DUSG_COMPAT=1 +# # to the "CFLAGS=" line; "timezone" and "daylight" are inspired by +# # Unix Systems Group code and are required by POSIX 2008 (with XSI) and later. +# # If not defined, the code attempts to guess USG_COMPAT from other macros. +# # +# # To support the external variable "altzone", add +# # -DALTZONE +# # to the end of the "CFLAGS=" line; although "altzone" appeared in +# # System V Release 3.1 it has not been standardized. +# # If you want functions that were inspired by early versions of X3J11's work, # add # -DSTD_INSPIRED @@ -226,11 +279,6 @@ GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-common -fstrict- # -DALL_STATE # to the end of the "CFLAGS=" line. Storage is obtained by calling malloc. # -# If you want an "altzone" variable (a la System V Release 3.1), add -# -DALTZONE -# to the end of the "CFLAGS=" line. -# This variable is not described in X3J11's work. -# # NIST-PCTS:151-2, Version 1.4, (1993-12-03) is a test suite put # out by the National Institute of Standards and Technology # which claims to test C and Posix conformance. If you want to pass PCTS, add @@ -240,8 +288,8 @@ GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-common -fstrict- # If you want strict compliance with XPG4 as of 1994-04-09, add # -DXPG4_1994_04_09 # to the end of the "CFLAGS=" line. This causes "strftime" to always return -# 53 as a week number (rather than 52 or 53) for those days in January that -# before the first Monday in January when a "%V" format is used and January 1 +# 53 as a week number (rather than 52 or 53) for January days before +# January's first Monday when a "%V" format is used and January 1 # falls on a Friday, Saturday, or Sunday. CFLAGS= @@ -265,7 +313,7 @@ ZFLAGS= # How to use zic to install tz binary files. -ZIC_INSTALL= $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) $(LEAPSECONDS) +ZIC_INSTALL= $(ZIC) -d $(DESTDIR)$(TZDIR) $(LEAPSECONDS) # The name of a Posix-compliant 'awk' on your system. AWK= awk @@ -289,6 +337,7 @@ SGML_CATALOG_FILES= \ # The name, arguments and environment of a program to validate your web pages. # See for a validator, and # for a validation library. +# Set VALIDATE=':' if you do not have such a program. VALIDATE = nsgmls VALIDATE_FLAGS = -s -B -wall -wno-unused-param VALIDATE_ENV = \ @@ -355,7 +404,7 @@ AR= ar RANLIB= : TZCOBJS= zic.o -TZDOBJS= zdump.o localtime.o asctime.o +TZDOBJS= zdump.o localtime.o asctime.o strftime.o DATEOBJS= date.o localtime.o strftime.o asctime.o LIBSRCS= localtime.c asctime.c difftime.c LIBOBJS= localtime.o asctime.o difftime.o @@ -370,33 +419,35 @@ MANTXTS= newctime.3.txt newstrftime.3.txt newtzset.3.t time2posix.3.txt \ tzfile.5.txt tzselect.8.txt zic.8.txt zdump.8.txt \ date.1.txt -COMMON= CONTRIBUTING LICENSE Makefile NEWS README Theory version +COMMON= calendars CONTRIBUTING LICENSE Makefile \ + NEWS README theory.html version WEB_PAGES= tz-art.htm tz-how-to.html tz-link.htm DOCS= $(MANS) date.1 $(MANTXTS) $(WEB_PAGES) PRIMARY_YDATA= africa antarctica asia australasia \ europe northamerica southamerica -YDATA= $(PRIMARY_YDATA) pacificnew etcetera backward +YDATA= $(PRIMARY_YDATA) etcetera $(BACKWARD) NDATA= systemv factory TDATA= $(YDATA) $(NDATA) ZONETABLES= zone1970.tab zone.tab -TABDATA= iso3166.tab leapseconds $(ZONETABLES) +TABDATA= iso3166.tab $(TZDATA_TEXT) $(ZONETABLES) LEAP_DEPS= leapseconds.awk leap-seconds.list -DATA= $(YDATA) $(NDATA) backzone $(TABDATA) \ - leap-seconds.list yearistype.sh -AWK_SCRIPTS= checklinks.awk checktab.awk leapseconds.awk +TZDATA_ZI_DEPS= zishrink.awk $(TDATA) $(PACKRATDATA) +DATA= $(YDATA) $(NDATA) backzone iso3166.tab leap-seconds.list \ + leapseconds yearistype.sh $(ZONETABLES) +AWK_SCRIPTS= checklinks.awk checktab.awk leapseconds.awk zishrink.awk MISC= $(AWK_SCRIPTS) zoneinfo2tdf.pl TZS_YEAR= 2050 TZS= to$(TZS_YEAR).tzs TZS_NEW= to$(TZS_YEAR)new.tzs TZS_DEPS= $(PRIMARY_YDATA) asctime.c localtime.c \ private.h tzfile.h zdump.c zic.c -ENCHILADA= $(COMMON) $(DOCS) $(SOURCES) $(DATA) $(MISC) $(TZS) +ENCHILADA= $(COMMON) $(DOCS) $(SOURCES) $(DATA) $(MISC) $(TZS) tzdata.zi # Consult these files when deciding whether to rebuild the 'version' file. # This list is not the same as the output of 'git ls-files', since # .gitignore is not distributed. VERSION_DEPS= \ - CONTRIBUTING LICENSE Makefile NEWS README Theory \ + calendars CONTRIBUTING LICENSE Makefile NEWS README \ africa antarctica asctime.c asia australasia \ backward backzone \ checklinks.awk checktab.awk \ @@ -405,7 +456,7 @@ VERSION_DEPS= \ leap-seconds.list leapseconds.awk localtime.c \ newctime.3 newstrftime.3 newtzset.3 northamerica \ pacificnew private.h \ - southamerica strftime.c systemv \ + southamerica strftime.c systemv theory.html \ time2posix.3 tz-art.htm tz-how-to.html tz-link.htm \ tzfile.5 tzfile.h tzselect.8 tzselect.ksh \ workman.sh yearistype.sh \ @@ -427,7 +478,7 @@ install: all $(DATA) $(REDO) $(MANS) $(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \ $(DESTDIR)$(MANDIR)/man8 $(ZIC_INSTALL) -l $(LOCALTIME) -p $(POSIXRULES) - cp -f iso3166.tab $(ZONETABLES) $(DESTDIR)$(TZDIR)/. + cp -f $(TABDATA) $(DESTDIR)$(TZDIR)/. cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/. cp libtz.a $(DESTDIR)$(LIBDIR)/. $(RANLIB) $(DESTDIR)$(LIBDIR)/libtz.a @@ -448,6 +499,11 @@ version: $(VERSION_DEPS) printf '%s\n' "$$V" >$@.out mv $@.out $@ +# This file can be tailored by setting BACKWARD, PACKRATDATA, etc. +tzdata.zi: $(TZDATA_ZI_DEPS) + LC_ALL=C $(AWK) -f zishrink.awk $(TDATA) $(PACKRATDATA) >$@.out + mv $@.out $@ + version.h: version VERSION=`cat version` && printf '%s\n' \ 'static char const PKGVERSION[]="($(PACKAGE)) ";' \ @@ -473,6 +529,7 @@ leapseconds: $(LEAP_DEPS) # Arguments to pass to submakes of install_data. # They can be overridden by later submake arguments. INSTALLARGS = \ + BACKWARD=$(BACKWARD) \ DESTDIR=$(DESTDIR) \ LEAPSECONDS='$(LEAPSECONDS)' \ PACKRATDATA='$(PACKRATDATA)' \ @@ -481,10 +538,8 @@ INSTALLARGS = \ ZIC='$(ZIC)' # 'make install_data' installs one set of tz binary files. -# It can be tailored by setting LEAPSECONDS, PACKRATDATA, etc. -install_data: zic leapseconds yearistype $(PACKRATDATA) $(TDATA) - $(ZIC_INSTALL) $(TDATA) - $(AWK) '/^Rule/' $(TDATA) | $(ZIC_INSTALL) - $(PACKRATDATA) +install_data: zic leapseconds yearistype tzdata.zi + $(ZIC_INSTALL) tzdata.zi posix_only: $(MAKE) $(INSTALLARGS) LEAPSECONDS= install_data @@ -521,14 +576,14 @@ posix_packrat: zones: $(REDO) -$(TZS_NEW): $(TDATA) zdump zic +$(TZS_NEW): tzdata.zi zdump zic mkdir -p tzs.dir - $(zic) -d tzs.dir $(TDATA) - $(AWK) '/^Link/{print $$1 "\t" $$2 "\t" $$3}' \ - $(TDATA) | LC_ALL=C sort >$@.out + $(zic) -d tzs.dir tzdata.zi + $(AWK) '/^L/{print "Link\t" $$2 "\t" $$3}' \ + tzdata.zi | LC_ALL=C sort >$@.out wd=`pwd` && \ zones=`$(AWK) -v wd="$$wd" \ - '/^Zone/{print wd "/tzs.dir/" $$2}' $(TDATA) \ + '/^Z/{print wd "/tzs.dir/" $$2}' tzdata.zi \ | LC_ALL=C sort` && \ ./zdump -i -c $(TZS_YEAR) $$zones >>$@.out sed 's,^TZ=".*tzs\.dir/,TZ=",' $@.out >$@.sed.out @@ -564,24 +619,37 @@ tzselect: tzselect.ksh version chmod +x $@.out mv $@.out $@ -check: check_character_set check_white_space check_links check_sorted \ - check_tables check_tzs check_web +check: check_character_set check_white_space check_links \ + check_name_lengths check_sorted \ + check_tables check_web check_zishrink check_tzs check_character_set: $(ENCHILADA) - LC_ALL=en_US.utf8 && export LC_ALL && \ + test ! '$(UTF8_LOCALE)' || \ + ! printf 'A\304\200B\n' | \ + LC_ALL='$(UTF8_LOCALE)' grep -q '^A.B$$' >/dev/null 2>&1 || { \ + LC_ALL='$(UTF8_LOCALE)' && export LC_ALL && \ sharp='#' && \ ! grep -Env $(SAFE_LINE) $(MANS) date.1 $(MANTXTS) \ $(MISC) $(SOURCES) $(WEB_PAGES) \ - CONTRIBUTING LICENSE Makefile README version && \ + CONTRIBUTING LICENSE Makefile README \ + version tzdata.zi && \ ! grep -Env $(SAFE_SHARP_LINE) $(TDATA) backzone \ leapseconds yearistype.sh zone.tab && \ - ! grep -Env $(OK_LINE) $(ENCHILADA) + ! grep -Env $(OK_LINE) $(ENCHILADA); \ + } check_white_space: $(ENCHILADA) patfmt=' \t|[\f\r\v]' && pat=`printf "$$patfmt\\n"` && \ ! grep -En "$$pat" $(ENCHILADA) ! grep -n '[[:space:]]$$' $(ENCHILADA) +PRECEDES_FILE_NAME = ^(Zone|Link[[:space:]]+[^[:space:]]+)[[:space:]]+ +FILE_NAME_COMPONENT_TOO_LONG = \ + $(PRECEDES_FILE_NAME)[^[:space:]]*[^/[:space:]]{15} + +check_name_lengths: $(TDATA) backzone + ! grep -En '$(FILE_NAME_COMPONENT_TOO_LONG)' $(TDATA) backzone + CHECK_CC_LIST = { n = split($$1,a,/,/); for (i=2; i<=n; i++) print a[1], a[i]; } check_sorted: backward backzone iso3166.tab zone.tab zone1970.tab @@ -596,6 +664,7 @@ check_sorted: backward backzone iso3166.tab zone.tab z check_links: checklinks.awk $(TDATA) $(AWK) -f checklinks.awk $(TDATA) + $(AWK) -f checklinks.awk tzdata.zi check_tables: checktab.awk $(PRIMARY_YDATA) $(ZONETABLES) for tab in $(ZONETABLES); do \ @@ -606,14 +675,32 @@ check_tables: checktab.awk $(PRIMARY_YDATA) $(ZONETABL check_tzs: $(TZS) $(TZS_NEW) diff -u $(TZS) $(TZS_NEW) -check_web: $(WEB_PAGES) - $(VALIDATE_ENV) $(VALIDATE) $(VALIDATE_FLAGS) $(WEB_PAGES) +# This checks only the HTML 4.01 strict page. +# To check the the other pages, use . +check_web: tz-how-to.html + $(VALIDATE_ENV) $(VALIDATE) $(VALIDATE_FLAGS) tz-how-to.html +# Check that tzdata.zi generates the same binary data that its sources do. +check_zishrink: tzdata.zi zic leapseconds $(PACKRATDATA) $(TDATA) + for type in posix right; do \ + mkdir -p time_t.dir/$$type time_t.dir/$$type-shrunk && \ + case $$type in \ + right) leap='-L leapseconds';; \ + *) leap=;; \ + esac && \ + $(ZIC) $$leap -d time_t.dir/$$type $(TDATA) && \ + $(AWK) '/^Rule/' $(TDATA) | \ + $(ZIC) $$leap -d time_t.dir/$$type - $(PACKRATDATA) && \ + $(ZIC) $$leap -d time_t.dir/$$type-shrunk tzdata.zi && \ + diff -r time_t.dir/$$type time_t.dir/$$type-shrunk || exit; \ + done + rm -fr time_t.dir + clean_misc: rm -f core *.o *.out \ date tzselect version.h zdump zic yearistype libtz.a clean: clean_misc - rm -fr *.dir tzdb-*/ $(TZS_NEW) + rm -fr *.dir tzdata.zi tzdb-*/ $(TZS_NEW) maintainer-clean: clean @echo 'This command is intended for maintainers to use; it' @@ -667,6 +754,7 @@ set-timestamps.out: $(ENCHILADA) touch -cmr `ls -t $$file workman.sh | sed 1q` $$file.txt || \ exit; \ done + touch -cmr `ls -t $(TZDATA_ZI_DEPS) | sed 1q` tzdata.zi touch -cmr `ls -t $(TZS_DEPS) | sed 1q` $(TZS) touch -cmr `ls -t $(VERSION_DEPS) | sed 1q` version touch $@ @@ -678,7 +766,7 @@ check_public: $(MAKE) maintainer-clean $(MAKE) "CFLAGS=$(GCC_DEBUG_FLAGS)" ALL mkdir -p public.dir - for i in $(TDATA) ; do \ + for i in $(TDATA) tzdata.zi; do \ $(zic) -v -d public.dir $$i 2>&1 || exit; \ done $(zic) -v -d public.dir $(TDATA) @@ -772,8 +860,8 @@ typecheck: $(MAKE) clean ; \ done -zonenames: $(TDATA) - @$(AWK) '/^Zone/ { print $$2 } /^Link/ { print $$3 }' $(TDATA) +zonenames: tzdata.zi + @$(AWK) '/^Z/ { print $$2 } /^L/ { print $$3 }' tzdata.zi asctime.o: private.h tzfile.h date.o: private.h @@ -789,6 +877,7 @@ zic.o: private.h tzfile.h version.h .PHONY: check check_character_set check_links .PHONY: check_public check_sorted check_tables .PHONY: check_time_t_alternatives check_tzs check_web check_white_space +.PHONY: check_zishrink .PHONY: clean clean_misc force_tzs .PHONY: install install_data maintainer-clean names .PHONY: posix_only posix_packrat posix_right Modified: stable/10/contrib/tzdata/NEWS ============================================================================== --- stable/10/contrib/tzdata/NEWS Mon Oct 30 15:56:17 2017 (r325159) +++ stable/10/contrib/tzdata/NEWS Mon Oct 30 15:57:48 2017 (r325160) @@ -1,5 +1,169 @@ News for the tz database +Release 2017c - 2017-10-20 14:49:34 -0700 + + Briefly: + Northern Cyprus switches from +03 to +02/+03 on 2017-10-29. + Fiji ends DST 2018-01-14, not 2018-01-21. + Namibia switches from +01/+02 to +02 on 2018-04-01. + Sudan switches from +03 to +02 on 2017-11-01. + Tonga likely switches from +13/+14 to +13 on 2017-11-05. + Turks & Caicos switches from -04 to -05/-04 on 2018-11-04. + A new file tzdata.zi now holds a small text copy of all data. + The zic input format has been regularized slightly. + + Changes to future time stamps + + Northern Cyprus has decided to resume EU rules starting + 2017-10-29, thus reinstituting winter time. + + Fiji ends DST 2018-01-14 instead of the 2018-01-21 previously + predicted. (Thanks to Dominic Fok.) Adjust future predictions + accordingly. + + Namibia will switch from +01 with DST to +02 all year on + 2017-09-03 at 02:00. This affects UT offsets starting 2018-04-01 + at 02:00. (Thanks to Steffen Thorsen.) + + Sudan will switch from +03 to +02 on 2017-11-01. (Thanks to Ahmed + Atyya and Yahia Abdalla.) South Sudan is not switching, so + Africa/Juba is no longer a link to Africa/Khartoum. + + Tonga has likely ended its experiment with DST, and will not + adjust its clocks on 2017-11-05. Although Tonga has not announced + whether it will continue to observe DST, the IATA is assuming that + it will not. (Thanks to David Wade.) + + Turks & Caicos will switch from -04 all year to -05 with US DST on + 2018-03-11 at 03:00. This affects UT offsets starting 2018-11-04 + at 02:00. (Thanks to Steffen Thorsen.) + + Changes to past time stamps + + Namibia switched from +02 to +01 on 1994-03-21, not 1994-04-03. + (Thanks to Arthur David Olson.) + + Detroit did not observe DST in 1967. + + Use railway time for Asia/Kolkata before 1941, by switching to + Madras local time (UT +052110) in 1870, then to IST (UT +0530) in + 1906. Also, treat 1941-2's +0630 as DST, like 1942-5. + + Europe/Dublin's 1946 and 1947 fallback transitions occurred at + 02:00 standard time, not 02:00 DST. (Thanks to Michael Deckers.) + + Pacific/Apia and Pacific/Pago_Pago switched from Antipodean to + American time in 1892, not 1879. (Thanks to Michael Deckers.) + + Adjust the 1867 transition in Alaska to better reflect the + historical record, by changing it to occur on 1867-10-18 at 15:30 + Sitka time rather than at the start of 1867-10-17 local time. + Although strictly speaking this is accurate only for Sitka, + the rest of Alaska's blanks need to be filled in somehow. + + Fix off-by-one errors in UT offsets for Adak and Nome before 1867. + (Thanks to Michael Deckers.) + + Add 7 s to the UT offset in Asia/Yangon before 1920. + + Changes to zone names + + Remove Canada/East-Saskatchewan from the 'backward' file, as it + exceeded the 14-character limit and was an unused misnomer anyway. + + Changes to build procedure + + To support applications that prefer to read time zone data in text + form, two zic input files tzdata.zi and leapseconds are now + installed by default. The commands 'zic tzdata.zi' and 'zic -L + leapseconds tzdata.zi' can reproduce the tzdata binary files + without and with leap seconds, respectively. To prevent these two + new files from being installed, use 'make TZDATA_TEXT=', and to + suppress leap seconds from the tzdata text installation, use 'make + TZDATA_TEXT=tzdata.zi'. + + 'make BACKWARD=' now suppresses backward-compatibility names + like 'US/Pacific' that are defined in the 'backward' and + 'pacificnew' files. + + 'make check' now works on systems that lack a UTF-8 locale, + or that lack the nsgmls program. Set UTF8_LOCALE to configure + the name of a UTF-8 locale, if you have one. + + Y2K runtime checks are no longer enabled by default. Add + -DDEPRECATE_TWO_DIGIT_YEARS to CFLAGS to enable them, instead of + adding -DNO_RUN_TIME_WARNINGS_ABOUT_YEAR_2000_PROBLEMS_THANK_YOU + to disable them. (New name suggested by Brian Inglis.) + + The build procedure for zdump now works on AIX 7.1. + (Problem reported by Kees Dekker.) + + Changes to code + + zic and the reference runtime now reject multiple leap seconds + within 28 days of each other, or leap seconds before the Epoch. + As a result, support for double leap seconds, which was + obsolescent and undocumented, has been removed. Double leap + seconds were an error in the C89 standard; they have never existed + in civil timekeeping. (Thanks to Robert Elz and Bradley White for + noticing glitches in the code that uncovered this problem.) + + zic now warns about use of the obsolescent and undocumented -y + option, and about use of the obsolescent TYPE field of Rule lines. + + zic now allows unambiguous abbreviations like "Sa" and "Su" for + weekdays; formerly it rejected them due to a bug. Conversely, zic + no longer considers non-prefixes to be abbreviations; for example, + it no longer accepts "lF" as an abbreviation for "lastFriday". + Also, zic warns about the undocumented usage with a "last-" + prefix, e.g., "last-Fri". + + Similarly, zic now accepts the unambiguous abbreviation "L" for + "Link" in ordinary context and for "Leap" in leap-second context. + Conversely, zic no longer accepts non-prefixes such as "La" as + abbreviations for words like "Leap". + + zic no longer accepts leap second lines in ordinary input, or + ordinary lines in leap second input. Formerly, zic sometimes + warned about this undocumented usage and handled it incorrectly. + + The new macro HAVE_TZNAME governs whether the tzname external + variable is exported, instead of USG_COMPAT. USG_COMPAT now + governs only the external variables "timezone" and "daylight". + This change is needed because the three variables are not in the + same category: although POSIX requires tzname, it specifies the + other two variables as optional. Also, USG_COMPAT is now 1 or 0: + if not defined, the code attempts to guess it from other macros. + + localtime.c and difftime.c no longer require stdio.h, and .c files + other than zic.c no longer require sys/wait.h. + + zdump.c no longer assumes snprintf. (Reported by Jonathan Leffler.) + + Calculation of time_t extrema works around a bug in GCC 4.8.4 + (Reported by Stan Shebs and Joseph Myers.) + + zic.c no longer mistranslates formats of line numbers in non-English + locales. (Problem reported by Benno Schulenberg.) + + Several minor changes have been made to the code to make it a + bit easier to port to MS-Windows and Solaris. (Thanks to Kees + Dekker for reporting the problems.) + + Changes to documentation and commentary + + The two new files 'theory.html' and 'calendars' contain the + contents of the removed file 'Theory'. The goal is to document + tzdb theory more accessibly. + + The zic man page now documents abbreviation rules. + + tz-link.htm now covers how to apply tzdata changes to clients. + (Thanks to Jorge Fábregas for the AIX link.) It also mentions MySQL. + + The leap-seconds.list URL has been updated to something that is + more reliable for tzdb. (Thanks to Tim Parenti and Brian Inglis.) + Release 2017b - 2017-03-17 07:30:38 -0700 Briefly: Haiti has resumed DST. @@ -15,7 +179,17 @@ Release 2017b - 2017-03-17 07:30:38 -0700 Use "MMT" to abbreviate Liberia's time zone before 1972, as "-004430" is one byte over the POSIX limit. (Problem reported by Derick Rethans.) + Changes to code + The reference localtime implementation now falls back on the + current US daylight-saving transition rules rather than the + 1987-2006 rules. This fallback occurs only when (1) the TZ + environment variable's value has a name like "AST4ADT" that asks + for daylight saving time but does not specify the rules, (2) there + is no file by that name, and (3) the TZDEFRULES file cannot be + loaded. (Thanks to Tom Lane.) + + Release 2017a - 2017-02-28 00:05:36 -0800 Briefly: Southern Chile moves from -04/-03 to -03, and Mongolia @@ -1981,7 +2155,7 @@ Release 2013e - 2013-09-19 23:50:04 -0700 The 'leapseconds' file is now generated automatically from a new file 'leap-seconds.list', which is a copy of - . + A new source file 'leapseconds.awk' implements this. The goal is simplification of the future maintenance of 'leapseconds'. @@ -2187,7 +2361,7 @@ Release 2013a - 2013-02-27 09:20:35 -0800 Many changes affect historical timestamps before 1940. These were deduced from: Milne J. Civil time. Geogr J. 1899 - Feb;13(2):173-94 . + Feb;13(2):173-94 . Changes affecting the code: Modified: stable/10/contrib/tzdata/africa ============================================================================== --- stable/10/contrib/tzdata/africa Mon Oct 30 15:56:17 2017 (r325159) +++ stable/10/contrib/tzdata/africa Mon Oct 30 15:57:48 2017 (r325160) @@ -26,7 +26,7 @@ # # For data circa 1899, a common source is: # Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94. -# http://www.jstor.org/stable/1774359 +# https://www.jstor.org/stable/1774359 # # A reliable and entertaining source about time zones is # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997). @@ -218,7 +218,7 @@ Rule Egypt 2006 only - Sep 21 24:00 0 - # saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07. # From Jesper Nørgaard Welen (2007-08-15): [The following agree:] # http://www.nentjes.info/Bill/bill5.htm -# http://www.timeanddate.com/worldclock/city.html?n=53 +# https://www.timeanddate.com/worldclock/city.html?n=53 # From Steffen Thorsen (2007-09-04): The official information...: # http://www.sis.gov.eg/En/EgyptOnline/Miscellaneous/000002/0207000000000000001580.htm Rule Egypt 2007 only - Sep Thu>=1 24:00 0 - @@ -256,8 +256,8 @@ Rule Egypt 2007 only - Sep Thu>=1 24:00 0 - # timeanddate[2] and another site I've found[3] also support that. # # [1] https://bugzilla.redhat.com/show_bug.cgi?id=492263 -# [2] http://www.timeanddate.com/worldclock/clockchange.html?n=53 -# [3] http://wwp.greenwichmeantime.com/time-zone/africa/egypt/ +# [2] https://www.timeanddate.com/worldclock/clockchange.html?n=53 +# [3] https://wwp.greenwichmeantime.com/time-zone/africa/egypt/ # From Arthur David Olson (2009-04-20): # In 2009 (and for the next several years), Ramadan ends before the fourth @@ -267,10 +267,10 @@ Rule Egypt 2007 only - Sep Thu>=1 24:00 0 - # From Steffen Thorsen (2009-08-11): # We have been able to confirm the August change with the Egyptian Cabinet # Information and Decision Support Center: -# http://www.timeanddate.com/news/time/egypt-dst-ends-2009.html +# https://www.timeanddate.com/news/time/egypt-dst-ends-2009.html # # The Middle East News Agency -# http://www.mena.org.eg/index.aspx +# https://www.mena.org.eg/index.aspx # also reports "Egypt starts winter time on August 21" # today in article numbered "71, 11/08/2009 12:25 GMT." # Only the title above is available without a subscription to their service, @@ -320,7 +320,7 @@ Rule Egypt 2007 only - Sep Thu>=1 24:00 0 - # Thursday of April.... Clocks will still be turned back for Ramadan, but # dates not yet announced.... # http://almogaz.com/news/weird-news/2015/04/05/1947105 ... -# http://www.timeanddate.com/news/time/egypt-starts-dst-2015.html +# https://www.timeanddate.com/news/time/egypt-starts-dst-2015.html # From Ahmed Nazmy (2015-04-20): # Egypt's ministers cabinet just announced ... that it will cancel DST at @@ -447,11 +447,11 @@ Zone Africa/Monrovia -0:43:08 - LMT 1882 # From Even Scharning (2012-11-10): # Libya set their time one hour back at 02:00 on Saturday November 10. -# http://www.libyaherald.com/2012/11/04/clocks-to-go-back-an-hour-on-saturday/ +# https://www.libyaherald.com/2012/11/04/clocks-to-go-back-an-hour-on-saturday/ # Here is an official source [in Arabic]: http://ls.ly/fb6Yc # # Steffen Thorsen forwarded a translation (2012-11-10) in -# http://mm.icann.org/pipermail/tz/2012-November/018451.html +# https://mm.icann.org/pipermail/tz/2012-November/018451.html # # From Tim Parenti (2012-11-11): # Treat the 2012-11-10 change as a zone change from UTC+2 to UTC+1. @@ -462,7 +462,7 @@ Zone Africa/Monrovia -0:43:08 - LMT 1882 # From Even Scharning (2013-10-25): # The scheduled end of DST in Libya on Friday, October 25, 2013 was # cancelled yesterday.... -# http://www.libyaherald.com/2013/10/24/correction-no-time-change-tomorrow/ +# https://www.libyaherald.com/2013/10/24/correction-no-time-change-tomorrow/ # # From Paul Eggert (2013-10-25): # For now, assume they're reverting to the pre-2012 rules of permanent UT +02. @@ -515,7 +515,7 @@ Zone Africa/Tripoli 0:52:44 - LMT 1920 # basis.... # It seems that Mauritius observed daylight saving time from 1982-10-10 to # 1983-03-20 as well, but that was not successful.... -# http://www.timeanddate.com/news/time/mauritius-daylight-saving-time.html +# https://www.timeanddate.com/news/time/mauritius-daylight-saving-time.html # From Alex Krivenyshev (2008-06-25): # http://economicdevelopment.gov.mu/portal/site/Mainhomepage/menuitem.a42b24128104d9845dabddd154508a0c/?content_id=0a7cee8b5d69a110VgnVCM1000000a04a8c0RCRD @@ -583,7 +583,7 @@ Zone Africa/Tripoli 0:52:44 - LMT 1920 # http://lexpress.mu/Story/3398~Beebeejaun---Les-objectifs-d-%C3%A9conomie-d-%C3%A9nergie-de-l-heure-d-%C3%A9t%C3%A9-ont-%C3%A9t%C3%A9-atteints- # # Our wrap-up: -# http://www.timeanddate.com/news/time/mauritius-dst-will-not-repeat.html +# https://www.timeanddate.com/news/time/mauritius-dst-will-not-repeat.html # From Arthur David Olson (2009-07-11): # The "mauritius-dst-will-not-repeat" wrapup includes this: @@ -615,7 +615,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # be one hour ahead of GMT between 1 June and 27 September, according to # Communication Minister and Government Spokesman, Khalid Naciri...." # -# http://www.worldtimezone.net/dst_news/dst_news_morocco01.html +# http://www.worldtimezone.com/dst_news/dst_news_morocco01.html # http://en.afrik.com/news11892.html # From Alex Krivenyshev (2008-05-09): @@ -628,7 +628,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # From Patrice Scattolin (2008-05-09): # According to this article: -# http://www.avmaroc.com/actualite/heure-dete-comment-a127896.html +# https://www.avmaroc.com/actualite/heure-dete-comment-a127896.html # (and republished here: ) # the changes occur at midnight: # @@ -650,7 +650,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # posted in English). # # The following Google query will generate many relevant hits: -# http://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search +# https://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search # From Steffen Thorsen (2008-08-27): # Morocco will change the clocks back on the midnight between August 31 @@ -661,7 +661,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # http://www.menara.ma/fr/Actualites/Maroc/Societe/ci.retour_a_l_heure_gmt_a_partir_du_dimanche_31_aout_a_minuit_officiel_.default # # We have some further details posted here: -# http://www.timeanddate.com/news/time/morocco-ends-dst-early-2008.html +# https://www.timeanddate.com/news/time/morocco-ends-dst-early-2008.html # From Steffen Thorsen (2009-03-17): # Morocco will observe DST from 2009-06-01 00:00 to 2009-08-21 00:00 according @@ -671,7 +671,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # (French) # # Our summary: -# http://www.timeanddate.com/news/time/morocco-starts-dst-2009.html +# https://www.timeanddate.com/news/time/morocco-starts-dst-2009.html # From Alexander Krivenyshev (2009-03-17): # Here is a link to official document from Royaume du Maroc Premier Ministre, @@ -694,7 +694,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # http://www.lavieeco.com/actualites/4099-le-maroc-passera-a-l-heure-d-ete-gmt1-le-2-mai.html # (French) # Our page: -# http://www.timeanddate.com/news/time/morocco-starts-dst-2010.html +# https://www.timeanddate.com/news/time/morocco-starts-dst-2010.html # From Dan Abitol (2011-03-30): # ...Rules for Africa/Casablanca are the following (24h format) @@ -711,7 +711,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # They said that the decision was already taken. # # More articles in the press -# http://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-leve.html +# https://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-leve.html # http://www.lematin.ma/Actualite/Express/Article.asp?id=148923 # http://www.lavieeco.com/actualite/Le-Maroc-passe-sur-GMT%2B1-a-partir-de-dim @@ -803,7 +803,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # 1433 (18 April 2012) and the decision of the Head of Government of # 16 N. 3-29-15 Chaaban 1435 (4 June 2015). # Source (french): -# http://lnt.ma/le-maroc-reculera-dune-heure-le-dimanche-14-juin/ +# https://lnt.ma/le-maroc-reculera-dune-heure-le-dimanche-14-juin/ # # From Milamber (2015-06-09): # http://www.mmsp.gov.ma/fr/actualites.aspx?id=863 @@ -812,7 +812,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # [The gov.ma announcement] would (probably) make the switch on 2015-07-19 go # from 03:00 to 04:00 rather than from 02:00 to 03:00, as in the patch.... # I think the patch is correct and the quoted text is wrong; the text in -# agrees +# agrees # with the patch. # From Paul Eggert (2015-06-08): @@ -937,10 +937,18 @@ Link Africa/Maputo Africa/Kigali # Rwanda Link Africa/Maputo Africa/Lubumbashi # E Dem. Rep. of Congo Link Africa/Maputo Africa/Lusaka # Zambia + # Namibia -# The 1994-04-03 transition is from Shanks & Pottenger. -# Shanks & Pottenger report no DST after 1998-04; go with IATA. +# From Arthur David Olson (2017-08-09): +# The text of the "Namibia Time Act, 1994" is available online at +# www.lac.org.na/laws/1994/811.pdf +# and includes this nugget: +# Notwithstanding the provisions of subsection (2) of section 1, the +# first winter period after the commencement of this Act shall +# commence at OOhOO on Monday 21 March 1994 and shall end at 02h00 on +# Sunday 4 September 1994. + # From Petronella Sibeene (2007-03-30): # http://allafrica.com/stories/200703300178.html # While the entire country changes its time, Katima Mulilo and other @@ -955,19 +963,30 @@ Link Africa/Maputo Africa/Lusaka # Zambia # observes Botswana time, we have no details about historical practice. # In the meantime people there can use Africa/Gaborone. # See: Immanuel S. The Namibian. 2017-02-23. -# http://www.namibian.com.na/51480/read/Time-change-divides-lawmakers +# https://www.namibian.com.na/51480/read/Time-change-divides-lawmakers +# From Steffen Thorsen (2017-08-09): +# Namibia is going to change their time zone to what is now their DST: +# https://www.newera.com.na/2017/02/23/namibias-winter-time-might-be-repealed/ +# This video is from the government decision: +# https://www.nbc.na/news/na-passes-namibia-time-bill-repealing-1994-namibia-time-act.8665 +# We have made the assumption so far that they will change their time zone at +# the same time they would normally start DST, the first Sunday in September: +# https://www.timeanddate.com/news/time/namibia-new-time-zone.html + # RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S -Rule Namibia 1994 max - Sep Sun>=1 2:00 1:00 S -Rule Namibia 1995 max - Apr Sun>=1 2:00 0 - +Rule Namibia 1994 only - Mar 21 0:00 0 - +Rule Namibia 1994 2016 - Sep Sun>=1 2:00 1:00 S +Rule Namibia 1995 2017 - Apr Sun>=1 2:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Windhoek 1:08:24 - LMT 1892 Feb 8 1:30 - +0130 1903 Mar 2:00 - SAST 1942 Sep 20 2:00 2:00 1:00 SAST 1943 Mar 21 2:00 2:00 - SAST 1990 Mar 21 # independence - 2:00 - CAT 1994 Apr 3 - 1:00 Namibia WA%sT + 2:00 - CAT 1994 Mar 21 0:00 + 1:00 Namibia WA%sT 2017 Sep 3 2:00 + 2:00 - CAT # Niger # See Africa/Lagos. @@ -1054,14 +1073,24 @@ Link Africa/Johannesburg Africa/Mbabane # Swaziland # no information # Sudan -# + # From # Sudan News Agency (2000-01-13), # also reported by Michaël De Beukelaer-Dossche via Steffen Thorsen: # Clocks will be moved ahead for 60 minutes all over the Sudan as of noon # Saturday.... This was announced Thursday by Caretaker State Minister for # Manpower Abdul-Rahman Nur-Eddin. + *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Mon Oct 30 17:33: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 34266E6293B for ; Mon, 30 Oct 2017 17:33:52 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: from mail-yw0-x235.google.com (mail-yw0-x235.google.com [IPv6:2607:f8b0:4002:c05::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 DEE686BB70 for ; Mon, 30 Oct 2017 17:33:51 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: by mail-yw0-x235.google.com with SMTP id y75so12298909ywg.0 for ; Mon, 30 Oct 2017 10:33:51 -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; bh=wg085Yas7gZrQRkaGVAZE3tFn9iqzNCNvZekLOQSBEI=; b=GiCnaXo/eOjv+fw1DYfVSontMKuFR4WQFNPbpKbuE3DXwuKzUpZ0bgJFjs499H+9r7 UktxH84HPeVPsEeghVKPPrQZ41fqBk2Aced3Bc1vwL0dkiu+yl5etWzLbrIPiGL137tE e0eEsGrUkB7XMt45gc9U9ixPlEWSk4M4jTges= 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; bh=wg085Yas7gZrQRkaGVAZE3tFn9iqzNCNvZekLOQSBEI=; b=SwqFCwuY9r8ZF3sEHu3Tj+XV8Ol5ExEPRA1fbyJwvUZq6UgsQqLjWILrsVH1J/jPS1 DO2gaiOSWG1iVZqzfzMLIHynzj8jtVuhKq8MLwwTu1ejkaWLTArzRGkSfLIUKZ94Kjcc FcMCFDqwMPUthhMLP/PvtEP9sDO3CGs15K6tdoWkpis02bRHbwM9amLGmKQVBUco3Hj9 jERhnL9ognYmzHm9UYUQeuZzfV/1tMhxtdDTQP6nrNVyRnPPU+ILIl7O7IpYzdiRLi72 pL0zKRfmJtuxytz48dR3K2ephTYQmh0crPI3SL2UKxh9ucFpVpvcxhw11LjOvZetfAwA tmIA== 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=wg085Yas7gZrQRkaGVAZE3tFn9iqzNCNvZekLOQSBEI=; b=BMNzY3bNGJrn9Xp4HTIHUrnn2diwzhczzcMLIfU6ZFMEL9dp7y3y/JowhuvMDOdGrG c7JNsKiQzpY9janEWto+2jEZV2JX4bYyDDCYP5radFEXuGFc1ewCpKHyTNCEulnvpzu9 i7/akGEZnjsQV0CiTcZhi4rXnDM4HjuoRhD4IlYux70rrzaW8Tt/foH037LIzJTikN4Z UPt/aDOaayVyiNKlYBy2Ol6x6OYo0ZzGAhZwxPYqzZI+Fjj+0ssZgCDw/qz43INHHs2c pgNpyRQgcQfzdEC1lG17J9t5WCAKUb4U4wz+ehd3KAC/+LfO4J6IToVc/qQ3m5sUOsVk ZpnA== X-Gm-Message-State: AMCzsaVk9IzFciUOvzuo6znh2NKYZZTLZaYJRYbVRYPRsAOnykdfGYEQ dFSig+SZW7kYmeFVK0k3fXvIZXpcC/b4NnpOapKPHA== X-Google-Smtp-Source: ABhQp+Q1lviu+KSTN/yKv7E2H9iXCPgsczon8w3xxwMRR2TR6BzX44BOmIJJp7iuTTNRFbggmua4qnftPFOG8DngAFg= X-Received: by 10.37.199.137 with SMTP id w131mr6135152ybe.118.1509384830943; Mon, 30 Oct 2017 10:33:50 -0700 (PDT) MIME-Version: 1.0 Sender: lists@eitanadler.com Received: by 10.37.56.66 with HTTP; Mon, 30 Oct 2017 10:33:20 -0700 (PDT) In-Reply-To: <20171030151519.lbda66rwlkcmhprp@ivaldir.net> References: <201710290453.v9T4rX3E060010@repo.freebsd.org> <20171030151519.lbda66rwlkcmhprp@ivaldir.net> From: Eitan Adler Date: Mon, 30 Oct 2017 10:33:20 -0700 X-Google-Sender-Auth: rhUU1RD5Qd4tXwdiaO0qbItEsYU Message-ID: Subject: Re: svn commit: r325092 - head/usr.bin/fortune/datfiles To: Baptiste Daroussin 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: Mon, 30 Oct 2017 17:33:52 -0000 On 30 October 2017 at 08:15, Baptiste Daroussin wrote: >> >> - Prefer UTF-8 over ISO-8859-1 >> - Remove some references to printing man pages > > Why? it was still valid. (a) Virtually no one needs this anymore (b) it uses non-CUPS utilities, which while they still work are non-modern. To everyone else still adding tips: *please commit them or file bugs asking for them to be committed* -- Eitan Adler Source, Ports, Doc committer Bugmeister, Ports Security teams From owner-svn-src-all@freebsd.org Mon Oct 30 18:03: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 62C31E62F25; Mon, 30 Oct 2017 18:03:34 +0000 (UTC) (envelope-from fsu@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 310CB6C685; Mon, 30 Oct 2017 18:03:34 +0000 (UTC) (envelope-from fsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9UI3XWP094590; Mon, 30 Oct 2017 18:03:33 GMT (envelope-from fsu@FreeBSD.org) Received: (from fsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9UI3X6i094588; Mon, 30 Oct 2017 18:03:33 GMT (envelope-from fsu@FreeBSD.org) Message-Id: <201710301803.v9UI3X6i094588@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fsu set sender to fsu@FreeBSD.org using -f From: Fedor Uporov Date: Mon, 30 Oct 2017 18:03:33 +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: r325161 - stable/11/sys/fs/fuse X-SVN-Group: stable-11 X-SVN-Commit-Author: fsu X-SVN-Commit-Paths: stable/11/sys/fs/fuse X-SVN-Commit-Revision: 325161 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 18:03:34 -0000 Author: fsu Date: Mon Oct 30 18:03:33 2017 New Revision: 325161 URL: https://svnweb.freebsd.org/changeset/base/325161 Log: MFC r324620: Add extended attributes support to fuse kernel module. Author: ken Reviewed by: cem, pfg (mentor) Approved by: pfg (mentor) Differential Revision: https://reviews.freebsd.org/D12485 Modified: stable/11/sys/fs/fuse/fuse_ipc.c stable/11/sys/fs/fuse/fuse_vnops.c Modified: stable/11/sys/fs/fuse/fuse_ipc.c ============================================================================== --- stable/11/sys/fs/fuse/fuse_ipc.c Mon Oct 30 15:57:48 2017 (r325160) +++ stable/11/sys/fs/fuse/fuse_ipc.c Mon Oct 30 18:03:33 2017 (r325161) @@ -636,23 +636,20 @@ fuse_body_audit(struct fuse_ticket *ftick, size_t blen break; case FUSE_SETXATTR: - panic("FUSE_SETXATTR implementor has forgotten to define a" - " response body format check"); + err = (blen == 0) ? 0 : EINVAL; break; case FUSE_GETXATTR: - panic("FUSE_GETXATTR implementor has forgotten to define a" - " response body format check"); - break; - case FUSE_LISTXATTR: - panic("FUSE_LISTXATTR implementor has forgotten to define a" - " response body format check"); + /* + * These can have varying response lengths, and 0 length + * isn't necessarily invalid. + */ + err = 0; break; case FUSE_REMOVEXATTR: - panic("FUSE_REMOVEXATTR implementor has forgotten to define a" - " response body format check"); + err = (blen == 0) ? 0 : EINVAL; break; case FUSE_FLUSH: Modified: stable/11/sys/fs/fuse/fuse_vnops.c ============================================================================== --- stable/11/sys/fs/fuse/fuse_vnops.c Mon Oct 30 15:57:48 2017 (r325160) +++ stable/11/sys/fs/fuse/fuse_vnops.c Mon Oct 30 18:03:33 2017 (r325161) @@ -73,6 +73,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -111,10 +112,13 @@ __FBSDID("$FreeBSD$"); static vop_access_t fuse_vnop_access; static vop_close_t fuse_vnop_close; static vop_create_t fuse_vnop_create; +static vop_deleteextattr_t fuse_vnop_deleteextattr; static vop_fsync_t fuse_vnop_fsync; static vop_getattr_t fuse_vnop_getattr; +static vop_getextattr_t fuse_vnop_getextattr; static vop_inactive_t fuse_vnop_inactive; static vop_link_t fuse_vnop_link; +static vop_listextattr_t fuse_vnop_listextattr; static vop_lookup_t fuse_vnop_lookup; static vop_mkdir_t fuse_vnop_mkdir; static vop_mknod_t fuse_vnop_mknod; @@ -127,6 +131,7 @@ static vop_remove_t fuse_vnop_remove; static vop_rename_t fuse_vnop_rename; static vop_rmdir_t fuse_vnop_rmdir; static vop_setattr_t fuse_vnop_setattr; +static vop_setextattr_t fuse_vnop_setextattr; static vop_strategy_t fuse_vnop_strategy; static vop_symlink_t fuse_vnop_symlink; static vop_write_t fuse_vnop_write; @@ -139,10 +144,13 @@ struct vop_vector fuse_vnops = { .vop_access = fuse_vnop_access, .vop_close = fuse_vnop_close, .vop_create = fuse_vnop_create, + .vop_deleteextattr = fuse_vnop_deleteextattr, .vop_fsync = fuse_vnop_fsync, .vop_getattr = fuse_vnop_getattr, + .vop_getextattr = fuse_vnop_getextattr, .vop_inactive = fuse_vnop_inactive, .vop_link = fuse_vnop_link, + .vop_listextattr = fuse_vnop_listextattr, .vop_lookup = fuse_vnop_lookup, .vop_mkdir = fuse_vnop_mkdir, .vop_mknod = fuse_vnop_mknod, @@ -156,6 +164,7 @@ struct vop_vector fuse_vnops = { .vop_rename = fuse_vnop_rename, .vop_rmdir = fuse_vnop_rmdir, .vop_setattr = fuse_vnop_setattr, + .vop_setextattr = fuse_vnop_setextattr, .vop_strategy = fuse_vnop_strategy, .vop_symlink = fuse_vnop_symlink, .vop_write = fuse_vnop_write, @@ -1955,6 +1964,383 @@ fuse_vnop_putpages(struct vop_putpages_args *ap) } } return rtvals[0]; +} + +static const char extattr_namespace_separator = '.'; + +/* + struct vop_getextattr_args { + struct vop_generic_args a_gen; + struct vnode *a_vp; + int a_attrnamespace; + const char *a_name; + struct uio *a_uio; + size_t *a_size; + struct ucred *a_cred; + struct thread *a_td; + }; +*/ +static int +fuse_vnop_getextattr(struct vop_getextattr_args *ap) +{ + struct vnode *vp = ap->a_vp; + struct uio *uio = ap->a_uio; + struct fuse_dispatcher fdi = {0}; + struct fuse_getxattr_in *get_xattr_in; + struct fuse_getxattr_out *get_xattr_out; + struct mount *mp = vnode_mount(vp); + char *prefix; + size_t len; + char *attr_str; + struct thread *td = ap->a_td; + struct ucred *cred = ap->a_cred; + int err = 0; + + fuse_trace_printf_vnop(); + + if (fuse_isdeadfs(vp)) + return ENXIO; + + /* Default to looking for user attributes. */ + if (ap->a_attrnamespace == EXTATTR_NAMESPACE_SYSTEM) + prefix = EXTATTR_NAMESPACE_SYSTEM_STRING; + else + prefix = EXTATTR_NAMESPACE_USER_STRING; + + len = strlen(prefix) + sizeof(extattr_namespace_separator) + + strlen(ap->a_name) + 1; + + fdisp_init(&fdi, len + sizeof(*get_xattr_in)); + fdisp_make_vp(&fdi, FUSE_GETXATTR, vp, td, cred); + + get_xattr_in = fdi.indata; + /* + * Check to see whether we're querying the available size or + * issuing the actual request. If we pass in 0, we get back struct + * fuse_getxattr_out. If we pass in a non-zero size, we get back + * that much data, without the struct fuse_getxattr_out header. + */ + if (ap->a_size != NULL) + get_xattr_in->size = 0; + else + get_xattr_in->size = uio->uio_resid; + + attr_str = (char *)fdi.indata + sizeof(*get_xattr_in); + snprintf(attr_str, len, "%s%c%s", prefix, extattr_namespace_separator, + ap->a_name); + + err = fdisp_wait_answ(&fdi); + + if (err != 0) { + if (err == ENOSYS) + fsess_set_notimpl(mp, FUSE_GETXATTR); + debug_printf("getxattr: got err=%d from daemon\n", err); + goto out; + } + + /* + * If we get to this point (i.e. no error), we should have a valid + * answer of some sort. i.e. non-zero iosize and a valid pointer. + */ + if ((fdi.answ == NULL) || (fdi.iosize == 0)) { + debug_printf("getxattr: err = 0, but answ = %p, iosize = %zu\n", + fdi.answ, fdi.iosize); + err = EINVAL; + goto out; + } + get_xattr_out = fdi.answ; + + if (ap->a_size != NULL) { + *ap->a_size = get_xattr_out->size; + } else if (fdi.iosize > 0) { + err = uiomove(fdi.answ, fdi.iosize, uio); + } else { + err = EINVAL; + } + +out: + fdisp_destroy(&fdi); + return (err); +} + +/* + struct vop_setextattr_args { + struct vop_generic_args a_gen; + struct vnode *a_vp; + int a_attrnamespace; + const char *a_name; + struct uio *a_uio; + struct ucred *a_cred; + struct thread *a_td; + }; +*/ +static int +fuse_vnop_setextattr(struct vop_setextattr_args *ap) +{ + struct vnode *vp = ap->a_vp; + struct uio *uio = ap->a_uio; + struct fuse_dispatcher fdi = {0}; + struct fuse_setxattr_in *set_xattr_in; + struct mount *mp = vnode_mount(vp); + char *prefix; + size_t len; + char *attr_str; + struct thread *td = ap->a_td; + struct ucred *cred = ap->a_cred; + int err = 0; + + fuse_trace_printf_vnop(); + + if (fuse_isdeadfs(vp)) + return ENXIO; + + /* Default to looking for user attributes. */ + if (ap->a_attrnamespace == EXTATTR_NAMESPACE_SYSTEM) + prefix = EXTATTR_NAMESPACE_SYSTEM_STRING; + else + prefix = EXTATTR_NAMESPACE_USER_STRING; + + len = strlen(prefix) + sizeof(extattr_namespace_separator) + + strlen(ap->a_name) + 1; + + fdisp_init(&fdi, len + sizeof(*set_xattr_in) + uio->uio_resid); + fdisp_make_vp(&fdi, FUSE_SETXATTR, vp, td, cred); + + set_xattr_in = fdi.indata; + set_xattr_in->size = uio->uio_resid; + + attr_str = (char *)fdi.indata + sizeof(*set_xattr_in); + snprintf(attr_str, len, "%s%c%s", prefix, extattr_namespace_separator, + ap->a_name); + + err = uiomove((char *)fdi.indata + sizeof(*set_xattr_in) + len, + uio->uio_resid, uio); + if (err != 0) { + debug_printf("setxattr: got error %d from uiomove\n", err); + goto out; + } + + err = fdisp_wait_answ(&fdi); + + if (err != 0) { + if (err == ENOSYS) + fsess_set_notimpl(mp, FUSE_SETXATTR); + debug_printf("setxattr: got err=%d from daemon\n", err); + goto out; + } + +out: + fdisp_destroy(&fdi); + return (err); +} + +/* + * The Linux / FUSE extended attribute list is simply a collection of + * NUL-terminated strings. The FreeBSD extended attribute list is a single + * byte length followed by a non-NUL terminated string. So, this allows + * conversion of the Linux / FUSE format to the FreeBSD format in place. + * Linux attribute names are reported with the namespace as a prefix (e.g. + * "user.attribute_name"), but in FreeBSD they are reported without the + * namespace prefix (e.g. "attribute_name"). So, we're going from: + * + * user.attr_name1\0user.attr_name2\0 + * + * to: + * + * attr_name1attr_name2 + * + * Where "" is a single byte number of characters in the attribute name. + * + * Args: + * prefix - exattr namespace prefix string + * list, list_len - input list with namespace prefixes + * bsd_list, bsd_list_len - output list compatible with bsd vfs + */ +static int +fuse_xattrlist_convert(char *prefix, const char *list, int list_len, + char *bsd_list, int *bsd_list_len) +{ + int len, pos, dist_to_next, prefix_len; + + pos = 0; + *bsd_list_len = 0; + prefix_len = strlen(prefix); + + while (pos < list_len && list[pos] != '\0') { + dist_to_next = strlen(&list[pos]) + 1; + if (bcmp(&list[pos], prefix, prefix_len) == 0 && + list[pos + prefix_len] == extattr_namespace_separator) { + len = dist_to_next - + (prefix_len + sizeof(extattr_namespace_separator)) - 1; + if (len >= EXTATTR_MAXNAMELEN) + return (ENAMETOOLONG); + + bsd_list[*bsd_list_len] = len; + memcpy(&bsd_list[*bsd_list_len + 1], + &list[pos + prefix_len + + sizeof(extattr_namespace_separator)], len); + + *bsd_list_len += len + 1; + } + + pos += dist_to_next; + } + + return (0); +} + +/* + struct vop_listextattr_args { + struct vop_generic_args a_gen; + struct vnode *a_vp; + int a_attrnamespace; + struct uio *a_uio; + size_t *a_size; + struct ucred *a_cred; + struct thread *a_td; + }; +*/ +static int +fuse_vnop_listextattr(struct vop_listextattr_args *ap) +{ + struct vnode *vp = ap->a_vp; + struct uio *uio = ap->a_uio; + struct fuse_dispatcher fdi = {0}; + struct fuse_getxattr_in *get_xattr_in; + struct fuse_getxattr_out *get_xattr_out; + struct mount *mp = vnode_mount(vp); + size_t len; + char *prefix; + char *attr_str; + char *bsd_list = NULL; + int bsd_list_len; + struct thread *td = ap->a_td; + struct ucred *cred = ap->a_cred; + int err = 0; + + fuse_trace_printf_vnop(); + + if (fuse_isdeadfs(vp)) + return ENXIO; + + /* + * Add space for a NUL and the period separator if enabled. + * Default to looking for user attributes. + */ + if (ap->a_attrnamespace == EXTATTR_NAMESPACE_SYSTEM) + prefix = EXTATTR_NAMESPACE_SYSTEM_STRING; + else + prefix = EXTATTR_NAMESPACE_USER_STRING; + + len = strlen(prefix) + sizeof(extattr_namespace_separator) + 1; + + fdisp_init(&fdi, sizeof(*get_xattr_in) + len); + fdisp_make_vp(&fdi, FUSE_LISTXATTR, vp, td, cred); + + get_xattr_in = fdi.indata; + if (ap->a_size != NULL) + get_xattr_in->size = 0; + else + get_xattr_in->size = uio->uio_resid + sizeof(*get_xattr_out); + + + attr_str = (char *)fdi.indata + sizeof(*get_xattr_in); + snprintf(attr_str, len, "%s%c", prefix, extattr_namespace_separator); + + err = fdisp_wait_answ(&fdi); + if (err != 0) { + if (err == ENOSYS) + fsess_set_notimpl(mp, FUSE_LISTXATTR); + debug_printf("listextattr: got err=%d from daemon\n", err); + goto out; + } + + if ((fdi.answ == NULL) || (fdi.iosize == 0)) { + err = EINVAL; + goto out; + } + get_xattr_out = fdi.answ; + + if (ap->a_size != NULL) { + *ap->a_size = get_xattr_out->size; + } else if (fdi.iosize > 0) { + /* + * The Linux / FUSE attribute list format isn't the same + * as FreeBSD's format. So we need to transform it into + * FreeBSD's format before giving it to the user. + */ + bsd_list = malloc(fdi.iosize, M_TEMP, M_WAITOK); + err = fuse_xattrlist_convert(prefix, fdi.answ, fdi.iosize, + bsd_list, &bsd_list_len); + if (err != 0) + goto out; + + err = uiomove(bsd_list, bsd_list_len, uio); + } else { + debug_printf("listextattr: returned iosize %zu for %s attribute list is " + "too small\n", fdi.iosize, prefix); + err = EINVAL; + } + +out: + free(bsd_list, M_TEMP); + fdisp_destroy(&fdi); + return (err); +} + +/* + struct vop_deleteextattr_args { + struct vop_generic_args a_gen; + struct vnode *a_vp; + int a_attrnamespace; + const char *a_name; + struct ucred *a_cred; + struct thread *a_td; + }; +*/ +static int +fuse_vnop_deleteextattr(struct vop_deleteextattr_args *ap) +{ + struct vnode *vp = ap->a_vp; + struct fuse_dispatcher fdi = {0}; + struct mount *mp = vnode_mount(vp); + char *prefix; + size_t len; + char *attr_str; + struct thread *td = ap->a_td; + struct ucred *cred = ap->a_cred; + int err; + + fuse_trace_printf_vnop(); + + if (fuse_isdeadfs(vp)) + return ENXIO; + + /* Default to looking for user attributes. */ + if (ap->a_attrnamespace == EXTATTR_NAMESPACE_SYSTEM) + prefix = EXTATTR_NAMESPACE_SYSTEM_STRING; + else + prefix = EXTATTR_NAMESPACE_USER_STRING; + + len = strlen(prefix) + sizeof(extattr_namespace_separator) + + strlen(ap->a_name) + 1; + + fdisp_init(&fdi, len); + fdisp_make_vp(&fdi, FUSE_REMOVEXATTR, vp, td, cred); + + attr_str = fdi.indata; + snprintf(attr_str, len, "%s%c%s", prefix, extattr_namespace_separator, + ap->a_name); + + err = fdisp_wait_answ(&fdi); + if (err != 0) { + if (err == ENOSYS) + fsess_set_notimpl(mp, FUSE_REMOVEXATTR); + debug_printf("removexattr: got err=%d from daemon\n", err); + } + + fdisp_destroy(&fdi); + return (err); } /* From owner-svn-src-all@freebsd.org Mon Oct 30 18:17:03 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 AF20BE63449; Mon, 30 Oct 2017 18:17:03 +0000 (UTC) (envelope-from arichardson@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 7E9A56CEDD; Mon, 30 Oct 2017 18:17:03 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9UIH2vH099414; Mon, 30 Oct 2017 18:17:02 GMT (envelope-from arichardson@FreeBSD.org) Received: (from arichardson@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9UIH2e2099413; Mon, 30 Oct 2017 18:17:02 GMT (envelope-from arichardson@FreeBSD.org) Message-Id: <201710301817.v9UIH2e2099413@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: arichardson set sender to arichardson@FreeBSD.org using -f From: Alex Richardson Date: Mon, 30 Oct 2017 18:17:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325162 - head/share/misc X-SVN-Group: head X-SVN-Commit-Author: arichardson X-SVN-Commit-Paths: head/share/misc X-SVN-Commit-Revision: 325162 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 18:17:03 -0000 Author: arichardson Date: Mon Oct 30 18:17:02 2017 New Revision: 325162 URL: https://svnweb.freebsd.org/changeset/base/325162 Log: Add myself to committers-src.dot Reviewed by: jhb (mentor) Approved by: jhb (mentor) Modified: head/share/misc/committers-src.dot Modified: head/share/misc/committers-src.dot ============================================================================== --- head/share/misc/committers-src.dot Mon Oct 30 18:03:33 2017 (r325161) +++ head/share/misc/committers-src.dot Mon Oct 30 18:17:02 2017 (r325162) @@ -113,6 +113,7 @@ andreast [label="Andreas Tobler\nandreast@FreeBSD.org\ andrew [label="Andrew Turner\nandrew@FreeBSD.org\n2010/07/19"] antoine [label="Antoine Brodin\nantoine@FreeBSD.org\n2008/02/03"] araujo [label="Marcelo Araujo\naraujo@FreeBSD.org\n2015/08/04"] +arichardson [label="Alex Richardson\narichardson@FreeBSD.org\n2017/10/30"] ariff [label="Ariff Abdullah\nariff@FreeBSD.org\n2005/11/14"] art [label="Artem Belevich\nart@FreeBSD.org\n2011/03/29"] arybchik [label="Andrew Rybchenko\narybchik@FreeBSD.org\n2014/10/12"] @@ -416,6 +417,7 @@ brian -> joe brooks -> bushman brooks -> jamie brooks -> theraven +brooks -> arichardson bz -> anchie bz -> jamie @@ -569,6 +571,7 @@ jhb -> peterj jhb -> pfg jhb -> rnoland jhb -> rpokala +jhb -> arichardson jimharris -> carl From owner-svn-src-all@freebsd.org Mon Oct 30 18:29: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 B5994E6367C; Mon, 30 Oct 2017 18:29:08 +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 A455C6D398; Mon, 30 Oct 2017 18:29:08 +0000 (UTC) (envelope-from devin@shxd.cx) Received: from [64.201.244.132] (port=55441 helo=[10.0.0.105]) by shxd.cx with esmtps (TLSv1:AES256-SHA:256) (Exim 4.77 (FreeBSD)) (envelope-from ) id 1e9CvN-000H6x-Gq; Mon, 30 Oct 2017 16:28:29 +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: Date: Mon, 30 Oct 2017 11:29:00 -0700 Cc: Cy Schubert , "src-committers@freebsd.org" , Eitan Adler , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" , Ed Maste , Warner Losh Content-Transfer-Encoding: quoted-printable Message-Id: References: <201710291851.v9TIpM0I073542@slippy.cwsent.com> To: Dan Mack 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 18:29:08 -0000 --=20 Devin --=20 Devin > On Oct 30, 2017, at 7:47 AM, Dan Mack wrote: >=20 > Devin Teske writes: >=20 > >=20 >>> Or better yet, ctrl-r in bash and zsh, or up-arrow in tcsh. >>=20 >> Since we are responding to emaste's astute observation with random >> personal favorites when it comes to history actions in an interactive >> shell... >>=20 >> How about Esc-P and Esc-N? >=20 > In continuation of the tangent --- >=20 > I use ESC-P / ESC-N a lot; it's a neat feature that tcsh has had for a > long time, maybe since the beginning. However it's a tcsh feature, not > sh, bash, or csh IIRC. But csh is actually tcsh on FreeBSD but I'm sure > most people already know this on this list. zsh's default implementation matches that of tcsh. csh would likely support it, but since /bin/csh and /bin/tcsh are hard links= to each other, can't tell for certain. That being said... It actually works better in bash without your (below) inputrc change. [t]csh, zsh, and bash implement this feature but bash implements it better t= han the others, though most people presume bash doesn't support it because i= t has to be used differently. > To emulate this behaviour in bash, I simply create a .inputrc file in my > $HOME with the following contents: >=20 > # .inputrc field > "\ep": history-search-backward > "\en": history-search-forward >=20 >=20 > Works for me. You probably won't want this for bash once you learn how to use bash's defau= lt implementation of Esc-N / Esc-P. Putting those (above) lines into ~/.inputrc may indeed make bash's Esc-N / E= sc-P behave like tcsh's/zsh's implementation, but bash's default implementat= ion is better, imho (see below) In tcsh/zsh: 1. Type letters that a previous cmd *begins with* 2. Esc-P In bash: 1. Esc-P (a ":" prompt appears) 2. Type letters that a previous cmd *contains* (or use ^ prefix for *begins-= with*) If you try to use bash's implementation in the tcsh/zsh way, you might be mi= sled into thinking "nothing happened" because if the input line is not empty= in bash, Esc-P does nothing. The [t]csh/zsh implementation is limited to only searching for previous comm= ands that start with something whilst the bash implementation allows searchi= ng for either text contained anywhere within a command or (if you put ^ as t= he first character) text that is at the start of a command. Being able to search anywhere within a command or at the beginning, I feel, m= akes the default bash implementation far more valuable than the one in [t]cs= h/zsh; and thus I get very sad when people make the bash implementation emul= ate [t]csh's/zsh's. --=20 Cheers, Devin= From owner-svn-src-all@freebsd.org Mon Oct 30 18:39: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 B69E7E63995; Mon, 30 Oct 2017 18:39:48 +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 A3DE86DB2B; Mon, 30 Oct 2017 18:39:48 +0000 (UTC) (envelope-from devin@shxd.cx) Received: from [64.201.244.132] (port=55469 helo=[10.0.0.105]) by shxd.cx with esmtps (TLSv1:AES256-SHA:256) (Exim 4.77 (FreeBSD)) (envelope-from ) id 1e9D5n-000HDE-Ed; Mon, 30 Oct 2017 16:39:15 +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: <20171030151627.GA74374@FreeBSD.org> Date: Mon, 30 Oct 2017 11:39:46 -0700 Cc: Dan Mack , "src-committers@freebsd.org" , Eitan Adler , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" , Cy Schubert , Ed Maste , Warner Losh Content-Transfer-Encoding: quoted-printable Message-Id: <3CB26689-0D12-4E69-9BBA-58CCC3B71F3F@shxd.cx> References: <201710291851.v9TIpM0I073542@slippy.cwsent.com> <20171030151627.GA74374@FreeBSD.org> To: Alexey Dokuchaev 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 18:39:48 -0000 > On Oct 30, 2017, at 8:16 AM, Alexey Dokuchaev wrote: >=20 >> On Mon, Oct 30, 2017 at 09:47:22AM -0500, Dan Mack wrote: >> ... >> I use ESC-P / ESC-N a lot; it's a neat feature that tcsh has had for a >> long time, maybe since the beginning. However it's a tcsh feature, not >> sh, bash, or csh IIRC. But csh is actually tcsh on FreeBSD but I'm sure >> most people already know this on this list. >=20 > It is the same as up/down arrows? =20 In tcsh/zsh if you do not type anything first, it is like up/down arrows. If you type something first, the list is filtered by "begins with" given wha= t you have typed thus-far. > Yeah, one of the best tcsh(1) features! >=20 Better in bash which allows you to filter not only on "begins with" but also= "contains" (which is arguably more valuable than "begins with"). >> To emulate this behaviour in bash, I simply create a .inputrc file in my >> $HOME with the following contents: >>=20 >> # .inputrc field >> "\ep": history-search-backward >> "\en": history-search-forward >=20 > On GNU/Linux boxes mine has: >=20 > "\e[A": history-search-backward > "\e[B": history-search-forward >=20 Interesting that you mapped these to cursor-up/cursor-down. That may cause unexpected results. For example, typing something and then pressing up-arrow will cause the shel= l to give you the previous command that started with that rather than the pr= evious command in-general. It would then be the case that you cannot navigate the history sequentially u= nless the input line is empty before using cursor-up/cursor-down. --=20 Devin From owner-svn-src-all@freebsd.org Mon Oct 30 18:45: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 B6FCCE63B49; Mon, 30 Oct 2017 18:45:06 +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 A56BC6DF3A; Mon, 30 Oct 2017 18:45:06 +0000 (UTC) (envelope-from devin@shxd.cx) Received: from [64.201.244.132] (port=55478 helo=[10.0.0.105]) by shxd.cx with esmtps (TLSv1:AES256-SHA:256) (Exim 4.77 (FreeBSD)) (envelope-from ) id 1e9DAv-000HGV-1V; Mon, 30 Oct 2017 16:44:33 +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: Date: Mon, 30 Oct 2017 11:45:04 -0700 Cc: Cy Schubert , "src-committers@freebsd.org" , Eitan Adler , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" , Ed Maste , Warner Losh Content-Transfer-Encoding: quoted-printable Message-Id: <40AC7875-A7AF-4323-B6A6-0936C0507761@shxd.cx> References: <201710291851.v9TIpM0I073542@slippy.cwsent.com> To: Dan Mack 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 18:45:06 -0000 > On Oct 30, 2017, at 7:47 AM, Dan Mack wrote: >=20 > Devin Teske writes: >=20 > >=20 >>> Or better yet, ctrl-r in bash and zsh, or up-arrow in tcsh. >>=20 >> Since we are responding to emaste's astute observation with random >> personal favorites when it comes to history actions in an interactive >> shell... >>=20 >> How about Esc-P and Esc-N? >=20 > In continuation of the tangent --- >=20 > I use ESC-P / ESC-N a lot; it's a neat feature that tcsh has had for a > long time, maybe since the beginning. However it's a tcsh feature, not > sh, bash, or csh IIRC. But csh is actually tcsh on FreeBSD but I'm sure > most people already know this on this list. zsh's default implementation matches that of tcsh. csh would likely support it, but since /bin/csh and /bin/tcsh are hard links= to each other, can't tell for certain. That being said... It actually works better in bash without your (below) inputrc change. [t]csh, zsh, and bash implement this feature but bash implements it better t= han the others, though most people presume bash doesn't support it because i= t has to be used differently. > To emulate this behaviour in bash, I simply create a .inputrc file in my > $HOME with the following contents: >=20 > # .inputrc field > "\ep": history-search-backward > "\en": history-search-forward >=20 >=20 > Works for me. You probably won't want this for bash once you learn how to use bash's defau= lt implementation of Esc-N / Esc-P. Putting those (above) lines into ~/.inputrc may indeed make bash's Esc-N / E= sc-P behave like tcsh's/zsh's implementation, but bash's default implementat= ion is better, imho (see below) In tcsh/zsh: 1. Type letters that a previous cmd *begins with* 2. Esc-P In bash: 1. Esc-P (a ":" prompt appears) 2. Type letters that a previous cmd *contains* (or use ^ prefix for *begins-= with*) If you try to use bash's implementation in the tcsh/zsh way, you might be mi= sled into thinking "nothing happened" because if the input line is not empty= in bash, Esc-P does nothing. The [t]csh/zsh implementation is limited to only searching for previous comm= ands that start with something whilst the bash implementation allows searchi= ng for either text contained anywhere within a command or (if you put ^ as t= he first character) text that is at the start of a command. Being able to search anywhere within a command or at the beginning, I feel, m= akes the default bash implementation far more valuable than the one in [t]cs= h/zsh; and thus I get very sad when people make the bash implementation emul= ate [t]csh's/zsh's. --=20 Cheers, Devin From owner-svn-src-all@freebsd.org Mon Oct 30 18:54: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 96979E63CE5; Mon, 30 Oct 2017 18:54:28 +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 569706E3A8; Mon, 30 Oct 2017 18:54:28 +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 v9UIsRWT016905; Mon, 30 Oct 2017 18:54:27 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9UIsRUA016904; Mon, 30 Oct 2017 18:54:27 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710301854.v9UIsRUA016904@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Mon, 30 Oct 2017 18:54:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325163 - head/tools/tools/nanobsd X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/tools/tools/nanobsd X-SVN-Commit-Revision: 325163 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 18:54:28 -0000 Author: bdrewery Date: Mon Oct 30 18:54:27 2017 New Revision: 325163 URL: https://svnweb.freebsd.org/changeset/base/325163 Log: Fix native-xtools installion after r325082 and r325000 to be to /nxb-bin. - r325082 split native-xtools-install out of native-xtools. - r325000 incorrectly changed the installation path from /nxb-bin to /. Discussed with: imp at D12782 Modified: head/tools/tools/nanobsd/defaults.sh Modified: head/tools/tools/nanobsd/defaults.sh ============================================================================== --- head/tools/tools/nanobsd/defaults.sh Mon Oct 30 18:17:02 2017 (r325162) +++ head/tools/tools/nanobsd/defaults.sh Mon Oct 30 18:54:27 2017 (r325163) @@ -438,7 +438,8 @@ native_xtools ( ) ( nano_make_install_env set -o xtrace cd "${NANO_SRC}" - ${NANO_MAKE} native-xtools NXBDESTDIR="${NANO_WORLDDIR}" + ${NANO_MAKE} native-xtools + ${NANO_MAKE} native-xtools-install DESTDIR="${NANO_WORLDDIR}" ) > ${NANO_LOG}/_.native_xtools 2>&1 ) From owner-svn-src-all@freebsd.org Mon Oct 30 20:31:49 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 CC116E65050; Mon, 30 Oct 2017 20:31:49 +0000 (UTC) (envelope-from pfg@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 70B64709CD; Mon, 30 Oct 2017 20:31:49 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9UKVmda058128; Mon, 30 Oct 2017 20:31:48 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9UKVmiW058126; Mon, 30 Oct 2017 20:31:48 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201710302031.v9UKVmiW058126@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Mon, 30 Oct 2017 20:31:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r325164 - stable/10/sys/fs/fuse X-SVN-Group: stable-10 X-SVN-Commit-Author: pfg X-SVN-Commit-Paths: stable/10/sys/fs/fuse X-SVN-Commit-Revision: 325164 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 20:31:49 -0000 Author: pfg Date: Mon Oct 30 20:31:48 2017 New Revision: 325164 URL: https://svnweb.freebsd.org/changeset/base/325164 Log: MFC r324620 (by fsu@): Add extended attributes support to fuse kernel module. Author: ken Reviewed by: cem, pfg (mentor) Approved by: pfg (mentor) Differential Revision: https://reviews.freebsd.org/D12485 Modified: stable/10/sys/fs/fuse/fuse_ipc.c stable/10/sys/fs/fuse/fuse_vnops.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/fs/fuse/fuse_ipc.c ============================================================================== --- stable/10/sys/fs/fuse/fuse_ipc.c Mon Oct 30 18:54:27 2017 (r325163) +++ stable/10/sys/fs/fuse/fuse_ipc.c Mon Oct 30 20:31:48 2017 (r325164) @@ -636,23 +636,20 @@ fuse_body_audit(struct fuse_ticket *ftick, size_t blen break; case FUSE_SETXATTR: - panic("FUSE_SETXATTR implementor has forgotten to define a" - " response body format check"); + err = (blen == 0) ? 0 : EINVAL; break; case FUSE_GETXATTR: - panic("FUSE_GETXATTR implementor has forgotten to define a" - " response body format check"); - break; - case FUSE_LISTXATTR: - panic("FUSE_LISTXATTR implementor has forgotten to define a" - " response body format check"); + /* + * These can have varying response lengths, and 0 length + * isn't necessarily invalid. + */ + err = 0; break; case FUSE_REMOVEXATTR: - panic("FUSE_REMOVEXATTR implementor has forgotten to define a" - " response body format check"); + err = (blen == 0) ? 0 : EINVAL; break; case FUSE_FLUSH: Modified: stable/10/sys/fs/fuse/fuse_vnops.c ============================================================================== --- stable/10/sys/fs/fuse/fuse_vnops.c Mon Oct 30 18:54:27 2017 (r325163) +++ stable/10/sys/fs/fuse/fuse_vnops.c Mon Oct 30 20:31:48 2017 (r325164) @@ -73,6 +73,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -111,10 +112,13 @@ __FBSDID("$FreeBSD$"); static vop_access_t fuse_vnop_access; static vop_close_t fuse_vnop_close; static vop_create_t fuse_vnop_create; +static vop_deleteextattr_t fuse_vnop_deleteextattr; static vop_fsync_t fuse_vnop_fsync; static vop_getattr_t fuse_vnop_getattr; +static vop_getextattr_t fuse_vnop_getextattr; static vop_inactive_t fuse_vnop_inactive; static vop_link_t fuse_vnop_link; +static vop_listextattr_t fuse_vnop_listextattr; static vop_lookup_t fuse_vnop_lookup; static vop_mkdir_t fuse_vnop_mkdir; static vop_mknod_t fuse_vnop_mknod; @@ -127,6 +131,7 @@ static vop_remove_t fuse_vnop_remove; static vop_rename_t fuse_vnop_rename; static vop_rmdir_t fuse_vnop_rmdir; static vop_setattr_t fuse_vnop_setattr; +static vop_setextattr_t fuse_vnop_setextattr; static vop_strategy_t fuse_vnop_strategy; static vop_symlink_t fuse_vnop_symlink; static vop_write_t fuse_vnop_write; @@ -139,10 +144,13 @@ struct vop_vector fuse_vnops = { .vop_access = fuse_vnop_access, .vop_close = fuse_vnop_close, .vop_create = fuse_vnop_create, + .vop_deleteextattr = fuse_vnop_deleteextattr, .vop_fsync = fuse_vnop_fsync, .vop_getattr = fuse_vnop_getattr, + .vop_getextattr = fuse_vnop_getextattr, .vop_inactive = fuse_vnop_inactive, .vop_link = fuse_vnop_link, + .vop_listextattr = fuse_vnop_listextattr, .vop_lookup = fuse_vnop_lookup, .vop_mkdir = fuse_vnop_mkdir, .vop_mknod = fuse_vnop_mknod, @@ -156,6 +164,7 @@ struct vop_vector fuse_vnops = { .vop_rename = fuse_vnop_rename, .vop_rmdir = fuse_vnop_rmdir, .vop_setattr = fuse_vnop_setattr, + .vop_setextattr = fuse_vnop_setextattr, .vop_strategy = fuse_vnop_strategy, .vop_symlink = fuse_vnop_symlink, .vop_write = fuse_vnop_write, @@ -1974,6 +1983,383 @@ fuse_vnop_putpages(struct vop_putpages_args *ap) } } return rtvals[0]; +} + +static const char extattr_namespace_separator = '.'; + +/* + struct vop_getextattr_args { + struct vop_generic_args a_gen; + struct vnode *a_vp; + int a_attrnamespace; + const char *a_name; + struct uio *a_uio; + size_t *a_size; + struct ucred *a_cred; + struct thread *a_td; + }; +*/ +static int +fuse_vnop_getextattr(struct vop_getextattr_args *ap) +{ + struct vnode *vp = ap->a_vp; + struct uio *uio = ap->a_uio; + struct fuse_dispatcher fdi = {0}; + struct fuse_getxattr_in *get_xattr_in; + struct fuse_getxattr_out *get_xattr_out; + struct mount *mp = vnode_mount(vp); + char *prefix; + size_t len; + char *attr_str; + struct thread *td = ap->a_td; + struct ucred *cred = ap->a_cred; + int err = 0; + + fuse_trace_printf_vnop(); + + if (fuse_isdeadfs(vp)) + return ENXIO; + + /* Default to looking for user attributes. */ + if (ap->a_attrnamespace == EXTATTR_NAMESPACE_SYSTEM) + prefix = EXTATTR_NAMESPACE_SYSTEM_STRING; + else + prefix = EXTATTR_NAMESPACE_USER_STRING; + + len = strlen(prefix) + sizeof(extattr_namespace_separator) + + strlen(ap->a_name) + 1; + + fdisp_init(&fdi, len + sizeof(*get_xattr_in)); + fdisp_make_vp(&fdi, FUSE_GETXATTR, vp, td, cred); + + get_xattr_in = fdi.indata; + /* + * Check to see whether we're querying the available size or + * issuing the actual request. If we pass in 0, we get back struct + * fuse_getxattr_out. If we pass in a non-zero size, we get back + * that much data, without the struct fuse_getxattr_out header. + */ + if (ap->a_size != NULL) + get_xattr_in->size = 0; + else + get_xattr_in->size = uio->uio_resid; + + attr_str = (char *)fdi.indata + sizeof(*get_xattr_in); + snprintf(attr_str, len, "%s%c%s", prefix, extattr_namespace_separator, + ap->a_name); + + err = fdisp_wait_answ(&fdi); + + if (err != 0) { + if (err == ENOSYS) + fsess_set_notimpl(mp, FUSE_GETXATTR); + debug_printf("getxattr: got err=%d from daemon\n", err); + goto out; + } + + /* + * If we get to this point (i.e. no error), we should have a valid + * answer of some sort. i.e. non-zero iosize and a valid pointer. + */ + if ((fdi.answ == NULL) || (fdi.iosize == 0)) { + debug_printf("getxattr: err = 0, but answ = %p, iosize = %zu\n", + fdi.answ, fdi.iosize); + err = EINVAL; + goto out; + } + get_xattr_out = fdi.answ; + + if (ap->a_size != NULL) { + *ap->a_size = get_xattr_out->size; + } else if (fdi.iosize > 0) { + err = uiomove(fdi.answ, fdi.iosize, uio); + } else { + err = EINVAL; + } + +out: + fdisp_destroy(&fdi); + return (err); +} + +/* + struct vop_setextattr_args { + struct vop_generic_args a_gen; + struct vnode *a_vp; + int a_attrnamespace; + const char *a_name; + struct uio *a_uio; + struct ucred *a_cred; + struct thread *a_td; + }; +*/ +static int +fuse_vnop_setextattr(struct vop_setextattr_args *ap) +{ + struct vnode *vp = ap->a_vp; + struct uio *uio = ap->a_uio; + struct fuse_dispatcher fdi = {0}; + struct fuse_setxattr_in *set_xattr_in; + struct mount *mp = vnode_mount(vp); + char *prefix; + size_t len; + char *attr_str; + struct thread *td = ap->a_td; + struct ucred *cred = ap->a_cred; + int err = 0; + + fuse_trace_printf_vnop(); + + if (fuse_isdeadfs(vp)) + return ENXIO; + + /* Default to looking for user attributes. */ + if (ap->a_attrnamespace == EXTATTR_NAMESPACE_SYSTEM) + prefix = EXTATTR_NAMESPACE_SYSTEM_STRING; + else + prefix = EXTATTR_NAMESPACE_USER_STRING; + + len = strlen(prefix) + sizeof(extattr_namespace_separator) + + strlen(ap->a_name) + 1; + + fdisp_init(&fdi, len + sizeof(*set_xattr_in) + uio->uio_resid); + fdisp_make_vp(&fdi, FUSE_SETXATTR, vp, td, cred); + + set_xattr_in = fdi.indata; + set_xattr_in->size = uio->uio_resid; + + attr_str = (char *)fdi.indata + sizeof(*set_xattr_in); + snprintf(attr_str, len, "%s%c%s", prefix, extattr_namespace_separator, + ap->a_name); + + err = uiomove((char *)fdi.indata + sizeof(*set_xattr_in) + len, + uio->uio_resid, uio); + if (err != 0) { + debug_printf("setxattr: got error %d from uiomove\n", err); + goto out; + } + + err = fdisp_wait_answ(&fdi); + + if (err != 0) { + if (err == ENOSYS) + fsess_set_notimpl(mp, FUSE_SETXATTR); + debug_printf("setxattr: got err=%d from daemon\n", err); + goto out; + } + +out: + fdisp_destroy(&fdi); + return (err); +} + +/* + * The Linux / FUSE extended attribute list is simply a collection of + * NUL-terminated strings. The FreeBSD extended attribute list is a single + * byte length followed by a non-NUL terminated string. So, this allows + * conversion of the Linux / FUSE format to the FreeBSD format in place. + * Linux attribute names are reported with the namespace as a prefix (e.g. + * "user.attribute_name"), but in FreeBSD they are reported without the + * namespace prefix (e.g. "attribute_name"). So, we're going from: + * + * user.attr_name1\0user.attr_name2\0 + * + * to: + * + * attr_name1attr_name2 + * + * Where "" is a single byte number of characters in the attribute name. + * + * Args: + * prefix - exattr namespace prefix string + * list, list_len - input list with namespace prefixes + * bsd_list, bsd_list_len - output list compatible with bsd vfs + */ +static int +fuse_xattrlist_convert(char *prefix, const char *list, int list_len, + char *bsd_list, int *bsd_list_len) +{ + int len, pos, dist_to_next, prefix_len; + + pos = 0; + *bsd_list_len = 0; + prefix_len = strlen(prefix); + + while (pos < list_len && list[pos] != '\0') { + dist_to_next = strlen(&list[pos]) + 1; + if (bcmp(&list[pos], prefix, prefix_len) == 0 && + list[pos + prefix_len] == extattr_namespace_separator) { + len = dist_to_next - + (prefix_len + sizeof(extattr_namespace_separator)) - 1; + if (len >= EXTATTR_MAXNAMELEN) + return (ENAMETOOLONG); + + bsd_list[*bsd_list_len] = len; + memcpy(&bsd_list[*bsd_list_len + 1], + &list[pos + prefix_len + + sizeof(extattr_namespace_separator)], len); + + *bsd_list_len += len + 1; + } + + pos += dist_to_next; + } + + return (0); +} + +/* + struct vop_listextattr_args { + struct vop_generic_args a_gen; + struct vnode *a_vp; + int a_attrnamespace; + struct uio *a_uio; + size_t *a_size; + struct ucred *a_cred; + struct thread *a_td; + }; +*/ +static int +fuse_vnop_listextattr(struct vop_listextattr_args *ap) +{ + struct vnode *vp = ap->a_vp; + struct uio *uio = ap->a_uio; + struct fuse_dispatcher fdi = {0}; + struct fuse_getxattr_in *get_xattr_in; + struct fuse_getxattr_out *get_xattr_out; + struct mount *mp = vnode_mount(vp); + size_t len; + char *prefix; + char *attr_str; + char *bsd_list = NULL; + int bsd_list_len; + struct thread *td = ap->a_td; + struct ucred *cred = ap->a_cred; + int err = 0; + + fuse_trace_printf_vnop(); + + if (fuse_isdeadfs(vp)) + return ENXIO; + + /* + * Add space for a NUL and the period separator if enabled. + * Default to looking for user attributes. + */ + if (ap->a_attrnamespace == EXTATTR_NAMESPACE_SYSTEM) + prefix = EXTATTR_NAMESPACE_SYSTEM_STRING; + else + prefix = EXTATTR_NAMESPACE_USER_STRING; + + len = strlen(prefix) + sizeof(extattr_namespace_separator) + 1; + + fdisp_init(&fdi, sizeof(*get_xattr_in) + len); + fdisp_make_vp(&fdi, FUSE_LISTXATTR, vp, td, cred); + + get_xattr_in = fdi.indata; + if (ap->a_size != NULL) + get_xattr_in->size = 0; + else + get_xattr_in->size = uio->uio_resid + sizeof(*get_xattr_out); + + + attr_str = (char *)fdi.indata + sizeof(*get_xattr_in); + snprintf(attr_str, len, "%s%c", prefix, extattr_namespace_separator); + + err = fdisp_wait_answ(&fdi); + if (err != 0) { + if (err == ENOSYS) + fsess_set_notimpl(mp, FUSE_LISTXATTR); + debug_printf("listextattr: got err=%d from daemon\n", err); + goto out; + } + + if ((fdi.answ == NULL) || (fdi.iosize == 0)) { + err = EINVAL; + goto out; + } + get_xattr_out = fdi.answ; + + if (ap->a_size != NULL) { + *ap->a_size = get_xattr_out->size; + } else if (fdi.iosize > 0) { + /* + * The Linux / FUSE attribute list format isn't the same + * as FreeBSD's format. So we need to transform it into + * FreeBSD's format before giving it to the user. + */ + bsd_list = malloc(fdi.iosize, M_TEMP, M_WAITOK); + err = fuse_xattrlist_convert(prefix, fdi.answ, fdi.iosize, + bsd_list, &bsd_list_len); + if (err != 0) + goto out; + + err = uiomove(bsd_list, bsd_list_len, uio); + } else { + debug_printf("listextattr: returned iosize %zu for %s attribute list is " + "too small\n", fdi.iosize, prefix); + err = EINVAL; + } + +out: + free(bsd_list, M_TEMP); + fdisp_destroy(&fdi); + return (err); +} + +/* + struct vop_deleteextattr_args { + struct vop_generic_args a_gen; + struct vnode *a_vp; + int a_attrnamespace; + const char *a_name; + struct ucred *a_cred; + struct thread *a_td; + }; +*/ +static int +fuse_vnop_deleteextattr(struct vop_deleteextattr_args *ap) +{ + struct vnode *vp = ap->a_vp; + struct fuse_dispatcher fdi = {0}; + struct mount *mp = vnode_mount(vp); + char *prefix; + size_t len; + char *attr_str; + struct thread *td = ap->a_td; + struct ucred *cred = ap->a_cred; + int err; + + fuse_trace_printf_vnop(); + + if (fuse_isdeadfs(vp)) + return ENXIO; + + /* Default to looking for user attributes. */ + if (ap->a_attrnamespace == EXTATTR_NAMESPACE_SYSTEM) + prefix = EXTATTR_NAMESPACE_SYSTEM_STRING; + else + prefix = EXTATTR_NAMESPACE_USER_STRING; + + len = strlen(prefix) + sizeof(extattr_namespace_separator) + + strlen(ap->a_name) + 1; + + fdisp_init(&fdi, len); + fdisp_make_vp(&fdi, FUSE_REMOVEXATTR, vp, td, cred); + + attr_str = fdi.indata; + snprintf(attr_str, len, "%s%c%s", prefix, extattr_namespace_separator, + ap->a_name); + + err = fdisp_wait_answ(&fdi); + if (err != 0) { + if (err == ENOSYS) + fsess_set_notimpl(mp, FUSE_REMOVEXATTR); + debug_printf("removexattr: got err=%d from daemon\n", err); + } + + fdisp_destroy(&fdi); + return (err); } /* From owner-svn-src-all@freebsd.org Mon Oct 30 20:58: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 00689E655A1; Mon, 30 Oct 2017 20:58:59 +0000 (UTC) (envelope-from wulf@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 C393F71361; Mon, 30 Oct 2017 20:58:58 +0000 (UTC) (envelope-from wulf@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9UKwvH3067446; Mon, 30 Oct 2017 20:58:57 GMT (envelope-from wulf@FreeBSD.org) Received: (from wulf@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9UKwvao067445; Mon, 30 Oct 2017 20:58:57 GMT (envelope-from wulf@FreeBSD.org) Message-Id: <201710302058.v9UKwvao067445@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wulf set sender to wulf@FreeBSD.org using -f From: Vladimir Kondratyev Date: Mon, 30 Oct 2017 20:58:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325165 - head/usr.sbin/bluetooth/bthidd X-SVN-Group: head X-SVN-Commit-Author: wulf X-SVN-Commit-Paths: head/usr.sbin/bluetooth/bthidd X-SVN-Commit-Revision: 325165 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 20:58:59 -0000 Author: wulf Date: Mon Oct 30 20:58:57 2017 New Revision: 325165 URL: https://svnweb.freebsd.org/changeset/base/325165 Log: bthidd(8): Generate button release event after virtual T-axis button press Apply PR/213957 (r308165, Make sure the virtual T-axis buttons generate button release event(s) for continuous tilting) to bluetooth mouse support. Reviewed by: emax, gonzo Approved by: gonzo (mentor) MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D12672 Modified: head/usr.sbin/bluetooth/bthidd/hid.c Modified: head/usr.sbin/bluetooth/bthidd/hid.c ============================================================================== --- head/usr.sbin/bluetooth/bthidd/hid.c Mon Oct 30 20:31:48 2017 (r325164) +++ head/usr.sbin/bluetooth/bthidd/hid.c Mon Oct 30 20:58:57 2017 (r325165) @@ -169,7 +169,7 @@ hid_interrupt(bthid_session_p s, uint8_t *data, int32_ hid_data_t d; hid_item_t h; int32_t report_id, usage, page, val, - mouse_x, mouse_y, mouse_z, mouse_butt, + mouse_x, mouse_y, mouse_z, mouse_t, mouse_butt, mevents, kevents, i; assert(s != NULL); @@ -196,7 +196,8 @@ hid_interrupt(bthid_session_p s, uint8_t *data, int32_ hid_device = get_hid_device(&s->bdaddr); assert(hid_device != NULL); - mouse_x = mouse_y = mouse_z = mouse_butt = mevents = kevents = 0; + mouse_x = mouse_y = mouse_z = mouse_t = mouse_butt = 0; + mevents = kevents = 0; for (d = hid_start_parse(hid_device->desc, 1 << hid_input, -1); hid_get_item(d, &h) > 0; ) { @@ -283,11 +284,7 @@ hid_interrupt(bthid_session_p s, uint8_t *data, int32_ switch (usage) { case HUC_AC_PAN: /* Horizontal scroll */ - if (val < 0) - mouse_butt |= (1 << 5); - else - mouse_butt |= (1 << 6); - + mouse_t = val; mevents ++; val = 0; break; @@ -529,7 +526,20 @@ check_middle_button: if (mevents > 0) { struct mouse_info mi; + memset(&mi, 0, sizeof(mi)); mi.operation = MOUSE_ACTION; + mi.u.data.buttons = mouse_butt; + + /* translate T-axis into button presses */ + if (mouse_t != 0) { + mi.u.data.buttons |= 1 << (mouse_t > 0 ? 6 : 5); + if (ioctl(s->srv->cons, CONS_MOUSECTL, &mi) < 0) + syslog(LOG_ERR, "Could not process mouse " \ + "events from %s. %s (%d)", + bt_ntoa(&s->bdaddr, NULL), + strerror(errno), errno); + } + mi.u.data.x = mouse_x; mi.u.data.y = mouse_y; mi.u.data.z = mouse_z; From owner-svn-src-all@freebsd.org Mon Oct 30 21:08:14 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 1BB14E6576E; Mon, 30 Oct 2017 21:08:14 +0000 (UTC) (envelope-from shurd@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 DCFDE71807; Mon, 30 Oct 2017 21:08:13 +0000 (UTC) (envelope-from shurd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9UL8Cus071652; Mon, 30 Oct 2017 21:08:12 GMT (envelope-from shurd@FreeBSD.org) Received: (from shurd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9UL8CMP071651; Mon, 30 Oct 2017 21:08:12 GMT (envelope-from shurd@FreeBSD.org) Message-Id: <201710302108.v9UL8CMP071651@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: shurd set sender to shurd@FreeBSD.org using -f From: Stephen Hurd Date: Mon, 30 Oct 2017 21:08:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325166 - head/sys/net X-SVN-Group: head X-SVN-Commit-Author: shurd X-SVN-Commit-Paths: head/sys/net X-SVN-Commit-Revision: 325166 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 21:08:14 -0000 Author: shurd Date: Mon Oct 30 21:08:12 2017 New Revision: 325166 URL: https://svnweb.freebsd.org/changeset/base/325166 Log: Avoid enabling MSI-X if MSI-X is disabled globally It was reported on the community call that with hw.pci.enable_msix=0, iflib would enable MSI-X on the device and attempt to use it, which caused issues. Test the sysctl explicitly and do not enable MSI-X if it's disabled globally. Reviewed by: sbruno Approved by: sbruno (mentor) Sponsored by: Limelight Networks Differential Revision: https://reviews.freebsd.org/D12805 Modified: head/sys/net/iflib.c Modified: head/sys/net/iflib.c ============================================================================== --- head/sys/net/iflib.c Mon Oct 30 20:58:57 2017 (r325165) +++ head/sys/net/iflib.c Mon Oct 30 21:08:12 2017 (r325166) @@ -5260,6 +5260,19 @@ iflib_msix_init(if_ctx_t ctx) bar = ctx->ifc_softc_ctx.isc_msix_bar; admincnt = sctx->isc_admin_intrcnt; + /* Override by global tuneable */ + { + int i; + size_t len = sizeof(i); + err = kernel_sysctlbyname(curthread, "hw.pci.enable_msix", &i, &len, NULL, 0, NULL, 0); + if (err == 0) { + if (i == 0) + goto msi; + } + else { + device_printf(dev, "unable to read hw.pci.enable_msix."); + } + } /* Override by tuneable */ if (scctx->isc_disable_msix) goto msi; From owner-svn-src-all@freebsd.org Mon Oct 30 21:14: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 661CCE65A25; Mon, 30 Oct 2017 21:14:32 +0000 (UTC) (envelope-from shurd@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 4274071E06; Mon, 30 Oct 2017 21:14:32 +0000 (UTC) (envelope-from shurd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9ULEVmT075577; Mon, 30 Oct 2017 21:14:31 GMT (envelope-from shurd@FreeBSD.org) Received: (from shurd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9ULEVHh075576; Mon, 30 Oct 2017 21:14:31 GMT (envelope-from shurd@FreeBSD.org) Message-Id: <201710302114.v9ULEVHh075576@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: shurd set sender to shurd@FreeBSD.org using -f From: Stephen Hurd Date: Mon, 30 Oct 2017 21:14:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325167 - head/sys/net X-SVN-Group: head X-SVN-Commit-Author: shurd X-SVN-Commit-Paths: head/sys/net X-SVN-Commit-Revision: 325167 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 21:14:32 -0000 Author: shurd Date: Mon Oct 30 21:14:31 2017 New Revision: 325167 URL: https://svnweb.freebsd.org/changeset/base/325167 Log: Fix PR222744 - netmap errors with iflib em driver Fix error when refilling netmap buffers that resulted in the first buffer of the successive passes through ifl_bus_addrs[] leaving the first value unset (tmp_pidx started at 1, not zero after the first time through the loop). Leave the one unused buffer required by some NICs visible in the netmap ring rather than hidden. There will always be a buffer in use by the kernel now when an iflib driver is used via netmap. Always get the netmap slot index via netmap_idx_n2k() to account for nkr_hwofs in a consistent way. Split shared functionality into new functions. iru_init(): shared by _iflib_fl_refill() and netmap_fl_refill() netmap_fl_refill(): shared by iflib_netmap_rxsync() and iflib_netmap_rxq_init() PR: 222744 Reported by: Shirkdog Reviewed by: sbruno Approved by: sbruno (mentor) Sponsored by: Limelight Networks Differential Revision: https://reviews.freebsd.org/D12769 Modified: head/sys/net/iflib.c Modified: head/sys/net/iflib.c ============================================================================== --- head/sys/net/iflib.c Mon Oct 30 21:08:12 2017 (r325166) +++ head/sys/net/iflib.c Mon Oct 30 21:14:31 2017 (r325167) @@ -137,6 +137,8 @@ typedef struct iflib_fl *iflib_fl_t; struct iflib_ctx; +static void iru_init(if_rxd_update_t iru, iflib_rxq_t rxq, uint8_t flid); + typedef struct iflib_filter_info { driver_filter_t *ifi_filter; void *ifi_filter_arg; @@ -723,6 +725,8 @@ static struct mbuf * iflib_fixup_rx(struct mbuf *m); MODULE_DEPEND(iflib, netmap, 1, 1, 1); +static int netmap_fl_refill(iflib_rxq_t rxq, struct netmap_kring *kring, uint32_t nm_i, bool init); + /* * device-specific sysctl variables: * @@ -785,6 +789,94 @@ iflib_netmap_register(struct netmap_adapter *na, int o return (status); } +static void +iru_init(if_rxd_update_t iru, iflib_rxq_t rxq, uint8_t flid) +{ + iflib_fl_t fl; + + fl = &rxq->ifr_fl[flid]; + iru->iru_paddrs = fl->ifl_bus_addrs; + iru->iru_vaddrs = &fl->ifl_vm_addrs[0]; + iru->iru_idxs = fl->ifl_rxd_idxs; + iru->iru_qsidx = rxq->ifr_id; + iru->iru_buf_size = fl->ifl_buf_size; + iru->iru_flidx = fl->ifl_id; +} + +static int +netmap_fl_refill(iflib_rxq_t rxq, struct netmap_kring *kring, uint32_t nm_i, bool init) +{ + struct netmap_adapter *na = kring->na; + u_int const lim = kring->nkr_num_slots - 1; + u_int head = kring->rhead; + struct netmap_ring *ring = kring->ring; + bus_dmamap_t *map; + struct if_rxd_update iru; + if_ctx_t ctx = rxq->ifr_ctx; + iflib_fl_t fl = &rxq->ifr_fl[0]; + uint32_t refill_pidx, nic_i; + + if (nm_i == head && __predict_true(!init)) + return 0; + iru_init(&iru, rxq, 0 /* flid */); + map = fl->ifl_sds.ifsd_map; + refill_pidx = netmap_idx_k2n(kring, nm_i); + /* + * IMPORTANT: we must leave one free slot in the ring, + * so move head back by one unit + */ + head = nm_prev(head, lim); + while (nm_i != head) { + for (int tmp_pidx = 0; tmp_pidx < IFLIB_MAX_RX_REFRESH && nm_i != head; tmp_pidx++) { + struct netmap_slot *slot = &ring->slot[nm_i]; + void *addr = PNMB(na, slot, &fl->ifl_bus_addrs[tmp_pidx]); + uint32_t nic_i_dma = refill_pidx; + nic_i = netmap_idx_k2n(kring, nm_i); + + MPASS(tmp_pidx < IFLIB_MAX_RX_REFRESH); + + if (addr == NETMAP_BUF_BASE(na)) /* bad buf */ + return netmap_ring_reinit(kring); + + fl->ifl_vm_addrs[tmp_pidx] = addr; + if (__predict_false(init) && map) { + netmap_load_map(na, fl->ifl_ifdi->idi_tag, map[nic_i], addr); + } else if (map && (slot->flags & NS_BUF_CHANGED)) { + /* buffer has changed, reload map */ + netmap_reload_map(na, fl->ifl_ifdi->idi_tag, map[nic_i], addr); + } + slot->flags &= ~NS_BUF_CHANGED; + + nm_i = nm_next(nm_i, lim); + fl->ifl_rxd_idxs[tmp_pidx] = nic_i = nm_next(nic_i, lim); + if (nm_i != head && tmp_pidx < IFLIB_MAX_RX_REFRESH-1) + continue; + + iru.iru_pidx = refill_pidx; + iru.iru_count = tmp_pidx+1; + ctx->isc_rxd_refill(ctx->ifc_softc, &iru); + + refill_pidx = nic_i; + if (map == NULL) + continue; + + for (int n = 0; n < iru.iru_count; n++) { + bus_dmamap_sync(fl->ifl_ifdi->idi_tag, map[nic_i_dma], + BUS_DMASYNC_PREREAD); + /* XXX - change this to not use the netmap func*/ + nic_i_dma = nm_next(nic_i_dma, lim); + } + } + } + kring->nr_hwcur = head; + + if (map) + bus_dmamap_sync(fl->ifl_ifdi->idi_tag, fl->ifl_ifdi->idi_map, + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); + ctx->isc_rxd_flush(ctx->ifc_softc, rxq->ifr_id, fl->ifl_id, nic_i); + return (0); +} + /* * Reconcile kernel and user view of the transmit ring. * @@ -848,7 +940,7 @@ iflib_netmap_txsync(struct netmap_kring *kring, int fl * to prefetch the next slot and txr entry. */ - nm_i = kring->nr_hwcur; + nm_i = netmap_idx_n2k(kring, kring->nr_hwcur); pkt_info_zero(&pi); pi.ipi_segs = txq->ift_segs; pi.ipi_qsidx = kring->ring_id; @@ -942,13 +1034,12 @@ iflib_netmap_rxsync(struct netmap_kring *kring, int fl struct netmap_adapter *na = kring->na; struct netmap_ring *ring = kring->ring; uint32_t nm_i; /* index into the netmap ring */ - uint32_t nic_i, nic_i_start; /* index into the NIC ring */ + uint32_t nic_i; /* index into the NIC ring */ u_int i, n; u_int const lim = kring->nkr_num_slots - 1; - u_int const head = kring->rhead; + u_int const head = netmap_idx_n2k(kring, kring->rhead); int force_update = (flags & NAF_FORCE_READ) || kring->nr_kflags & NKR_PENDINTR; struct if_rxd_info ri; - struct if_rxd_update iru; struct ifnet *ifp = na->ifp; if_ctx_t ctx = ifp->if_softc; @@ -984,7 +1075,8 @@ iflib_netmap_rxsync(struct netmap_kring *kring, int fl int error, avail; uint16_t slot_flags = kring->nkr_slot_flags; - for (fl = rxq->ifr_fl, i = 0; i < rxq->ifr_nfl; i++, fl++) { + for (i = 0; i < rxq->ifr_nfl; i++) { + fl = &rxq->ifr_fl[i]; nic_i = fl->ifl_cidx; nm_i = netmap_idx_n2k(kring, nic_i); avail = iflib_rxd_avail(ctx, rxq, nic_i, USHRT_MAX); @@ -1011,7 +1103,7 @@ iflib_netmap_rxsync(struct netmap_kring *kring, int fl iflib_rx_miss_bufs += n; } fl->ifl_cidx = nic_i; - kring->nr_hwtail = nm_i; + kring->nr_hwtail = netmap_idx_k2n(kring, nm_i); } kring->nr_kflags &= ~NKR_PENDINTR; } @@ -1025,67 +1117,9 @@ iflib_netmap_rxsync(struct netmap_kring *kring, int fl * nm_i == (nic_i + kring->nkr_hwofs) % ring_size */ /* XXX not sure how this will work with multiple free lists */ - nm_i = kring->nr_hwcur; - if (nm_i == head) - return (0); + nm_i = netmap_idx_n2k(kring, kring->nr_hwcur); - iru.iru_paddrs = fl->ifl_bus_addrs; - iru.iru_vaddrs = &fl->ifl_vm_addrs[0]; - iru.iru_idxs = fl->ifl_rxd_idxs; - iru.iru_qsidx = rxq->ifr_id; - iru.iru_buf_size = fl->ifl_buf_size; - iru.iru_flidx = fl->ifl_id; - nic_i_start = nic_i = netmap_idx_k2n(kring, nm_i); - for (i = 0; nm_i != head; i++) { - struct netmap_slot *slot = &ring->slot[nm_i]; - void *addr = PNMB(na, slot, &fl->ifl_bus_addrs[i]); - - if (addr == NETMAP_BUF_BASE(na)) /* bad buf */ - goto ring_reset; - - fl->ifl_vm_addrs[i] = addr; - if (fl->ifl_sds.ifsd_map && (slot->flags & NS_BUF_CHANGED)) { - /* buffer has changed, reload map */ - netmap_reload_map(na, fl->ifl_ifdi->idi_tag, fl->ifl_sds.ifsd_map[nic_i], addr); - } - slot->flags &= ~NS_BUF_CHANGED; - - nm_i = nm_next(nm_i, lim); - fl->ifl_rxd_idxs[i] = nic_i = nm_next(nic_i, lim); - if (nm_i != head && i < IFLIB_MAX_RX_REFRESH) - continue; - - iru.iru_pidx = nic_i_start; - iru.iru_count = i; - i = 0; - ctx->isc_rxd_refill(ctx->ifc_softc, &iru); - if (fl->ifl_sds.ifsd_map == NULL) { - nic_i_start = nic_i; - continue; - } - nic_i = nic_i_start; - for (n = 0; n < iru.iru_count; n++) { - bus_dmamap_sync(fl->ifl_ifdi->idi_tag, fl->ifl_sds.ifsd_map[nic_i], - BUS_DMASYNC_PREREAD); - nic_i = nm_next(nic_i, lim); - } - nic_i_start = nic_i; - } - kring->nr_hwcur = head; - - if (fl->ifl_sds.ifsd_map) - bus_dmamap_sync(fl->ifl_ifdi->idi_tag, fl->ifl_ifdi->idi_map, - BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); - /* - * IMPORTANT: we must leave one free slot in the ring, - * so move nic_i back by one unit - */ - nic_i = nm_prev(nic_i, lim); - ctx->isc_rxd_flush(ctx->ifc_softc, rxq->ifr_id, fl->ifl_id, nic_i); - return 0; - -ring_reset: - return netmap_ring_reinit(kring); + return (netmap_fl_refill(rxq, kring, nm_i, false)); } static void @@ -1153,59 +1187,20 @@ iflib_netmap_txq_init(if_ctx_t ctx, iflib_txq_t txq) netmap_load_map(na, txq->ift_desc_tag, txq->ift_sds.ifsd_map[i], NMB(na, slot + si)); } } + static void iflib_netmap_rxq_init(if_ctx_t ctx, iflib_rxq_t rxq) { struct netmap_adapter *na = NA(ctx->ifc_ifp); + struct netmap_kring *kring = &na->rx_rings[rxq->ifr_id]; struct netmap_slot *slot; - struct if_rxd_update iru; - iflib_fl_t fl; - bus_dmamap_t *map; - int nrxd; - uint32_t i, j, pidx_start; + uint32_t nm_i; slot = netmap_reset(na, NR_RX, rxq->ifr_id, 0); if (slot == NULL) return; - fl = &rxq->ifr_fl[0]; - map = fl->ifl_sds.ifsd_map; - nrxd = ctx->ifc_softc_ctx.isc_nrxd[0]; - iru.iru_paddrs = fl->ifl_bus_addrs; - iru.iru_vaddrs = &fl->ifl_vm_addrs[0]; - iru.iru_idxs = fl->ifl_rxd_idxs; - iru.iru_qsidx = rxq->ifr_id; - iru.iru_buf_size = rxq->ifr_fl[0].ifl_buf_size; - iru.iru_flidx = 0; - - for (pidx_start = i = j = 0; i < nrxd; i++, j++) { - int sj = netmap_idx_n2k(&na->rx_rings[rxq->ifr_id], i); - void *addr; - - fl->ifl_rxd_idxs[j] = i; - addr = fl->ifl_vm_addrs[j] = PNMB(na, slot + sj, &fl->ifl_bus_addrs[j]); - if (map) { - netmap_load_map(na, rxq->ifr_fl[0].ifl_ifdi->idi_tag, *map, addr); - map++; - } - - if (j < IFLIB_MAX_RX_REFRESH && i < nrxd - 1) - continue; - - iru.iru_pidx = pidx_start; - pidx_start = i; - iru.iru_count = j; - j = 0; - MPASS(pidx_start + j <= nrxd); - /* Update descriptors and the cached value */ - ctx->isc_rxd_refill(ctx->ifc_softc, &iru); - } - /* preserve queue */ - if (ctx->ifc_ifp->if_capenable & IFCAP_NETMAP) { - struct netmap_kring *kring = &na->rx_rings[rxq->ifr_id]; - int t = na->num_rx_desc - 1 - nm_kr_rxspace(kring); - ctx->isc_rxd_flush(ctx->ifc_softc, rxq->ifr_id, 0 /* fl_id */, t); - } else - ctx->isc_rxd_flush(ctx->ifc_softc, rxq->ifr_id, 0 /* fl_id */, nrxd-1); + nm_i = netmap_idx_n2k(kring, 0); + netmap_fl_refill(rxq, kring, nm_i, true); } #define iflib_netmap_detach(ifp) netmap_detach(ifp) @@ -1843,12 +1838,7 @@ _iflib_fl_refill(if_ctx_t ctx, iflib_fl_t fl, int coun DBG_COUNTER_INC(fl_refills); if (n > 8) DBG_COUNTER_INC(fl_refills_large); - iru.iru_paddrs = fl->ifl_bus_addrs; - iru.iru_vaddrs = &fl->ifl_vm_addrs[0]; - iru.iru_idxs = fl->ifl_rxd_idxs; - iru.iru_qsidx = fl->ifl_rxq->ifr_id; - iru.iru_buf_size = fl->ifl_buf_size; - iru.iru_flidx = fl->ifl_id; + iru_init(&iru, fl->ifl_rxq, fl->ifl_id); while (n--) { /* * We allocate an uninitialized mbuf + cluster, mbuf is From owner-svn-src-all@freebsd.org Mon Oct 30 21:20: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 60D91E65AF3; Mon, 30 Oct 2017 21:20:34 +0000 (UTC) (envelope-from shurd@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 2EC977204A; Mon, 30 Oct 2017 21:20:34 +0000 (UTC) (envelope-from shurd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9ULKX2k075887; Mon, 30 Oct 2017 21:20:33 GMT (envelope-from shurd@FreeBSD.org) Received: (from shurd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9ULKXS6075886; Mon, 30 Oct 2017 21:20:33 GMT (envelope-from shurd@FreeBSD.org) Message-Id: <201710302120.v9ULKXS6075886@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: shurd set sender to shurd@FreeBSD.org using -f From: Stephen Hurd Date: Mon, 30 Oct 2017 21:20:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325168 - head/sys/net X-SVN-Group: head X-SVN-Commit-Author: shurd X-SVN-Commit-Paths: head/sys/net X-SVN-Commit-Revision: 325168 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 21:20:34 -0000 Author: shurd Date: Mon Oct 30 21:20:33 2017 New Revision: 325168 URL: https://svnweb.freebsd.org/changeset/base/325168 Log: bnxt: HW_LRO Rx Pkt with > 32 fragments caused Crash (iflib) Broadcom NIC with HW_LRO setting max_agg_segs >= 6 can generate Rx pkt with 64 (2^6) fragments, modify IFLIB_MAX_RX_SEGS to 64 to avoid memory corruption / Crash. Submitted by: Bhargava Chenna Marreddy Reviewed by: shurd, sbruno Approved by: sbruno (mentor) Sponsored by: Broadcom Limited Differential Revision: https://reviews.freebsd.org/D12774 Modified: head/sys/net/iflib.c Modified: head/sys/net/iflib.c ============================================================================== --- head/sys/net/iflib.c Mon Oct 30 21:14:31 2017 (r325167) +++ head/sys/net/iflib.c Mon Oct 30 21:20:33 2017 (r325168) @@ -288,7 +288,8 @@ typedef struct iflib_sw_tx_desc_array { /* magic number that should be high enough for any hardware */ #define IFLIB_MAX_TX_SEGS 128 -#define IFLIB_MAX_RX_SEGS 32 +/* bnxt supports 64 with hardware LRO enabled */ +#define IFLIB_MAX_RX_SEGS 64 #define IFLIB_RX_COPY_THRESH 128 #define IFLIB_MAX_RX_REFRESH 32 /* The minimum descriptors per second before we start coalescing */ From owner-svn-src-all@freebsd.org Mon Oct 30 21:26: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 A17EAE65E29; Mon, 30 Oct 2017 21:26:24 +0000 (UTC) (envelope-from shurd@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 7BAFC726E1; Mon, 30 Oct 2017 21:26:24 +0000 (UTC) (envelope-from shurd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9ULQNQr079863; Mon, 30 Oct 2017 21:26:23 GMT (envelope-from shurd@FreeBSD.org) Received: (from shurd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9ULQNXr079861; Mon, 30 Oct 2017 21:26:23 GMT (envelope-from shurd@FreeBSD.org) Message-Id: <201710302126.v9ULQNXr079861@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: shurd set sender to shurd@FreeBSD.org using -f From: Stephen Hurd Date: Mon, 30 Oct 2017 21:26:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325169 - head/sys/dev/bnxt X-SVN-Group: head X-SVN-Commit-Author: shurd X-SVN-Commit-Paths: head/sys/dev/bnxt X-SVN-Commit-Revision: 325169 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 21:26:24 -0000 Author: shurd Date: Mon Oct 30 21:26:23 2017 New Revision: 325169 URL: https://svnweb.freebsd.org/changeset/base/325169 Log: bnxt: Add support for new phy_types and speeds 1) Add new phy_types and speeds from the latest firmware header. 2) Introduced a macro to avoid code duplication and improve readability for the invocation of ifmedia_add(). Submitted by: Bhargava Chenna Marreddy Reviewed by: shurd, sbruno Approved by: sbruno (mentor) Sponsored by: Broadcom Limited Differential Revision: https://reviews.freebsd.org/D12423 Modified: head/sys/dev/bnxt/bnxt.h head/sys/dev/bnxt/if_bnxt.c Modified: head/sys/dev/bnxt/bnxt.h ============================================================================== --- head/sys/dev/bnxt/bnxt.h Mon Oct 30 21:20:33 2017 (r325168) +++ head/sys/dev/bnxt/bnxt.h Mon Oct 30 21:26:23 2017 (r325169) @@ -231,6 +231,11 @@ __FBSDID("$FreeBSD$"); #define clamp_t(type, _x, min, max) min_t(type, max_t(type, _x, min), max) +#define BNXT_IFMEDIA_ADD(supported, fw_speed, ifm_speed) do { \ + if ((supported) & HWRM_PORT_PHY_QCFG_OUTPUT_SUPPORT_ ## fw_speed) \ + ifmedia_add(softc->media, IFM_ETHER | (ifm_speed), 0, NULL); \ +} while(0) + /* NVRAM access */ enum bnxt_nvm_directory_type { BNX_DIR_TYPE_UNUSED = 0, Modified: head/sys/dev/bnxt/if_bnxt.c ============================================================================== --- head/sys/dev/bnxt/if_bnxt.c Mon Oct 30 21:20:33 2017 (r325168) +++ head/sys/dev/bnxt/if_bnxt.c Mon Oct 30 21:26:23 2017 (r325169) @@ -2121,129 +2121,86 @@ bnxt_add_media_types(struct bnxt_softc *softc) return; switch (phy_type) { + case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_100G_BASECR4: + case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_40G_BASECR4: + case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_25G_BASECR_CA_L: + case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_25G_BASECR_CA_S: + case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_25G_BASECR_CA_N: case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASECR: - if (supported & HWRM_PORT_PHY_QCFG_OUTPUT_SUPPORT_SPEEDS_100GB) - ifmedia_add(softc->media, IFM_ETHER | IFM_100G_CR4, 0, - NULL); - if (supported & HWRM_PORT_PHY_QCFG_OUTPUT_SUPPORT_SPEEDS_50GB) - ifmedia_add(softc->media, IFM_ETHER | IFM_50G_CR2, 0, - NULL); - if (supported & HWRM_PORT_PHY_QCFG_OUTPUT_SUPPORT_SPEEDS_40GB) - ifmedia_add(softc->media, IFM_ETHER | IFM_40G_CR4, 0, - NULL); - if (supported & HWRM_PORT_PHY_QCFG_OUTPUT_SUPPORT_SPEEDS_25GB) - ifmedia_add(softc->media, IFM_ETHER | IFM_25G_CR, 0, - NULL); - if (supported & HWRM_PORT_PHY_QCFG_OUTPUT_SUPPORT_SPEEDS_10GB) - ifmedia_add(softc->media, IFM_ETHER | IFM_10G_CR1, 0, - NULL); + BNXT_IFMEDIA_ADD(supported, SPEEDS_100GB, IFM_100G_CR4); + BNXT_IFMEDIA_ADD(supported, SPEEDS_50GB, IFM_50G_CR2); + BNXT_IFMEDIA_ADD(supported, SPEEDS_40GB, IFM_40G_CR4); + BNXT_IFMEDIA_ADD(supported, SPEEDS_25GB, IFM_25G_CR); + BNXT_IFMEDIA_ADD(supported, SPEEDS_10GB, IFM_10G_CR1); + BNXT_IFMEDIA_ADD(supported, SPEEDS_1GB, IFM_1000_T); break; + + case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_100G_BASELR4: + case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_40G_BASELR4: + case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASELR: + BNXT_IFMEDIA_ADD(supported, SPEEDS_100GB, IFM_100G_LR4); + BNXT_IFMEDIA_ADD(supported, SPEEDS_40GB, IFM_40G_LR4); + BNXT_IFMEDIA_ADD(supported, SPEEDS_25GB, IFM_25G_LR); + BNXT_IFMEDIA_ADD(supported, SPEEDS_10GB, IFM_10G_LR); + BNXT_IFMEDIA_ADD(supported, SPEEDS_1GB, IFM_1000_LX); + break; + + case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_100G_BASESR10: + case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_100G_BASESR4: + case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_40G_BASESR4: + case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASESR: + case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_40G_BASEER4: + case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_100G_BASEER4: + case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_25G_BASESR: + case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_1G_BASESX: + BNXT_IFMEDIA_ADD(supported, SPEEDS_100GB, IFM_100G_SR4); + BNXT_IFMEDIA_ADD(supported, SPEEDS_40GB, IFM_40G_SR4); + BNXT_IFMEDIA_ADD(supported, SPEEDS_25GB, IFM_25G_SR); + BNXT_IFMEDIA_ADD(supported, SPEEDS_10GB, IFM_10G_SR); + BNXT_IFMEDIA_ADD(supported, SPEEDS_1GB, IFM_1000_SX); + break; + case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKR4: case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKR2: case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKR: - if (supported & HWRM_PORT_PHY_QCFG_OUTPUT_SUPPORT_SPEEDS_100GB) - ifmedia_add(softc->media, IFM_ETHER | IFM_100G_KR4, 0, - NULL); - if (supported & HWRM_PORT_PHY_QCFG_OUTPUT_SUPPORT_SPEEDS_50GB) - ifmedia_add(softc->media, IFM_ETHER | IFM_50G_KR2, 0, - NULL); - if (supported & HWRM_PORT_PHY_QCFG_OUTPUT_SUPPORT_SPEEDS_40GB) - ifmedia_add(softc->media, IFM_ETHER | IFM_40G_KR4, 0, - NULL); - if (supported & HWRM_PORT_PHY_QCFG_OUTPUT_SUPPORT_SPEEDS_25GB) - ifmedia_add(softc->media, IFM_ETHER | IFM_25G_KR, 0, - NULL); - if (supported & HWRM_PORT_PHY_QCFG_OUTPUT_SUPPORT_SPEEDS_20GB) - ifmedia_add(softc->media, IFM_ETHER | IFM_20G_KR2, 0, - NULL); - if (supported & HWRM_PORT_PHY_QCFG_OUTPUT_SUPPORT_SPEEDS_10GB) - ifmedia_add(softc->media, IFM_ETHER | IFM_10G_KR, 0, - NULL); + BNXT_IFMEDIA_ADD(supported, SPEEDS_100GB, IFM_100G_KR4); + BNXT_IFMEDIA_ADD(supported, SPEEDS_50GB, IFM_50G_KR2); + BNXT_IFMEDIA_ADD(supported, SPEEDS_40GB, IFM_40G_KR4); + BNXT_IFMEDIA_ADD(supported, SPEEDS_25GB, IFM_25G_KR); + BNXT_IFMEDIA_ADD(supported, SPEEDS_20GB, IFM_20G_KR2); + BNXT_IFMEDIA_ADD(supported, SPEEDS_10GB, IFM_10G_KR); + BNXT_IFMEDIA_ADD(supported, SPEEDS_1GB, IFM_1000_KX); break; - case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASELR: - if (supported & HWRM_PORT_PHY_QCFG_OUTPUT_SUPPORT_SPEEDS_100GB) - ifmedia_add(softc->media, IFM_ETHER | IFM_100G_LR4, 0, - NULL); - if (supported & HWRM_PORT_PHY_QCFG_OUTPUT_SUPPORT_SPEEDS_40GB) - ifmedia_add(softc->media, IFM_ETHER | IFM_40G_LR4, 0, - NULL); - if (supported & HWRM_PORT_PHY_QCFG_OUTPUT_SUPPORT_SPEEDS_10GB) - ifmedia_add(softc->media, IFM_ETHER | IFM_10G_LR, 0, - NULL); + + case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_40G_ACTIVE_CABLE: + BNXT_IFMEDIA_ADD(supported, SPEEDS_25GB, IFM_25G_ACC); + BNXT_IFMEDIA_ADD(supported, SPEEDS_10GB, IFM_10G_AOC); break; - case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASESR: - if (supported & HWRM_PORT_PHY_QCFG_OUTPUT_SUPPORT_SPEEDS_100GB) - ifmedia_add(softc->media, IFM_ETHER | IFM_100G_SR4, 0, - NULL); - if (supported & HWRM_PORT_PHY_QCFG_OUTPUT_SUPPORT_SPEEDS_40GB) - ifmedia_add(softc->media, IFM_ETHER | IFM_40G_SR4, 0, - NULL); - if (supported & HWRM_PORT_PHY_QCFG_OUTPUT_SUPPORT_SPEEDS_25GB) - ifmedia_add(softc->media, IFM_ETHER | IFM_25G_SR, 0, - NULL); - if (supported & HWRM_PORT_PHY_QCFG_OUTPUT_SUPPORT_SPEEDS_10GB) - ifmedia_add(softc->media, IFM_ETHER | IFM_10G_SR, 0, - NULL); + + case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_1G_BASECX: + BNXT_IFMEDIA_ADD(supported, SPEEDS_1GBHD, IFM_1000_CX); break; - case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKX: - if (supported & HWRM_PORT_PHY_QCFG_OUTPUT_SUPPORT_SPEEDS_10GB) - ifmedia_add(softc->media, IFM_ETHER | IFM_10G_KX4, 0, - NULL); - if (supported & HWRM_PORT_PHY_QCFG_OUTPUT_SUPPORT_SPEEDS_2_5GB) - ifmedia_add(softc->media, IFM_ETHER | IFM_2500_KX, 0, - NULL); - if (supported & HWRM_PORT_PHY_QCFG_OUTPUT_SUPPORT_SPEEDS_1GB) - ifmedia_add(softc->media, IFM_ETHER | IFM_1000_KX, 0, - NULL); - break; + + case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_1G_BASET: case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASET: case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASETE: - if (supported & HWRM_PORT_PHY_QCFG_OUTPUT_SUPPORT_SPEEDS_10MB) - ifmedia_add(softc->media, IFM_ETHER | IFM_10_T, 0, - NULL); - if (supported & HWRM_PORT_PHY_QCFG_OUTPUT_SUPPORT_SPEEDS_100MB) - ifmedia_add(softc->media, IFM_ETHER | IFM_100_T, 0, - NULL); - if (supported & HWRM_PORT_PHY_QCFG_OUTPUT_SUPPORT_SPEEDS_1GB) - ifmedia_add(softc->media, IFM_ETHER | IFM_1000_T, 0, - NULL); - if (supported & HWRM_PORT_PHY_QCFG_OUTPUT_SUPPORT_SPEEDS_2_5GB) - ifmedia_add(softc->media, IFM_ETHER | IFM_2500_T, 0, - NULL); - if (supported & HWRM_PORT_PHY_QCFG_OUTPUT_SUPPORT_SPEEDS_10GB) - ifmedia_add(softc->media, IFM_ETHER | IFM_10G_T, 0, - NULL); + BNXT_IFMEDIA_ADD(supported, SPEEDS_1GB, IFM_1000_T); + BNXT_IFMEDIA_ADD(supported, SPEEDS_100MB, IFM_100_T); + BNXT_IFMEDIA_ADD(supported, SPEEDS_10MB, IFM_10_T); break; + + case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKX: + BNXT_IFMEDIA_ADD(supported, SPEEDS_10GB, IFM_10G_KR); + BNXT_IFMEDIA_ADD(supported, SPEEDS_1GB, IFM_1000_KX); + break; + case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_SGMIIEXTPHY: - if (supported & HWRM_PORT_PHY_QCFG_OUTPUT_SUPPORT_SPEEDS_1GB) - ifmedia_add(softc->media, IFM_ETHER | IFM_1000_SGMII, 0, - NULL); + BNXT_IFMEDIA_ADD(supported, SPEEDS_1GB, IFM_1000_SGMII); break; + case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_UNKNOWN: default: - /* - * Workaround for Cumulus & Stratus - * For Stratus: - * media_type is being returned as 0x0 - * Return support speeds as 10G, 25G, 50G & 100G - * - * For Cumulus: - * phy_type is being returned as 0x14 (PHY_TYPE_40G_BASECR4) - * Return support speeds as 1G, 10G, 25G & 50G - */ - if (pci_get_device(softc->dev) == BCM57454) { - /* For Stratus: 10G, 25G, 50G & 100G */ - ifmedia_add(softc->media, IFM_ETHER | IFM_100G_CR4, 0, NULL); - ifmedia_add(softc->media, IFM_ETHER | IFM_50G_CR2, 0, NULL); - ifmedia_add(softc->media, IFM_ETHER | IFM_25G_CR, 0, NULL); - ifmedia_add(softc->media, IFM_ETHER | IFM_10G_CR1, 0, NULL); - } else if (pci_get_device(softc->dev) == BCM57414) { - /* For Cumulus: 1G, 10G, 25G & 50G */ - ifmedia_add(softc->media, IFM_ETHER | IFM_50G_CR2, 0, NULL); - ifmedia_add(softc->media, IFM_ETHER | IFM_25G_CR, 0, NULL); - ifmedia_add(softc->media, IFM_ETHER | IFM_10G_CR1, 0, NULL); - ifmedia_add(softc->media, IFM_ETHER | IFM_1000_T, 0, NULL); - } + /* Only Autoneg is supported for TYPE_UNKNOWN */ break; } From owner-svn-src-all@freebsd.org Mon Oct 30 21:35:12 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 CAD47E66234; Mon, 30 Oct 2017 21:35:12 +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 A429072EE0; Mon, 30 Oct 2017 21:35:11 +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 2552343A; Mon, 30 Oct 2017 16:35:06 -0500 (CDT) From: Dan Mack To: Devin Teske Cc: Alexey Dokuchaev , "src-committers\@freebsd.org" , Eitan Adler , "svn-src-all\@freebsd.org" , "svn-src-head\@freebsd.org" , Cy Schubert , Ed Maste , Warner Losh Subject: Re: svn commit: r325092 - head/usr.bin/fortune/datfiles References: <201710291851.v9TIpM0I073542@slippy.cwsent.com> <20171030151627.GA74374@FreeBSD.org> <3CB26689-0D12-4E69-9BBA-58CCC3B71F3F@shxd.cx> Date: Mon, 30 Oct 2017 16:35:04 -0500 In-Reply-To: <3CB26689-0D12-4E69-9BBA-58CCC3B71F3F@shxd.cx> (Devin Teske's message of "Mon, 30 Oct 2017 11:39:46 -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-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Oct 2017 21:35:12 -0000 Devin Teske writes: > Better in bash which allows you to filter not only on "begins with" > but also "contains" (which is arguably more valuable than "begins > with"). Definately different. Better? Maybe for some. I most always search command history by prefix and then just using multiple ESC-p invocations to find the one command to edit/re-execute. Less frequently I want to search the whole text of history for the whole command line sequence like bash Ctrl-R accomplishes. >>> To emulate this behaviour in bash, I simply create a .inputrc file in my >>> $HOME with the following contents: >>> >>> # .inputrc file >>> "\ep": history-search-backward >>> "\en": history-search-forward > Interesting that you mapped these to cursor-up/cursor-down. > > That may cause unexpected results. > For example, typing something and then pressing up-arrow will cause > the shell to give you the previous command that started with that > rather than the previous command in-general. It's ESC-p/ESC-n, not just plain up-arrow/down-arrow. Up arrow still does up without any search. At least with my config using \ep as shown. My up arrows work for me as expected - they just iterate forward and backward through shell history. Dan From owner-svn-src-all@freebsd.org Mon Oct 30 21:40:15 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 9D892E66375 for ; Mon, 30 Oct 2017 21:40:15 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: from mail-yw0-x22b.google.com (mail-yw0-x22b.google.com [IPv6:2607:f8b0:4002:c05::22b]) (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 5E07B730D7 for ; Mon, 30 Oct 2017 21:40:15 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: by mail-yw0-x22b.google.com with SMTP id q126so12932906ywq.10 for ; Mon, 30 Oct 2017 14:40:15 -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; bh=pMKFUzwdD3zUXR2VoKEKz+76bQ5M7Gz5AtSj8uJiuZk=; b=KUzGWT2D0yCcgQia2L3fesnysvW/uddRDVN5DmRK4Iah8sE4hakvS/2RubkJhHfmKa 9X3ulKZr6C1kZWWBpEd4VR40Xzv2xMbFCYGBUaXW0zIiieM1QiEEuLjjMu4DvQimheJ7 BmoHaVwq5icJI//lo0KeXSJZbka4iFhxiHR/c= 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; bh=pMKFUzwdD3zUXR2VoKEKz+76bQ5M7Gz5AtSj8uJiuZk=; b=o0kZKtZ9EyH7B4JCS4HkRwvBIwMt35VaEj5zBut6BHXNDQiOCgH1zCSEEG8ZZNKsrj 1wyhUFp/DBJ1g0c90x7hfFUP/wlojh3oMTQGcOXM9nSgP5gGdQkmcdhSk/tCODhz7s7K RkADBgKGja+CHpZZQ0OcP2rKyXujeglQSr5QIE/XgF+fsOhlKgMlCc2BWPYdgi3aN7YB A/GrJQZFguQaIxz03RUMan84yEu7IyghNEHVdH0FnqtLbynsCcfERCXWo3tA/HEZhW1a l3K5VRpGFGZtzm6aq6VP84epfKOUYyPgpS48+G3swdgiT5w3KHv2T7M9syvj1JdpzBiv yESA== 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=pMKFUzwdD3zUXR2VoKEKz+76bQ5M7Gz5AtSj8uJiuZk=; b=gEmzpwJd6eK1woKnToCWxtR7iI2QBBsK69N/1y2DUvJRU84/yUZuLdnVLFpyUebqD0 IQQcOF55Gjr2Nztkf3bBhJOpCjNTsP3up2x2xsx1sxSC8j9QoVGRSBQWDcNA/drVOjUc afZQ2r3EGTLlzthfTUiiB2sUY0ScEu2mwictCAulUwVGHCzHyL0At8KV8mMB7rddKiKd 2YX/KvfwXJURjcqJSUVFl5Duiw9bEwkaHuIYMkCTUtq2npuNOMgKCBSDrl4LdGdi92/E Dl6L3YhloXGJi37CM7WxGSz3V62iJ3+et7FPp45RL1/shj1y8eAdKFfkGC5cUPdPvL2F SGSQ== X-Gm-Message-State: AMCzsaXvEet2eHTDg0jzLsb2yNdCL41pe8pBupRn7B1rfWuXdoy9xc6r vxB2yd7uGVJprhOj0scGij/M0Y843hedy5EQSekNfQ== X-Google-Smtp-Source: ABhQp+S5xbIuDbTVtJWb+yD+91AAE9IoXGfZaevjWQezaIQF2BIItb53A2jWX75lT7oDmTASI4HaEmzoOvplEbFonOY= X-Received: by 10.37.190.139 with SMTP id i11mr3427007ybk.296.1509399614385; Mon, 30 Oct 2017 14:40:14 -0700 (PDT) MIME-Version: 1.0 Sender: lists@eitanadler.com Received: by 10.37.56.66 with HTTP; Mon, 30 Oct 2017 14:39:43 -0700 (PDT) In-Reply-To: <20171030022726.GA63037@FreeBSD.org> References: <201710290825.v9T8PV3W047519@repo.freebsd.org> <20171030022726.GA63037@FreeBSD.org> From: Eitan Adler Date: Mon, 30 Oct 2017 14:39:43 -0700 X-Google-Sender-Auth: 7qDhlgCmql1ax55tIAK069qUy2c Message-ID: Subject: Re: svn commit: r325097 - head To: Alexey Dokuchaev Cc: Warner Losh , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , src-committers 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: Mon, 30 Oct 2017 21:40:15 -0000 On 29 October 2017 at 19:27, Alexey Dokuchaev wrote: > +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"? The old way is still documented in the developers handbook. -- Eitan Adler Source, Ports, Doc committer Bugmeister, Ports Security teams From owner-svn-src-all@freebsd.org Mon Oct 30 22:40: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 A9265E2533C; Mon, 30 Oct 2017 22:40:50 +0000 (UTC) (envelope-from andrew@fubar.geek.nz) Received: from fry.fubar.geek.nz (fry.fubar.geek.nz [139.59.165.16]) by mx1.freebsd.org (Postfix) with ESMTP id 78C5274AEB; Mon, 30 Oct 2017 22:40:49 +0000 (UTC) (envelope-from andrew@fubar.geek.nz) Received: from [IPv6:2a02:c7f:1e13:cf00:a53a:b754:fef3:58ee] (unknown [IPv6:2a02:c7f:1e13:cf00:a53a:b754:fef3:58ee]) by fry.fubar.geek.nz (Postfix) with ESMTPSA id 6DDD14E6DC; Mon, 30 Oct 2017 22:40:42 +0000 (UTC) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 10.3 \(3273\)) Subject: Re: svn commit: r325167 - head/sys/net From: Andrew Turner In-Reply-To: <201710302114.v9ULEVHh075576@repo.freebsd.org> Date: Mon, 30 Oct 2017 22:40:39 +0000 Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <045AD4A3-D46B-4B27-9A75-4C8BBB55DAD8@fubar.geek.nz> References: <201710302114.v9ULEVHh075576@repo.freebsd.org> To: Stephen Hurd X-Mailer: Apple Mail (2.3273) 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 22:40:50 -0000 > On 30 Oct 2017, at 21:14, Stephen Hurd wrote: >=20 > Author: shurd > Date: Mon Oct 30 21:14:31 2017 > New Revision: 325167 > URL: https://svnweb.freebsd.org/changeset/base/325167 >=20 > Log: > Fix PR222744 - netmap errors with iflib em driver >=20 > Fix error when refilling netmap buffers that resulted in the first > buffer of the successive passes through ifl_bus_addrs[] leaving the > first value unset (tmp_pidx started at 1, not zero after the first = time > through the loop). >=20 > Leave the one unused buffer required by some NICs visible in the = netmap > ring rather than hidden. There will always be a buffer in use by the > kernel now when an iflib driver is used via netmap. >=20 > Always get the netmap slot index via netmap_idx_n2k() to account for > nkr_hwofs in a consistent way. >=20 > Split shared functionality into new functions. > iru_init(): shared by _iflib_fl_refill() and netmap_fl_refill() > netmap_fl_refill(): shared by iflib_netmap_rxsync() and > iflib_netmap_rxq_init() >=20 > PR: 222744 > Reported by: Shirkdog > Reviewed by: sbruno > Approved by: sbruno (mentor) > Sponsored by: Limelight Networks > Differential Revision: https://reviews.freebsd.org/D12769 This breaks building without netmap as iru_init is within an #ifdef = DEV_NETMAP block, but is declared and used outside this: --- iflib.o --- = /jenkins/workspace/FreeBSD-arm64-head/freebsd-head/sys/net/iflib.c:140:13:= error: function 'iru_init' has internal linkage but is not defined = [-Werror,-Wundefined-internal] static void iru_init(if_rxd_update_t iru, iflib_rxq_t rxq, uint8_t = flid); ^ = /jenkins/workspace/FreeBSD-arm64-head/freebsd-head/sys/net/iflib.c:1841:2:= note: used here iru_init(&iru, fl->ifl_rxq, fl->ifl_id); ^ 1 error generated. Andrew From owner-svn-src-all@freebsd.org Mon Oct 30 23:14: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 27632E26228; Mon, 30 Oct 2017 23:14: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 0186175EA4; Mon, 30 Oct 2017 23:14:23 +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 v9UNENg4025744; Mon, 30 Oct 2017 23:14:23 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9UNEMSF025740; Mon, 30 Oct 2017 23:14:22 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201710302314.v9UNEMSF025740@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 23:14:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325170 - in head/sys/boot/userboot: ficl test userboot zfs X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head/sys/boot/userboot: ficl test userboot zfs X-SVN-Commit-Revision: 325170 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 23:14:24 -0000 Author: imp Date: Mon Oct 30 23:14:22 2017 New Revision: 325170 URL: https://svnweb.freebsd.org/changeset/base/325170 Log: Use defs.mk values for userboot Sponsored by: Netflix Modified: head/sys/boot/userboot/ficl/Makefile head/sys/boot/userboot/test/Makefile head/sys/boot/userboot/userboot/Makefile head/sys/boot/userboot/zfs/Makefile Modified: head/sys/boot/userboot/ficl/Makefile ============================================================================== --- head/sys/boot/userboot/ficl/Makefile Mon Oct 30 21:26:23 2017 (r325169) +++ head/sys/boot/userboot/ficl/Makefile Mon Oct 30 23:14:22 2017 (r325170) @@ -1,10 +1,10 @@ # $FreeBSD$ # -.include +.include MK_SSP= no -.PATH: ${.CURDIR}/../../ficl -.PATH: ${.CURDIR}/../../ficl/${MACHINE_CPUARCH} +.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 @@ -29,7 +29,7 @@ INTERNALLIB= .endif # Standard softwords -.PATH: ${.CURDIR}/../../ficl/softwords +.PATH: ${BOOTSRC}/ficl/softwords SOFTWORDS= softcore.fr jhlocal.fr marker.fr freebsd.fr ficllocal.fr \ ifbrack.fr # Optional OO extension softwords @@ -43,12 +43,8 @@ SOFTWORDS= softcore.fr jhlocal.fr marker.fr freebsd.fr CFLAGS+= -m32 -mcpu=powerpc -I. .endif -CFLAGS+= -I${.CURDIR}/../../ficl -CFLAGS+= -I${.CURDIR}/../../ficl/${MACHINE_CPUARCH} -CFLAGS+= -I${.CURDIR}/../../common - softcore.c: ${SOFTWORDS} softcore.awk - (cd ${.CURDIR}/../../ficl/softwords; cat ${SOFTWORDS} \ + (cd ${FICLSRC}/softwords; cat ${SOFTWORDS} \ | awk -f softcore.awk -v datestamp="`LC_ALL=C date`") > ${.TARGET} #.if ${MACHINE_CPUARCH} == "amd64" Modified: head/sys/boot/userboot/test/Makefile ============================================================================== --- head/sys/boot/userboot/test/Makefile Mon Oct 30 21:26:23 2017 (r325169) +++ head/sys/boot/userboot/test/Makefile Mon Oct 30 23:14:22 2017 (r325170) @@ -3,13 +3,13 @@ MAN= -.include +.include MK_SSP= no PROG= test INTERNALPROG= -CFLAGS+= -I${.CURDIR}/.. -CFLAGS+= -I${.CURDIR}/../../.. +CFLAGS+= -I${BOOTSRC}/userboot +CFLAGS+= -I${SYSDIR} .include Modified: head/sys/boot/userboot/userboot/Makefile ============================================================================== --- head/sys/boot/userboot/userboot/Makefile Mon Oct 30 21:26:23 2017 (r325169) +++ head/sys/boot/userboot/userboot/Makefile Mon Oct 30 23:14:22 2017 (r325170) @@ -2,7 +2,8 @@ MAN= -.include +.include + MK_SSP= no LOADER_MSDOS_SUPPORT?= yes @@ -34,8 +35,8 @@ SRCS+= userboot_disk.c SRCS+= vers.c CFLAGS+= -Wall -CFLAGS+= -I${.CURDIR}/.. -CFLAGS+= -I${.CURDIR}/../../.. +CFLAGS+= -I${BOOTSRC}/userboot +CFLAGS+= -I${SYSDIR} CFLAGS+= -ffreestanding -I. CWARNFLAGS.main.c += -Wno-implicit-function-declaration @@ -46,11 +47,11 @@ NEWVERSWHAT= "User boot" ${MACHINE_CPUARCH} .if ${MK_ZFS} != "no" CFLAGS+= -DUSERBOOT_ZFS_SUPPORT -LIBZFSBOOT= ${.OBJDIR}/../zfs/libzfsboot.a +LIBZFSBOOT= ${BOOTOBJ}/userboot/zfs/libzfsboot.a .endif # Always add MI sources -.include "../../loader.mk" +.include "${BOOTSRC}/loader.mk" CFLAGS+= -I. DPADD+= ${LIBFICL} ${LIBZFSBOOT} ${LIBSA} LDADD+= ${LIBFICL} ${LIBZFSBOOT} ${LIBSA} Modified: head/sys/boot/userboot/zfs/Makefile ============================================================================== --- head/sys/boot/userboot/zfs/Makefile Mon Oct 30 21:26:23 2017 (r325169) +++ head/sys/boot/userboot/zfs/Makefile Mon Oct 30 23:14:22 2017 (r325170) @@ -1,8 +1,8 @@ # $FreeBSD$ -S= ${.CURDIR}/../../zfs +.include -.PATH: ${S} ${.CURDIR}/../../../crypto/skein +.PATH: ${BOOTSRC}/zfs ${SYSDIR}/crypto/skein LIB= zfsboot INTERNALLIB= @@ -11,10 +11,10 @@ SRCS+= zfs.c skein.c skein_block.c # Do not unroll skein loops, reduce code size CFLAGS+= -DSKEIN_LOOP=111 -CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I. +CFLAGS+= -I${LDRSRC} -I${SYSDIR} -I. CFLAGS+= -I${SASRC} -CFLAGS+= -I${.CURDIR}/../../../cddl/boot/zfs -CFLAGS+= -I${.CURDIR}/../../../crypto/skein +CFLAGS+= -I${SYSDIR}/cddl/boot/zfs +CFLAGS+= -I${SYSDIR}/crypto/skein CFLAGS+= -ffreestanding -fPIC CFLAGS+= -Wformat -Wall From owner-svn-src-all@freebsd.org Mon Oct 30 23:14: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 59E94E26277; Mon, 30 Oct 2017 23:14:40 +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 233CF75F8C; Mon, 30 Oct 2017 23:14:40 +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 v9UNEdeU025821; Mon, 30 Oct 2017 23:14:39 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9UNEbJd025802; Mon, 30 Oct 2017 23:14:37 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201710302314.v9UNEbJd025802@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 23:14:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325171 - in head/sys/boot: i386 i386/boot0 i386/boot2 i386/btx/btx i386/btx/btxldr i386/btx/lib i386/cdboot i386/gptboot i386/gptzfsboot i386/kgzldr i386/libfirewire i386/libi386 i386/... X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head/sys/boot: i386 i386/boot0 i386/boot2 i386/btx/btx i386/btx/btxldr i386/btx/lib i386/cdboot i386/gptboot i386/gptzfsboot i386/kgzldr i386/libfirewire i386/libi386 i386/loader i386/mbr i386/pmbr... X-SVN-Commit-Revision: 325171 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 23:14:40 -0000 Author: imp Date: Mon Oct 30 23:14:37 2017 New Revision: 325171 URL: https://svnweb.freebsd.org/changeset/base/325171 Log: Use defs.mk name and prefer bsd.init.mk Also need to make some small tweaks to the Makefiles to use += rather than = due to small shift in include file order. Sponsored by: Netflix Modified: head/sys/boot/i386/Makefile.inc head/sys/boot/i386/boot0/Makefile head/sys/boot/i386/boot2/Makefile head/sys/boot/i386/btx/btx/Makefile head/sys/boot/i386/btx/btxldr/Makefile head/sys/boot/i386/btx/lib/Makefile head/sys/boot/i386/cdboot/Makefile head/sys/boot/i386/gptboot/Makefile head/sys/boot/i386/gptzfsboot/Makefile head/sys/boot/i386/kgzldr/Makefile head/sys/boot/i386/libfirewire/Makefile head/sys/boot/i386/libi386/Makefile head/sys/boot/i386/loader/Makefile head/sys/boot/i386/mbr/Makefile head/sys/boot/i386/pmbr/Makefile head/sys/boot/i386/pxeldr/Makefile head/sys/boot/i386/zfsboot/Makefile head/sys/boot/i386/zfsloader/Makefile head/sys/boot/libsa32/Makefile Modified: head/sys/boot/i386/Makefile.inc ============================================================================== --- head/sys/boot/i386/Makefile.inc Mon Oct 30 23:14:22 2017 (r325170) +++ head/sys/boot/i386/Makefile.inc Mon Oct 30 23:14:37 2017 (r325171) @@ -8,29 +8,28 @@ CFLAGS.gcc+= -mpreferred-stack-boundary=2 CFLAGS+= ${CFLAGS_NO_SIMD} -msoft-float LDFLAGS+= -nostdlib -.if ${MACHINE_CPUARCH} == "amd64" -CFLAGS+= -m32 -ACFLAGS+= -m32 -# LD_FLAGS is passed directly to ${LD}, not via ${CC}: -LD_FLAGS+= -m elf_i386_fbsd -AFLAGS+= --32 -.endif - # BTX components -.if exists(${.OBJDIR}/../btx) -BTXDIR= ${.OBJDIR}/../btx -.else -BTXDIR= ${.CURDIR}/../btx -.endif +BTXDIR= ${BOOTOBJ}/i386/btx BTXLDR= ${BTXDIR}/btxldr/btxldr BTXKERN= ${BTXDIR}/btx/btx BTXCRT= ${BTXDIR}/lib/crt0.o +BTXSRC= ${BOOTSRC}/i386/btx +BTXLIB= ${BTXSRC}/lib + # compact binary with no padding between text, data, bss LDSCRIPT= ${BOOTSRC}/i386/boot.ldscript # LDFLAGS_BIN=-e start -Ttext ${ORG} -Wl,-T,${LDSCRIPT},-S,--oformat,binary # LD_FLAGS_BIN=-static -T ${LDSCRIPT} --gc-sections LDFLAGS_BIN=-e start -Ttext ${ORG} -Wl,-N,-S,--oformat,binary LD_FLAGS_BIN=-static -N --gc-sections + +.if ${MACHINE_CPUARCH} == "amd64" +CFLAGS+= -m32 +ACFLAGS+= -m32 +# LD_FLAGS is passed directly to ${LD}, not via ${CC}: +LD_FLAGS+= -m elf_i386_fbsd +AFLAGS+= --32 +.endif .include "../Makefile.inc" Modified: head/sys/boot/i386/boot0/Makefile ============================================================================== --- head/sys/boot/i386/boot0/Makefile Mon Oct 30 23:14:22 2017 (r325170) +++ head/sys/boot/i386/boot0/Makefile Mon Oct 30 23:14:37 2017 (r325171) @@ -75,6 +75,6 @@ CFLAGS+=-DFLAGS=${BOOT_BOOT0_FLAGS} \ -DTICKS=${BOOT_BOOT0_TICKS} \ -DCOMSPEED=${BOOT_BOOT0_COMCONSOLE_SPEED} -LDFLAGS=${LDFLAGS_BIN} +LDFLAGS+=${LDFLAGS_BIN} .include Modified: head/sys/boot/i386/boot2/Makefile ============================================================================== --- head/sys/boot/i386/boot2/Makefile Mon Oct 30 23:14:22 2017 (r325170) +++ head/sys/boot/i386/boot2/Makefile Mon Oct 30 23:14:37 2017 (r325171) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include FILES= boot boot1 boot2 @@ -22,7 +22,7 @@ BOOT2_UFS?= UFS1_AND_UFS2 #BOOT2_UFS?= UFS2_ONLY #BOOT2_UFS?= UFS1_ONLY -CFLAGS= -fomit-frame-pointer \ +CFLAGS+=-fomit-frame-pointer \ -mrtd \ -mregparm=3 \ -D${BOOT2_UFS} \ @@ -30,8 +30,8 @@ CFLAGS= -fomit-frame-pointer \ -DSIOPRT=${BOOT_COMCONSOLE_PORT} \ -DSIOFMT=${B2SIOFMT} \ -DSIOSPD=${BOOT_COMCONSOLE_SPEED} \ - -I${.CURDIR}/../../common \ - -I${.CURDIR}/../btx/lib -I. \ + -I${LDRSRC} \ + -I${BTXLIB} -I. \ -Wall -Waggregate-return -Wbad-function-cast -Wno-cast-align \ -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \ @@ -46,11 +46,8 @@ CFLAGS.gcc+= -mno-align-long-strings CFLAGS.clang+= -Oz ${CLANG_OPT_SMALL} -LD_FLAGS=${LD_FLAGS_BIN} +LD_FLAGS+=${LD_FLAGS_BIN} -# Pick up ../Makefile.inc early. -.include - CLEANFILES= boot boot: boot1 boot2 @@ -99,7 +96,7 @@ boot2.h: boot1.out .if ${MACHINE_CPUARCH} == "amd64" beforedepend boot2.s: machine CLEANFILES+= machine -machine: ${.CURDIR}/../../../i386/include .NOMETA +machine: ${SYSDIR}/i386/include .NOMETA ln -sf ${.ALLSRC} ${.TARGET} .endif Modified: head/sys/boot/i386/btx/btx/Makefile ============================================================================== --- head/sys/boot/i386/btx/btx/Makefile Mon Oct 30 23:14:22 2017 (r325170) +++ head/sys/boot/i386/btx/btx/Makefile Mon Oct 30 23:14:37 2017 (r325171) @@ -1,5 +1,7 @@ # $FreeBSD$ +.include + PROG= btx INTERNALPROG= MAN= @@ -12,7 +14,7 @@ BOOT_BTX_FLAGS=0x0 .endif CFLAGS+=-DBTX_FLAGS=${BOOT_BTX_FLAGS} -CFLAGS+=-I${.CURDIR}/../../common +CFLAGS+=-I${BOOTSRC}/i386/common .if defined(BTX_SERIAL) BOOT_COMCONSOLE_PORT?= 0x3f8 @@ -25,7 +27,7 @@ CFLAGS+=-DBTX_SERIAL -DSIOPRT=${BOOT_COMCONSOLE_PORT} ORG= 0x9000 -LDFLAGS=${LDFLAGS_BIN} +LDFLAGS+=${LDFLAGS_BIN} .include Modified: head/sys/boot/i386/btx/btxldr/Makefile ============================================================================== --- head/sys/boot/i386/btx/btxldr/Makefile Mon Oct 30 23:14:22 2017 (r325170) +++ head/sys/boot/i386/btx/btxldr/Makefile Mon Oct 30 23:14:37 2017 (r325171) @@ -1,19 +1,21 @@ # $FreeBSD$ +.include + PROG= btxldr INTERNALPROG= MAN= SRCS= btxldr.S CFLAGS+=-DLOADER_ADDRESS=${LOADER_ADDRESS} -CFLAGS+=-I${.CURDIR}/../../common +CFLAGS+=-I${BOOTSRC}/i386/common .if defined(BTXLDR_VERBOSE) CFLAGS+=-DBTXLDR_VERBOSE .endif ORG=${LOADER_ADDRESS} -LDFLAGS=${LDFLAGS_BIN} +LDFLAGS+=${LDFLAGS_BIN} .include Modified: head/sys/boot/i386/btx/lib/Makefile ============================================================================== --- head/sys/boot/i386/btx/lib/Makefile Mon Oct 30 23:14:22 2017 (r325170) +++ head/sys/boot/i386/btx/lib/Makefile Mon Oct 30 23:14:37 2017 (r325171) @@ -1,10 +1,12 @@ # $FreeBSD$ +.include + PROG= crt0.o INTERNALPROG= MAN= SRCS= btxcsu.S btxsys.s btxv86.s -CFLAGS+=-I${.CURDIR}/../../common -LDFLAGS=-Wl,-r +CFLAGS+=-I${BOOTSRC}/i386/common +LDFLAGS+=-Wl,-r .include Modified: head/sys/boot/i386/cdboot/Makefile ============================================================================== --- head/sys/boot/i386/cdboot/Makefile Mon Oct 30 23:14:22 2017 (r325170) +++ head/sys/boot/i386/cdboot/Makefile Mon Oct 30 23:14:37 2017 (r325171) @@ -1,16 +1,18 @@ # $FreeBSD$ +.include + PROG= cdboot STRIP= BINMODE=${NOBINMODE} MAN= SRCS= ${PROG}.S -CFLAGS+=-I${.CURDIR}/../common +CFLAGS+=-I${BOOTSRC}/i386/common ORG= 0x7c00 -LDFLAGS=${LDFLAGS_BIN} +LDFLAGS+=${LDFLAGS_BIN} .include Modified: head/sys/boot/i386/gptboot/Makefile ============================================================================== --- head/sys/boot/i386/gptboot/Makefile Mon Oct 30 23:14:22 2017 (r325170) +++ head/sys/boot/i386/gptboot/Makefile Mon Oct 30 23:14:37 2017 (r325171) @@ -1,8 +1,8 @@ # $FreeBSD$ -.include "../Makefile.inc" +.include -.PATH: ${.CURDIR}/../boot2 ${.CURDIR}/../common ${SASRC} +.PATH: ${BOOTSRC}/i386/boot2 ${BOOTSRC}/i386/common ${SASRC} FILES= gptboot MAN= gptboot.8 @@ -29,11 +29,11 @@ CFLAGS+=-DBOOTPROG=\"gptboot\" \ -DSIOPRT=${BOOT_COMCONSOLE_PORT} \ -DSIOFMT=${B2SIOFMT} \ -DSIOSPD=${BOOT_COMCONSOLE_SPEED} \ - -I${.CURDIR}/../../common \ - -I${.CURDIR}/../common \ - -I${.CURDIR}/../btx/lib -I. \ - -I${.CURDIR}/../boot2 \ - -I${.CURDIR}/../../.. \ + -I${LDRSRC} \ + -I${BOOTSRC}/i386/common \ + -I${BTXLIB} -I. \ + -I${BOOTSRC}/i386/boot2 \ + -I${SYSDIR} \ -Wall -Waggregate-return -Wbad-function-cast -Wno-cast-align \ -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \ @@ -44,17 +44,13 @@ CFLAGS.gcc+= --param max-inline-insns-single=100 .if ${LOADER_GELI_SUPPORT:Uyes} == "yes" CFLAGS+= -DLOADER_GELI_SUPPORT CFLAGS+= -I${BOOTSRC}/geli -CFLAGS+= -I${.CURDIR}/../../.. LIBGELIBOOT= ${BOOTOBJ}/geli/libgeliboot.a -.PATH: ${.CURDIR}/../../../opencrypto +.PATH: ${SYSDIR}/opencrypto OPENCRYPTO_XTS= xform_aes_xts.o .endif -LD_FLAGS=${LD_FLAGS_BIN} +LD_FLAGS+=${LD_FLAGS_BIN} -# Pick up ../Makefile.inc early. -.include - CLEANFILES= gptboot gptboot: gptldr.bin gptboot.bin ${BTXKERN} @@ -84,7 +80,7 @@ gptboot.o: ${SASRC}/ufsread.c beforedepend gptboot.o: machine CLEANFILES+= machine machine: .NOMETA - ln -sf ${.CURDIR}/../../../i386/include machine + ln -sf ${SYSDIR}/i386/include machine .endif .include Modified: head/sys/boot/i386/gptzfsboot/Makefile ============================================================================== --- head/sys/boot/i386/gptzfsboot/Makefile Mon Oct 30 23:14:22 2017 (r325170) +++ head/sys/boot/i386/gptzfsboot/Makefile Mon Oct 30 23:14:37 2017 (r325171) @@ -1,10 +1,10 @@ # $FreeBSD$ -.include "../Makefile.inc" +.include -.PATH: ${.CURDIR}/../boot2 ${.CURDIR}/../gptboot \ - ${.CURDIR}/../zfsboot ${.CURDIR}/../common \ - ${.CURDIR}/../../../crypto/skein ${SASRC} +.PATH: ${BOOTSRC}/i386/boot2 ${BOOTSRC}/i386/gptboot \ + ${BOOTSRC}/i386/zfsboot ${BOOTSRC}/i386/common \ + ${SYSDIR}/crypto/skein ${SASRC} FILES= gptzfsboot MAN= gptzfsboot.8 @@ -25,14 +25,14 @@ CFLAGS+=-DBOOTPROG=\"gptzfsboot\" \ -DSIOPRT=${BOOT_COMCONSOLE_PORT} \ -DSIOFMT=${B2SIOFMT} \ -DSIOSPD=${BOOT_COMCONSOLE_SPEED} \ - -I${.CURDIR}/../../common \ - -I${.CURDIR}/../common \ - -I${.CURDIR}/../../zfs \ - -I${.CURDIR}/../../../cddl/boot/zfs \ - -I${.CURDIR}/../../../crypto/skein \ - -I${.CURDIR}/../btx/lib -I. \ - -I${.CURDIR}/../boot2 \ - -I${.CURDIR}/../../.. \ + -I${LDRSRC} \ + -I${BOOTSRC}/i386/common \ + -I${BOOTSRC}/zfs \ + -I${SYSDIR}/cddl/boot/zfs \ + -I${SYSDIR}/crypto/skein \ + -I${BOOTSRC}/i386/btx/lib -I. \ + -I${BOOTSRC}/i386/boot2 \ + -I${SYSDIR} \ -Wall -Waggregate-return -Wbad-function-cast \ -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \ @@ -52,17 +52,14 @@ CFLAGS+= -DSKEIN_LOOP=111 CFLAGS+= -DLOADER_GELI_SUPPORT CFLAGS+= -I${BOOTSRC}/geli LIBGELIBOOT= ${BOOTOBJ}/geli/libgeliboot.a -.PATH: ${.CURDIR}/../../../opencrypto +.PATH: ${SYSDIR}/opencrypto OPENCRYPTO_XTS= xform_aes_xts.o .endif CFLAGS.gcc+= --param max-inline-insns-single=100 -LD_FLAGS=${LD_FLAGS_BIN} +LD_FLAGS+=${LD_FLAGS_BIN} -# Pick up ../Makefile.inc early. -.include - CLEANFILES= gptzfsboot gptzfsboot: gptldr.bin gptzfsboot.bin ${BTXKERN} @@ -87,13 +84,13 @@ gptzfsboot.out: ${BTXCRT} zfsboot.o sio.o gpt.o drv.o skein.o skein_block.o ${OPENCRYPTO_XTS} ${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBGELIBOOT} ${LIBSA32} -zfsboot.o: ${.CURDIR}/../../zfs/zfsimpl.c +zfsboot.o: ${BOOTSRC}/zfs/zfsimpl.c .if ${MACHINE_CPUARCH} == "amd64" beforedepend zfsboot.o: machine CLEANFILES+= machine machine: .NOMETA - ln -sf ${.CURDIR}/../../../i386/include machine + ln -sf ${SYSDIR}/i386/include machine .endif .include Modified: head/sys/boot/i386/kgzldr/Makefile ============================================================================== --- head/sys/boot/i386/kgzldr/Makefile Mon Oct 30 23:14:22 2017 (r325170) +++ head/sys/boot/i386/kgzldr/Makefile Mon Oct 30 23:14:37 2017 (r325171) @@ -1,5 +1,7 @@ # $FreeBSD$ +.include + PROG= kgzldr.o STRIP= BINMODE=${LIBMODE} @@ -10,8 +12,8 @@ SRCS= start.s boot.c inflate.c lib.c crt.s sio.s CFLAGS= -Os CFLAGS+=-DKZIP NO_SHARED= -LDFLAGS=-Wl,-r -.PATH: ${.CURDIR}/../../../kern +LDFLAGS+=-Wl,-r +.PATH: ${SYSDIR}/kern BOOT_COMCONSOLE_PORT?= 0x3f8 AFLAGS+=--defsym SIO_PRT=${BOOT_COMCONSOLE_PORT} Modified: head/sys/boot/i386/libfirewire/Makefile ============================================================================== --- head/sys/boot/i386/libfirewire/Makefile Mon Oct 30 23:14:22 2017 (r325170) +++ head/sys/boot/i386/libfirewire/Makefile Mon Oct 30 23:14:37 2017 (r325171) @@ -1,24 +1,26 @@ # $FreeBSD$ +.include + LIB= firewire INTERNALLIB= -.PATH: ${.CURDIR}/../../../dev/dcons ${.CURDIR}/../../../dev/firewire +.PATH: ${SYSDIR}/dev/dcons ${SYSDIR}/dev/firewire SRCS+= firewire.c fwohci.c dconsole.c SRCS+= dcons.c fwcrom.c CFLAGS+= -D_BOOT -CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I. -CFLAGS+= -I${.CURDIR}/../btx/lib -CFLAGS+= -I${.CURDIR}/../libi386 +CFLAGS+= -I${LDRSRC} -I${SYSDIR} -I. +CFLAGS+= -I${BTXLIB} +CFLAGS+= -I${BOOTSRC}/i386/libi386 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 Modified: head/sys/boot/i386/libi386/Makefile ============================================================================== --- head/sys/boot/i386/libi386/Makefile Mon Oct 30 23:14:22 2017 (r325170) +++ head/sys/boot/i386/libi386/Makefile Mon Oct 30 23:14:37 2017 (r325171) @@ -1,7 +1,7 @@ # $FreeBSD$ -# -.include "../../defs.mk" +.include + LIB= i386 INTERNALLIB= @@ -11,7 +11,7 @@ SRCS= biosacpi.c bioscd.c biosdisk.c biosmem.c biospnp elf64_freebsd.c multiboot.c multiboot_tramp.S relocater_tramp.S \ i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \ smbios.c time.c vidconsole.c amd64_tramp.S spinconsole.c -.PATH: ${.CURDIR}/../../zfs +.PATH: ${BOOTSRC}/zfs SRCS+= devicename_stubs.c BOOT_COMCONSOLE_PORT?= 0x3f8 @@ -49,11 +49,11 @@ CFLAGS+= -DTERM_EMU # XXX: make alloca() useable CFLAGS+= -Dalloca=__builtin_alloca -CFLAGS+= -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/i386 \ - -I${.CURDIR}/../../common -I${.CURDIR}/../common \ - -I${.CURDIR}/../btx/lib \ - -I${.CURDIR}/../../../contrib/dev/acpica/include \ - -I${.CURDIR}/../../.. -I. +CFLAGS+= -I${BOOTSRC}/ficl -I${BOOTSRC}/ficl/i386 \ + -I${LDRSRC} -I${BOOTSRC}/i386/common \ + -I${BTXLIB} \ + -I${SYSDIR}/contrib/dev/acpica/include \ + -I${SYSDIR} -I. # Handle FreeBSD specific %b and %D printf format specifiers CFLAGS+= ${FORMAT_EXTENSIONS} @@ -61,7 +61,7 @@ CFLAGS+= ${FORMAT_EXTENSIONS} .if ${MACHINE_CPUARCH} == "amd64" CLEANFILES+= machine machine: .NOMETA - ln -sf ${.CURDIR}/../../../i386/include machine + ln -sf ${SYSDIR}/i386/include machine .endif .include Modified: head/sys/boot/i386/loader/Makefile ============================================================================== --- head/sys/boot/i386/loader/Makefile Mon Oct 30 23:14:22 2017 (r325170) +++ head/sys/boot/i386/loader/Makefile Mon Oct 30 23:14:37 2017 (r325171) @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include + MK_SSP= no LOADER?= loader @@ -24,13 +25,13 @@ SRCS= main.c conf.c vers.c chain.c # Put LOADER_FIREWIRE_SUPPORT=yes in /etc/make.conf for FireWire/dcons support .if defined(LOADER_FIREWIRE_SUPPORT) CFLAGS+= -DLOADER_FIREWIRE_SUPPORT -LIBFIREWIRE= ${.OBJDIR}/../libfirewire/libfirewire.a +LIBFIREWIRE= ${BOOTSRC}/i386/libfirewire/libfirewire.a .endif # Set by zfsloader Makefile .if defined(LOADER_ZFS_SUPPORT) CFLAGS+= -DLOADER_ZFS_SUPPORT -LIBZFSBOOT= ${.OBJDIR}/../../zfs/libzfsboot.a +LIBZFSBOOT= ${BOOTOBJ}/zfs/libzfsboot.a .endif # Include bcache code. @@ -44,34 +45,31 @@ HAVE_ISABUS= yes CFLAGS+= -DLOADER_GELI_SUPPORT CFLAGS+= -I${BOOTSRC}/geli LIBGELIBOOT= ${BOOTOBJ}/geli/libgeliboot.a -.PATH: ${.CURDIR}/../../../opencrypto +.PATH: ${SYSDIR}/opencrypto SRCS+= xform_aes_xts.c -CFLAGS+= -I${.CURDIR}/../../.. -D_STAND +CFLAGS+= -I${SYSDIR} -D_STAND .endif # Always add MI sources -.include "../../loader.mk" +.include "${BOOTSRC}/loader.mk" CFLAGS+= -I. CLEANFILES= ${LOADER} ${LOADER}.bin loader.help CFLAGS+= -Wall -LDFLAGS= -static -Ttext 0x0 +LDFLAGS+= -static -Ttext 0x0 # i386 standalone support library -LIBI386= ${.OBJDIR}/../libi386/libi386.a -CFLAGS+= -I${.CURDIR}/.. +LIBI386= ${BOOTOBJ}/i386/libi386/libi386.a +CFLAGS+= -I${BOOTSRC}/i386 # BTX components -CFLAGS+= -I${.CURDIR}/../btx/lib +CFLAGS+= -I${BTXLIB} # Debug me! #CFLAGS+= -g #LDFLAGS+= -g -# Pick up ../Makefile.inc early. -.include - ${LOADER}: ${LOADER}.bin ${BTXLDR} ${BTXKERN} btxld -v -f aout -e ${LOADER_ADDRESS} -o ${.TARGET} -l ${BTXLDR} \ -b ${BTXKERN} ${LOADER}.bin @@ -87,8 +85,8 @@ FILES= ${LOADER} FILESMODE_${LOADER}= ${BINMODE} -b .if !defined(LOADER_ONLY) -.PATH: ${.CURDIR}/../../forth -.include "${.CURDIR}/../../forth/Makefile.inc" +.PATH: ${BOOTSRC}/forth +.include "${BOOTSRC}/forth/Makefile.inc" FILES+= pcibios.4th FILES+= loader.rc menu.rc @@ -114,5 +112,5 @@ beforedepend ${OBJS}: machine CLEANFILES+= machine CFLAGS+= -DLOADER_PREFER_AMD64 machine: .NOMETA - ln -sf ${.CURDIR}/../../../i386/include machine + ln -sf ${SYSDIR}/i386/include machine .endif Modified: head/sys/boot/i386/mbr/Makefile ============================================================================== --- head/sys/boot/i386/mbr/Makefile Mon Oct 30 23:14:22 2017 (r325170) +++ head/sys/boot/i386/mbr/Makefile Mon Oct 30 23:14:37 2017 (r325171) @@ -12,6 +12,6 @@ BOOT_MBR_FLAGS?= 0x80 ORG= 0x600 AFLAGS+=--defsym FLAGS=${BOOT_MBR_FLAGS} -LDFLAGS=${LDFLAGS_BIN} +LDFLAGS+=${LDFLAGS_BIN} .include Modified: head/sys/boot/i386/pmbr/Makefile ============================================================================== --- head/sys/boot/i386/pmbr/Makefile Mon Oct 30 23:14:22 2017 (r325170) +++ head/sys/boot/i386/pmbr/Makefile Mon Oct 30 23:14:37 2017 (r325171) @@ -9,6 +9,6 @@ SRCS= ${PROG}.s ORG= 0x600 AFLAGS+=--defsym FLAGS=${BOOT_MBR_FLAGS} -LDFLAGS=${LDFLAGS_BIN} +LDFLAGS+=${LDFLAGS_BIN} .include Modified: head/sys/boot/i386/pxeldr/Makefile ============================================================================== --- head/sys/boot/i386/pxeldr/Makefile Mon Oct 30 23:14:22 2017 (r325170) +++ head/sys/boot/i386/pxeldr/Makefile Mon Oct 30 23:14:37 2017 (r325171) @@ -1,6 +1,5 @@ # $FreeBSD$ -# Pick up ../Makefile.inc early. .include PROG= ${LDR} @@ -23,9 +22,9 @@ CFLAGS+=-DPROBE_KEYBOARD CFLAGS+=-DALWAYS_SERIAL .endif -CFLAGS+=-I${.CURDIR}/../common +CFLAGS+=-I${BOOTSRC}/i386/common -LOADERBIN= ${.OBJDIR}/../loader/loader.bin +LOADERBIN= ${BOOTOBJ}/i386/loader/loader.bin CLEANFILES+= ${BOOT}.tmp Modified: head/sys/boot/i386/zfsboot/Makefile ============================================================================== --- head/sys/boot/i386/zfsboot/Makefile Mon Oct 30 23:14:22 2017 (r325170) +++ head/sys/boot/i386/zfsboot/Makefile Mon Oct 30 23:14:37 2017 (r325171) @@ -2,10 +2,10 @@ LOADER_GELI_SUPPORT=no -.include "../Makefile.inc" +.include -.PATH: ${.CURDIR}/../boot2 ${.CURDIR}/../common \ - ${.CURDIR}/../../../crypto/skein ${SASRC} +.PATH: ${BOOTSRC}/i386/boot2 ${BOOTSRC}/i386/common \ + ${SYSDIR}/crypto/skein ${SASRC} FILES= zfsboot MAN= zfsboot.8 @@ -26,13 +26,14 @@ CFLAGS+=-DBOOTPROG=\"zfsboot\" \ -DSIOPRT=${BOOT_COMCONSOLE_PORT} \ -DSIOFMT=${B2SIOFMT} \ -DSIOSPD=${BOOT_COMCONSOLE_SPEED} \ - -I${.CURDIR}/../../common \ - -I${.CURDIR}/../common \ - -I${.CURDIR}/../../zfs \ - -I${.CURDIR}/../../../cddl/boot/zfs \ - -I${.CURDIR}/../../../crypto/skein \ - -I${.CURDIR}/../btx/lib -I. \ - -I${.CURDIR}/../boot2 \ + -I${LDRSRC} \ + -I${BOOTSRC}/i386/common \ + -I${BOOTSRC}/i386 \ + -I${BOOTSRC}/zfs \ + -I${SYSDIR}/cddl/boot/zfs \ + -I${SYSDIR}/crypto/skein \ + -I${BTXLIB} -I. \ + -I${BOOTSRC}/i386/boot2 \ -Wall -Waggregate-return -Wbad-function-cast -Wno-cast-align \ -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \ @@ -42,11 +43,8 @@ CFLAGS.gcc+= --param max-inline-insns-single=100 # Do not unroll skein loops, reduce code size CFLAGS+= -DSKEIN_LOOP=111 -LD_FLAGS=${LD_FLAGS_BIN} +LD_FLAGS+=${LD_FLAGS_BIN} -# Pick up ../Makefile.inc early. -.include - CLEANFILES= zfsboot zfsboot: zfsboot1 zfsboot2 @@ -93,7 +91,7 @@ SRCS= zfsboot.c beforedepend zfsboot.o: machine CLEANFILES+= machine machine: .NOMETA - ln -sf ${.CURDIR}/../../../i386/include machine + ln -sf ${SYSDIR}/i386/include machine .endif .include Modified: head/sys/boot/i386/zfsloader/Makefile ============================================================================== --- head/sys/boot/i386/zfsloader/Makefile Mon Oct 30 23:14:22 2017 (r325170) +++ head/sys/boot/i386/zfsloader/Makefile Mon Oct 30 23:14:37 2017 (r325171) @@ -1,12 +1,14 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../loader +.include +.PATH: ${BOOTSRC}/i386/loader + LOADER= zfsloader NEWVERSWHAT= "ZFS enabled bootstrap loader" x86 LOADER_ZFS_SUPPORT=yes LOADER_ONLY= yes MAN= -.include "${.CURDIR}/../loader/Makefile" +.include "${BOOTSRC}/i386/loader/Makefile" Modified: head/sys/boot/libsa32/Makefile ============================================================================== --- head/sys/boot/libsa32/Makefile Mon Oct 30 23:14:22 2017 (r325170) +++ head/sys/boot/libsa32/Makefile Mon Oct 30 23:14:37 2017 (r325171) @@ -1,9 +1,7 @@ # $FreeBSD$ -.include +.include -.include "../Makefile.inc" - LIB=sa32 .if ${MACHINE_CPUARCH} == "amd64" LIBSTAND_CPUARCH=i386 @@ -22,5 +20,5 @@ CFLAGS+= -m32 -I. CLEANFILES+= machine beforedepend ${OBJS}: machine machine: .NOMETA - ln -fs ${.CURDIR}/../../i386/include machine + ln -fs ${SYSDIR}/i386/include machine .endif From owner-svn-src-all@freebsd.org Mon Oct 30 23:14: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 89824E262C4; Mon, 30 Oct 2017 23:14:45 +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 5663675FFA; Mon, 30 Oct 2017 23:14:45 +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 v9UNEicw025874; Mon, 30 Oct 2017 23:14:44 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9UNEiNJ025872; Mon, 30 Oct 2017 23:14:44 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201710302314.v9UNEiNJ025872@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 23:14:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325172 - in head/sys/boot/sparc64: boot1 loader X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head/sys/boot/sparc64: boot1 loader X-SVN-Commit-Revision: 325172 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 23:14:45 -0000 Author: imp Date: Mon Oct 30 23:14:44 2017 New Revision: 325172 URL: https://svnweb.freebsd.org/changeset/base/325172 Log: Remove the -nostdlib stuff I added. Instead, fix LDFLAGS to be honored correctly with the new Makefile.inc include order. Sponsored by: Netflix Modified: head/sys/boot/sparc64/boot1/Makefile head/sys/boot/sparc64/loader/Makefile Modified: head/sys/boot/sparc64/boot1/Makefile ============================================================================== --- head/sys/boot/sparc64/boot1/Makefile Mon Oct 30 23:14:37 2017 (r325171) +++ head/sys/boot/sparc64/boot1/Makefile Mon Oct 30 23:14:44 2017 (r325172) @@ -13,8 +13,8 @@ BOOTBLOCKBASE= 0x4000 CFLAGS.clang+=-mcmodel=small CFLAGS.gcc+=-mcmodel=medlow -CFLAGS+=-Os -I${LDRSRC} -nostdlib -LDFLAGS=-Ttext ${BOOTBLOCKBASE} -Wl,-N +CFLAGS+=-Os -I${LDRSRC} +LDFLAGS+=-Ttext ${BOOTBLOCKBASE} -Wl,-N # Construct boot1. sunlabel expects it to contain zeroed-out space for the # label, and to be of the correct size. Modified: head/sys/boot/sparc64/loader/Makefile ============================================================================== --- head/sys/boot/sparc64/loader/Makefile Mon Oct 30 23:14:37 2017 (r325171) +++ head/sys/boot/sparc64/loader/Makefile Mon Oct 30 23:14:44 2017 (r325172) @@ -25,8 +25,6 @@ LOADER_GZIP_SUPPORT?= yes LOADER_BZIP2_SUPPORT?= no LOADER_DEBUG?= no -CFLAGS+=-nostdlib - .if ${LOADER_DEBUG} == "yes" CFLAGS+= -DLOADER_DEBUG .endif @@ -43,7 +41,7 @@ CFLAGS+= -I. CLEANFILES+= loader.help -LDFLAGS= -static +LDFLAGS+= -static # Open Firmware standalone support library LIBOFW= ${BOOTOBJ}/ofw/libofw/libofw.a From owner-svn-src-all@freebsd.org Mon Oct 30 23:14: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 26364E26307; Mon, 30 Oct 2017 23:14:50 +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 DA5DF76067; Mon, 30 Oct 2017 23:14:49 +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 v9UNEmYD025927; Mon, 30 Oct 2017 23:14:49 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9UNEmL1025926; Mon, 30 Oct 2017 23:14:48 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201710302314.v9UNEmL1025926@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 23:14:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325173 - in head/sys/boot/userboot: . ficl X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head/sys/boot/userboot: . ficl X-SVN-Commit-Revision: 325173 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 23:14:50 -0000 Author: imp Date: Mon Oct 30 23:14:48 2017 New Revision: 325173 URL: https://svnweb.freebsd.org/changeset/base/325173 Log: We don't need to build a special ficl for userboot. Prior to bringing efi into the system, amd64 systems were building 32-bit ficl only, while userboot required the 64-bit one. However, with efi, we now build both. userboot can and should use the one we build for the main tree (in fact, it has been for a while, though I didn't check to see if that was an intentional change before, or an accidental one in my cleanup). Eliminate the extra copy (and build time) for userboot. Sponsored by: Netflix Deleted: head/sys/boot/userboot/ficl/Makefile head/sys/boot/userboot/ficl/Makefile.depend Modified: head/sys/boot/userboot/Makefile Modified: head/sys/boot/userboot/Makefile ============================================================================== --- head/sys/boot/userboot/Makefile Mon Oct 30 23:14:44 2017 (r325172) +++ head/sys/boot/userboot/Makefile Mon Oct 30 23:14:48 2017 (r325173) @@ -2,7 +2,7 @@ .include -SUBDIR= ficl test zfs userboot +SUBDIR= test zfs userboot .include From owner-svn-src-all@freebsd.org Mon Oct 30 23:14: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 AA08AE2634A; Mon, 30 Oct 2017 23:14:54 +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 732C4760F3; Mon, 30 Oct 2017 23:14:54 +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 v9UNEr5w025982; Mon, 30 Oct 2017 23:14:53 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9UNErGN025981; Mon, 30 Oct 2017 23:14:53 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201710302314.v9UNErGN025981@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 23:14:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325174 - head/sys/boot/ficl X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/sys/boot/ficl X-SVN-Commit-Revision: 325174 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 23:14:54 -0000 Author: imp Date: Mon Oct 30 23:14:53 2017 New Revision: 325174 URL: https://svnweb.freebsd.org/changeset/base/325174 Log: Minor cleanup Remove ancient comment about words to maybe add to the builds as softwords. We're not going to bring them in, so delete the noise. Also, check to see if HAVE_PNP is defined rather than if its value is true. Sponsored by: Netflix Modified: head/sys/boot/ficl/Makefile Modified: head/sys/boot/ficl/Makefile ============================================================================== --- head/sys/boot/ficl/Makefile Mon Oct 30 23:14:48 2017 (r325173) +++ head/sys/boot/ficl/Makefile Mon Oct 30 23:14:53 2017 (r325174) @@ -13,7 +13,7 @@ CLEANFILES= softcore.c testmain testmain.o (${MACHINE_CPUARCH} == "amd64" && defined(FICL32)) CFLAGS+= -march=i386 .endif -.if HAVE_PNP +.if defined(HAVE_PNP) CFLAGS+= -DHAVE_PNP .endif .include @@ -32,8 +32,6 @@ INTERNALLIB= .PATH: ${FICLSRC}/softwords SOFTWORDS= softcore.fr jhlocal.fr marker.fr freebsd.fr ficllocal.fr \ ifbrack.fr -# Optional OO extension softwords -#SOFTWORDS+= oo.fr classes.fr softcore.c: ${SOFTWORDS} softcore.awk (cd ${FICLSRC}/softwords; cat ${SOFTWORDS} \ From owner-svn-src-all@freebsd.org Mon Oct 30 23:15: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 BA211E26421; Mon, 30 Oct 2017 23:15:02 +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 6DDE9761E6; Mon, 30 Oct 2017 23:15:02 +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 v9UNF13a026061; Mon, 30 Oct 2017 23:15:01 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9UNExnn026034; Mon, 30 Oct 2017 23:14:59 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201710302314.v9UNExnn026034@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 23:14:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325175 - in head/sys/boot: . efi/boot1 efi/libefi efi/loader i386/gptzfsboot i386/libi386 i386/loader i386/zfsboot ofw/libofw sparc64/loader userboot userboot/userboot userboot/zfs zfs X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head/sys/boot: . efi/boot1 efi/libefi efi/loader i386/gptzfsboot i386/libi386 i386/loader i386/zfsboot ofw/libofw sparc64/loader userboot userboot/userboot userboot/zfs zfs X-SVN-Commit-Revision: 325175 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 23:15:02 -0000 Author: imp Date: Mon Oct 30 23:14:59 2017 New Revision: 325175 URL: https://svnweb.freebsd.org/changeset/base/325175 Log: For amd64, compile both zfs and zfs32 libraries. We have a separate copy of zfs for userboot. However, we don't need it if we compile both 32 and 64 bit ZFS libraries. Remove redunant copies of zfs related .o files now that both versions are available. Introduce ZFSSRC and use it everywhere. Sponsored by: Netflix Deleted: head/sys/boot/userboot/zfs/Makefile head/sys/boot/userboot/zfs/Makefile.depend Modified: head/sys/boot/Makefile.amd64 head/sys/boot/Makefile.arm head/sys/boot/Makefile.arm64 head/sys/boot/Makefile.i386 head/sys/boot/defs.mk head/sys/boot/efi/boot1/Makefile head/sys/boot/efi/libefi/Makefile head/sys/boot/efi/loader/Makefile head/sys/boot/i386/gptzfsboot/Makefile head/sys/boot/i386/libi386/Makefile head/sys/boot/i386/loader/Makefile head/sys/boot/i386/zfsboot/Makefile head/sys/boot/ofw/libofw/Makefile head/sys/boot/sparc64/loader/Makefile head/sys/boot/userboot/Makefile head/sys/boot/userboot/userboot/Makefile head/sys/boot/zfs/Makefile Modified: head/sys/boot/Makefile.amd64 ============================================================================== --- head/sys/boot/Makefile.amd64 Mon Oct 30 23:14:53 2017 (r325174) +++ head/sys/boot/Makefile.amd64 Mon Oct 30 23:14:59 2017 (r325175) @@ -1,16 +1,16 @@ # $FreeBSD$ -SUBDIR+= efi SUBDIR+= libsa32 -SUBDIR+= zfs +SUBDIR+= zfs zfs32 +.if ${MK_FORTH} != "no" +SUBDIR+= ficl32 +.endif + +SUBDIR+= efi SUBDIR+= userboot .if ${LOADER_GELI_SUPPORT:Uyes} == "yes" SUBDIR+= geli -.endif - -.if ${MK_FORTH} != "no" -SUBDIR+= ficl32 .endif SUBDIR+= i386 Modified: head/sys/boot/Makefile.arm ============================================================================== --- head/sys/boot/Makefile.arm Mon Oct 30 23:14:53 2017 (r325174) +++ head/sys/boot/Makefile.arm Mon Oct 30 23:14:59 2017 (r325175) @@ -3,5 +3,8 @@ .if ${MK_FDT} != "no" SUBDIR+= fdt .endif +.if ${MK_ZFS} != "no" +SUBDIR+= zfs +.endif SUBDIR+= efi uboot Modified: head/sys/boot/Makefile.arm64 ============================================================================== --- head/sys/boot/Makefile.arm64 Mon Oct 30 23:14:53 2017 (r325174) +++ head/sys/boot/Makefile.arm64 Mon Oct 30 23:14:59 2017 (r325175) @@ -3,5 +3,8 @@ .if ${MK_FDT} != "no" SUBDIR+= fdt .endif +.if ${MK_ZFS} != "no" +SUBDIR+= zfs +.endif SUBDIR+= efi Modified: head/sys/boot/Makefile.i386 ============================================================================== --- head/sys/boot/Makefile.i386 Mon Oct 30 23:14:53 2017 (r325174) +++ head/sys/boot/Makefile.i386 Mon Oct 30 23:14:59 2017 (r325175) @@ -1,9 +1,9 @@ # $FreeBSD$ -SUBDIR+= efi SUBDIR+= libsa32 -SUBDIR+= zfs - .if ${LOADER_GELI_SUPPORT:Uyes} == "yes" SUBDIR+= geli .endif +SUBDIR+= zfs + +SUBDIR+= efi Modified: head/sys/boot/defs.mk ============================================================================== --- head/sys/boot/defs.mk Mon Oct 30 23:14:53 2017 (r325174) +++ head/sys/boot/defs.mk Mon Oct 30 23:14:59 2017 (r325175) @@ -15,6 +15,7 @@ LDRSRC= ${BOOTSRC}/common SASRC= ${BOOTSRC}/libsa SYSDIR= ${SRCTOP}/sys UBOOTSRC= ${BOOTSRC}/uboot +ZFSSRC= ${BOOTSRC}/zfs BOOTOBJ= ${OBJTOP}/sys/boot Modified: head/sys/boot/efi/boot1/Makefile ============================================================================== --- head/sys/boot/efi/boot1/Makefile Mon Oct 30 23:14:53 2017 (r325174) +++ head/sys/boot/efi/boot1/Makefile Mon Oct 30 23:14:59 2017 (r325175) @@ -26,21 +26,15 @@ CWARNFLAGS.zfs_module.c += -Wno-missing-prototypes CWARNFLAGS.zfs_module.c += -Wno-sign-compare CWARNFLAGS.zfs_module.c += -Wno-unused-parameter CWARNFLAGS.zfs_module.c += -Wno-unused-function -CWARNFLAGS.skein.c += -Wno-cast-align -.if ${COMPILER_TYPE} == "clang" -CWARNFLAGS.skein.c += -Wno-missing-variable-declarations -.else if ${COMPILER_TYPE} == "gcc" -CWARNFLAGS.skein.c += -Wno-missing-declarations -.endif # architecture-specific loader code SRCS= boot1.c self_reloc.c start.S ufs_module.c .if ${MK_ZFS} != "no" SRCS+= zfs_module.c -SRCS+= skein.c skein_block.c -# Do not unroll skein loops, reduce code size -CFLAGS+= -DSKEIN_LOOP=111 -.PATH: ${SYSDIR}/crypto/skein +CFLAGS+= -I${ZFSSRC} +CFLAGS+= -I${SYSDIR}/cddl/boot/zfs +CFLAGS+= -DEFI_ZFS_BOOT +LIBZFSBOOT= ${BOOTOBJ}/zfs/libzfsboot.a .endif .if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} > 40201 @@ -57,13 +51,6 @@ CFLAGS+= -DEFI_UFS_BOOT CFLAGS+= -DEFI_DEBUG .endif -.if ${MK_ZFS} != "no" -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: ${EFISRC}/loader/arch/${MACHINE} .PATH: ${EFISRC}/loader @@ -91,8 +78,8 @@ LIBEFI= ${BOOTOBJ}/efi/libefi/libefi.a # __aeabi_* (arm) or __divdi3 (i386). # as well as required string and memory functions for all platforms. # -DPADD+= ${LIBEFI} ${LIBSA} -LDADD+= ${LIBEFI} ${LIBSA} +DPADD+= ${LIBEFI} ${LIBZFSBOOT} ${LIBSA} +LDADD+= ${LIBEFI} ${LIBZFSBOOT} ${LIBSA} DPADD+= ${LDSCRIPT} Modified: head/sys/boot/efi/libefi/Makefile ============================================================================== --- head/sys/boot/efi/libefi/Makefile Mon Oct 30 23:14:53 2017 (r325174) +++ head/sys/boot/efi/libefi/Makefile Mon Oct 30 23:14:59 2017 (r325175) @@ -38,9 +38,7 @@ CFLAGS+= -I${SYSDIR} CFLAGS+= -I${EFIINC} CFLAGS+= -I${EFIINCMD} .if ${MK_ZFS} != "no" -CFLAGS+= -I${BOOTSRC}/zfs -CFLAGS+= -I${SYSDIR}/cddl/boot/zfs -CFLAGS+= -I${SYSDIR}/crypto/skein +CFLAGS+= -I${ZFSSRC} CFLAGS+= -DEFI_ZFS_BOOT .endif Modified: head/sys/boot/efi/loader/Makefile ============================================================================== --- head/sys/boot/efi/loader/Makefile Mon Oct 30 23:14:53 2017 (r325174) +++ head/sys/boot/efi/loader/Makefile Mon Oct 30 23:14:59 2017 (r325175) @@ -29,17 +29,9 @@ SRCS= autoload.c \ vers.c .if ${MK_ZFS} != "no" -SRCS+= zfs.c -.PATH: ${BOOTSRC}/zfs -SRCS+= skein.c skein_block.c -# Do not unroll skein loops, reduce code size -CFLAGS+= -DSKEIN_LOOP=111 -.PATH: ${SYSDIR}/crypto/skein - -# Disable warnings that are currently incompatible with the zfs boot code -CWARNFLAGS.zfs.c+= -Wno-sign-compare -CWARNFLAGS.zfs.c+= -Wno-array-bounds -CWARNFLAGS.zfs.c+= -Wno-missing-prototypes +LIBZFSBOOT= ${BOOTOBJ}/zfs/libzfsboot.a +CFLAGS+= -I${ZFSSRC} +CFLAGS+= -DEFI_ZFS_BOOT .endif .if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} > 40201 @@ -65,12 +57,6 @@ 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${BOOTSRC}/zfs -CFLAGS+= -I${SYSDIR}/cddl/boot/zfs -CFLAGS+= -I${SYSDIR}/crypto/skein -CFLAGS+= -DEFI_ZFS_BOOT -.endif CFLAGS+= -DNO_PCI -DEFI .if !defined(BOOT_HIDE_SERIAL_NUMBERS) @@ -142,9 +128,9 @@ loader.efi: ${PROG} LIBEFI= ${BOOTOBJ}/efi/libefi/libefi.a -DPADD= ${LIBFICL} ${LIBEFI} ${LIBFDT} ${LIBEFI_FDT} ${LIBSA} \ +DPADD= ${LIBFICL} ${LIBEFI} ${LIBFDT} ${LIBEFI_FDT} ${LIBZFSBOOT} ${LIBSA} \ ${LDSCRIPT} -LDADD= ${LIBFICL} ${LIBEFI} ${LIBFDT} ${LIBEFI_FDT} ${LIBSA} +LDADD= ${LIBFICL} ${LIBEFI} ${LIBFDT} ${LIBEFI_FDT} ${LIBZFSBOOT} ${LIBSA} .include Modified: head/sys/boot/i386/gptzfsboot/Makefile ============================================================================== --- head/sys/boot/i386/gptzfsboot/Makefile Mon Oct 30 23:14:53 2017 (r325174) +++ head/sys/boot/i386/gptzfsboot/Makefile Mon Oct 30 23:14:59 2017 (r325175) @@ -4,7 +4,7 @@ .PATH: ${BOOTSRC}/i386/boot2 ${BOOTSRC}/i386/gptboot \ ${BOOTSRC}/i386/zfsboot ${BOOTSRC}/i386/common \ - ${SYSDIR}/crypto/skein ${SASRC} + ${SASRC} FILES= gptzfsboot MAN= gptzfsboot.8 @@ -27,9 +27,8 @@ CFLAGS+=-DBOOTPROG=\"gptzfsboot\" \ -DSIOSPD=${BOOT_COMCONSOLE_SPEED} \ -I${LDRSRC} \ -I${BOOTSRC}/i386/common \ - -I${BOOTSRC}/zfs \ + -I${ZFSSRC} \ -I${SYSDIR}/cddl/boot/zfs \ - -I${SYSDIR}/crypto/skein \ -I${BOOTSRC}/i386/btx/lib -I. \ -I${BOOTSRC}/i386/boot2 \ -I${SYSDIR} \ @@ -45,8 +44,11 @@ NO_WCAST_ALIGN= CFLAGS+= -Wno-tentative-definition-incomplete-type .endif -# Do not unroll skein loops, reduce code size -CFLAGS+= -DSKEIN_LOOP=111 +.if ${MACHINE} == "amd64" +LIBZFSBOOT=${BOOTOBJ}/zfs32/libzfsboot.a +.else +LIBZFSBOOT=${BOOTOBJ}/zfs/libzfsboot.a +.endif .if ${LOADER_GELI_SUPPORT:Uyes} == "yes" CFLAGS+= -DLOADER_GELI_SUPPORT @@ -75,16 +77,16 @@ gptldr.out: gptldr.o ${LD} ${LD_FLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} gptldr.o CLEANFILES+= gptzfsboot.bin gptzfsboot.out zfsboot.o sio.o cons.o \ - drv.o gpt.o util.o skein.o skein_block.o ${OPENCRYPTO_XTS} + drv.o gpt.o util.o ${OPENCRYPTO_XTS} gptzfsboot.bin: gptzfsboot.out ${OBJCOPY} -S -O binary gptzfsboot.out ${.TARGET} gptzfsboot.out: ${BTXCRT} zfsboot.o sio.o gpt.o drv.o cons.o util.o \ - skein.o skein_block.o ${OPENCRYPTO_XTS} - ${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBGELIBOOT} ${LIBSA32} + ${OPENCRYPTO_XTS} + ${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBGELIBOOT} ${LIBZFSBOOT} ${LIBSA32} -zfsboot.o: ${BOOTSRC}/zfs/zfsimpl.c +zfsboot.o: ${ZFSSRC}/zfsimpl.c .if ${MACHINE_CPUARCH} == "amd64" beforedepend zfsboot.o: machine Modified: head/sys/boot/i386/libi386/Makefile ============================================================================== --- head/sys/boot/i386/libi386/Makefile Mon Oct 30 23:14:53 2017 (r325174) +++ head/sys/boot/i386/libi386/Makefile Mon Oct 30 23:14:59 2017 (r325175) @@ -11,8 +11,8 @@ SRCS= biosacpi.c bioscd.c biosdisk.c biosmem.c biospnp elf64_freebsd.c multiboot.c multiboot_tramp.S relocater_tramp.S \ i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \ smbios.c time.c vidconsole.c amd64_tramp.S spinconsole.c -.PATH: ${BOOTSRC}/zfs -SRCS+= devicename_stubs.c +.PATH: ${ZFSSRC} +SRCS+= devicename_stubs.c BOOT_COMCONSOLE_PORT?= 0x3f8 CFLAGS+= -DCOMPORT=${BOOT_COMCONSOLE_PORT} Modified: head/sys/boot/i386/loader/Makefile ============================================================================== --- head/sys/boot/i386/loader/Makefile Mon Oct 30 23:14:53 2017 (r325174) +++ head/sys/boot/i386/loader/Makefile Mon Oct 30 23:14:59 2017 (r325175) @@ -31,7 +31,11 @@ LIBFIREWIRE= ${BOOTSRC}/i386/libfirewire/libfirewire.a # Set by zfsloader Makefile .if defined(LOADER_ZFS_SUPPORT) CFLAGS+= -DLOADER_ZFS_SUPPORT +.if ${MACHINE} == "amd64" +LIBZFSBOOT= ${BOOTOBJ}/zfs32/libzfsboot.a +.else LIBZFSBOOT= ${BOOTOBJ}/zfs/libzfsboot.a +.endif .endif # Include bcache code. Modified: head/sys/boot/i386/zfsboot/Makefile ============================================================================== --- head/sys/boot/i386/zfsboot/Makefile Mon Oct 30 23:14:53 2017 (r325174) +++ head/sys/boot/i386/zfsboot/Makefile Mon Oct 30 23:14:59 2017 (r325175) @@ -4,8 +4,7 @@ LOADER_GELI_SUPPORT=no .include -.PATH: ${BOOTSRC}/i386/boot2 ${BOOTSRC}/i386/common \ - ${SYSDIR}/crypto/skein ${SASRC} +.PATH: ${BOOTSRC}/i386/boot2 ${BOOTSRC}/i386/common ${SASRC} FILES= zfsboot MAN= zfsboot.8 @@ -29,9 +28,8 @@ CFLAGS+=-DBOOTPROG=\"zfsboot\" \ -I${LDRSRC} \ -I${BOOTSRC}/i386/common \ -I${BOOTSRC}/i386 \ - -I${BOOTSRC}/zfs \ + -I${ZFSSRC} \ -I${SYSDIR}/cddl/boot/zfs \ - -I${SYSDIR}/crypto/skein \ -I${BTXLIB} -I. \ -I${BOOTSRC}/i386/boot2 \ -Wall -Waggregate-return -Wbad-function-cast -Wno-cast-align \ @@ -40,8 +38,11 @@ CFLAGS+=-DBOOTPROG=\"zfsboot\" \ -Winline CFLAGS.gcc+= --param max-inline-insns-single=100 -# Do not unroll skein loops, reduce code size -CFLAGS+= -DSKEIN_LOOP=111 +.if ${MACHINE} == "amd64" +LIBZFSBOOT=${BOOTOBJ}/zfs32/libzfsboot.a +.else +LIBZFSBOOT=${BOOTOBJ}/zfs/libzfsboot.a +.endif LD_FLAGS+=${LD_FLAGS_BIN} @@ -59,8 +60,7 @@ zfsldr.out: zfsldr.o ${LD} ${LD_FLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} zfsldr.o CLEANFILES+= zfsboot2 zfsboot.ld zfsboot.ldr zfsboot.bin zfsboot.out \ - zfsboot.o zfsboot.s zfsboot.s.tmp sio.o cons.o drv.o util.o \ - skein.o skein_block.o + zfsboot.o zfsboot.s zfsboot.s.tmp sio.o cons.o drv.o util.o # We currently allow 128k bytes for zfsboot - in practice it could be # any size up to 3.5Mb but keeping it fixed size simplifies zfsldr. @@ -82,8 +82,8 @@ zfsboot.ldr: zfsboot.bin: zfsboot.out ${OBJCOPY} -S -O binary zfsboot.out ${.TARGET} -zfsboot.out: ${BTXCRT} zfsboot.o sio.o drv.o cons.o util.o skein.o skein_block.o - ${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSA32} +zfsboot.out: ${BTXCRT} zfsboot.o sio.o drv.o cons.o util.o + ${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBZFSBOOT} ${LIBSA32} SRCS= zfsboot.c Modified: head/sys/boot/ofw/libofw/Makefile ============================================================================== --- head/sys/boot/ofw/libofw/Makefile Mon Oct 30 23:14:53 2017 (r325174) +++ head/sys/boot/ofw/libofw/Makefile Mon Oct 30 23:14:59 2017 (r325175) @@ -8,7 +8,7 @@ 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: ${BOOTSRC}/zfs +.PATH: ${ZFSSRC} SRCS+= devicename_stubs.c # Pick up the bootstrap header for some interface items Modified: head/sys/boot/sparc64/loader/Makefile ============================================================================== --- head/sys/boot/sparc64/loader/Makefile Mon Oct 30 23:14:53 2017 (r325174) +++ head/sys/boot/sparc64/loader/Makefile Mon Oct 30 23:14:59 2017 (r325175) @@ -30,7 +30,7 @@ CFLAGS+= -DLOADER_DEBUG .endif .if ${LOADER_ZFS_SUPPORT} == "yes" CFLAGS+= -DLOADER_ZFS_SUPPORT -CFLAGS+= -I${BOOTSRC}/zfs +CFLAGS+= -I${ZFSSRC} CFLAGS+= -I${SYSDIR}/cddl/boot/zfs LIBZFSBOOT= ${BOOTOBJ}/zfs/libzfsboot.a .endif Modified: head/sys/boot/userboot/Makefile ============================================================================== --- head/sys/boot/userboot/Makefile Mon Oct 30 23:14:53 2017 (r325174) +++ head/sys/boot/userboot/Makefile Mon Oct 30 23:14:59 2017 (r325175) @@ -2,7 +2,7 @@ .include -SUBDIR= test zfs userboot +SUBDIR= test userboot .include Modified: head/sys/boot/userboot/userboot/Makefile ============================================================================== --- head/sys/boot/userboot/userboot/Makefile Mon Oct 30 23:14:53 2017 (r325174) +++ head/sys/boot/userboot/userboot/Makefile Mon Oct 30 23:14:59 2017 (r325175) @@ -47,7 +47,7 @@ NEWVERSWHAT= "User boot" ${MACHINE_CPUARCH} .if ${MK_ZFS} != "no" CFLAGS+= -DUSERBOOT_ZFS_SUPPORT -LIBZFSBOOT= ${BOOTOBJ}/userboot/zfs/libzfsboot.a +LIBZFSBOOT= ${BOOTOBJ}/zfs/libzfsboot.a .endif # Always add MI sources Modified: head/sys/boot/zfs/Makefile ============================================================================== --- head/sys/boot/zfs/Makefile Mon Oct 30 23:14:53 2017 (r325174) +++ head/sys/boot/zfs/Makefile Mon Oct 30 23:14:59 2017 (r325175) @@ -5,9 +5,8 @@ LIB= zfsboot INTERNALLIB= -SRCS+= zfs.c - -SRCS+= skein.c skein_block.c +.PATH: ${ZFSSRC} +SRCS+= zfs.c skein.c skein_block.c # Do not unroll skein loops, reduce code size CFLAGS+= -DSKEIN_LOOP=111 .PATH: ${SYSDIR}/crypto/skein @@ -17,16 +16,17 @@ CFLAGS+= -I${LDRSRC} -I${SYSDIR} -I. CFLAGS+= -I${SYSDIR}/cddl/boot/zfs CFLAGS+= -I${SYSDIR}/crypto/skein -.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "i386" || \ + (${MACHINE_CPUARCH} == "amd64" && defined(ZFS32)) CFLAGS+= -march=i386 .endif -.if ${MACHINE_CPUARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" && defined(ZFS32) CFLAGS+= -m32 .endif CFLAGS+= -Wformat -Wall -.if ${MACHINE_CPUARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" && defined(ZFS32) CLEANFILES+= machine machine: .NOMETA ln -sf ${SYSDIR}/i386/include machine @@ -35,7 +35,7 @@ machine: .NOMETA .include .include -.if ${MACHINE_CPUARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" && defined(ZFS32) .if !exists(machine) beforedepend ${OBJS}: machine .endif From owner-svn-src-all@freebsd.org Mon Oct 30 23:39: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 3D360E26C32; Mon, 30 Oct 2017 23:39:57 +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 0CE0376E81; Mon, 30 Oct 2017 23:39:56 +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 v9UNdusl034650; Mon, 30 Oct 2017 23:39:56 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9UNdu4t034649; Mon, 30 Oct 2017 23:39:56 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201710302339.v9UNdu4t034649@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 23:39:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325176 - head/sys/boot/zfs32 X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/sys/boot/zfs32 X-SVN-Commit-Revision: 325176 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 23:39:57 -0000 Author: imp Date: Mon Oct 30 23:39:55 2017 New Revision: 325176 URL: https://svnweb.freebsd.org/changeset/base/325176 Log: Actually add zfs32/Makefile Added: head/sys/boot/zfs32/ head/sys/boot/zfs32/Makefile (contents, props changed) Added: head/sys/boot/zfs32/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/boot/zfs32/Makefile Mon Oct 30 23:39:55 2017 (r325176) @@ -0,0 +1,5 @@ +# $FreeBSD$ + +ZFS32=1 + +.include "${.CURDIR}/../zfs/Makefile" From owner-svn-src-all@freebsd.org Tue Oct 31 00: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 8D79FE2F836; Tue, 31 Oct 2017 00:03:23 +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 5933A77A0B; Tue, 31 Oct 2017 00:03: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 v9V03MdX046689; Tue, 31 Oct 2017 00:03:22 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9V03MFB046688; Tue, 31 Oct 2017 00:03:22 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710310003.v9V03MFB046688@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 31 Oct 2017 00:03:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325177 - head/targets/pseudo/bootstrap-tools X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/targets/pseudo/bootstrap-tools X-SVN-Commit-Revision: 325177 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: Tue, 31 Oct 2017 00:03:23 -0000 Author: bdrewery Date: Tue Oct 31 00:03:22 2017 New Revision: 325177 URL: https://svnweb.freebsd.org/changeset/base/325177 Log: Use more clear SRCTOP here. Sponsored by: Dell EMC Isilon Modified: head/targets/pseudo/bootstrap-tools/Makefile Modified: head/targets/pseudo/bootstrap-tools/Makefile ============================================================================== --- head/targets/pseudo/bootstrap-tools/Makefile Mon Oct 30 23:39:55 2017 (r325176) +++ head/targets/pseudo/bootstrap-tools/Makefile Tue Oct 31 00:03:22 2017 (r325177) @@ -86,7 +86,7 @@ BSTCARGS= \ # finally we build toolchain leveraging the above. bootstrap-toolchain: .MAKE cross-tools - ${BSTCENV} ${MAKE} -C ${.CURDIR:H:H} ${BSTCARGS} toolchain + ${BSTCENV} ${MAKE} -C ${SRCTOP} ${BSTCARGS} toolchain # Ensure CCACHE_DIR is ignored since we are processing .meta files here. .include From owner-svn-src-all@freebsd.org Tue Oct 31 00:03: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 37185E2F84D; Tue, 31 Oct 2017 00:03: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 0604677A0C; Tue, 31 Oct 2017 00:03:26 +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 v9V03QoC046737; Tue, 31 Oct 2017 00:03:26 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9V03QS3046734; Tue, 31 Oct 2017 00:03:26 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710310003.v9V03QS3046734@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 31 Oct 2017 00:03:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325178 - in head: libexec/telnetd usr.sbin/bsnmpd/tools X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: in head: libexec/telnetd usr.sbin/bsnmpd/tools X-SVN-Commit-Revision: 325178 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: Tue, 31 Oct 2017 00:03:27 -0000 Author: bdrewery Date: Tue Oct 31 00:03:25 2017 New Revision: 325178 URL: https://svnweb.freebsd.org/changeset/base/325178 Log: These values already set by src.libnames.mk. MFC after: 2 weeks Sponsored by: Dell EMC Isilon Modified: head/libexec/telnetd/Makefile head/usr.sbin/bsnmpd/tools/Makefile.inc Modified: head/libexec/telnetd/Makefile ============================================================================== --- head/libexec/telnetd/Makefile Tue Oct 31 00:03:22 2017 (r325177) +++ head/libexec/telnetd/Makefile Tue Oct 31 00:03:25 2017 (r325178) @@ -27,8 +27,6 @@ CFLAGS+= -DINET6 CFLAGS+= -I${TELNETDIR} CFLAGS+= -I${TELNETDIR}/telnet -LIBTELNET= ${OBJTOP}/lib/libtelnet/libtelnet.a - LIBADD= telnet util ncursesw .if ${MK_OPENSSL} != "no" Modified: head/usr.sbin/bsnmpd/tools/Makefile.inc ============================================================================== --- head/usr.sbin/bsnmpd/tools/Makefile.inc Tue Oct 31 00:03:22 2017 (r325177) +++ head/usr.sbin/bsnmpd/tools/Makefile.inc Tue Oct 31 00:03:25 2017 (r325178) @@ -6,11 +6,4 @@ PACKAGE= bsnmp CFLAGS+= -I. -I${.CURDIR} -.if exists(${.OBJDIR:H}/libbsnmptools) -LIBBSNMPTOOLSDIR= ${.OBJDIR:H}/libbsnmptools -.else -LIBBSNMPTOOLSDIR= ${.CURDIR:H}/libbsnmptools -.endif -LIBBSNMPTOOLS= ${LIBBSNMPTOOLSDIR}/libbsnmptools.a - WARNS?= 6 From owner-svn-src-all@freebsd.org Tue Oct 31 00:03: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 288F9E2F878; Tue, 31 Oct 2017 00:03:32 +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 E882777A27; Tue, 31 Oct 2017 00:03: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 v9V03T5K046785; Tue, 31 Oct 2017 00:03:29 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9V03TEC046784; Tue, 31 Oct 2017 00:03:29 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710310003.v9V03TEC046784@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 31 Oct 2017 00:03:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325179 - head/release X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/release X-SVN-Commit-Revision: 325179 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: Tue, 31 Oct 2017 00:03:32 -0000 Author: bdrewery Date: Tue Oct 31 00:03:29 2017 New Revision: 325179 URL: https://svnweb.freebsd.org/changeset/base/325179 Log: Run mm-mtree with whatever -j value the build is using. Reviewed by: gjb Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D12807 Modified: head/release/Makefile Modified: head/release/Makefile ============================================================================== --- head/release/Makefile Tue Oct 31 00:03:25 2017 (r325178) +++ head/release/Makefile Tue Oct 31 00:03:29 2017 (r325179) @@ -132,7 +132,8 @@ base.txz: cd ${WORLDDIR} && ${IMAKE} distributeworld DISTDIR=${.OBJDIR}/${DISTDIR} # Set up mergemaster root database sh ${.CURDIR}/scripts/mm-mtree.sh -m ${WORLDDIR} -F \ - "TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}" -D "${.OBJDIR}/${DISTDIR}/base" + "TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET} ${.MAKE.JOBS:D-j${.MAKE.JOBS}}" \ + -D "${.OBJDIR}/${DISTDIR}/base" etcupdate extract -B -M "TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}" \ -s ${WORLDDIR} -d "${.OBJDIR}/${DISTDIR}/base/var/db/etcupdate" # Package all components From owner-svn-src-all@freebsd.org Tue Oct 31 00:03: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 8CDF0E2F884; Tue, 31 Oct 2017 00:03:33 +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 497E077A4F; Tue, 31 Oct 2017 00:03:33 +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 v9V03WqI046830; Tue, 31 Oct 2017 00:03:32 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9V03W3R046829; Tue, 31 Oct 2017 00:03:32 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710310003.v9V03W3R046829@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 31 Oct 2017 00:03:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325180 - head/share/mk X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/share/mk X-SVN-Commit-Revision: 325180 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: Tue, 31 Oct 2017 00:03:33 -0000 Author: bdrewery Date: Tue Oct 31 00:03:32 2017 New Revision: 325180 URL: https://svnweb.freebsd.org/changeset/base/325180 Log: Follow-up r320149: Enable GPL_DTC if we're using GCC as the cross-compiler. This fixes object files landing in the source tree in gnu/usr.bin/dtc for GCC platforms. We cannot reliably detect if an external compiler is used here, and the default YES option does include GCC_BOOTSTRAP which implies that GCC may be used for the build. The problem manifests when not using an external compiler, and the host compiler is clang. When a fresh build is done (no OBJDIR yet) the 'make obj' treewalk is done before 'make cross-tools', so COMPILER_FEATURES at this point contains 'c++11' since the host compiler was used for COMPILER_FEATURES. Once cross-tools builds the GCC bootstrap compiler and then descends into 'make everything', COMPILER_FEATURES no longer contains 'c++11' and MK_GPL_DTC defaults to enabled. Now it builds in gnu/usr.bin/dtc without an OBJDIR preset and drops files into the source tree. The COMPILER_FEATURES check here is useful for knowing if we can *bootstrap* C++11 things. Indeed we do bootstrap dtc as a build tool so it is useful for enabling the BSD dtc for the build, but we end up needing the GPL dtc for installation anyway. Reviewed by: manu, emaste Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D12817 Modified: head/share/mk/src.opts.mk Modified: head/share/mk/src.opts.mk ============================================================================== --- head/share/mk/src.opts.mk Tue Oct 31 00:03:29 2017 (r325179) +++ head/share/mk/src.opts.mk Tue Oct 31 00:03:32 2017 (r325180) @@ -227,8 +227,8 @@ __DEFAULT_NO_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX GPL_DTC # If an external compiler that supports C++11 is used as ${CC} and Clang # supports the target, then Clang is enabled but GCC is installed as the # default /usr/bin/cc. -__DEFAULT_YES_OPTIONS+=CLANG CLANG_FULL GCC GCC_BOOTSTRAP GNUCXX -__DEFAULT_NO_OPTIONS+=CLANG_BOOTSTRAP CLANG_IS_CC GPL_DTC LLD +__DEFAULT_YES_OPTIONS+=CLANG CLANG_FULL GCC GCC_BOOTSTRAP GNUCXX GPL_DTC +__DEFAULT_NO_OPTIONS+=CLANG_BOOTSTRAP CLANG_IS_CC LLD .else # Everything else disables Clang, and uses GCC instead. __DEFAULT_YES_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX GPL_DTC From owner-svn-src-all@freebsd.org Tue Oct 31 00:03: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 AE33EE2F8B9; Tue, 31 Oct 2017 00:03: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 19D5D77A83; Tue, 31 Oct 2017 00:03: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 v9V03bxZ046883; Tue, 31 Oct 2017 00:03:37 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9V03afF046876; Tue, 31 Oct 2017 00:03:36 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710310003.v9V03afF046876@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 31 Oct 2017 00:03:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325181 - in head: lib/libgcc_eh lib/libgcc_s share/mk targets/pseudo/userland/gnu targets/pseudo/userland/lib X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: in head: lib/libgcc_eh lib/libgcc_s share/mk targets/pseudo/userland/gnu targets/pseudo/userland/lib X-SVN-Commit-Revision: 325181 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: Tue, 31 Oct 2017 00:03:39 -0000 Author: bdrewery Date: Tue Oct 31 00:03:36 2017 New Revision: 325181 URL: https://svnweb.freebsd.org/changeset/base/325181 Log: DIRDEPS_BUILD: libgcc now depends on MK_LLVM_LIBUNWIND The dependency on gnu/lib/libgcc or lib/libgcc* is determined at 'make dirdeps' time. Sponsored by: Dell EMC Isilon Added: head/lib/libgcc_eh/Makefile.depend (contents, props changed) head/lib/libgcc_s/Makefile.depend (contents, props changed) Modified: head/lib/libgcc_eh/Makefile.inc head/share/mk/local.dirdeps.mk head/share/mk/local.gendirdeps.mk head/targets/pseudo/userland/gnu/Makefile.depend head/targets/pseudo/userland/lib/Makefile.depend Added: head/lib/libgcc_eh/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libgcc_eh/Makefile.depend Tue Oct 31 00:03:36 2017 (r325181) @@ -0,0 +1,13 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Modified: head/lib/libgcc_eh/Makefile.inc ============================================================================== --- head/lib/libgcc_eh/Makefile.inc Tue Oct 31 00:03:32 2017 (r325180) +++ head/lib/libgcc_eh/Makefile.inc Tue Oct 31 00:03:36 2017 (r325181) @@ -29,7 +29,8 @@ CXXFLAGS+= -std=c++11 .endif CXXFLAGS+= -fno-rtti STATIC_CXXFLAGS+= -fvisibility=hidden -fPIC +# Probably need to just move this earlier or use CXXFLAGS .if ${MK_DIRDEPS_BUILD} == "yes" # Avoid dependency on lib/libc++ -CFLAGS+= -I${SRCTOP}/contrib/libc++/include +CFLAGS+= -isystem ${SRCTOP}/contrib/libc++/include -nostdinc++ .endif Added: head/lib/libgcc_s/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libgcc_s/Makefile.depend Tue Oct 31 00:03:36 2017 (r325181) @@ -0,0 +1,16 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + gnu/lib/csu \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Modified: head/share/mk/local.dirdeps.mk ============================================================================== --- head/share/mk/local.dirdeps.mk Tue Oct 31 00:03:32 2017 (r325180) +++ head/share/mk/local.dirdeps.mk Tue Oct 31 00:03:36 2017 (r325181) @@ -76,6 +76,19 @@ DIRDEPS += \ cddl/usr.bin/ctfmerge.host .endif +# Add in proper libgcc (gnu or LLVM) if not building libcc and libc is needed. +# Add both gcc_s and gcc_eh as dependencies as the decision to build +# -static or not is not known here. +.if ${DEP_RELDIR:M*libgcc*} == "" && ${DIRDEPS:Mlib/libc} +.if ${MK_LLVM_LIBUNWIND} == "yes" +DIRDEPS+= \ + lib/libgcc_eh \ + lib/libgcc_s +.else +DIRDEPS+= gnu/lib/libgcc +.endif +.endif + # Bootstrap support. Give hints to DIRDEPS if there is no Makefile.depend* # generated yet. This can be based on things such as SRC files and LIBADD. # These hints will not factor into the final Makefile.depend as only what is @@ -124,7 +137,6 @@ _SRCS= ${SRCS} ${_PROGS_SRCS} # Has C files. The C_DIRDEPS are shared with C++ files as well. C_DIRDEPS= \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/arpa \ include/protocols \ @@ -135,6 +147,7 @@ C_DIRDEPS= \ lib/libc \ lib/libcompiler_rt \ +# libgcc is needed as well but is added later. .if ${MK_GSSAPI} != "no" C_DIRDEPS+= include/gssapi Modified: head/share/mk/local.gendirdeps.mk ============================================================================== --- head/share/mk/local.gendirdeps.mk Tue Oct 31 00:03:32 2017 (r325180) +++ head/share/mk/local.gendirdeps.mk Tue Oct 31 00:03:36 2017 (r325181) @@ -10,6 +10,9 @@ GENDIRDEPS_FILTER+= \ Ngnu/lib/libssp/libssp_nonshared \ Ncddl/usr.bin/ctf* \ Nlib/libc_nonshared \ + Ngnu/lib/libgcc \ + Nlib/libgcc_eh \ + Nlib/libgcc_s \ Ntargets/pseudo/stage* \ Ntools/* Modified: head/targets/pseudo/userland/gnu/Makefile.depend ============================================================================== --- head/targets/pseudo/userland/gnu/Makefile.depend Tue Oct 31 00:03:32 2017 (r325180) +++ head/targets/pseudo/userland/gnu/Makefile.depend Tue Oct 31 00:03:36 2017 (r325181) @@ -9,7 +9,6 @@ DIRDEPS = \ gnu/lib/csu \ gnu/lib/libdialog \ - gnu/lib/libgcc \ gnu/lib/libgcov \ gnu/lib/libgomp \ gnu/lib/libreadline/history/doc \ @@ -43,6 +42,10 @@ DIRDEPS = \ .if ${MK_GPL_DTC} != "no" DIRDEPS+= gnu/usr.bin/dtc +.endif + +.if ${MK_LLVM_LIBUNWIND} == "no" +DIRDEPS+= gnu/lib/libgcc .endif .include Modified: head/targets/pseudo/userland/lib/Makefile.depend ============================================================================== --- head/targets/pseudo/userland/lib/Makefile.depend Tue Oct 31 00:03:32 2017 (r325180) +++ head/targets/pseudo/userland/lib/Makefile.depend Tue Oct 31 00:03:36 2017 (r325181) @@ -224,6 +224,12 @@ DIRDEPS+= lib/libgpio DIRDEPS+= lib/libefivar .endif +.if ${MK_LLVM_LIBUNWIND} != "no" +DIRDEPS+= \ + lib/libgcc_eh \ + lib/libgcc_s +.endif + .if ${MK_OFED} != "no" DIRDEPS+= \ contrib/ofed/usr.lib/libcxgb4 \ From owner-svn-src-all@freebsd.org Tue Oct 31 00:03: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 B4470E2F900; Tue, 31 Oct 2017 00:03: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 0F73177AD3; Tue, 31 Oct 2017 00:03: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 v9V03hBs046975; Tue, 31 Oct 2017 00:03:43 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9V03hAa046974; Tue, 31 Oct 2017 00:03:43 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710310003.v9V03hAa046974@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 31 Oct 2017 00:03:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325183 - head/targets/pseudo/tests X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/targets/pseudo/tests X-SVN-Commit-Revision: 325183 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: Tue, 31 Oct 2017 00:03:46 -0000 Author: bdrewery Date: Tue Oct 31 00:03:43 2017 New Revision: 325183 URL: https://svnweb.freebsd.org/changeset/base/325183 Log: libdevdctl tests require an external port. Sponsored by: Dell EMC Isilon Modified: head/targets/pseudo/tests/Makefile.depend Modified: head/targets/pseudo/tests/Makefile.depend ============================================================================== --- head/targets/pseudo/tests/Makefile.depend Tue Oct 31 00:03:40 2017 (r325182) +++ head/targets/pseudo/tests/Makefile.depend Tue Oct 31 00:03:43 2017 (r325183) @@ -161,7 +161,6 @@ DIRDEPS= \ lib/libcasper/services/cap_pwd/tests \ lib/libcasper/services/cap_sysctl/tests \ lib/libcrypt/tests \ - lib/libdevdctl/tests \ lib/libkvm/tests \ lib/libmp/tests \ lib/libnv/tests \ From owner-svn-src-all@freebsd.org Tue Oct 31 00:03: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 E1891E2F965; Tue, 31 Oct 2017 00:03:52 +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 B108777B13; Tue, 31 Oct 2017 00:03: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 v9V03kfS047022; Tue, 31 Oct 2017 00:03:46 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9V03kWE047021; Tue, 31 Oct 2017 00:03:46 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710310003.v9V03kWE047021@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 31 Oct 2017 00:03:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325184 - head/targets/pseudo/clang X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/targets/pseudo/clang X-SVN-Commit-Revision: 325184 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: Tue, 31 Oct 2017 00:03:53 -0000 Author: bdrewery Date: Tue Oct 31 00:03:46 2017 New Revision: 325184 URL: https://svnweb.freebsd.org/changeset/base/325184 Log: Provide clang-rt for the clang toolchain as well. Sponsored by: Dell EMC Isilon Modified: head/targets/pseudo/clang/Makefile.depend Modified: head/targets/pseudo/clang/Makefile.depend ============================================================================== --- head/targets/pseudo/clang/Makefile.depend Tue Oct 31 00:03:43 2017 (r325183) +++ head/targets/pseudo/clang/Makefile.depend Tue Oct 31 00:03:46 2017 (r325184) @@ -12,6 +12,28 @@ DIRDEPS = \ usr.bin/clang/llvm-objdump \ usr.bin/clang/llvm-tblgen \ +.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" +DIRDEPS+= \ + lib/libclang_rt/include \ + lib/libclang_rt/asan \ + lib/libclang_rt/asan-preinit \ + lib/libclang_rt/asan_dynamic \ + lib/libclang_rt/asan_cxx \ + lib/libclang_rt/safestack \ + lib/libclang_rt/stats \ + lib/libclang_rt/stats_client \ + lib/libclang_rt/ubsan_standalone \ + lib/libclang_rt/ubsan_standalone_cxx \ + +.endif + +.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" || \ + (${MACHINE_CPUARCH} == "arm" && ${MACHINE_ARCH} != "armeb") +DIRDEPS+= \ + lib/libclang_rt/profile \ + +.endif + .if ${MK_LLDB} == "yes" DIRDEPS+= \ usr.bin/clang/lldb From owner-svn-src-all@freebsd.org Tue Oct 31 00:03: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 12F7BE2F966; Tue, 31 Oct 2017 00:03: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 79D2377B31; Tue, 31 Oct 2017 00:03:52 +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 v9V03n7j047067; Tue, 31 Oct 2017 00:03:49 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9V03nAh047066; Tue, 31 Oct 2017 00:03:49 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710310003.v9V03nAh047066@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 31 Oct 2017 00:03:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325185 - head/targets/pseudo/the-lot X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/targets/pseudo/the-lot X-SVN-Commit-Revision: 325185 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: Tue, 31 Oct 2017 00:03:53 -0000 Author: bdrewery Date: Tue Oct 31 00:03:49 2017 New Revision: 325185 URL: https://svnweb.freebsd.org/changeset/base/325185 Log: Properly connect tests. Sponsored by: Dell EMC Isilon Modified: head/targets/pseudo/the-lot/Makefile.depend Modified: head/targets/pseudo/the-lot/Makefile.depend ============================================================================== --- head/targets/pseudo/the-lot/Makefile.depend Tue Oct 31 00:03:46 2017 (r325184) +++ head/targets/pseudo/the-lot/Makefile.depend Tue Oct 31 00:03:49 2017 (r325185) @@ -10,7 +10,7 @@ DIRDEPS = \ targets/pseudo/userland \ .if ${MK_TESTS} != "no" -DIRDEPS+= targes/pseudo/tests +DIRDEPS+= targets/pseudo/tests .endif .include From owner-svn-src-all@freebsd.org Tue Oct 31 00:03:56 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 8E4C6E2F995; Tue, 31 Oct 2017 00:03:56 +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 EC4F277B59; Tue, 31 Oct 2017 00:03: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 v9V03qmi047113; Tue, 31 Oct 2017 00:03:52 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9V03qvb047112; Tue, 31 Oct 2017 00:03:52 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710310003.v9V03qvb047112@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 31 Oct 2017 00:03:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325186 - head/lib X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/lib X-SVN-Commit-Revision: 325186 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: Tue, 31 Oct 2017 00:03:56 -0000 Author: bdrewery Date: Tue Oct 31 00:03:52 2017 New Revision: 325186 URL: https://svnweb.freebsd.org/changeset/base/325186 Log: Connect libpathconv, disconnected since import in r309035. Sponsored by: Dell EMC Isilon Modified: head/lib/Makefile Modified: head/lib/Makefile ============================================================================== --- head/lib/Makefile Tue Oct 31 00:03:49 2017 (r325185) +++ head/lib/Makefile Tue Oct 31 00:03:52 2017 (r325186) @@ -65,6 +65,7 @@ SUBDIR= ${SUBDIR_BOOTSTRAP} \ libopenbsd \ libopie \ libpam \ + libpathconv \ libpcap \ libpjdlog \ ${_libproc} \ From owner-svn-src-all@freebsd.org Tue Oct 31 00:03: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 D4C76E2F901; Tue, 31 Oct 2017 00:03: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 4D5B577ADA; Tue, 31 Oct 2017 00:03: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 v9V03eCL046929; Tue, 31 Oct 2017 00:03:40 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9V03eeR046928; Tue, 31 Oct 2017 00:03:40 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710310003.v9V03eeR046928@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 31 Oct 2017 00:03:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325182 - head/targets/pseudo/userland X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/targets/pseudo/userland X-SVN-Commit-Revision: 325182 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: Tue, 31 Oct 2017 00:03:46 -0000 Author: bdrewery Date: Tue Oct 31 00:03:40 2017 New Revision: 325182 URL: https://svnweb.freebsd.org/changeset/base/325182 Log: Chase r315223: Disconnect ipftest/ipresend Sponsored by: Dell EMC Isilon Modified: head/targets/pseudo/userland/Makefile.depend Modified: head/targets/pseudo/userland/Makefile.depend ============================================================================== --- head/targets/pseudo/userland/Makefile.depend Tue Oct 31 00:03:36 2017 (r325181) +++ head/targets/pseudo/userland/Makefile.depend Tue Oct 31 00:03:40 2017 (r325182) @@ -100,11 +100,9 @@ DIRDEPS+= \ sbin/ipf/ipf \ sbin/ipf/ipfs \ sbin/ipf/ipfstat \ - sbin/ipf/ipftest \ sbin/ipf/ipmon \ sbin/ipf/ipnat \ sbin/ipf/ippool \ - sbin/ipf/ipresend \ sbin/ipf/libipf \ sbin/ipfw \ sbin/iscontrol \ From owner-svn-src-all@freebsd.org Tue Oct 31 00:04: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 CD8CFE2FABC; Tue, 31 Oct 2017 00:04: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 6DCDA77C42; Tue, 31 Oct 2017 00:04: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 v9V04CUN047222; Tue, 31 Oct 2017 00:04:12 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9V047UE047168; Tue, 31 Oct 2017 00:04:07 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710310004.v9V047UE047168@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 31 Oct 2017 00:04:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325187 - in head: bin/chflags/tests bin/chmod/tests bin/echo/tests bin/ln/tests bin/mkdir/tests bin/rmdir/tests bin/sh/tests/invocation cddl/usr.sbin/dtrace/tests/common/sugar lib/libc... X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: in head: bin/chflags/tests bin/chmod/tests bin/echo/tests bin/ln/tests bin/mkdir/tests bin/rmdir/tests bin/sh/tests/invocation cddl/usr.sbin/dtrace/tests/common/sugar lib/libc/tests/iconv lib/libc/tes... X-SVN-Commit-Revision: 325187 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: Tue, 31 Oct 2017 00:04:14 -0000 Author: bdrewery Date: Tue Oct 31 00:04:07 2017 New Revision: 325187 URL: https://svnweb.freebsd.org/changeset/base/325187 Log: DIRDEPS_BUILD: Connect new directories. Sponsored by: Dell EMC Isilon Added: head/bin/chflags/tests/Makefile.depend (contents, props changed) head/bin/chmod/tests/Makefile.depend (contents, props changed) head/bin/echo/tests/Makefile.depend (contents, props changed) head/bin/ln/tests/Makefile.depend (contents, props changed) head/bin/mkdir/tests/Makefile.depend (contents, props changed) head/bin/rmdir/tests/Makefile.depend (contents, props changed) head/bin/sh/tests/invocation/Makefile.depend (contents, props changed) head/cddl/usr.sbin/dtrace/tests/common/sugar/Makefile.depend (contents, props changed) head/lib/libc/tests/iconv/Makefile.depend (contents, props changed) head/lib/libc/tests/tls/dso/Makefile.depend (contents, props changed) head/lib/libcam/tests/Makefile.depend (contents, props changed) head/lib/libcasper/services/cap_dns/tests/Makefile.depend (contents, props changed) head/lib/libcasper/services/cap_grp/tests/Makefile.depend (contents, props changed) head/lib/libcasper/services/cap_pwd/tests/Makefile.depend (contents, props changed) head/lib/libcasper/services/cap_sysctl/tests/Makefile.depend (contents, props changed) head/lib/libcasper/services/tests/Makefile.depend (contents, props changed) head/lib/libkvm/tests/Makefile.depend (contents, props changed) head/lib/libpathconv/Makefile.depend (contents, props changed) head/lib/libpathconv/tests/Makefile.depend (contents, props changed) head/lib/libpmcstat/Makefile.depend (contents, props changed) head/lib/libsbuf/tests/Makefile.depend (contents, props changed) head/lib/libxo/tests/encoder/Makefile.depend (contents, props changed) head/sbin/pfctl/tests/Makefile.depend (contents, props changed) head/sbin/pfctl/tests/files/Makefile.depend (contents, props changed) head/share/zoneinfo/tests/Makefile.depend (contents, props changed) head/sys/boot/man/Makefile.depend (contents, props changed) head/sys/boot/zfs32/Makefile.depend (contents, props changed) head/tests/sys/fs/Makefile.depend (contents, props changed) head/tests/sys/fs/tmpfs/Makefile.depend (contents, props changed) head/tests/sys/kqueue/Makefile.depend (contents, props changed) head/tests/sys/netpfil/Makefile.depend (contents, props changed) head/tests/sys/netpfil/pf/Makefile.depend (contents, props changed) head/tests/sys/pjdfstest/tests/utimensat/Makefile.depend (contents, props changed) head/usr.bin/compress/tests/Makefile.depend (contents, props changed) head/usr.bin/csplit/tests/Makefile.depend (contents, props changed) head/usr.bin/diff/tests/Makefile.depend (contents, props changed) head/usr.bin/diff3/tests/Makefile.depend (contents, props changed) head/usr.bin/du/tests/Makefile.depend (contents, props changed) head/usr.bin/getconf/tests/Makefile.depend (contents, props changed) head/usr.bin/hexdump/tests/Makefile.depend (contents, props changed) head/usr.bin/indent/tests/Makefile.depend (contents, props changed) head/usr.bin/pr/tests/Makefile.depend (contents, props changed) head/usr.bin/procstat/tests/Makefile.depend (contents, props changed) head/usr.bin/stat/tests/Makefile.depend (contents, props changed) head/usr.bin/tail/tests/Makefile.depend (contents, props changed) Modified: head/targets/pseudo/clang/Makefile.depend head/targets/pseudo/tests/Makefile.depend head/targets/pseudo/userland/cddl/Makefile.depend head/targets/pseudo/userland/lib/Makefile.depend head/targets/pseudo/userland/misc/Makefile.depend head/targets/pseudo/userland/share/Makefile.depend Added: head/bin/chflags/tests/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/bin/chflags/tests/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,11 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: head/bin/chmod/tests/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/bin/chmod/tests/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,11 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: head/bin/echo/tests/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/bin/echo/tests/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,11 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: head/bin/ln/tests/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/bin/ln/tests/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,11 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: head/bin/mkdir/tests/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/bin/mkdir/tests/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,11 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: head/bin/rmdir/tests/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/bin/rmdir/tests/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,11 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: head/bin/sh/tests/invocation/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/bin/sh/tests/invocation/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,11 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: head/cddl/usr.sbin/dtrace/tests/common/sugar/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cddl/usr.sbin/dtrace/tests/common/sugar/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,11 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: head/lib/libc/tests/iconv/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libc/tests/iconv/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,18 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + gnu/lib/csu \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/atf/libatf-c \ + lib/libc \ + lib/libcompiler_rt \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: head/lib/libc/tests/tls/dso/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libc/tests/tls/dso/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,18 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + gnu/lib/csu \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/atf/libatf-c \ + lib/libc \ + lib/libcompiler_rt \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: head/lib/libcam/tests/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libcam/tests/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,20 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + gnu/lib/csu \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/atf/libatf-c \ + lib/libc \ + lib/libcam \ + lib/libcompiler_rt \ + lib/libsbuf \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: head/lib/libcasper/services/cap_dns/tests/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libcasper/services/cap_dns/tests/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,21 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + gnu/lib/csu \ + include \ + include/arpa \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcasper/libcasper \ + lib/libcasper/services/cap_dns \ + lib/libcompiler_rt \ + lib/libnv \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: head/lib/libcasper/services/cap_grp/tests/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libcasper/services/cap_grp/tests/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,20 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + gnu/lib/csu \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcasper/libcasper \ + lib/libcasper/services/cap_grp \ + lib/libcompiler_rt \ + lib/libnv \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: head/lib/libcasper/services/cap_pwd/tests/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libcasper/services/cap_pwd/tests/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,20 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + gnu/lib/csu \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcasper/libcasper \ + lib/libcasper/services/cap_pwd \ + lib/libcompiler_rt \ + lib/libnv \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: head/lib/libcasper/services/cap_sysctl/tests/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libcasper/services/cap_sysctl/tests/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,20 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + gnu/lib/csu \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcasper/libcasper \ + lib/libcasper/services/cap_sysctl \ + lib/libcompiler_rt \ + lib/libnv \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: head/lib/libcasper/services/tests/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libcasper/services/tests/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,11 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: head/lib/libkvm/tests/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libkvm/tests/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,20 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + gnu/lib/csu \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/atf/libatf-c \ + lib/libc \ + lib/libcompiler_rt \ + lib/libelf \ + lib/libkvm \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: head/lib/libpathconv/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libpathconv/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,17 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + gnu/lib/csu \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: head/lib/libpathconv/tests/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libpathconv/tests/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,18 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + gnu/lib/csu \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + lib/libpathconv \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: head/lib/libpmcstat/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libpmcstat/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,15 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/libelf \ + lib/libpmc \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: head/lib/libsbuf/tests/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libsbuf/tests/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,20 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + gnu/lib/csu \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/atf/libatf-c \ + lib/libc \ + lib/libcompiler_rt \ + lib/libsbuf \ + lib/libutil \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: head/lib/libxo/tests/encoder/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libxo/tests/encoder/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,17 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + gnu/lib/csu \ + include \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + lib/libxo \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: head/sbin/pfctl/tests/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sbin/pfctl/tests/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,11 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: head/sbin/pfctl/tests/files/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sbin/pfctl/tests/files/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,11 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: head/share/zoneinfo/tests/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/share/zoneinfo/tests/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,11 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: head/sys/boot/man/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/boot/man/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,11 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: head/sys/boot/zfs32/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/boot/zfs32/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,13 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Modified: head/targets/pseudo/clang/Makefile.depend ============================================================================== --- head/targets/pseudo/clang/Makefile.depend Tue Oct 31 00:03:52 2017 (r325186) +++ head/targets/pseudo/clang/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -62,6 +62,7 @@ DIRDEPS+= \ usr.bin/clang/llvm-modextract \ usr.bin/clang/llvm-nm \ usr.bin/clang/llvm-pdbdump \ + usr.bin/clang/llvm-pdbutil \ usr.bin/clang/llvm-profdata \ usr.bin/clang/llvm-rtdyld \ usr.bin/clang/llvm-symbolizer \ Modified: head/targets/pseudo/tests/Makefile.depend ============================================================================== --- head/targets/pseudo/tests/Makefile.depend Tue Oct 31 00:03:52 2017 (r325186) +++ head/targets/pseudo/tests/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -7,6 +7,7 @@ # find . -name Makefile -exec grep -l '^\.include.*\.test.mk' {} + | grep -v '^\./contrib' | sed -e 's,/Makefile,,' -e 's,^\./,,' -e 's,^, ,' -e 's,$, \\,' | sort DIRDEPS= \ bin/cat/tests \ + bin/chflags/tests \ bin/chmod/tests \ bin/date/tests \ bin/dd/tests \ @@ -14,15 +15,18 @@ DIRDEPS= \ bin/expr/tests \ bin/ln/tests \ bin/ls/tests \ + bin/mkdir/tests \ bin/mv/tests \ bin/pax/tests \ bin/pkill/tests \ bin/pwait/tests \ + bin/rmdir/tests \ bin/sh/tests \ bin/sh/tests/builtins \ bin/sh/tests/errors \ bin/sh/tests/execution \ bin/sh/tests/expansion \ + bin/sh/tests/invocation \ bin/sh/tests/parameters \ bin/sh/tests/parser \ bin/sh/tests/set-e \ @@ -152,14 +156,16 @@ DIRDEPS= \ lib/libc/tests/string \ lib/libc/tests/sys \ lib/libc/tests/termios \ - lib/libc/tests/time \ lib/libc/tests/tls \ + lib/libc/tests/tls/dso \ + lib/libc/tests/tls_dso \ lib/libc/tests/ttyio \ lib/libcam/tests \ lib/libcasper/services/cap_dns/tests \ lib/libcasper/services/cap_grp/tests \ lib/libcasper/services/cap_pwd/tests \ lib/libcasper/services/cap_sysctl/tests \ + lib/libcasper/services/tests \ lib/libcrypt/tests \ lib/libkvm/tests \ lib/libmp/tests \ @@ -174,6 +180,7 @@ DIRDEPS= \ lib/libthread_db/tests \ lib/libutil/tests \ lib/libxo/tests \ + lib/libxo/tests/encoder \ lib/msun/tests \ lib/tests \ libexec/atf/atf-check/tests \ @@ -187,6 +194,7 @@ DIRDEPS= \ sbin/ifconfig/tests \ sbin/mdconfig/tests \ sbin/pfctl/tests \ + sbin/pfctl/tests/files \ sbin/savecore/tests \ sbin/tests \ secure/lib/tests \ @@ -233,6 +241,8 @@ DIRDEPS= \ tests/sys/mac/portacl \ tests/sys/mqueue \ tests/sys/netinet \ + tests/sys/netpfil \ + tests/sys/netpfil/pf \ tests/sys/opencrypto \ tests/sys/pjdfstest/tests \ tests/sys/pjdfstest/tests/chflags \ Modified: head/targets/pseudo/userland/cddl/Makefile.depend ============================================================================== --- head/targets/pseudo/userland/cddl/Makefile.depend Tue Oct 31 00:03:52 2017 (r325186) +++ head/targets/pseudo/userland/cddl/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -7,6 +7,7 @@ .endif DIRDEPS = \ + lib/libprocstat/zfs \ cddl/lib/drti \ cddl/lib/libavl \ cddl/lib/libctf \ Modified: head/targets/pseudo/userland/lib/Makefile.depend ============================================================================== --- head/targets/pseudo/userland/lib/Makefile.depend Tue Oct 31 00:03:52 2017 (r325186) +++ head/targets/pseudo/userland/lib/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -122,10 +122,10 @@ DIRDEPS = \ lib/libpam/modules/pam_tacplus \ lib/libpam/modules/pam_unix \ lib/libpam/static_libpam \ + lib/libpathconv \ lib/libpcap \ lib/libpe \ lib/libpjdlog \ - lib/libpmc \ lib/libproc \ lib/libprocstat \ lib/libradius \ @@ -134,13 +134,14 @@ DIRDEPS = \ lib/librss \ lib/librt \ lib/librtld_db \ + lib/libsa \ lib/libsbuf \ lib/libsdp \ lib/libsm \ lib/libsmb \ lib/libsmdb \ lib/libsmutil \ - lib/libstand \ + lib/libsqlite3 \ lib/libstdbuf \ lib/libstdthreads \ lib/libsysdecode \ @@ -193,6 +194,11 @@ DIRDEPS+= \ .endif +.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" || \ + ${MACHINE_CPUARCH} == "powerpc" +DIRDEPS+= sys/boot/libsa32 +.endif + .if defined(LINKER_FEATURES) && ${LINKER_FEATURES:Mfilter} DIRDEPS+= lib/libdl .endif @@ -228,6 +234,12 @@ DIRDEPS+= lib/libefivar DIRDEPS+= \ lib/libgcc_eh \ lib/libgcc_s +.endif + +.if ${MK_PMC} != "no" +DIRDEPS+= \ + lib/libpmc \ + lib/libpmcstat .endif .if ${MK_OFED} != "no" Modified: head/targets/pseudo/userland/misc/Makefile.depend ============================================================================== --- head/targets/pseudo/userland/misc/Makefile.depend Tue Oct 31 00:03:52 2017 (r325186) +++ head/targets/pseudo/userland/misc/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -42,14 +42,13 @@ DIRDEPS.x86sys= \ sys/boot/i386/btx/lib \ sys/boot/i386/cdboot \ sys/boot/i386/gptboot \ - sys/boot/i386/kgzldr \ sys/boot/i386/libfirewire \ sys/boot/i386/libi386 \ sys/boot/i386/loader \ sys/boot/i386/mbr \ sys/boot/i386/pmbr \ sys/boot/i386/pxeldr \ - sys/boot/libstand32 \ + sys/boot/libsa32 \ ${_sys_boot_zfs} \ .if ${MK_ZFS} != "no" @@ -67,14 +66,12 @@ DIRDEPS.amd64= \ ${DIRDEPS.x86sys} \ ${_sys_boot_efi} \ sys/boot/ficl32 \ - sys/boot/userboot/ficl \ - sys/boot/userboot/libstand \ sys/boot/userboot/test \ sys/boot/userboot/userboot \ .if ${MK_ZFS} != "no" DIRDEPS.amd64+= \ - sys/boot/userboot/zfs \ + sys/boot/zfs32 \ .endif @@ -86,8 +83,8 @@ DIRDEPS+= \ DIRDEPS.arm= ${_sys_boot_fdt} ${_sys_boot_efi} DIRDEPS.arm64= ${_sys_boot_fdt} ${_sys_boot_efi} -DIRDEPS.i386= ${DIRDEPS.x86sys} ${_sys_boot_efi} -DIRDEPS.powerpc= ${_sys_boot_fdt} sys/boot/libstand32 sys/boot/ofw sys/boot/uboot +DIRDEPS.i386= ${DIRDEPS.x86sys} ${_sys_boot_efi} sys/boot/i386/kgzldr +DIRDEPS.powerpc= ${_sys_boot_fdt} sys/boot/libsa32 sys/boot/ofw sys/boot/uboot DIRDEPS.sparc64= sys/boot/ofw ${_sys_boot_zfs} .endif Modified: head/targets/pseudo/userland/share/Makefile.depend ============================================================================== --- head/targets/pseudo/userland/share/Makefile.depend Tue Oct 31 00:03:52 2017 (r325186) +++ head/targets/pseudo/userland/share/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -91,6 +91,7 @@ DIRDEPS = \ share/xml/atf \ share/xsl/atf \ share/zoneinfo \ + sys/boot/man \ .include Added: head/tests/sys/fs/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tests/sys/fs/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,11 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: head/tests/sys/fs/tmpfs/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tests/sys/fs/tmpfs/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,17 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + gnu/lib/csu \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: head/tests/sys/kqueue/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tests/sys/kqueue/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,19 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + gnu/lib/csu \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/atf/libatf-c \ + lib/libc \ + lib/libcompiler_rt \ + lib/libnetbsd \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: head/tests/sys/netpfil/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tests/sys/netpfil/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,11 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: head/tests/sys/netpfil/pf/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tests/sys/netpfil/pf/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,11 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: head/tests/sys/pjdfstest/tests/utimensat/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tests/sys/pjdfstest/tests/utimensat/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,11 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: head/usr.bin/compress/tests/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.bin/compress/tests/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,11 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: head/usr.bin/csplit/tests/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.bin/csplit/tests/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,11 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: head/usr.bin/diff/tests/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.bin/diff/tests/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,11 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: head/usr.bin/diff3/tests/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.bin/diff3/tests/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,11 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: head/usr.bin/du/tests/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.bin/du/tests/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,11 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: head/usr.bin/getconf/tests/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.bin/getconf/tests/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,16 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + gnu/lib/csu \ + include \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: head/usr.bin/hexdump/tests/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.bin/hexdump/tests/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,11 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: head/usr.bin/indent/tests/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.bin/indent/tests/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,11 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: head/usr.bin/pr/tests/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.bin/pr/tests/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,11 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: head/usr.bin/procstat/tests/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.bin/procstat/tests/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,16 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + gnu/lib/csu \ + include \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: head/usr.bin/stat/tests/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.bin/stat/tests/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,11 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: head/usr.bin/tail/tests/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.bin/tail/tests/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) @@ -0,0 +1,11 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif From owner-svn-src-all@freebsd.org Tue Oct 31 00:07: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 2153CE2FEF1; Tue, 31 Oct 2017 00:07: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 898637C986; Tue, 31 Oct 2017 00:07: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 v9V07FcL047474; Tue, 31 Oct 2017 00:07:15 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9V075Bo047372; Tue, 31 Oct 2017 00:07:05 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710310007.v9V075Bo047372@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 31 Oct 2017 00:07:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325188 - in head: bin/cat bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/expr bin/getfacl bin/hostname bin/kenv bin/kill bin/ln... X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: in head: bin/cat bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/expr bin/getfacl bin/hostname bin/kenv bin/kill bin/ln bin/ls bin/mkdir bin/mv ... X-SVN-Commit-Revision: 325188 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: Tue, 31 Oct 2017 00:07:17 -0000 Author: bdrewery Date: Tue Oct 31 00:07:04 2017 New Revision: 325188 URL: https://svnweb.freebsd.org/changeset/base/325188 Log: DIRDEPS_BUILD: Update dependencies. Sponsored by: Dell EMC Isilon Modified: head/bin/cat/Makefile.depend head/bin/chflags/Makefile.depend head/bin/chio/Makefile.depend head/bin/chmod/Makefile.depend head/bin/cp/Makefile.depend head/bin/csh/Makefile.depend head/bin/date/Makefile.depend head/bin/dd/Makefile.depend head/bin/df/Makefile.depend head/bin/domainname/Makefile.depend head/bin/echo/Makefile.depend head/bin/ed/Makefile.depend head/bin/expr/Makefile.depend head/bin/getfacl/Makefile.depend head/bin/hostname/Makefile.depend head/bin/kenv/Makefile.depend head/bin/kill/Makefile.depend head/bin/ln/Makefile.depend head/bin/ls/Makefile.depend head/bin/mkdir/Makefile.depend head/bin/mv/Makefile.depend head/bin/pax/Makefile.depend head/bin/pkill/Makefile.depend head/bin/ps/Makefile.depend head/bin/pwait/Makefile.depend head/bin/pwd/Makefile.depend head/bin/realpath/Makefile.depend head/bin/rm/Makefile.depend head/bin/rmail/Makefile.depend head/bin/rmdir/Makefile.depend head/bin/setfacl/Makefile.depend head/bin/sh/Makefile.depend head/bin/sleep/Makefile.depend head/bin/stty/Makefile.depend head/bin/sync/Makefile.depend head/bin/test/Makefile.depend head/bin/uuidgen/Makefile.depend head/cddl/lib/libavl/Makefile.depend head/cddl/lib/libctf/Makefile.depend head/cddl/lib/libdtrace/Makefile.depend head/cddl/lib/libnvpair/Makefile.depend head/cddl/lib/libumem/Makefile.depend head/cddl/lib/libuutil/Makefile.depend head/cddl/lib/libzfs/Makefile.depend head/cddl/lib/libzfs_core/Makefile.depend head/cddl/lib/libzpool/Makefile.depend head/cddl/sbin/zfs/Makefile.depend head/cddl/sbin/zpool/Makefile.depend head/cddl/usr.bin/ctfconvert/Makefile.depend head/cddl/usr.bin/ctfdump/Makefile.depend head/cddl/usr.bin/ctfmerge/Makefile.depend head/cddl/usr.bin/zinject/Makefile.depend head/cddl/usr.bin/zstreamdump/Makefile.depend head/cddl/usr.bin/ztest/Makefile.depend head/cddl/usr.sbin/dtrace/Makefile.depend head/cddl/usr.sbin/dtrace/tests/common/io/Makefile.depend head/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile.depend head/cddl/usr.sbin/dtrace/tests/common/json/Makefile.depend head/cddl/usr.sbin/dtrace/tests/common/pid/Makefile.depend head/cddl/usr.sbin/dtrace/tests/common/probes/Makefile.depend head/cddl/usr.sbin/dtrace/tests/common/proc/Makefile.depend head/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile.depend head/cddl/usr.sbin/dtrace/tests/common/raise/Makefile.depend head/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile.depend head/cddl/usr.sbin/dtrace/tests/common/stop/Makefile.depend head/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile.depend head/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile.depend head/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile.depend head/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile.depend head/cddl/usr.sbin/lockstat/Makefile.depend head/cddl/usr.sbin/plockstat/Makefile.depend head/cddl/usr.sbin/zdb/Makefile.depend head/cddl/usr.sbin/zfsd/Makefile.depend head/cddl/usr.sbin/zhack/Makefile.depend head/contrib/ofed/usr.bin/ibaddr/Makefile.depend head/contrib/ofed/usr.bin/ibnetdiscover/Makefile.depend head/contrib/ofed/usr.bin/ibping/Makefile.depend head/contrib/ofed/usr.bin/ibportstate/Makefile.depend head/contrib/ofed/usr.bin/ibroute/Makefile.depend head/contrib/ofed/usr.bin/ibsendtrap/Makefile.depend head/contrib/ofed/usr.bin/ibstat/Makefile.depend head/contrib/ofed/usr.bin/ibsysstat/Makefile.depend head/contrib/ofed/usr.bin/ibtracert/Makefile.depend head/contrib/ofed/usr.bin/opensm/Makefile.depend head/contrib/ofed/usr.bin/osmtest/Makefile.depend head/contrib/ofed/usr.bin/perfquery/Makefile.depend head/contrib/ofed/usr.bin/saquery/Makefile.depend head/contrib/ofed/usr.bin/sminfo/Makefile.depend head/contrib/ofed/usr.bin/smpdump/Makefile.depend head/contrib/ofed/usr.bin/smpquery/Makefile.depend head/contrib/ofed/usr.bin/vendstat/Makefile.depend head/contrib/ofed/usr.lib/libcxgb4/Makefile.depend head/contrib/ofed/usr.lib/libibcm/Makefile.depend head/contrib/ofed/usr.lib/libibcommon/Makefile.depend head/contrib/ofed/usr.lib/libibmad/Makefile.depend head/contrib/ofed/usr.lib/libibumad/Makefile.depend head/contrib/ofed/usr.lib/libibverbs/Makefile.depend head/contrib/ofed/usr.lib/libmlx4/Makefile.depend head/contrib/ofed/usr.lib/libmthca/Makefile.depend head/contrib/ofed/usr.lib/libopensm/Makefile.depend head/contrib/ofed/usr.lib/libosmcomp/Makefile.depend head/contrib/ofed/usr.lib/libosmvendor/Makefile.depend head/contrib/ofed/usr.lib/librdmacm/Makefile.depend head/contrib/ofed/usr.lib/libsdp/Makefile.depend head/gnu/lib/libdialog/Makefile.depend head/gnu/lib/libgomp/Makefile.depend head/gnu/lib/libregex/Makefile.depend head/gnu/lib/libssp/Makefile.depend head/gnu/lib/libstdc++/Makefile.depend head/gnu/lib/libsupc++/Makefile.depend head/gnu/usr.bin/binutils/as/Makefile.depend head/gnu/usr.bin/binutils/ld/Makefile.depend head/gnu/usr.bin/binutils/objcopy/Makefile.depend head/gnu/usr.bin/binutils/objdump/Makefile.depend head/gnu/usr.bin/cc/c++/Makefile.depend head/gnu/usr.bin/cc/cc/Makefile.depend head/gnu/usr.bin/cc/cc1/Makefile.depend head/gnu/usr.bin/cc/cc1plus/Makefile.depend head/gnu/usr.bin/cc/cc_tools/Makefile.depend head/gnu/usr.bin/cc/cpp/Makefile.depend head/gnu/usr.bin/cc/gcov/Makefile.depend head/gnu/usr.bin/dialog/Makefile.depend head/gnu/usr.bin/diff3/Makefile.depend head/gnu/usr.bin/dtc/Makefile.depend head/gnu/usr.bin/gdb/gdb/Makefile.depend head/gnu/usr.bin/gdb/gdbserver/Makefile.depend head/gnu/usr.bin/gdb/gdbtui/Makefile.depend head/gnu/usr.bin/gdb/kgdb/Makefile.depend head/gnu/usr.bin/gperf/Makefile.depend head/gnu/usr.bin/grep/Makefile.depend head/kerberos5/lib/libasn1/Makefile.depend head/kerberos5/lib/libgssapi_krb5/Makefile.depend head/kerberos5/lib/libgssapi_ntlm/Makefile.depend head/kerberos5/lib/libgssapi_spnego/Makefile.depend head/kerberos5/lib/libhdb/Makefile.depend head/kerberos5/lib/libheimbase/Makefile.depend head/kerberos5/lib/libheimipcc/Makefile.depend head/kerberos5/lib/libheimipcs/Makefile.depend head/kerberos5/lib/libheimntlm/Makefile.depend head/kerberos5/lib/libhx509/Makefile.depend head/kerberos5/lib/libkadm5clnt/Makefile.depend head/kerberos5/lib/libkadm5srv/Makefile.depend head/kerberos5/lib/libkafs5/Makefile.depend head/kerberos5/lib/libkdc/Makefile.depend head/kerberos5/lib/libkrb5/Makefile.depend head/kerberos5/lib/libroken/Makefile.depend head/kerberos5/lib/libwind/Makefile.depend head/kerberos5/libexec/digest-service/Makefile.depend head/kerberos5/libexec/hprop/Makefile.depend head/kerberos5/libexec/hpropd/Makefile.depend head/kerberos5/libexec/ipropd-master/Makefile.depend head/kerberos5/libexec/ipropd-slave/Makefile.depend head/kerberos5/libexec/kadmind/Makefile.depend head/kerberos5/libexec/kcm/Makefile.depend head/kerberos5/libexec/kdc/Makefile.depend head/kerberos5/libexec/kdigest/Makefile.depend head/kerberos5/libexec/kfd/Makefile.depend head/kerberos5/libexec/kimpersonate/Makefile.depend head/kerberos5/libexec/kpasswdd/Makefile.depend head/kerberos5/tools/asn1_compile/Makefile.depend head/kerberos5/tools/make-roken/Makefile.depend head/kerberos5/tools/slc/Makefile.depend head/kerberos5/usr.bin/hxtool/Makefile.depend head/kerberos5/usr.bin/kadmin/Makefile.depend head/kerberos5/usr.bin/kcc/Makefile.depend head/kerberos5/usr.bin/kdestroy/Makefile.depend head/kerberos5/usr.bin/kf/Makefile.depend head/kerberos5/usr.bin/kgetcred/Makefile.depend head/kerberos5/usr.bin/kinit/Makefile.depend head/kerberos5/usr.bin/kpasswd/Makefile.depend head/kerberos5/usr.bin/ksu/Makefile.depend head/kerberos5/usr.bin/string2key/Makefile.depend head/kerberos5/usr.bin/verify_krb5_conf/Makefile.depend head/kerberos5/usr.sbin/iprop-log/Makefile.depend head/kerberos5/usr.sbin/kstash/Makefile.depend head/kerberos5/usr.sbin/ktutil/Makefile.depend head/lib/atf/libatf-c++/Makefile.depend head/lib/atf/libatf-c++/tests/Makefile.depend head/lib/atf/libatf-c++/tests/detail/Makefile.depend head/lib/atf/libatf-c/Makefile.depend head/lib/atf/libatf-c/tests/Makefile.depend head/lib/atf/libatf-c/tests/detail/Makefile.depend head/lib/atf/tests/test-programs/Makefile.depend head/lib/lib80211/Makefile.depend head/lib/libalias/libalias/Makefile.depend head/lib/libalias/modules/cuseeme/Makefile.depend head/lib/libalias/modules/dummy/Makefile.depend head/lib/libalias/modules/ftp/Makefile.depend head/lib/libalias/modules/irc/Makefile.depend head/lib/libalias/modules/nbt/Makefile.depend head/lib/libalias/modules/pptp/Makefile.depend head/lib/libalias/modules/skinny/Makefile.depend head/lib/libalias/modules/smedia/Makefile.depend head/lib/libarchive/Makefile.depend head/lib/libarchive/tests/Makefile.depend head/lib/libauditd/Makefile.depend head/lib/libbegemot/Makefile.depend head/lib/libblacklist/Makefile.depend head/lib/libblocksruntime/Makefile.depend head/lib/libbluetooth/Makefile.depend head/lib/libbsdstat/Makefile.depend head/lib/libbsm/Makefile.depend head/lib/libbsnmp/libbsnmp/Makefile.depend head/lib/libbz2/Makefile.depend head/lib/libc++/Makefile.depend head/lib/libc/tests/c063/Makefile.depend head/lib/libc/tests/db/Makefile.depend head/lib/libc/tests/gen/Makefile.depend head/lib/libc/tests/gen/execve/Makefile.depend head/lib/libc/tests/gen/posix_spawn/Makefile.depend head/lib/libc/tests/hash/Makefile.depend head/lib/libc/tests/inet/Makefile.depend head/lib/libc/tests/locale/Makefile.depend head/lib/libc/tests/net/Makefile.depend head/lib/libc/tests/nss/Makefile.depend head/lib/libc/tests/regex/Makefile.depend head/lib/libc/tests/resolv/Makefile.depend head/lib/libc/tests/rpc/Makefile.depend head/lib/libc/tests/setjmp/Makefile.depend head/lib/libc/tests/ssp/Makefile.depend head/lib/libc/tests/stdio/Makefile.depend head/lib/libc/tests/stdlib/Makefile.depend head/lib/libc/tests/string/Makefile.depend head/lib/libc/tests/sys/Makefile.depend head/lib/libc/tests/termios/Makefile.depend head/lib/libc/tests/time/Makefile.depend head/lib/libc/tests/tls/Makefile.depend head/lib/libc/tests/tls_dso/Makefile.depend head/lib/libc/tests/ttyio/Makefile.depend head/lib/libcalendar/Makefile.depend head/lib/libcam/Makefile.depend head/lib/libcasper/libcasper/Makefile.depend head/lib/libcasper/services/cap_dns/Makefile.depend head/lib/libcasper/services/cap_grp/Makefile.depend head/lib/libcasper/services/cap_pwd/Makefile.depend head/lib/libcasper/services/cap_random/Makefile.depend head/lib/libcasper/services/cap_sysctl/Makefile.depend head/lib/libclang_rt/asan_dynamic/Makefile.depend head/lib/libcom_err/Makefile.depend head/lib/libcrypt/Makefile.depend head/lib/libcrypt/tests/Makefile.depend head/lib/libcuse/Makefile.depend head/lib/libcxxrt/Makefile.depend head/lib/libdevctl/Makefile.depend head/lib/libdevdctl/Makefile.depend head/lib/libdevinfo/Makefile.depend head/lib/libdevstat/Makefile.depend head/lib/libdl/Makefile.depend head/lib/libdpv/Makefile.depend head/lib/libdwarf/Makefile.depend head/lib/libedit/Makefile.depend head/lib/libefivar/Makefile.depend head/lib/libelf/Makefile.depend head/lib/libevent/Makefile.depend head/lib/libexecinfo/Makefile.depend head/lib/libexpat/Makefile.depend head/lib/libfetch/Makefile.depend head/lib/libfigpar/Makefile.depend head/lib/libgeom/Makefile.depend head/lib/libgpio/Makefile.depend head/lib/libgssapi/Makefile.depend head/lib/libiconv_modules/BIG5/Makefile.depend head/lib/libiconv_modules/DECHanyu/Makefile.depend head/lib/libiconv_modules/EUC/Makefile.depend head/lib/libiconv_modules/EUCTW/Makefile.depend head/lib/libiconv_modules/GBK2K/Makefile.depend head/lib/libiconv_modules/HZ/Makefile.depend head/lib/libiconv_modules/ISO2022/Makefile.depend head/lib/libiconv_modules/JOHAB/Makefile.depend head/lib/libiconv_modules/MSKanji/Makefile.depend head/lib/libiconv_modules/UES/Makefile.depend head/lib/libiconv_modules/UTF1632/Makefile.depend head/lib/libiconv_modules/UTF7/Makefile.depend head/lib/libiconv_modules/UTF8/Makefile.depend head/lib/libiconv_modules/VIQR/Makefile.depend head/lib/libiconv_modules/ZW/Makefile.depend head/lib/libiconv_modules/iconv_none/Makefile.depend head/lib/libiconv_modules/iconv_std/Makefile.depend head/lib/libiconv_modules/mapper_646/Makefile.depend head/lib/libiconv_modules/mapper_none/Makefile.depend head/lib/libiconv_modules/mapper_parallel/Makefile.depend head/lib/libiconv_modules/mapper_serial/Makefile.depend head/lib/libiconv_modules/mapper_std/Makefile.depend head/lib/libiconv_modules/mapper_zone/Makefile.depend head/lib/libipsec/Makefile.depend head/lib/libjail/Makefile.depend head/lib/libkiconv/Makefile.depend head/lib/libkvm/Makefile.depend head/lib/libldns/Makefile.depend head/lib/liblzma/Makefile.depend head/lib/libmagic/Makefile.depend head/lib/libmd/Makefile.depend head/lib/libmemstat/Makefile.depend head/lib/libmilter/Makefile.depend head/lib/libmp/Makefile.depend head/lib/libmp/tests/Makefile.depend head/lib/libmt/Makefile.depend head/lib/libnandfs/Makefile.depend head/lib/libnetgraph/Makefile.depend head/lib/libngatm/Makefile.depend head/lib/libnv/Makefile.depend head/lib/libnv/tests/Makefile.depend head/lib/libopie/Makefile.depend head/lib/libpam/libpam/Makefile.depend head/lib/libpam/modules/pam_chroot/Makefile.depend head/lib/libpam/modules/pam_deny/Makefile.depend head/lib/libpam/modules/pam_echo/Makefile.depend head/lib/libpam/modules/pam_exec/Makefile.depend head/lib/libpam/modules/pam_ftpusers/Makefile.depend head/lib/libpam/modules/pam_group/Makefile.depend head/lib/libpam/modules/pam_guest/Makefile.depend head/lib/libpam/modules/pam_krb5/Makefile.depend head/lib/libpam/modules/pam_ksu/Makefile.depend head/lib/libpam/modules/pam_lastlog/Makefile.depend head/lib/libpam/modules/pam_login_access/Makefile.depend head/lib/libpam/modules/pam_nologin/Makefile.depend head/lib/libpam/modules/pam_opie/Makefile.depend head/lib/libpam/modules/pam_opieaccess/Makefile.depend head/lib/libpam/modules/pam_passwdqc/Makefile.depend head/lib/libpam/modules/pam_permit/Makefile.depend head/lib/libpam/modules/pam_radius/Makefile.depend head/lib/libpam/modules/pam_rhosts/Makefile.depend head/lib/libpam/modules/pam_rootok/Makefile.depend head/lib/libpam/modules/pam_securetty/Makefile.depend head/lib/libpam/modules/pam_self/Makefile.depend head/lib/libpam/modules/pam_ssh/Makefile.depend head/lib/libpam/modules/pam_tacplus/Makefile.depend head/lib/libpam/modules/pam_unix/Makefile.depend head/lib/libpcap/Makefile.depend head/lib/libpjdlog/Makefile.depend head/lib/libpmc/Makefile.depend head/lib/libproc/Makefile.depend head/lib/libproc/tests/Makefile.depend head/lib/libprocstat/Makefile.depend head/lib/libradius/Makefile.depend head/lib/librpcsec_gss/Makefile.depend head/lib/librpcsvc/Makefile.depend head/lib/librss/Makefile.depend head/lib/librt/Makefile.depend head/lib/librt/tests/Makefile.depend head/lib/librtld_db/Makefile.depend head/lib/libsbuf/Makefile.depend head/lib/libsdp/Makefile.depend head/lib/libsmb/Makefile.depend head/lib/libsqlite3/Makefile.depend head/lib/libstdbuf/Makefile.depend head/lib/libstdthreads/Makefile.depend head/lib/libsysdecode/Makefile.depend head/lib/libtacplus/Makefile.depend head/lib/libthr/Makefile.depend head/lib/libthr/tests/Makefile.depend head/lib/libthr/tests/dlopen/Makefile.depend head/lib/libthr/tests/dlopen/dso/Makefile.depend head/lib/libthread_db/Makefile.depend head/lib/libucl/Makefile.depend head/lib/libufs/Makefile.depend head/lib/libugidfw/Makefile.depend head/lib/libulog/Makefile.depend head/lib/libunbound/Makefile.depend head/lib/libusb/Makefile.depend head/lib/libusbhid/Makefile.depend head/lib/libutil/Makefile.depend head/lib/libutil/tests/Makefile.depend head/lib/libvgl/Makefile.depend head/lib/libvmmapi/Makefile.depend head/lib/libwrap/Makefile.depend head/lib/libxo/Makefile.depend head/lib/libxo/tests/Makefile.depend head/lib/libypclnt/Makefile.depend head/lib/libz/Makefile.depend head/lib/libzstd/Makefile.depend head/lib/msun/Makefile.depend head/lib/msun/tests/Makefile.depend head/lib/ncurses/form/Makefile.depend head/lib/ncurses/formw/Makefile.depend head/lib/ncurses/menu/Makefile.depend head/lib/ncurses/menuw/Makefile.depend head/lib/ncurses/ncurses/Makefile.depend head/lib/ncurses/ncursesw/Makefile.depend head/lib/ncurses/panel/Makefile.depend head/lib/ncurses/panelw/Makefile.depend head/libexec/atf/atf-check/Makefile.depend head/libexec/atf/atf-sh/Makefile.depend head/libexec/atrun/Makefile.depend head/libexec/bootpd/Makefile.depend head/libexec/bootpd/bootpgw/Makefile.depend head/libexec/bootpd/tools/bootpef/Makefile.depend head/libexec/bootpd/tools/bootptest/Makefile.depend head/libexec/comsat/Makefile.depend head/libexec/dma/dma-mbox-create/Makefile.depend head/libexec/dma/dmagent/Makefile.depend head/libexec/fingerd/Makefile.depend head/libexec/ftpd/Makefile.depend head/libexec/getty/Makefile.depend head/libexec/mail.local/Makefile.depend head/libexec/mknetid/Makefile.depend head/libexec/pppoed/Makefile.depend head/libexec/rbootd/Makefile.depend head/libexec/revnetgroup/Makefile.depend head/libexec/rpc.rquotad/Makefile.depend head/libexec/rpc.rstatd/Makefile.depend head/libexec/rpc.rusersd/Makefile.depend head/libexec/rpc.rwalld/Makefile.depend head/libexec/rpc.sprayd/Makefile.depend head/libexec/rtld-elf/tests/Makefile.depend head/libexec/rtld-elf/tests/libpythagoras/Makefile.depend head/libexec/rtld-elf/tests/target/Makefile.depend head/libexec/smrsh/Makefile.depend head/libexec/talkd/Makefile.depend head/libexec/tcpd/Makefile.depend head/libexec/telnetd/Makefile.depend head/libexec/tftp-proxy/Makefile.depend head/libexec/tftpd/Makefile.depend head/libexec/ulog-helper/Makefile.depend head/libexec/ypxfr/Makefile.depend head/rescue/rescue/Makefile.depend head/sbin/adjkerntz/Makefile.depend head/sbin/badsect/Makefile.depend head/sbin/bsdlabel/Makefile.depend head/sbin/camcontrol/Makefile.depend head/sbin/ccdconfig/Makefile.depend head/sbin/clri/Makefile.depend head/sbin/comcontrol/Makefile.depend head/sbin/conscontrol/Makefile.depend head/sbin/ddb/Makefile.depend head/sbin/decryptcore/Makefile.depend head/sbin/devd/Makefile.depend head/sbin/devd/tests/Makefile.depend head/sbin/devfs/Makefile.depend head/sbin/dhclient/Makefile.depend head/sbin/dhclient/tests/Makefile.depend head/sbin/dmesg/Makefile.depend head/sbin/dump/Makefile.depend head/sbin/dumpfs/Makefile.depend head/sbin/dumpon/Makefile.depend head/sbin/etherswitchcfg/Makefile.depend head/sbin/fdisk/Makefile.depend head/sbin/ffsinfo/Makefile.depend head/sbin/fsck/Makefile.depend head/sbin/fsck_ffs/Makefile.depend head/sbin/fsck_msdosfs/Makefile.depend head/sbin/fsdb/Makefile.depend head/sbin/fsirand/Makefile.depend head/sbin/gbde/Makefile.depend head/sbin/geom/class/cache/Makefile.depend head/sbin/geom/class/concat/Makefile.depend head/sbin/geom/class/eli/Makefile.depend head/sbin/geom/class/journal/Makefile.depend head/sbin/geom/class/label/Makefile.depend head/sbin/geom/class/mirror/Makefile.depend head/sbin/geom/class/mountver/Makefile.depend head/sbin/geom/class/multipath/Makefile.depend head/sbin/geom/class/nop/Makefile.depend head/sbin/geom/class/part/Makefile.depend head/sbin/geom/class/raid/Makefile.depend head/sbin/geom/class/raid3/Makefile.depend head/sbin/geom/class/sched/Makefile.depend head/sbin/geom/class/shsec/Makefile.depend head/sbin/geom/class/stripe/Makefile.depend head/sbin/geom/class/virstor/Makefile.depend head/sbin/geom/core/Makefile.depend head/sbin/ggate/ggatec/Makefile.depend head/sbin/ggate/ggated/Makefile.depend head/sbin/ggate/ggatel/Makefile.depend head/sbin/growfs/Makefile.depend head/sbin/gvinum/Makefile.depend head/sbin/hastctl/Makefile.depend head/sbin/hastd/Makefile.depend head/sbin/ifconfig/Makefile.depend head/sbin/init/Makefile.depend head/sbin/ipf/ipf/Makefile.depend head/sbin/ipf/ipfs/Makefile.depend head/sbin/ipf/ipfstat/Makefile.depend head/sbin/ipf/ipftest/Makefile.depend head/sbin/ipf/ipmon/Makefile.depend head/sbin/ipf/ipnat/Makefile.depend head/sbin/ipf/ippool/Makefile.depend head/sbin/ipf/ipresend/Makefile.depend head/sbin/ipfw/Makefile.depend head/sbin/iscontrol/Makefile.depend head/sbin/kldconfig/Makefile.depend head/sbin/kldload/Makefile.depend head/sbin/kldstat/Makefile.depend head/sbin/kldunload/Makefile.depend head/sbin/ldconfig/Makefile.depend head/sbin/md5/Makefile.depend head/sbin/mdconfig/Makefile.depend head/sbin/mdmfs/Makefile.depend head/sbin/mknod/Makefile.depend head/sbin/mksnap_ffs/Makefile.depend head/sbin/mount/Makefile.depend head/sbin/mount_cd9660/Makefile.depend head/sbin/mount_fusefs/Makefile.depend head/sbin/mount_msdosfs/Makefile.depend head/sbin/mount_nfs/Makefile.depend head/sbin/mount_nullfs/Makefile.depend head/sbin/mount_udf/Makefile.depend head/sbin/mount_unionfs/Makefile.depend head/sbin/nandfs/Makefile.depend head/sbin/natd/Makefile.depend head/sbin/newfs/Makefile.depend head/sbin/newfs_msdos/Makefile.depend head/sbin/newfs_nandfs/Makefile.depend head/sbin/nfsiod/Makefile.depend head/sbin/nos-tun/Makefile.depend head/sbin/nvmecontrol/Makefile.depend head/sbin/pfctl/Makefile.depend head/sbin/pflogd/Makefile.depend head/sbin/ping/Makefile.depend head/sbin/ping6/Makefile.depend head/sbin/quotacheck/Makefile.depend head/sbin/rcorder/Makefile.depend head/sbin/reboot/Makefile.depend head/sbin/recoverdisk/Makefile.depend head/sbin/restore/Makefile.depend head/sbin/route/Makefile.depend head/sbin/routed/Makefile.depend head/sbin/routed/rtquery/Makefile.depend head/sbin/rtsol/Makefile.depend head/sbin/savecore/Makefile.depend head/sbin/sconfig/Makefile.depend head/sbin/setkey/Makefile.depend head/sbin/shutdown/Makefile.depend head/sbin/spppcontrol/Makefile.depend head/sbin/sunlabel/Makefile.depend head/sbin/swapon/Makefile.depend head/sbin/sysctl/Makefile.depend head/sbin/tunefs/Makefile.depend head/sbin/umount/Makefile.depend head/sbin/zfsbootcfg/Makefile.depend head/secure/lib/libcrypto/Makefile.depend head/secure/lib/libcrypto/engines/lib4758cca/Makefile.depend head/secure/lib/libcrypto/engines/libaep/Makefile.depend head/secure/lib/libcrypto/engines/libatalla/Makefile.depend head/secure/lib/libcrypto/engines/libcapi/Makefile.depend head/secure/lib/libcrypto/engines/libchil/Makefile.depend head/secure/lib/libcrypto/engines/libcswift/Makefile.depend head/secure/lib/libcrypto/engines/libgost/Makefile.depend head/secure/lib/libcrypto/engines/libnuron/Makefile.depend head/secure/lib/libcrypto/engines/libsureware/Makefile.depend head/secure/lib/libcrypto/engines/libubsec/Makefile.depend head/secure/lib/libssh/Makefile.depend head/secure/lib/libssl/Makefile.depend head/secure/libexec/sftp-server/Makefile.depend head/secure/libexec/ssh-keysign/Makefile.depend head/secure/libexec/ssh-pkcs11-helper/Makefile.depend head/secure/usr.bin/openssl/Makefile.depend head/secure/usr.bin/scp/Makefile.depend head/secure/usr.bin/sftp/Makefile.depend head/secure/usr.bin/ssh-add/Makefile.depend head/secure/usr.bin/ssh-agent/Makefile.depend head/secure/usr.bin/ssh-keygen/Makefile.depend head/secure/usr.bin/ssh-keyscan/Makefile.depend head/secure/usr.bin/ssh/Makefile.depend head/secure/usr.sbin/sshd/Makefile.depend head/share/examples/libvgl/Makefile.depend head/share/examples/tests/tests/atf/Makefile.depend head/share/examples/tests/tests/plain/Makefile.depend head/share/examples/tests/tests/tap/Makefile.depend head/share/syscons/scrnmaps/Makefile.depend head/sys/boot/efi/boot1/Makefile.depend head/sys/boot/efi/loader/Makefile.depend head/sys/boot/fdt/Makefile.depend head/sys/boot/ficl/Makefile.depend head/sys/boot/ficl32/Makefile.depend head/sys/boot/geli/Makefile.depend head/sys/boot/i386/gptboot/Makefile.depend head/sys/boot/i386/gptzfsboot/Makefile.depend head/sys/boot/i386/loader/Makefile.depend head/sys/boot/i386/zfsboot/Makefile.depend head/sys/boot/i386/zfsloader/Makefile.depend head/sys/boot/userboot/test/Makefile.depend head/sys/boot/userboot/userboot/Makefile.depend head/targets/pseudo/userland/gnu/Makefile.depend head/tests/sys/aio/Makefile.depend head/tests/sys/fifo/Makefile.depend head/tests/sys/file/Makefile.depend head/tests/sys/geom/class/eli/Makefile.depend head/tests/sys/kern/Makefile.depend head/tests/sys/kern/acct/Makefile.depend head/tests/sys/kern/execve/Makefile.depend head/tests/sys/kern/pipe/Makefile.depend head/tests/sys/kqueue/libkqueue/Makefile.depend head/tests/sys/mac/bsdextended/Makefile.depend head/tests/sys/mqueue/Makefile.depend head/tests/sys/netinet/Makefile.depend head/tests/sys/pjdfstest/pjdfstest/Makefile.depend head/tests/sys/posixshm/Makefile.depend head/tests/sys/sys/Makefile.depend head/tests/sys/vfs/Makefile.depend head/tests/sys/vm/Makefile.depend head/tools/bsdbox/Makefile.depend head/tools/regression/include/stdatomic/Makefile.depend head/tools/tools/ath/ath_ee_9300_print/Makefile.depend head/tools/tools/drm/radeon/mkregtable/Makefile.depend head/tools/tools/usbtest/Makefile.depend head/usr.bin/addr2line/Makefile.depend head/usr.bin/apply/Makefile.depend head/usr.bin/ar/Makefile.depend head/usr.bin/asa/Makefile.depend head/usr.bin/at/Makefile.depend head/usr.bin/atm/sscop/Makefile.depend head/usr.bin/awk/Makefile.depend head/usr.bin/banner/Makefile.depend head/usr.bin/basename/Makefile.depend head/usr.bin/bc/Makefile.depend head/usr.bin/biff/Makefile.depend head/usr.bin/bluetooth/bthost/Makefile.depend head/usr.bin/bluetooth/btsockstat/Makefile.depend head/usr.bin/bluetooth/rfcomm_sppd/Makefile.depend head/usr.bin/bmake/Makefile.depend head/usr.bin/brandelf/Makefile.depend head/usr.bin/bsdcat/Makefile.depend head/usr.bin/bsdcat/tests/Makefile.depend head/usr.bin/bsdiff/bsdiff/Makefile.depend head/usr.bin/bsdiff/bspatch/Makefile.depend head/usr.bin/bzip2/Makefile.depend head/usr.bin/bzip2recover/Makefile.depend head/usr.bin/c89/Makefile.depend head/usr.bin/c99/Makefile.depend head/usr.bin/caesar/Makefile.depend head/usr.bin/calendar/Makefile.depend head/usr.bin/cap_mkdb/Makefile.depend head/usr.bin/chat/Makefile.depend head/usr.bin/chkey/Makefile.depend head/usr.bin/chpass/Makefile.depend head/usr.bin/cksum/Makefile.depend head/usr.bin/clang/bugpoint/Makefile.depend head/usr.bin/clang/clang-format/Makefile.depend head/usr.bin/clang/clang-tblgen/Makefile.depend head/usr.bin/clang/clang/Makefile.depend head/usr.bin/clang/llc/Makefile.depend head/usr.bin/clang/lld/Makefile.depend head/usr.bin/clang/lldb/Makefile.depend head/usr.bin/clang/lli/Makefile.depend head/usr.bin/clang/llvm-ar/Makefile.depend head/usr.bin/clang/llvm-as/Makefile.depend head/usr.bin/clang/llvm-bcanalyzer/Makefile.depend head/usr.bin/clang/llvm-cov/Makefile.depend head/usr.bin/clang/llvm-cxxdump/Makefile.depend head/usr.bin/clang/llvm-cxxfilt/Makefile.depend head/usr.bin/clang/llvm-diff/Makefile.depend head/usr.bin/clang/llvm-dis/Makefile.depend head/usr.bin/clang/llvm-dwarfdump/Makefile.depend head/usr.bin/clang/llvm-extract/Makefile.depend head/usr.bin/clang/llvm-link/Makefile.depend head/usr.bin/clang/llvm-lto/Makefile.depend head/usr.bin/clang/llvm-lto2/Makefile.depend head/usr.bin/clang/llvm-mc/Makefile.depend head/usr.bin/clang/llvm-modextract/Makefile.depend head/usr.bin/clang/llvm-nm/Makefile.depend head/usr.bin/clang/llvm-objdump/Makefile.depend head/usr.bin/clang/llvm-pdbutil/Makefile.depend head/usr.bin/clang/llvm-profdata/Makefile.depend head/usr.bin/clang/llvm-rtdyld/Makefile.depend head/usr.bin/clang/llvm-symbolizer/Makefile.depend head/usr.bin/clang/llvm-tblgen/Makefile.depend head/usr.bin/clang/llvm-xray/Makefile.depend head/usr.bin/clang/opt/Makefile.depend head/usr.bin/cmp/Makefile.depend head/usr.bin/col/Makefile.depend head/usr.bin/colldef/Makefile.depend head/usr.bin/colrm/Makefile.depend head/usr.bin/column/Makefile.depend head/usr.bin/comm/Makefile.depend head/usr.bin/compile_et/Makefile.depend head/usr.bin/compress/Makefile.depend head/usr.bin/cpio/Makefile.depend head/usr.bin/cpio/tests/Makefile.depend head/usr.bin/cpuset/Makefile.depend head/usr.bin/csplit/Makefile.depend head/usr.bin/ctags/Makefile.depend head/usr.bin/ctlstat/Makefile.depend head/usr.bin/cut/Makefile.depend head/usr.bin/cxxfilt/Makefile.depend head/usr.bin/dc/Makefile.depend head/usr.bin/dirname/Makefile.depend head/usr.bin/dpv/Makefile.depend head/usr.bin/drill/Makefile.depend head/usr.bin/dtc/Makefile.depend head/usr.bin/du/Makefile.depend head/usr.bin/ee/Makefile.depend head/usr.bin/elf2aout/Makefile.depend head/usr.bin/elfcopy/Makefile.depend head/usr.bin/elfdump/Makefile.depend head/usr.bin/enigma/Makefile.depend head/usr.bin/env/Makefile.depend head/usr.bin/expand/Makefile.depend head/usr.bin/factor/Makefile.depend head/usr.bin/false/Makefile.depend head/usr.bin/fetch/Makefile.depend head/usr.bin/file/Makefile.depend head/usr.bin/file2c/Makefile.depend head/usr.bin/find/Makefile.depend head/usr.bin/finger/Makefile.depend head/usr.bin/fmt/Makefile.depend head/usr.bin/fold/Makefile.depend head/usr.bin/fortune/fortune/Makefile.depend head/usr.bin/fortune/strfile/Makefile.depend head/usr.bin/fortune/unstr/Makefile.depend head/usr.bin/from/Makefile.depend head/usr.bin/fstat/Makefile.depend head/usr.bin/fsync/Makefile.depend head/usr.bin/ftp/Makefile.depend head/usr.bin/gcore/Makefile.depend head/usr.bin/gencat/Makefile.depend head/usr.bin/getaddrinfo/Makefile.depend head/usr.bin/getconf/Makefile.depend head/usr.bin/getent/Makefile.depend head/usr.bin/getopt/Makefile.depend head/usr.bin/gprof/Makefile.depend head/usr.bin/grdc/Makefile.depend head/usr.bin/grep/Makefile.depend head/usr.bin/gzip/Makefile.depend head/usr.bin/head/Makefile.depend head/usr.bin/hexdump/Makefile.depend head/usr.bin/host/Makefile.depend head/usr.bin/iconv/Makefile.depend head/usr.bin/id/Makefile.depend head/usr.bin/ident/Makefile.depend head/usr.bin/indent/Makefile.depend head/usr.bin/ipcrm/Makefile.depend head/usr.bin/ipcs/Makefile.depend head/usr.bin/iscsictl/Makefile.depend head/usr.bin/join/Makefile.depend head/usr.bin/jot/Makefile.depend head/usr.bin/kdump/Makefile.depend head/usr.bin/keylogin/Makefile.depend head/usr.bin/keylogout/Makefile.depend head/usr.bin/killall/Makefile.depend head/usr.bin/ktrace/Makefile.depend head/usr.bin/ktrdump/Makefile.depend head/usr.bin/lam/Makefile.depend head/usr.bin/last/Makefile.depend head/usr.bin/lastcomm/Makefile.depend head/usr.bin/ldd/Makefile.depend head/usr.bin/leave/Makefile.depend head/usr.bin/less/Makefile.depend head/usr.bin/lessecho/Makefile.depend head/usr.bin/lesskey/Makefile.depend head/usr.bin/lex/Makefile.depend head/usr.bin/limits/Makefile.depend head/usr.bin/locale/Makefile.depend head/usr.bin/localedef/Makefile.depend head/usr.bin/locate/bigram/Makefile.depend head/usr.bin/locate/code/Makefile.depend head/usr.bin/locate/locate/Makefile.depend head/usr.bin/lock/Makefile.depend head/usr.bin/lockf/Makefile.depend head/usr.bin/logger/Makefile.depend head/usr.bin/login/Makefile.depend head/usr.bin/logins/Makefile.depend head/usr.bin/logname/Makefile.depend head/usr.bin/look/Makefile.depend head/usr.bin/lsvfs/Makefile.depend head/usr.bin/lzmainfo/Makefile.depend head/usr.bin/m4/Makefile.depend head/usr.bin/mail/Makefile.depend head/usr.bin/mandoc/Makefile.depend head/usr.bin/mesg/Makefile.depend head/usr.bin/minigzip/Makefile.depend head/usr.bin/ministat/Makefile.depend head/usr.bin/mkcsmapper/Makefile.depend head/usr.bin/mkcsmapper_static/Makefile.depend head/usr.bin/mkesdb/Makefile.depend head/usr.bin/mkesdb_static/Makefile.depend head/usr.bin/mkfifo/Makefile.depend head/usr.bin/mkimg/Makefile.depend head/usr.bin/mklocale/Makefile.depend head/usr.bin/mkstr/Makefile.depend head/usr.bin/mktemp/Makefile.depend head/usr.bin/mkuzip/Makefile.depend head/usr.bin/morse/Makefile.depend head/usr.bin/msgs/Makefile.depend head/usr.bin/mt/Makefile.depend head/usr.bin/nc/Makefile.depend head/usr.bin/ncal/Makefile.depend head/usr.bin/netstat/Makefile.depend head/usr.bin/newgrp/Makefile.depend head/usr.bin/newkey/Makefile.depend head/usr.bin/nfsstat/Makefile.depend head/usr.bin/nice/Makefile.depend head/usr.bin/nl/Makefile.depend head/usr.bin/nm/Makefile.depend head/usr.bin/nohup/Makefile.depend head/usr.bin/numactl/Makefile.depend head/usr.bin/number/Makefile.depend head/usr.bin/opieinfo/Makefile.depend head/usr.bin/opiekey/Makefile.depend head/usr.bin/opiepasswd/Makefile.depend head/usr.bin/pamtest/Makefile.depend head/usr.bin/passwd/Makefile.depend head/usr.bin/paste/Makefile.depend head/usr.bin/patch/Makefile.depend head/usr.bin/pathchk/Makefile.depend head/usr.bin/perror/Makefile.depend head/usr.bin/pom/Makefile.depend head/usr.bin/pr/Makefile.depend head/usr.bin/primes/Makefile.depend head/usr.bin/printenv/Makefile.depend head/usr.bin/printf/Makefile.depend head/usr.bin/proccontrol/Makefile.depend head/usr.bin/procstat/Makefile.depend head/usr.bin/protect/Makefile.depend head/usr.bin/quota/Makefile.depend head/usr.bin/random/Makefile.depend head/usr.bin/rctl/Makefile.depend head/usr.bin/readelf/Makefile.depend head/usr.bin/renice/Makefile.depend head/usr.bin/resizewin/Makefile.depend head/usr.bin/rev/Makefile.depend head/usr.bin/revoke/Makefile.depend head/usr.bin/rpcgen/Makefile.depend head/usr.bin/rpcinfo/Makefile.depend head/usr.bin/rs/Makefile.depend head/usr.bin/rup/Makefile.depend head/usr.bin/ruptime/Makefile.depend head/usr.bin/rusers/Makefile.depend head/usr.bin/rwall/Makefile.depend head/usr.bin/rwho/Makefile.depend head/usr.bin/script/Makefile.depend head/usr.bin/sdiff/Makefile.depend head/usr.bin/sed/Makefile.depend head/usr.bin/seq/Makefile.depend head/usr.bin/setchannel/Makefile.depend head/usr.bin/showmount/Makefile.depend head/usr.bin/size/Makefile.depend head/usr.bin/smbutil/Makefile.depend head/usr.bin/sockstat/Makefile.depend head/usr.bin/soelim/Makefile.depend head/usr.bin/sort/Makefile.depend head/usr.bin/split/Makefile.depend head/usr.bin/stat/Makefile.depend head/usr.bin/stdbuf/Makefile.depend head/usr.bin/strings/Makefile.depend head/usr.bin/su/Makefile.depend head/usr.bin/svn/svn/Makefile.depend head/usr.bin/svn/svnadmin/Makefile.depend head/usr.bin/svn/svnbench/Makefile.depend head/usr.bin/svn/svndumpfilter/Makefile.depend head/usr.bin/svn/svnfsfs/Makefile.depend head/usr.bin/svn/svnlook/Makefile.depend head/usr.bin/svn/svnmucc/Makefile.depend head/usr.bin/svn/svnrdump/Makefile.depend head/usr.bin/svn/svnserve/Makefile.depend head/usr.bin/svn/svnsync/Makefile.depend head/usr.bin/svn/svnversion/Makefile.depend head/usr.bin/systat/Makefile.depend head/usr.bin/tabs/Makefile.depend head/usr.bin/tail/Makefile.depend head/usr.bin/talk/Makefile.depend head/usr.bin/tar/Makefile.depend head/usr.bin/tar/tests/Makefile.depend head/usr.bin/tcopy/Makefile.depend head/usr.bin/tee/Makefile.depend head/usr.bin/telnet/Makefile.depend head/usr.bin/tftp/Makefile.depend head/usr.bin/time/Makefile.depend head/usr.bin/timeout/Makefile.depend head/usr.bin/tip/tip/Makefile.depend head/usr.bin/top/Makefile.depend head/usr.bin/touch/Makefile.depend head/usr.bin/tput/Makefile.depend head/usr.bin/tr/Makefile.depend head/usr.bin/true/Makefile.depend head/usr.bin/truncate/Makefile.depend head/usr.bin/truss/Makefile.depend head/usr.bin/tset/Makefile.depend head/usr.bin/tsort/Makefile.depend head/usr.bin/tty/Makefile.depend head/usr.bin/ul/Makefile.depend head/usr.bin/uname/Makefile.depend head/usr.bin/unexpand/Makefile.depend head/usr.bin/unifdef/Makefile.depend head/usr.bin/uniq/Makefile.depend head/usr.bin/units/Makefile.depend head/usr.bin/unvis/Makefile.depend head/usr.bin/unzip/Makefile.depend head/usr.bin/usbhidaction/Makefile.depend head/usr.bin/usbhidctl/Makefile.depend head/usr.bin/users/Makefile.depend head/usr.bin/uudecode/Makefile.depend head/usr.bin/uuencode/Makefile.depend head/usr.bin/vacation/Makefile.depend head/usr.bin/vgrind/Makefile.depend head/usr.bin/vi/Makefile.depend head/usr.bin/vis/Makefile.depend head/usr.bin/vmstat/Makefile.depend head/usr.bin/vtfontcvt/Makefile.depend head/usr.bin/w/Makefile.depend head/usr.bin/wall/Makefile.depend head/usr.bin/wc/Makefile.depend head/usr.bin/what/Makefile.depend head/usr.bin/whereis/Makefile.depend head/usr.bin/which/Makefile.depend head/usr.bin/who/Makefile.depend head/usr.bin/whois/Makefile.depend head/usr.bin/write/Makefile.depend head/usr.bin/xargs/Makefile.depend head/usr.bin/xinstall/Makefile.depend head/usr.bin/xlint/lint1/Makefile.depend head/usr.bin/xlint/lint2/Makefile.depend head/usr.bin/xlint/xlint/Makefile.depend head/usr.bin/xo/Makefile.depend head/usr.bin/xstr/Makefile.depend head/usr.bin/xz/Makefile.depend head/usr.bin/xzdec/Makefile.depend head/usr.bin/yacc/Makefile.depend head/usr.bin/yes/Makefile.depend head/usr.bin/ypcat/Makefile.depend head/usr.bin/ypmatch/Makefile.depend head/usr.bin/ypwhich/Makefile.depend head/usr.bin/zstd/Makefile.depend head/usr.sbin/ac/Makefile.depend head/usr.sbin/accton/Makefile.depend head/usr.sbin/acpi/acpiconf/Makefile.depend head/usr.sbin/acpi/acpidb/Makefile.depend head/usr.sbin/acpi/acpidump/Makefile.depend head/usr.sbin/acpi/iasl/Makefile.depend head/usr.sbin/amd/amd/Makefile.depend head/usr.sbin/amd/amq/Makefile.depend head/usr.sbin/amd/fixmount/Makefile.depend head/usr.sbin/amd/fsinfo/Makefile.depend head/usr.sbin/amd/hlfsd/Makefile.depend head/usr.sbin/amd/mk-amd-map/Makefile.depend head/usr.sbin/amd/pawd/Makefile.depend head/usr.sbin/amd/wire-test/Makefile.depend head/usr.sbin/ancontrol/Makefile.depend head/usr.sbin/apm/Makefile.depend head/usr.sbin/apmd/Makefile.depend head/usr.sbin/arp/Makefile.depend head/usr.sbin/asf/Makefile.depend head/usr.sbin/audit/Makefile.depend head/usr.sbin/auditd/Makefile.depend head/usr.sbin/auditdistd/Makefile.depend head/usr.sbin/auditreduce/Makefile.depend head/usr.sbin/authpf/Makefile.depend head/usr.sbin/autofs/Makefile.depend head/usr.sbin/bhyve/Makefile.depend head/usr.sbin/bhyvectl/Makefile.depend head/usr.sbin/bhyveload/Makefile.depend head/usr.sbin/binmiscctl/Makefile.depend head/usr.sbin/blacklistctl/Makefile.depend head/usr.sbin/blacklistd/Makefile.depend head/usr.sbin/bluetooth/ath3kfw/Makefile.depend head/usr.sbin/bluetooth/bcmfw/Makefile.depend head/usr.sbin/bluetooth/bt3cfw/Makefile.depend head/usr.sbin/bluetooth/bthidcontrol/Makefile.depend head/usr.sbin/bluetooth/bthidd/Makefile.depend head/usr.sbin/bluetooth/btpand/Makefile.depend head/usr.sbin/bluetooth/hccontrol/Makefile.depend head/usr.sbin/bluetooth/hcsecd/Makefile.depend head/usr.sbin/bluetooth/hcseriald/Makefile.depend head/usr.sbin/bluetooth/l2control/Makefile.depend head/usr.sbin/bluetooth/l2ping/Makefile.depend head/usr.sbin/bluetooth/rfcomm_pppd/Makefile.depend head/usr.sbin/bluetooth/sdpcontrol/Makefile.depend head/usr.sbin/bluetooth/sdpd/Makefile.depend head/usr.sbin/boot0cfg/Makefile.depend head/usr.sbin/bootparamd/bootparamd/Makefile.depend head/usr.sbin/bootparamd/callbootd/Makefile.depend head/usr.sbin/bsdinstall/distextract/Makefile.depend head/usr.sbin/bsdinstall/distfetch/Makefile.depend head/usr.sbin/bsdinstall/partedit/Makefile.depend head/usr.sbin/bsnmpd/bsnmpd/Makefile.depend head/usr.sbin/bsnmpd/gensnmptree/Makefile.depend head/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile.depend head/usr.sbin/bsnmpd/modules/snmp_hast/Makefile.depend head/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile.depend head/usr.sbin/bsnmpd/modules/snmp_lm75/Makefile.depend head/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile.depend head/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile.depend head/usr.sbin/bsnmpd/modules/snmp_pf/Makefile.depend head/usr.sbin/bsnmpd/modules/snmp_target/Makefile.depend head/usr.sbin/bsnmpd/modules/snmp_usm/Makefile.depend head/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile.depend head/usr.sbin/bsnmpd/modules/snmp_wlan/Makefile.depend head/usr.sbin/bsnmpd/tools/bsnmptools/Makefile.depend head/usr.sbin/btxld/Makefile.depend head/usr.sbin/camdd/Makefile.depend head/usr.sbin/cdcontrol/Makefile.depend head/usr.sbin/chkgrp/Makefile.depend head/usr.sbin/chown/Makefile.depend head/usr.sbin/chroot/Makefile.depend head/usr.sbin/ckdist/Makefile.depend head/usr.sbin/clear_locks/Makefile.depend head/usr.sbin/config/Makefile.depend head/usr.sbin/cpucontrol/Makefile.depend head/usr.sbin/cron/cron/Makefile.depend head/usr.sbin/cron/crontab/Makefile.depend head/usr.sbin/crunch/crunchgen/Makefile.depend head/usr.sbin/crunch/crunchide/Makefile.depend head/usr.sbin/ctladm/Makefile.depend head/usr.sbin/ctld/Makefile.depend head/usr.sbin/ctm/ctm/Makefile.depend head/usr.sbin/ctm/ctm_dequeue/Makefile.depend head/usr.sbin/ctm/ctm_rmail/Makefile.depend head/usr.sbin/ctm/ctm_smail/Makefile.depend head/usr.sbin/cxgbetool/Makefile.depend head/usr.sbin/daemon/Makefile.depend head/usr.sbin/dconschat/Makefile.depend head/usr.sbin/devctl/Makefile.depend head/usr.sbin/devinfo/Makefile.depend head/usr.sbin/digictl/Makefile.depend head/usr.sbin/diskinfo/Makefile.depend head/usr.sbin/dumpcis/Makefile.depend head/usr.sbin/editmap/Makefile.depend head/usr.sbin/edquota/Makefile.depend head/usr.sbin/eeprom/Makefile.depend head/usr.sbin/efidp/Makefile.depend head/usr.sbin/efivar/Makefile.depend head/usr.sbin/extattr/Makefile.depend head/usr.sbin/extattrctl/Makefile.depend head/usr.sbin/fdcontrol/Makefile.depend head/usr.sbin/fdformat/Makefile.depend head/usr.sbin/fdread/Makefile.depend head/usr.sbin/fdwrite/Makefile.depend head/usr.sbin/fifolog/fifolog_create/Makefile.depend head/usr.sbin/fifolog/fifolog_reader/Makefile.depend head/usr.sbin/fifolog/fifolog_writer/Makefile.depend head/usr.sbin/flowctl/Makefile.depend head/usr.sbin/fmtree/Makefile.depend head/usr.sbin/fstyp/Makefile.depend head/usr.sbin/ftp-proxy/Makefile.depend head/usr.sbin/fwcontrol/Makefile.depend head/usr.sbin/getfmac/Makefile.depend head/usr.sbin/getpmac/Makefile.depend head/usr.sbin/gpioctl/Makefile.depend head/usr.sbin/gssd/Makefile.depend head/usr.sbin/gstat/Makefile.depend head/usr.sbin/hyperv/tools/kvp/Makefile.depend head/usr.sbin/hyperv/tools/vss/Makefile.depend head/usr.sbin/i2c/Makefile.depend head/usr.sbin/ifmcstat/Makefile.depend head/usr.sbin/inetd/Makefile.depend head/usr.sbin/iostat/Makefile.depend head/usr.sbin/iovctl/Makefile.depend head/usr.sbin/ip6addrctl/Makefile.depend head/usr.sbin/ipfwpcap/Makefile.depend head/usr.sbin/iscsid/Makefile.depend head/usr.sbin/jail/Makefile.depend head/usr.sbin/jexec/Makefile.depend head/usr.sbin/jls/Makefile.depend head/usr.sbin/kbdcontrol/Makefile.depend head/usr.sbin/kbdmap/Makefile.depend head/usr.sbin/keyserv/Makefile.depend head/usr.sbin/kgmon/Makefile.depend head/usr.sbin/kgzip/Makefile.depend head/usr.sbin/kldxref/Makefile.depend head/usr.sbin/lastlogin/Makefile.depend head/usr.sbin/lmcconfig/Makefile.depend head/usr.sbin/lpr/chkprintcap/Makefile.depend head/usr.sbin/lpr/filters.ru/koi2855/Makefile.depend head/usr.sbin/lpr/filters.ru/koi2alt/Makefile.depend head/usr.sbin/lpr/filters/Makefile.depend head/usr.sbin/lpr/lpc/Makefile.depend head/usr.sbin/lpr/lpd/Makefile.depend head/usr.sbin/lpr/lpq/Makefile.depend head/usr.sbin/lpr/lpr/Makefile.depend head/usr.sbin/lpr/lprm/Makefile.depend head/usr.sbin/lpr/lptest/Makefile.depend head/usr.sbin/lpr/pac/Makefile.depend head/usr.sbin/lptcontrol/Makefile.depend head/usr.sbin/mailstats/Makefile.depend head/usr.sbin/mailwrapper/Makefile.depend head/usr.sbin/makefs/Makefile.depend head/usr.sbin/makemap/Makefile.depend head/usr.sbin/memcontrol/Makefile.depend head/usr.sbin/mfiutil/Makefile.depend head/usr.sbin/mixer/Makefile.depend head/usr.sbin/mld6query/Makefile.depend head/usr.sbin/mlxcontrol/Makefile.depend head/usr.sbin/mount_smbfs/Makefile.depend head/usr.sbin/mountd/Makefile.depend head/usr.sbin/moused/Makefile.depend head/usr.sbin/mpsutil/Makefile.depend head/usr.sbin/mptable/Makefile.depend head/usr.sbin/mptutil/Makefile.depend head/usr.sbin/mtest/Makefile.depend head/usr.sbin/nandsim/Makefile.depend head/usr.sbin/nandtool/Makefile.depend head/usr.sbin/ndiscvt/Makefile.depend head/usr.sbin/ndp/Makefile.depend head/usr.sbin/newsyslog/Makefile.depend head/usr.sbin/nfscbd/Makefile.depend head/usr.sbin/nfsd/Makefile.depend head/usr.sbin/nfsdumpstate/Makefile.depend head/usr.sbin/nfsrevoke/Makefile.depend head/usr.sbin/nfsuserd/Makefile.depend head/usr.sbin/ngctl/Makefile.depend head/usr.sbin/nghook/Makefile.depend head/usr.sbin/nmtree/Makefile.depend head/usr.sbin/nologin/Makefile.depend head/usr.sbin/nscd/Makefile.depend head/usr.sbin/ntp/ntp-keygen/Makefile.depend head/usr.sbin/ntp/ntpd/Makefile.depend head/usr.sbin/ntp/ntpdate/Makefile.depend head/usr.sbin/ntp/ntpdc/Makefile.depend head/usr.sbin/ntp/ntpq/Makefile.depend head/usr.sbin/ntp/ntptime/Makefile.depend head/usr.sbin/ntp/sntp/Makefile.depend head/usr.sbin/ofwdump/Makefile.depend head/usr.sbin/pciconf/Makefile.depend head/usr.sbin/pkg/Makefile.depend head/usr.sbin/pmcannotate/Makefile.depend head/usr.sbin/pmccontrol/Makefile.depend head/usr.sbin/pmcstat/Makefile.depend head/usr.sbin/pmcstudy/Makefile.depend head/usr.sbin/pnpinfo/Makefile.depend head/usr.sbin/portsnap/make_index/Makefile.depend head/usr.sbin/portsnap/phttpget/Makefile.depend head/usr.sbin/powerd/Makefile.depend head/usr.sbin/ppp/Makefile.depend head/usr.sbin/pppctl/Makefile.depend head/usr.sbin/praliases/Makefile.depend head/usr.sbin/praudit/Makefile.depend head/usr.sbin/prometheus_sysctl_exporter/Makefile.depend head/usr.sbin/pstat/Makefile.depend head/usr.sbin/pw/Makefile.depend head/usr.sbin/pw/tests/Makefile.depend head/usr.sbin/pwd_mkdb/Makefile.depend head/usr.sbin/quot/Makefile.depend head/usr.sbin/quotaon/Makefile.depend head/usr.sbin/rarpd/Makefile.depend head/usr.sbin/repquota/Makefile.depend head/usr.sbin/rip6query/Makefile.depend head/usr.sbin/rmt/Makefile.depend head/usr.sbin/route6d/Makefile.depend head/usr.sbin/rpc.lockd/Makefile.depend head/usr.sbin/rpc.statd/Makefile.depend head/usr.sbin/rpc.umntall/Makefile.depend head/usr.sbin/rpc.yppasswdd/Makefile.depend head/usr.sbin/rpc.ypupdated/Makefile.depend head/usr.sbin/rpc.ypxfrd/Makefile.depend head/usr.sbin/rpcbind/Makefile.depend head/usr.sbin/rpcbind/tests/Makefile.depend head/usr.sbin/rrenumd/Makefile.depend head/usr.sbin/rtadvctl/Makefile.depend head/usr.sbin/rtadvd/Makefile.depend head/usr.sbin/rtprio/Makefile.depend head/usr.sbin/rtsold/Makefile.depend head/usr.sbin/rwhod/Makefile.depend head/usr.sbin/sa/Makefile.depend head/usr.sbin/sendmail/Makefile.depend head/usr.sbin/services_mkdb/Makefile.depend head/usr.sbin/sesutil/Makefile.depend head/usr.sbin/setfib/Makefile.depend head/usr.sbin/setfmac/Makefile.depend head/usr.sbin/setpmac/Makefile.depend head/usr.sbin/smbmsg/Makefile.depend head/usr.sbin/snapinfo/Makefile.depend head/usr.sbin/spray/Makefile.depend head/usr.sbin/syslogd/Makefile.depend head/usr.sbin/tcpdchk/Makefile.depend head/usr.sbin/tcpdmatch/Makefile.depend head/usr.sbin/tcpdrop/Makefile.depend head/usr.sbin/tcpdump/tcpdump/Makefile.depend head/usr.sbin/timed/timed/Makefile.depend head/usr.sbin/timed/timedc/Makefile.depend head/usr.sbin/traceroute/Makefile.depend head/usr.sbin/traceroute6/Makefile.depend head/usr.sbin/trpt/Makefile.depend head/usr.sbin/tzsetup/Makefile.depend head/usr.sbin/uathload/Makefile.depend head/usr.sbin/uefisign/Makefile.depend head/usr.sbin/ugidfw/Makefile.depend head/usr.sbin/uhsoctl/Makefile.depend head/usr.sbin/unbound/anchor/Makefile.depend head/usr.sbin/unbound/checkconf/Makefile.depend head/usr.sbin/unbound/control/Makefile.depend head/usr.sbin/unbound/daemon/Makefile.depend head/usr.sbin/usbconfig/Makefile.depend head/usr.sbin/usbdump/Makefile.depend head/usr.sbin/utx/Makefile.depend head/usr.sbin/vidcontrol/Makefile.depend head/usr.sbin/vipw/Makefile.depend head/usr.sbin/wake/Makefile.depend head/usr.sbin/watch/Makefile.depend head/usr.sbin/watchdogd/Makefile.depend head/usr.sbin/wlandebug/Makefile.depend head/usr.sbin/wpa/hostapd/Makefile.depend head/usr.sbin/wpa/hostapd_cli/Makefile.depend head/usr.sbin/wpa/ndis_events/Makefile.depend head/usr.sbin/wpa/wpa_cli/Makefile.depend head/usr.sbin/wpa/wpa_passphrase/Makefile.depend head/usr.sbin/wpa/wpa_supplicant/Makefile.depend head/usr.sbin/yp_mkdb/Makefile.depend head/usr.sbin/ypbind/Makefile.depend head/usr.sbin/ypldap/Makefile.depend head/usr.sbin/yppoll/Makefile.depend head/usr.sbin/yppush/Makefile.depend head/usr.sbin/ypserv/Makefile.depend head/usr.sbin/ypset/Makefile.depend head/usr.sbin/zic/zdump/Makefile.depend head/usr.sbin/zic/zic/Makefile.depend head/usr.sbin/zonectl/Makefile.depend Modified: head/bin/cat/Makefile.depend ============================================================================== --- head/bin/cat/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/bin/cat/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/bin/chflags/Makefile.depend ============================================================================== --- head/bin/chflags/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/bin/chflags/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/bin/chio/Makefile.depend ============================================================================== --- head/bin/chio/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/bin/chio/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/bin/chmod/Makefile.depend ============================================================================== --- head/bin/chmod/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/bin/chmod/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/bin/cp/Makefile.depend ============================================================================== --- head/bin/cp/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/bin/cp/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/bin/csh/Makefile.depend ============================================================================== --- head/bin/csh/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/bin/csh/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/arpa \ include/xlocale \ Modified: head/bin/date/Makefile.depend ============================================================================== --- head/bin/date/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/bin/date/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/protocols \ include/xlocale \ Modified: head/bin/dd/Makefile.depend ============================================================================== --- head/bin/dd/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/bin/dd/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/bin/df/Makefile.depend ============================================================================== --- head/bin/df/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/bin/df/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/bin/domainname/Makefile.depend ============================================================================== --- head/bin/domainname/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/bin/domainname/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/bin/echo/Makefile.depend ============================================================================== --- head/bin/echo/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/bin/echo/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/bin/ed/Makefile.depend ============================================================================== --- head/bin/ed/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/bin/ed/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/bin/expr/Makefile.depend ============================================================================== --- head/bin/expr/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/bin/expr/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/bin/getfacl/Makefile.depend ============================================================================== --- head/bin/getfacl/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/bin/getfacl/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/bin/hostname/Makefile.depend ============================================================================== --- head/bin/hostname/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/bin/hostname/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/bin/kenv/Makefile.depend ============================================================================== --- head/bin/kenv/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/bin/kenv/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/bin/kill/Makefile.depend ============================================================================== --- head/bin/kill/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/bin/kill/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/bin/ln/Makefile.depend ============================================================================== --- head/bin/ln/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/bin/ln/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/bin/ls/Makefile.depend ============================================================================== --- head/bin/ls/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/bin/ls/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/bin/mkdir/Makefile.depend ============================================================================== --- head/bin/mkdir/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/bin/mkdir/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/bin/mv/Makefile.depend ============================================================================== --- head/bin/mv/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/bin/mv/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/bin/pax/Makefile.depend ============================================================================== --- head/bin/pax/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/bin/pax/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/bin/pkill/Makefile.depend ============================================================================== --- head/bin/pkill/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/bin/pkill/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/bin/ps/Makefile.depend ============================================================================== --- head/bin/ps/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/bin/ps/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/bin/pwait/Makefile.depend ============================================================================== --- head/bin/pwait/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/bin/pwait/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/bin/pwd/Makefile.depend ============================================================================== --- head/bin/pwd/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/bin/pwd/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/bin/realpath/Makefile.depend ============================================================================== --- head/bin/realpath/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/bin/realpath/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ lib/${CSU_DIR} \ lib/libc \ Modified: head/bin/rm/Makefile.depend ============================================================================== --- head/bin/rm/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/bin/rm/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/bin/rmail/Makefile.depend ============================================================================== --- head/bin/rmail/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/bin/rmail/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/bin/rmdir/Makefile.depend ============================================================================== --- head/bin/rmdir/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/bin/rmdir/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/bin/setfacl/Makefile.depend ============================================================================== --- head/bin/setfacl/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/bin/setfacl/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/bin/sh/Makefile.depend ============================================================================== --- head/bin/sh/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/bin/sh/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/bin/sleep/Makefile.depend ============================================================================== --- head/bin/sleep/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/bin/sleep/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/bin/stty/Makefile.depend ============================================================================== --- head/bin/stty/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/bin/stty/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/bin/sync/Makefile.depend ============================================================================== --- head/bin/sync/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/bin/sync/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ lib/${CSU_DIR} \ lib/libc \ Modified: head/bin/test/Makefile.depend ============================================================================== --- head/bin/test/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/bin/test/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/bin/uuidgen/Makefile.depend ============================================================================== --- head/bin/uuidgen/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/bin/uuidgen/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ lib/${CSU_DIR} \ lib/libc \ Modified: head/cddl/lib/libavl/Makefile.depend ============================================================================== --- head/cddl/lib/libavl/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/cddl/lib/libavl/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ lib/${CSU_DIR} \ lib/libc \ Modified: head/cddl/lib/libctf/Makefile.depend ============================================================================== --- head/cddl/lib/libctf/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/cddl/lib/libctf/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/cddl/lib/libdtrace/Makefile.depend ============================================================================== --- head/cddl/lib/libdtrace/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/cddl/lib/libdtrace/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -4,7 +4,6 @@ DIRDEPS = \ cddl/lib/libctf \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/arpa \ include/xlocale \ Modified: head/cddl/lib/libnvpair/Makefile.depend ============================================================================== --- head/cddl/lib/libnvpair/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/cddl/lib/libnvpair/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/cddl/lib/libumem/Makefile.depend ============================================================================== --- head/cddl/lib/libumem/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/cddl/lib/libumem/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ lib/${CSU_DIR} \ lib/libc \ Modified: head/cddl/lib/libuutil/Makefile.depend ============================================================================== --- head/cddl/lib/libuutil/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/cddl/lib/libuutil/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/cddl/lib/libzfs/Makefile.depend ============================================================================== --- head/cddl/lib/libzfs/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/cddl/lib/libzfs/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -8,7 +8,6 @@ DIRDEPS = \ cddl/lib/libuutil \ cddl/lib/libzfs_core \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/cddl/lib/libzfs_core/Makefile.depend ============================================================================== --- head/cddl/lib/libzfs_core/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/cddl/lib/libzfs_core/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -4,7 +4,6 @@ DIRDEPS = \ cddl/lib/libnvpair \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/cddl/lib/libzpool/Makefile.depend ============================================================================== --- head/cddl/lib/libzpool/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/cddl/lib/libzpool/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -6,7 +6,6 @@ DIRDEPS = \ cddl/lib/libnvpair \ cddl/lib/libumem \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/cddl/sbin/zfs/Makefile.depend ============================================================================== --- head/cddl/sbin/zfs/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/cddl/sbin/zfs/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -9,7 +9,6 @@ DIRDEPS = \ cddl/lib/libzfs \ cddl/lib/libzfs_core \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/cddl/sbin/zpool/Makefile.depend ============================================================================== --- head/cddl/sbin/zpool/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/cddl/sbin/zpool/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -9,7 +9,6 @@ DIRDEPS = \ cddl/lib/libzfs \ cddl/lib/libzfs_core \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/cddl/usr.bin/ctfconvert/Makefile.depend ============================================================================== --- head/cddl/usr.bin/ctfconvert/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/cddl/usr.bin/ctfconvert/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/cddl/usr.bin/ctfdump/Makefile.depend ============================================================================== --- head/cddl/usr.bin/ctfdump/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/cddl/usr.bin/ctfdump/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/cddl/usr.bin/ctfmerge/Makefile.depend ============================================================================== --- head/cddl/usr.bin/ctfmerge/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/cddl/usr.bin/ctfmerge/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/cddl/usr.bin/zinject/Makefile.depend ============================================================================== --- head/cddl/usr.bin/zinject/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/cddl/usr.bin/zinject/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -10,7 +10,6 @@ DIRDEPS = \ cddl/lib/libzfs_core \ cddl/lib/libzpool \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/cddl/usr.bin/zstreamdump/Makefile.depend ============================================================================== --- head/cddl/usr.bin/zstreamdump/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/cddl/usr.bin/zstreamdump/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -7,7 +7,6 @@ DIRDEPS = \ cddl/lib/libumem \ cddl/lib/libzpool \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/cddl/usr.bin/ztest/Makefile.depend ============================================================================== --- head/cddl/usr.bin/ztest/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/cddl/usr.bin/ztest/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -10,7 +10,6 @@ DIRDEPS = \ cddl/lib/libzfs_core \ cddl/lib/libzpool \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/cddl/usr.sbin/dtrace/Makefile.depend ============================================================================== --- head/cddl/usr.sbin/dtrace/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/cddl/usr.sbin/dtrace/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -5,7 +5,6 @@ DIRDEPS = \ cddl/lib/libctf \ cddl/lib/libdtrace \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/cddl/usr.sbin/dtrace/tests/common/io/Makefile.depend ============================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/io/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/cddl/usr.sbin/dtrace/tests/common/io/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ lib/${CSU_DIR} \ lib/libc \ Modified: head/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile.depend ============================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ lib/${CSU_DIR} \ lib/libc \ Modified: head/cddl/usr.sbin/dtrace/tests/common/json/Makefile.depend ============================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/json/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/cddl/usr.sbin/dtrace/tests/common/json/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ lib/${CSU_DIR} \ lib/libc \ Modified: head/cddl/usr.sbin/dtrace/tests/common/pid/Makefile.depend ============================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/pid/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/cddl/usr.sbin/dtrace/tests/common/pid/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ lib/${CSU_DIR} \ lib/libc \ Modified: head/cddl/usr.sbin/dtrace/tests/common/probes/Makefile.depend ============================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/probes/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/cddl/usr.sbin/dtrace/tests/common/probes/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -2,6 +2,11 @@ # Autogenerated - do NOT edit! DIRDEPS = \ + gnu/lib/csu \ + include \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ .include Modified: head/cddl/usr.sbin/dtrace/tests/common/proc/Makefile.depend ============================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/proc/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/cddl/usr.sbin/dtrace/tests/common/proc/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile.depend ============================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ Modified: head/cddl/usr.sbin/dtrace/tests/common/raise/Makefile.depend ============================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/raise/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/cddl/usr.sbin/dtrace/tests/common/raise/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ lib/${CSU_DIR} \ lib/libc \ Modified: head/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile.depend ============================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ lib/${CSU_DIR} \ lib/libc \ Modified: head/cddl/usr.sbin/dtrace/tests/common/stop/Makefile.depend ============================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/stop/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/cddl/usr.sbin/dtrace/tests/common/stop/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ lib/${CSU_DIR} \ lib/libc \ Modified: head/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile.depend ============================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ lib/${CSU_DIR} \ lib/libc \ Modified: head/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile.depend ============================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ lib/${CSU_DIR} \ lib/libc \ Modified: head/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile.depend ============================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ lib/${CSU_DIR} \ lib/libc \ Modified: head/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile.depend ============================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ lib/${CSU_DIR} \ lib/libc \ Modified: head/cddl/usr.sbin/lockstat/Makefile.depend ============================================================================== --- head/cddl/usr.sbin/lockstat/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/cddl/usr.sbin/lockstat/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -5,7 +5,6 @@ DIRDEPS = \ cddl/lib/libctf \ cddl/lib/libdtrace \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/cddl/usr.sbin/plockstat/Makefile.depend ============================================================================== --- head/cddl/usr.sbin/plockstat/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/cddl/usr.sbin/plockstat/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -5,7 +5,6 @@ DIRDEPS = \ cddl/lib/libctf \ cddl/lib/libdtrace \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/cddl/usr.sbin/zdb/Makefile.depend ============================================================================== --- head/cddl/usr.sbin/zdb/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/cddl/usr.sbin/zdb/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -10,7 +10,6 @@ DIRDEPS = \ cddl/lib/libzfs_core \ cddl/lib/libzpool \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/cddl/usr.sbin/zfsd/Makefile.depend ============================================================================== --- head/cddl/usr.sbin/zfsd/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/cddl/usr.sbin/zfsd/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -9,7 +9,6 @@ DIRDEPS = \ cddl/lib/libzfs \ cddl/lib/libzfs_core \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/cddl/usr.sbin/zhack/Makefile.depend ============================================================================== --- head/cddl/usr.sbin/zhack/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/cddl/usr.sbin/zhack/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -10,7 +10,6 @@ DIRDEPS = \ cddl/lib/libzfs_core \ cddl/lib/libzpool \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/contrib/ofed/usr.bin/ibaddr/Makefile.depend ============================================================================== --- head/contrib/ofed/usr.bin/ibaddr/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/contrib/ofed/usr.bin/ibaddr/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -6,7 +6,6 @@ DIRDEPS = \ contrib/ofed/usr.lib/libibmad \ contrib/ofed/usr.lib/libibumad \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/arpa \ include/xlocale \ Modified: head/contrib/ofed/usr.bin/ibnetdiscover/Makefile.depend ============================================================================== --- head/contrib/ofed/usr.bin/ibnetdiscover/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/contrib/ofed/usr.bin/ibnetdiscover/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -7,7 +7,6 @@ DIRDEPS = \ contrib/ofed/usr.lib/libibumad \ contrib/ofed/usr.lib/libosmcomp \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/contrib/ofed/usr.bin/ibping/Makefile.depend ============================================================================== --- head/contrib/ofed/usr.bin/ibping/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/contrib/ofed/usr.bin/ibping/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -6,7 +6,6 @@ DIRDEPS = \ contrib/ofed/usr.lib/libibmad \ contrib/ofed/usr.lib/libibumad \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/contrib/ofed/usr.bin/ibportstate/Makefile.depend ============================================================================== --- head/contrib/ofed/usr.bin/ibportstate/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/contrib/ofed/usr.bin/ibportstate/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -6,7 +6,6 @@ DIRDEPS = \ contrib/ofed/usr.lib/libibmad \ contrib/ofed/usr.lib/libibumad \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/contrib/ofed/usr.bin/ibroute/Makefile.depend ============================================================================== --- head/contrib/ofed/usr.bin/ibroute/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/contrib/ofed/usr.bin/ibroute/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -7,7 +7,6 @@ DIRDEPS = \ contrib/ofed/usr.lib/libibumad \ contrib/ofed/usr.lib/libosmcomp \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/contrib/ofed/usr.bin/ibsendtrap/Makefile.depend ============================================================================== --- head/contrib/ofed/usr.bin/ibsendtrap/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/contrib/ofed/usr.bin/ibsendtrap/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -6,7 +6,6 @@ DIRDEPS = \ contrib/ofed/usr.lib/libibmad \ contrib/ofed/usr.lib/libibumad \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/contrib/ofed/usr.bin/ibstat/Makefile.depend ============================================================================== --- head/contrib/ofed/usr.bin/ibstat/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/contrib/ofed/usr.bin/ibstat/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -5,7 +5,6 @@ DIRDEPS = \ contrib/ofed/usr.lib/libibcommon \ contrib/ofed/usr.lib/libibumad \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/contrib/ofed/usr.bin/ibsysstat/Makefile.depend ============================================================================== --- head/contrib/ofed/usr.bin/ibsysstat/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/contrib/ofed/usr.bin/ibsysstat/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -6,7 +6,6 @@ DIRDEPS = \ contrib/ofed/usr.lib/libibmad \ contrib/ofed/usr.lib/libibumad \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/contrib/ofed/usr.bin/ibtracert/Makefile.depend ============================================================================== --- head/contrib/ofed/usr.bin/ibtracert/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/contrib/ofed/usr.bin/ibtracert/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -7,7 +7,6 @@ DIRDEPS = \ contrib/ofed/usr.lib/libibumad \ contrib/ofed/usr.lib/libosmcomp \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/contrib/ofed/usr.bin/opensm/Makefile.depend ============================================================================== --- head/contrib/ofed/usr.bin/opensm/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/contrib/ofed/usr.bin/opensm/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -8,7 +8,6 @@ DIRDEPS = \ contrib/ofed/usr.lib/libosmcomp \ contrib/ofed/usr.lib/libosmvendor \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/arpa \ include/xlocale \ Modified: head/contrib/ofed/usr.bin/osmtest/Makefile.depend ============================================================================== --- head/contrib/ofed/usr.bin/osmtest/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/contrib/ofed/usr.bin/osmtest/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -9,7 +9,6 @@ DIRDEPS = \ contrib/ofed/usr.lib/libosmcomp \ contrib/ofed/usr.lib/libosmvendor \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/arpa \ include/xlocale \ Modified: head/contrib/ofed/usr.bin/perfquery/Makefile.depend ============================================================================== --- head/contrib/ofed/usr.bin/perfquery/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/contrib/ofed/usr.bin/perfquery/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -6,7 +6,6 @@ DIRDEPS = \ contrib/ofed/usr.lib/libibmad \ contrib/ofed/usr.lib/libibumad \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/contrib/ofed/usr.bin/saquery/Makefile.depend ============================================================================== --- head/contrib/ofed/usr.bin/saquery/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/contrib/ofed/usr.bin/saquery/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -9,7 +9,6 @@ DIRDEPS = \ contrib/ofed/usr.lib/libosmcomp \ contrib/ofed/usr.lib/libosmvendor \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/arpa \ include/xlocale \ Modified: head/contrib/ofed/usr.bin/sminfo/Makefile.depend ============================================================================== --- head/contrib/ofed/usr.bin/sminfo/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/contrib/ofed/usr.bin/sminfo/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -6,7 +6,6 @@ DIRDEPS = \ contrib/ofed/usr.lib/libibmad \ contrib/ofed/usr.lib/libibumad \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/contrib/ofed/usr.bin/smpdump/Makefile.depend ============================================================================== --- head/contrib/ofed/usr.bin/smpdump/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/contrib/ofed/usr.bin/smpdump/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -6,7 +6,6 @@ DIRDEPS = \ contrib/ofed/usr.lib/libibmad \ contrib/ofed/usr.lib/libibumad \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/contrib/ofed/usr.bin/smpquery/Makefile.depend ============================================================================== --- head/contrib/ofed/usr.bin/smpquery/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/contrib/ofed/usr.bin/smpquery/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -7,7 +7,6 @@ DIRDEPS = \ contrib/ofed/usr.lib/libibumad \ contrib/ofed/usr.lib/libosmcomp \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/contrib/ofed/usr.bin/vendstat/Makefile.depend ============================================================================== --- head/contrib/ofed/usr.bin/vendstat/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/contrib/ofed/usr.bin/vendstat/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -6,7 +6,6 @@ DIRDEPS = \ contrib/ofed/usr.lib/libibmad \ contrib/ofed/usr.lib/libibumad \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/contrib/ofed/usr.lib/libcxgb4/Makefile.depend ============================================================================== --- head/contrib/ofed/usr.lib/libcxgb4/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/contrib/ofed/usr.lib/libcxgb4/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -4,7 +4,6 @@ DIRDEPS = \ contrib/ofed/usr.lib/libibverbs \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/arpa \ include/xlocale \ Modified: head/contrib/ofed/usr.lib/libibcm/Makefile.depend ============================================================================== --- head/contrib/ofed/usr.lib/libibcm/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/contrib/ofed/usr.lib/libibcm/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -4,7 +4,6 @@ DIRDEPS = \ contrib/ofed/usr.lib/libibverbs \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/contrib/ofed/usr.lib/libibcommon/Makefile.depend ============================================================================== --- head/contrib/ofed/usr.lib/libibcommon/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/contrib/ofed/usr.lib/libibcommon/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/contrib/ofed/usr.lib/libibmad/Makefile.depend ============================================================================== --- head/contrib/ofed/usr.lib/libibmad/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/contrib/ofed/usr.lib/libibmad/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -5,7 +5,6 @@ DIRDEPS = \ contrib/ofed/usr.lib/libibcommon \ contrib/ofed/usr.lib/libibumad \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/arpa \ include/xlocale \ Modified: head/contrib/ofed/usr.lib/libibumad/Makefile.depend ============================================================================== --- head/contrib/ofed/usr.lib/libibumad/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/contrib/ofed/usr.lib/libibumad/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -4,7 +4,6 @@ DIRDEPS = \ contrib/ofed/usr.lib/libibcommon \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/contrib/ofed/usr.lib/libibverbs/Makefile.depend ============================================================================== --- head/contrib/ofed/usr.lib/libibverbs/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/contrib/ofed/usr.lib/libibverbs/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/contrib/ofed/usr.lib/libmlx4/Makefile.depend ============================================================================== --- head/contrib/ofed/usr.lib/libmlx4/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/contrib/ofed/usr.lib/libmlx4/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -4,7 +4,6 @@ DIRDEPS = \ contrib/ofed/usr.lib/libibverbs \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/contrib/ofed/usr.lib/libmthca/Makefile.depend ============================================================================== --- head/contrib/ofed/usr.lib/libmthca/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/contrib/ofed/usr.lib/libmthca/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -4,7 +4,6 @@ DIRDEPS = \ contrib/ofed/usr.lib/libibverbs \ gnu/lib/csu \ - gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ Modified: head/contrib/ofed/usr.lib/libopensm/Makefile.depend ============================================================================== --- head/contrib/ofed/usr.lib/libopensm/Makefile.depend Tue Oct 31 00:04:07 2017 (r325187) +++ head/contrib/ofed/usr.lib/libopensm/Makefile.depend Tue Oct 31 00:07:04 2017 (r325188) @@ -3,7 +3,6 @@ DIRDEPS = \ gnu/lib/csu \ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Tue Oct 31 00:07:39 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 6D265E2FFA2; Tue, 31 Oct 2017 00:07:39 +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 45C317CB65; Tue, 31 Oct 2017 00:07:39 +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 v9V07c2S047527; Tue, 31 Oct 2017 00:07:38 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9V07bKA047522; Tue, 31 Oct 2017 00:07:37 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710310007.v9V07bKA047522@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 31 Oct 2017 00:07:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325189 - in head/gnu/usr.bin/binutils: . as ld objcopy objdump X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: in head/gnu/usr.bin/binutils: . as ld objcopy objdump X-SVN-Commit-Revision: 325189 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: Tue, 31 Oct 2017 00:07:39 -0000 Author: bdrewery Date: Tue Oct 31 00:07:37 2017 New Revision: 325189 URL: https://svnweb.freebsd.org/changeset/base/325189 Log: Rename RELTOP since it will mean something else globally. Sponsored by: Dell EMC Isilon Modified: head/gnu/usr.bin/binutils/Makefile.inc0 head/gnu/usr.bin/binutils/as/Makefile head/gnu/usr.bin/binutils/ld/Makefile head/gnu/usr.bin/binutils/objcopy/Makefile head/gnu/usr.bin/binutils/objdump/Makefile Modified: head/gnu/usr.bin/binutils/Makefile.inc0 ============================================================================== --- head/gnu/usr.bin/binutils/Makefile.inc0 Tue Oct 31 00:07:04 2017 (r325188) +++ head/gnu/usr.bin/binutils/Makefile.inc0 Tue Oct 31 00:07:37 2017 (r325189) @@ -21,12 +21,12 @@ TARGET_TUPLE?= ${BINUTILS_ARCH}-${TARGET_VENDOR}-${TAR TARGET_BIG_ENDIAN=t .endif -# RELTOP is the relative path to this point in the source or object +# GNURELTOP is the relative path to this point in the source or object # tree, from any subdirectory of same. It gets extra "../" prefixes # added to it as we descend into subdirectories. -RELTOP:= .. +GNURELTOP:= .. -RELSRC= ${RELTOP}/../../../contrib/binutils +RELSRC= ${GNURELTOP}/../../../contrib/binutils SRCDIR= ${.CURDIR}/${RELSRC} .if ${TARGET_CPUARCH} == "arm" || ${TARGET_CPUARCH} == "i386" || \ @@ -39,8 +39,8 @@ CFLAGS+= -DBFD_DEFAULT_TARGET_SIZE=64 CFLAGS+= -I. CFLAGS+= -I${.CURDIR} -CFLAGS+= -I${.CURDIR}/${RELTOP}/libbfd -CFLAGS+= -I${.OBJDIR}/${RELTOP}/libbfd +CFLAGS+= -I${.CURDIR}/${GNURELTOP}/libbfd +CFLAGS+= -I${.OBJDIR}/${GNURELTOP}/libbfd CFLAGS+= -I${SRCDIR}/include ARCHS= ${TARGET_CPUARCH} Modified: head/gnu/usr.bin/binutils/as/Makefile ============================================================================== --- head/gnu/usr.bin/binutils/as/Makefile Tue Oct 31 00:07:04 2017 (r325188) +++ head/gnu/usr.bin/binutils/as/Makefile Tue Oct 31 00:07:37 2017 (r325189) @@ -95,9 +95,9 @@ CFLAGS+= -I${.CURDIR} -I${.CURDIR}/${TARGET_CPUARCH}-f NO_SHARED?= yes .endif -DPADD= ${RELTOP}/libbfd/libbfd.a -DPADD+= ${RELTOP}/libiberty/libiberty.a -DPADD+= ${RELTOP}/libopcodes/libopcodes.a +DPADD= ${GNURELTOP}/libbfd/libbfd.a +DPADD+= ${GNURELTOP}/libiberty/libiberty.a +DPADD+= ${GNURELTOP}/libopcodes/libopcodes.a LDADD= ${DPADD} .include Modified: head/gnu/usr.bin/binutils/ld/Makefile ============================================================================== --- head/gnu/usr.bin/binutils/ld/Makefile Tue Oct 31 00:07:04 2017 (r325188) +++ head/gnu/usr.bin/binutils/ld/Makefile Tue Oct 31 00:07:37 2017 (r325189) @@ -41,8 +41,8 @@ CFLAGS+= -I${SRCDIR}/ld -I${SRCDIR}/bfd .if ${MK_SHARED_TOOLCHAIN} == "no" NO_SHARED?= yes .endif -DPADD= ${RELTOP}/libbfd/libbfd.a -DPADD+= ${RELTOP}/libiberty/libiberty.a +DPADD= ${GNURELTOP}/libbfd/libbfd.a +DPADD+= ${GNURELTOP}/libiberty/libiberty.a LDADD= ${DPADD} CLEANDIRS+= ldscripts CLEANFILES+= ldemul-list.h stringify.sed Modified: head/gnu/usr.bin/binutils/objcopy/Makefile ============================================================================== --- head/gnu/usr.bin/binutils/objcopy/Makefile Tue Oct 31 00:07:04 2017 (r325188) +++ head/gnu/usr.bin/binutils/objcopy/Makefile Tue Oct 31 00:07:37 2017 (r325189) @@ -7,11 +7,11 @@ PROG= objcopy SRCS= objcopy.c not-strip.c CFLAGS+= -D_GNU_SOURCE -CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils +CFLAGS+= -I${.CURDIR}/${GNURELTOP}/libbinutils CFLAGS+= -I${SRCDIR}/binutils -I${SRCDIR}/bfd -DPADD= ${RELTOP}/libbinutils/libbinutils.a -DPADD+= ${RELTOP}/libbfd/libbfd.a -DPADD+= ${RELTOP}/libiberty/libiberty.a +DPADD= ${GNURELTOP}/libbinutils/libbinutils.a +DPADD+= ${GNURELTOP}/libbfd/libbfd.a +DPADD+= ${GNURELTOP}/libiberty/libiberty.a LDADD= ${DPADD} .include Modified: head/gnu/usr.bin/binutils/objdump/Makefile ============================================================================== --- head/gnu/usr.bin/binutils/objdump/Makefile Tue Oct 31 00:07:04 2017 (r325188) +++ head/gnu/usr.bin/binutils/objdump/Makefile Tue Oct 31 00:07:37 2017 (r325189) @@ -7,13 +7,13 @@ PROG= objdump SRCS= objdump.c prdbg.c CFLAGS+= -D_GNU_SOURCE -CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils +CFLAGS+= -I${.CURDIR}/${GNURELTOP}/libbinutils CFLAGS+= -I${SRCDIR}/binutils CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\" -DPADD= ${RELTOP}/libbinutils/libbinutils.a -DPADD+= ${RELTOP}/libopcodes/libopcodes.a -DPADD+= ${RELTOP}/libbfd/libbfd.a -DPADD+= ${RELTOP}/libiberty/libiberty.a +DPADD= ${GNURELTOP}/libbinutils/libbinutils.a +DPADD+= ${GNURELTOP}/libopcodes/libopcodes.a +DPADD+= ${GNURELTOP}/libbfd/libbfd.a +DPADD+= ${GNURELTOP}/libiberty/libiberty.a LDADD= ${DPADD} .include From owner-svn-src-all@freebsd.org Tue Oct 31 00:07: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 B34D9E3A005; Tue, 31 Oct 2017 00:07:43 +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 3675A7CBAB; Tue, 31 Oct 2017 00:07:42 +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 v9V07f6K047573; Tue, 31 Oct 2017 00:07:41 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9V07fol047572; Tue, 31 Oct 2017 00:07:41 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710310007.v9V07fol047572@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 31 Oct 2017 00:07:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325190 - head/share/mk X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/share/mk X-SVN-Commit-Revision: 325190 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: Tue, 31 Oct 2017 00:07:44 -0000 Author: bdrewery Date: Tue Oct 31 00:07:41 2017 New Revision: 325190 URL: https://svnweb.freebsd.org/changeset/base/325190 Log: Add RELOBJTOP and RELSRCTOP for relative paths. RELSRCTOP is likely not as useful since make will always be running from inside of .OBJDIR and using something like ${.CURDIR}/${RELSRCTOP} is not redundant for ${SRCTOP}. Sponsored by: Dell EMC Isilon Modified: head/share/mk/src.sys.env.mk Modified: head/share/mk/src.sys.env.mk ============================================================================== --- head/share/mk/src.sys.env.mk Tue Oct 31 00:07:37 2017 (r325189) +++ head/share/mk/src.sys.env.mk Tue Oct 31 00:07:41 2017 (r325190) @@ -6,10 +6,14 @@ SRCTOP:= ${.PARSEDIR:tA:H:H} .if ${.CURDIR} == ${SRCTOP} -RELDIR = . +RELDIR= . +RELTOP= . .elif ${.CURDIR:M${SRCTOP}/*} -RELDIR := ${.CURDIR:S,${SRCTOP}/,,} +RELDIR:= ${.CURDIR:S,${SRCTOP}/,,} .endif +RELTOP?= ${RELDIR:C,[^/]+,..,g} +RELOBJTOP?= ${RELTOP} +RELSRCTOP?= ${RELTOP} # site customizations that do not depend on anything! SRC_ENV_CONF?= /etc/src-env.conf From owner-svn-src-all@freebsd.org Tue Oct 31 00:26: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 94C4EE3A896; Tue, 31 Oct 2017 00:26:43 +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 7163E7D67C; Tue, 31 Oct 2017 00:26: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 v9V0QgSE055857; Tue, 31 Oct 2017 00:26:42 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9V0Qg6C055855; Tue, 31 Oct 2017 00:26:42 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710310026.v9V0Qg6C055855@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 31 Oct 2017 00:26:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325191 - head/share/mk X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/share/mk X-SVN-Commit-Revision: 325191 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: Tue, 31 Oct 2017 00:26:43 -0000 Author: bdrewery Date: Tue Oct 31 00:26:42 2017 New Revision: 325191 URL: https://svnweb.freebsd.org/changeset/base/325191 Log: Move some objdir handling (OBJROOT/OBJTOP) out of DIRDEPS_BUILD-only files. Sponsored by: Dell EMC Isilon Added: head/share/mk/src.sys.obj.mk (contents, props changed) Modified: head/share/mk/local.meta.sys.mk Modified: head/share/mk/local.meta.sys.mk ============================================================================== --- head/share/mk/local.meta.sys.mk Tue Oct 31 00:07:41 2017 (r325190) +++ head/share/mk/local.meta.sys.mk Tue Oct 31 00:26:42 2017 (r325191) @@ -7,36 +7,10 @@ # we need this until there is an alternative MK_INSTALL_AS_USER= yes -_default_makeobjdir=$${.CURDIR:S,^$${SRCTOP},$${OBJTOP},} +# Default OBJROOT/MAKEOBJDIR handled in local.sys.obj.mk +.include -.if empty(OBJROOT) || ${.MAKE.LEVEL} == 0 -.if defined(MAKEOBJDIRPREFIX) && !empty(MAKEOBJDIRPREFIX) -# put things approximately where they want -OBJROOT:=${MAKEOBJDIRPREFIX}${SRCTOP}/ -MAKEOBJDIRPREFIX= -.export MAKEOBJDIRPREFIX -.endif -.if empty(MAKEOBJDIR) -# OBJTOP set below -MAKEOBJDIR=${_default_makeobjdir} -# export but do not track -.export-env MAKEOBJDIR -# Expand for our own use -MAKEOBJDIR:= ${MAKEOBJDIR} -.endif -.if !empty(SB) -SB_OBJROOT ?= ${SB}/obj/ -# this is what we use below -OBJROOT ?= ${SB_OBJROOT} -.endif -OBJROOT ?= /usr/obj${SRCTOP}/ -.if ${OBJROOT:M*/} != "" -OBJROOT:= ${OBJROOT:H:tA}/ -.else -OBJROOT:= ${OBJROOT:H:tA}/${OBJROOT:T} -.endif -.export OBJROOT SRCTOP - +.if !defined(HOST_TARGET) # we need HOST_TARGET etc below. .include .export HOST_TARGET Added: head/share/mk/src.sys.obj.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/share/mk/src.sys.obj.mk Tue Oct 31 00:26:42 2017 (r325191) @@ -0,0 +1,38 @@ +# $FreeBSD$ + +_default_makeobjdir= $${.CURDIR:S,^$${SRCTOP},$${OBJTOP},} + +.if empty(OBJROOT) || ${.MAKE.LEVEL} == 0 +.if defined(MAKEOBJDIRPREFIX) && !empty(MAKEOBJDIRPREFIX) +# put things approximately where they want +OBJROOT:= ${MAKEOBJDIRPREFIX}${SRCTOP}/ +MAKEOBJDIRPREFIX= +.export MAKEOBJDIRPREFIX +.endif +.if empty(MAKEOBJDIR) +# OBJTOP set below +MAKEOBJDIR= ${_default_makeobjdir} +# export but do not track +.export-env MAKEOBJDIR +# Expand for our own use +MAKEOBJDIR:= ${MAKEOBJDIR} +.endif +.if !empty(SB) +SB_OBJROOT?= ${SB}/obj/ +# this is what we use below +OBJROOT?= ${SB_OBJROOT} +.endif +OBJROOT?= /usr/obj${SRCTOP}/ +.if ${OBJROOT:M*/} != "" +OBJROOT:= ${OBJROOT:H:tA}/ +.else +OBJROOT:= ${OBJROOT:H:tA}/${OBJROOT:T} +.endif +.export OBJROOT SRCTOP +.endif + +.if defined(MAKEOBJDIR) +.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 Tue Oct 31 01:43: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 A0B2DE461F5; Tue, 31 Oct 2017 01:43:37 +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 6E9418008E; Tue, 31 Oct 2017 01:43: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 v9V1hai1089064; Tue, 31 Oct 2017 01:43:36 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9V1haa9089063; Tue, 31 Oct 2017 01:43:36 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710310143.v9V1haa9089063@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 31 Oct 2017 01:43:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325192 - head/etc/mtree X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/etc/mtree X-SVN-Commit-Revision: 325192 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: Tue, 31 Oct 2017 01:43:37 -0000 Author: bdrewery Date: Tue Oct 31 01:43:36 2017 New Revision: 325192 URL: https://svnweb.freebsd.org/changeset/base/325192 Log: Fix installworld/distrib-dirs for pathconv after r325186. Sponsored by: Dell EMC Isilon Modified: head/etc/mtree/BSD.tests.dist Modified: head/etc/mtree/BSD.tests.dist ============================================================================== --- head/etc/mtree/BSD.tests.dist Tue Oct 31 00:26:42 2017 (r325191) +++ head/etc/mtree/BSD.tests.dist Tue Oct 31 01:43:36 2017 (r325192) @@ -358,6 +358,8 @@ dlopen .. .. + libpathconv + .. libutil .. libxo From owner-svn-src-all@freebsd.org Tue Oct 31 01:45:15 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 93DBAE463A9; Tue, 31 Oct 2017 01:45:15 +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 61C3F80266; Tue, 31 Oct 2017 01:45:15 +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 v9V1jE04089192; Tue, 31 Oct 2017 01:45:14 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9V1jE6N089191; Tue, 31 Oct 2017 01:45:14 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710310145.v9V1jE6N089191@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 31 Oct 2017 01:45:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325193 - head X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 325193 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: Tue, 31 Oct 2017 01:45:15 -0000 Author: bdrewery Date: Tue Oct 31 01:45:14 2017 New Revision: 325193 URL: https://svnweb.freebsd.org/changeset/base/325193 Log: cleanworld: No need to cleandir if MK_AUTO_OBJ is enabled. Sponsored by: Dell EMC Isilon Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Tue Oct 31 01:43:36 2017 (r325192) +++ head/Makefile.inc1 Tue Oct 31 01:45:14 2017 (r325193) @@ -2752,7 +2752,8 @@ builddtb: .PHONY # # It is expected that BW_CANONICALOBJDIR == the CANONICALOBJDIR as would be # created by bsd.obj.mk, except that we don't want to .include that file -# in this makefile. +# in this makefile. We don't do a cleandir walk if MK_AUTO_OBJ is yes +# since it is not possible for files to land in the wrong place. # BW_CANONICALOBJDIR:=${OBJTREE}${.CURDIR} cleanworld: .PHONY @@ -2761,9 +2762,11 @@ cleanworld: .PHONY -chflags -R 0 ${BW_CANONICALOBJDIR} rm -rf ${BW_CANONICALOBJDIR}/* .endif +.if ${MK_AUTO_OBJ} == "no" .if ${.CURDIR} == ${.OBJDIR} || ${.CURDIR}/obj == ${.OBJDIR} # To be safe in this case, fall back to a 'make cleandir' ${_+_}@cd ${.CURDIR}; ${MAKE} cleandir +.endif .endif .if ${TARGET} == ${MACHINE} && ${TARGET_ARCH} == ${MACHINE_ARCH} From owner-svn-src-all@freebsd.org Tue Oct 31 02:12: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 38C8EE47E85; Tue, 31 Oct 2017 02:12: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 1515C812D3; Tue, 31 Oct 2017 02:12: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 v9V2C9YO099620; Tue, 31 Oct 2017 02:12:09 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9V2C919099619; Tue, 31 Oct 2017 02:12:09 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710310212.v9V2C919099619@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 31 Oct 2017 02:12:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325194 - head/share/mk X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/share/mk X-SVN-Commit-Revision: 325194 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: Tue, 31 Oct 2017 02:12:10 -0000 Author: bdrewery Date: Tue Oct 31 02:12:09 2017 New Revision: 325194 URL: https://svnweb.freebsd.org/changeset/base/325194 Log: Disable MK_AUTO_OBJ as a make argument like r325078. This avoids needlessly trying to enable it opportunistically. Sponsored by: Dell EMC Isilon Modified: head/share/mk/bsd.crunchgen.mk Modified: head/share/mk/bsd.crunchgen.mk ============================================================================== --- head/share/mk/bsd.crunchgen.mk Tue Oct 31 01:45:14 2017 (r325193) +++ head/share/mk/bsd.crunchgen.mk Tue Oct 31 02:12:09 2017 (r325194) @@ -41,7 +41,7 @@ CRUNCHOBJS= ${.OBJDIR} CRUNCH_GENERATE_LINKS?= yes # Don't let the prog.mk use MK_AUTO_OBJ, but do let the component builds use # it. -CRUNCHENV+= MK_AUTO_OBJ=no +CRUNCHARGS+= MK_AUTO_OBJ=no CRUNCH_BUILDOPTS+= MK_AUTO_OBJ=${MK_AUTO_OBJ} CLEANFILES+= ${CONF} *.o *.lo *.c *.mk *.cache *.a *.h @@ -114,7 +114,7 @@ CRUNCHENV+= MK_TESTS=no \ ${OUTPUTS:[1]}: .META ${OUTPUTS:[2..-1]}: .NOMETA ${OUTPUTS}: ${CONF} - MAKE="${MAKE}" ${CRUNCHENV:NMK_AUTO_OBJ=*} MAKEOBJDIRPREFIX=${CRUNCHOBJS} \ + MAKE="${MAKE}" ${CRUNCHENV} MAKEOBJDIRPREFIX=${CRUNCHOBJS} \ MK_AUTO_OBJ=${MK_AUTO_OBJ} \ ${CRUNCHGEN} -fq -m ${OUTMK} -c ${OUTC} ${CONF} # Avoid redundantly calling 'make objs' which we've done by our @@ -127,21 +127,23 @@ ${PROG}: ${OUTPUTS} objs .NOMETA .PHONY ${CRUNCHENV} \ CC="${CC} ${CFLAGS} ${LDFLAGS}" \ CXX="${CXX} ${CXXFLAGS} ${LDFLAGS}" \ - ${MAKE} .MAKE.MODE="${.MAKE.MODE} curdirOk=yes" \ + ${MAKE} ${CRUNCHARGS} .MAKE.MODE="${.MAKE.MODE} curdirOk=yes" \ .MAKE.META.IGNORE_PATHS="${.MAKE.META.IGNORE_PATHS}" \ -f ${OUTMK} exe objs: ${OUTMK} .META ${CRUNCHENV} MAKEOBJDIRPREFIX=${CRUNCHOBJS} \ - ${MAKE} -f ${OUTMK} BUILD_TOOLS_META=.NOMETA objs + ${MAKE} -f ${OUTMK} ${CRUNCHARGS} BUILD_TOOLS_META=.NOMETA objs # Someone should replace the bin/csh and bin/sh build-tools with # shell scripts so we can remove this nonsense. .for _tool in ${CRUNCH_BUILDTOOLS} build-tools-${_tool}: ${_+_}cd ${.CURDIR}/../../${_tool}; \ - ${CRUNCHENV} MAKEOBJDIRPREFIX=${CRUNCHOBJS} ${MAKE} obj; \ - ${CRUNCHENV} MAKEOBJDIRPREFIX=${CRUNCHOBJS} ${MAKE} build-tools + ${CRUNCHENV} MAKEOBJDIRPREFIX=${CRUNCHOBJS} ${MAKE} \ + ${CRUNCHARGS} obj; \ + ${CRUNCHENV} MAKEOBJDIRPREFIX=${CRUNCHOBJS} ${MAKE} ${CRUNCHARGS} \ + build-tools build-tools: build-tools-${_tool} .endfor @@ -155,6 +157,7 @@ build-tools: build-tools-${_tool} ${__target}_crunchdir_${P}: .PHONY .MAKE ${_+_}cd ${CRUNCH_SRCDIR_${P}} && \ ${CRUNCHENV} MAKEOBJDIRPREFIX=${CANONICALOBJDIR} ${MAKE} \ + ${CRUNCHARGS} \ DIRPRFX=${DIRPRFX}${P}/ ${CRUNCH_BUILDOPTS} ${__target} ${__target}: ${__target}_crunchdir_${P} .endfor From owner-svn-src-all@freebsd.org Tue Oct 31 02:12:14 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 7474EE47EAF; Tue, 31 Oct 2017 02:12:14 +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 43800812F4; Tue, 31 Oct 2017 02:12:14 +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 v9V2CDoE000666; Tue, 31 Oct 2017 02:12:13 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9V2CDun000665; Tue, 31 Oct 2017 02:12:13 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710310212.v9V2CDun000665@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 31 Oct 2017 02:12:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325195 - head/share/mk X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/share/mk X-SVN-Commit-Revision: 325195 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: Tue, 31 Oct 2017 02:12:14 -0000 Author: bdrewery Date: Tue Oct 31 02:12:13 2017 New Revision: 325195 URL: https://svnweb.freebsd.org/changeset/base/325195 Log: AUTO_OBJ can work for crunchgen build-tools. Sponsored by: Dell EMC Isilon Modified: head/share/mk/bsd.crunchgen.mk Modified: head/share/mk/bsd.crunchgen.mk ============================================================================== --- head/share/mk/bsd.crunchgen.mk Tue Oct 31 02:12:09 2017 (r325194) +++ head/share/mk/bsd.crunchgen.mk Tue Oct 31 02:12:13 2017 (r325195) @@ -140,10 +140,10 @@ objs: ${OUTMK} .META .for _tool in ${CRUNCH_BUILDTOOLS} build-tools-${_tool}: ${_+_}cd ${.CURDIR}/../../${_tool}; \ - ${CRUNCHENV} MAKEOBJDIRPREFIX=${CRUNCHOBJS} ${MAKE} \ - ${CRUNCHARGS} obj; \ - ${CRUNCHENV} MAKEOBJDIRPREFIX=${CRUNCHOBJS} ${MAKE} ${CRUNCHARGS} \ - build-tools + if [ "${MK_AUTO_OBJ}" = "no" ]; then \ + ${CRUNCHENV} MAKEOBJDIRPREFIX=${CRUNCHOBJS} ${MAKE} obj; \ + fi; \ + ${CRUNCHENV} MAKEOBJDIRPREFIX=${CRUNCHOBJS} ${MAKE} build-tools build-tools: build-tools-${_tool} .endfor From owner-svn-src-all@freebsd.org Tue Oct 31 02:18: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 B87FBE48395; Tue, 31 Oct 2017 02:18: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 83D3881779; Tue, 31 Oct 2017 02:18: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 v9V2I6Vu001792; Tue, 31 Oct 2017 02:18:06 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9V2I6kW001791; Tue, 31 Oct 2017 02:18:06 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710310218.v9V2I6kW001791@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 31 Oct 2017 02:18:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325196 - head/tools/build/options X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/tools/build/options X-SVN-Commit-Revision: 325196 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: Tue, 31 Oct 2017 02:18:07 -0000 Author: bdrewery Date: Tue Oct 31 02:18:06 2017 New Revision: 325196 URL: https://svnweb.freebsd.org/changeset/base/325196 Log: makeman: Ensure MK_AUTO_OBJ is disabled in some lookups. Sponsored by: Dell EMC Isilon Modified: head/tools/build/options/makeman Modified: head/tools/build/options/makeman ============================================================================== --- head/tools/build/options/makeman Tue Oct 31 02:12:13 2017 (r325195) +++ head/tools/build/options/makeman Tue Oct 31 02:18:06 2017 (r325196) @@ -44,7 +44,7 @@ no_targets() show_options() { - ALL_TARGETS=$(echo $(${make} targets | tail -n +2)) + ALL_TARGETS=$(echo $(${make} targets MK_AUTO_OBJ=no | tail -n +2)) rm -f $t/settings for target in ${ALL_TARGETS} ; do prev_opt= @@ -245,7 +245,7 @@ EOF show with SRC_ENV_CONF=/dev/null | sort | sed 's/$/=/' > $t/src.conf show settings SRC_ENV_CONF=$t/src.conf | sort > $t/config_WITH_ALL show without SRC_ENV_CONF=/dev/null | sort > $t/config_WITHOUT_ALL - env_only_options="$(${make} -V __ENV_ONLY_OPTIONS)" + env_only_options="$(${make} MK_AUTO_OBJ=no -V __ENV_ONLY_OPTIONS)" show_options | while read opt targets ; do From owner-svn-src-all@freebsd.org Tue Oct 31 02:25: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 A853EE48F29; Tue, 31 Oct 2017 02:25: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 7782581E53; Tue, 31 Oct 2017 02:25: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 v9V2Pl2Z005887; Tue, 31 Oct 2017 02:25:47 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9V2PlOx005886; Tue, 31 Oct 2017 02:25:47 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710310225.v9V2PlOx005886@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 31 Oct 2017 02:25:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325197 - head/share/mk X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/share/mk X-SVN-Commit-Revision: 325197 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: Tue, 31 Oct 2017 02:25:48 -0000 Author: bdrewery Date: Tue Oct 31 02:25:47 2017 New Revision: 325197 URL: https://svnweb.freebsd.org/changeset/base/325197 Log: This check is not ready here yet. Keeping for blame purposes, it will be enabled soon. Modified: head/share/mk/src.sys.obj.mk Modified: head/share/mk/src.sys.obj.mk ============================================================================== --- head/share/mk/src.sys.obj.mk Tue Oct 31 02:18:06 2017 (r325196) +++ head/share/mk/src.sys.obj.mk Tue Oct 31 02:25:47 2017 (r325197) @@ -31,8 +31,10 @@ OBJROOT:= ${OBJROOT:H:tA}/${OBJROOT:T} .export OBJROOT SRCTOP .endif +.if 0 .if defined(MAKEOBJDIR) .if ${MAKEOBJDIR:M/*} == "" .error Cannot use MAKEOBJDIR=${MAKEOBJDIR}${.newline}Unset MAKEOBJDIR to get default: MAKEOBJDIR='${_default_makeobjdir}' +.endif .endif .endif From owner-svn-src-all@freebsd.org Tue Oct 31 02: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 2B750E491FC; Tue, 31 Oct 2017 02:29:32 +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 ED1D6820AF; Tue, 31 Oct 2017 02:29: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 v9V2TVhp006051; Tue, 31 Oct 2017 02:29:31 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9V2TVGu006050; Tue, 31 Oct 2017 02:29:31 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710310229.v9V2TVGu006050@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 31 Oct 2017 02:29:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325198 - head/share/man/man5 X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/share/man/man5 X-SVN-Commit-Revision: 325198 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: Tue, 31 Oct 2017 02:29:32 -0000 Author: bdrewery Date: Tue Oct 31 02:29:30 2017 New Revision: 325198 URL: https://svnweb.freebsd.org/changeset/base/325198 Log: Regenerate after r325180 Modified: head/share/man/man5/src.conf.5 Modified: head/share/man/man5/src.conf.5 ============================================================================== --- head/share/man/man5/src.conf.5 Tue Oct 31 02:25:47 2017 (r325197) +++ head/share/man/man5/src.conf.5 Tue Oct 31 02:29:30 2017 (r325198) @@ -1,6 +1,6 @@ .\" DO NOT EDIT-- this file is generated by tools/build/options/makeman. .\" $FreeBSD$ -.Dd October 10, 2017 +.Dd October 30, 2017 .Dt SRC.CONF 5 .Os .Sh NAME @@ -764,13 +764,13 @@ Set to build the BSD licensed version of the device tr than the GPLed one from elinux.org. .Pp This is a default setting on -amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64 and powerpc/powerpcspe. +amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, arm64/aarch64 and i386/i386. .It Va WITH_GPL_DTC Set to build the GPL'd version of the device tree compiler from elinux.org, instead of the BSD licensed one. .Pp This is a default setting on -riscv/riscv64, riscv/riscv64sf and sparc64/sparc64. +mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe, riscv/riscv64, riscv/riscv64sf and sparc64/sparc64. .It Va WITHOUT_GSSAPI Set to not build libgssapi. .It Va WITHOUT_HAST From owner-svn-src-all@freebsd.org Tue Oct 31 02:36:12 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 DDB10E499DF; Tue, 31 Oct 2017 02:36:12 +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 B949A826B3; Tue, 31 Oct 2017 02:36:12 +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 v9V2aBuC009948; Tue, 31 Oct 2017 02:36:11 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9V2aBYI009947; Tue, 31 Oct 2017 02:36:11 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201710310236.v9V2aBYI009947@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Tue, 31 Oct 2017 02:36:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325199 - head/sys/contrib/ncsw/etc X-SVN-Group: head X-SVN-Commit-Author: jhibbits X-SVN-Commit-Paths: head/sys/contrib/ncsw/etc X-SVN-Commit-Revision: 325199 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: Tue, 31 Oct 2017 02:36:13 -0000 Author: jhibbits Date: Tue Oct 31 02:36:11 2017 New Revision: 325199 URL: https://svnweb.freebsd.org/changeset/base/325199 Log: Add a file to unbreak the build Added: head/sys/contrib/ncsw/etc/sprint.c (contents, props changed) Added: head/sys/contrib/ncsw/etc/sprint.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/contrib/ncsw/etc/sprint.c Tue Oct 31 02:36:11 2017 (r325199) @@ -0,0 +1,81 @@ +/* + * 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: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of Freescale Semiconductor nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * + * ALTERNATIVELY, this software may be distributed under the terms of the + * GNU General Public License ("GPL") as published by the Free Software + * Foundation, either version 2 of that License or (at your option) any + * later version. + * + * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + + +/*------------------------------------------------------*/ +/* File: sprint.c */ +/* */ +/* Description: */ +/* Debug routines (externals) */ +/*------------------------------------------------------*/ +#include "string_ext.h" +#include "stdlib_ext.h" +#include "stdarg_ext.h" +#include "sprint_ext.h" +#include "std_ext.h" +#include "xx_ext.h" + + +int Sprint(char * buf, const char *fmt, ...) +{ + va_list args; + int i; + + va_start(args, fmt); + i=vsprintf(buf,fmt,args); + va_end(args); + return i; +} + +int Snprint(char * buf, uint32_t size, const char *fmt, ...) +{ + va_list args; + int i; + + va_start(args, fmt); + i=vsnprintf(buf,size,fmt,args); + va_end(args); + return i; +} + +#ifndef NCSW_VXWORKS +int Sscan(const char * buf, const char * fmt, ...) +{ + va_list args; + int i; + + va_start(args,fmt); + i = vsscanf(buf,fmt,args); + va_end(args); + return i; +} +#endif /* NCSW_VXWORKS */ From owner-svn-src-all@freebsd.org Tue Oct 31 02:49: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 C00CEE4A4D0; Tue, 31 Oct 2017 02:49:29 +0000 (UTC) (envelope-from shurd@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 8DA1E82ECE; Tue, 31 Oct 2017 02:49:29 +0000 (UTC) (envelope-from shurd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9V2nSKQ014272; Tue, 31 Oct 2017 02:49:28 GMT (envelope-from shurd@FreeBSD.org) Received: (from shurd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9V2nSHW014271; Tue, 31 Oct 2017 02:49:28 GMT (envelope-from shurd@FreeBSD.org) Message-Id: <201710310249.v9V2nSHW014271@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: shurd set sender to shurd@FreeBSD.org using -f From: Stephen Hurd Date: Tue, 31 Oct 2017 02:49:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325201 - head/sys/net X-SVN-Group: head X-SVN-Commit-Author: shurd X-SVN-Commit-Paths: head/sys/net X-SVN-Commit-Revision: 325201 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: Tue, 31 Oct 2017 02:49:29 -0000 Author: shurd Date: Tue Oct 31 02:49:28 2017 New Revision: 325201 URL: https://svnweb.freebsd.org/changeset/base/325201 Log: Fix build with nodevice netmap iru_init() was declared and used outside the DEV_NETMAP conditional blocks, but was implemented inside one. Move the implementation out of the DEV_NETMAP block to allow building with netmap disabled. Reported by: Andrew Turner Reviewed by: sbruno Approved by: sbruno (mentor) Sponsored by: Limelight Networks Differential Revision: https://reviews.freebsd.org/D12842 Modified: head/sys/net/iflib.c Modified: head/sys/net/iflib.c ============================================================================== --- head/sys/net/iflib.c Tue Oct 31 02:46:36 2017 (r325200) +++ head/sys/net/iflib.c Tue Oct 31 02:49:28 2017 (r325201) @@ -790,20 +790,6 @@ iflib_netmap_register(struct netmap_adapter *na, int o return (status); } -static void -iru_init(if_rxd_update_t iru, iflib_rxq_t rxq, uint8_t flid) -{ - iflib_fl_t fl; - - fl = &rxq->ifr_fl[flid]; - iru->iru_paddrs = fl->ifl_bus_addrs; - iru->iru_vaddrs = &fl->ifl_vm_addrs[0]; - iru->iru_idxs = fl->ifl_rxd_idxs; - iru->iru_qsidx = rxq->ifr_id; - iru->iru_buf_size = fl->ifl_buf_size; - iru->iru_flidx = fl->ifl_id; -} - static int netmap_fl_refill(iflib_rxq_t rxq, struct netmap_kring *kring, uint32_t nm_i, bool init) { @@ -1235,6 +1221,20 @@ prefetch2cachelines(void *x) #define prefetch(x) #define prefetch2cachelines(x) #endif + +static void +iru_init(if_rxd_update_t iru, iflib_rxq_t rxq, uint8_t flid) +{ + iflib_fl_t fl; + + fl = &rxq->ifr_fl[flid]; + iru->iru_paddrs = fl->ifl_bus_addrs; + iru->iru_vaddrs = &fl->ifl_vm_addrs[0]; + iru->iru_idxs = fl->ifl_rxd_idxs; + iru->iru_qsidx = rxq->ifr_id; + iru->iru_buf_size = fl->ifl_buf_size; + iru->iru_flidx = fl->ifl_id; +} static void _iflib_dmamap_cb(void *arg, bus_dma_segment_t *segs, int nseg, int err) From owner-svn-src-all@freebsd.org Tue Oct 31 02:52: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 74292E4A7D9; Tue, 31 Oct 2017 02:52:37 +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 42673832F3; Tue, 31 Oct 2017 02:52: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 v9V2qac3018232; Tue, 31 Oct 2017 02:52:36 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9V2qa8a018231; Tue, 31 Oct 2017 02:52:36 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710310252.v9V2qa8a018231@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 31 Oct 2017 02:52:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325202 - head X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 325202 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: Tue, 31 Oct 2017 02:52:37 -0000 Author: bdrewery Date: Tue Oct 31 02:52:36 2017 New Revision: 325202 URL: https://svnweb.freebsd.org/changeset/base/325202 Log: native-xtools: Allow SYSTEM_COMPILER to be used after r325001. Now that a proper sysroot is used and a separate target list, it should be safe to skip building the initial cross-compiler. X-MFC-With: r325001 MFC after: 1 month Sponsored by: Dell EMC Isilon Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Tue Oct 31 02:49:28 2017 (r325201) +++ head/Makefile.inc1 Tue Oct 31 02:52:36 2017 (r325202) @@ -133,7 +133,7 @@ WANT_COMPILER_VERSION!= \ # TARGET_ARCH!=MACHINE_ARCH. .if ${MK_SYSTEM_COMPILER} == "yes" && \ (${MK_CLANG_BOOTSTRAP} == "yes" || ${MK_GCC_BOOTSTRAP} == "yes") && \ - !make(showconfig) && !make(native-xtools) && !make(xdev*) && \ + !make(showconfig) && !make(xdev*) && \ ${WANT_COMPILER_TYPE} == ${COMPILER_TYPE} && \ (${COMPILER_TYPE} == "clang" || ${TARGET_ARCH} == ${MACHINE_ARCH}) && \ ${COMPILER_VERSION} == ${WANT_COMPILER_VERSION} && \ From owner-svn-src-all@freebsd.org Tue Oct 31 02:53: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 819BCE4A964; Tue, 31 Oct 2017 02:53:52 +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 4A65D83566; Tue, 31 Oct 2017 02:53:52 +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 v9V2rpki018373; Tue, 31 Oct 2017 02:53:51 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9V2roxR018362; Tue, 31 Oct 2017 02:53:50 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201710310253.v9V2roxR018362@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Tue, 31 Oct 2017 02:53:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325204 - in head/sys: contrib/ncsw/Peripherals/FM/Port contrib/ncsw/Peripherals/QM contrib/ncsw/etc dev/dpaa powerpc/conf X-SVN-Group: head X-SVN-Commit-Author: jhibbits X-SVN-Commit-Paths: in head/sys: contrib/ncsw/Peripherals/FM/Port contrib/ncsw/Peripherals/QM contrib/ncsw/etc dev/dpaa powerpc/conf X-SVN-Commit-Revision: 325204 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: Tue, 31 Oct 2017 02:53:52 -0000 Author: jhibbits Date: Tue Oct 31 02:53:50 2017 New Revision: 325204 URL: https://svnweb.freebsd.org/changeset/base/325204 Log: Make DPAA work in 64-bit mode Rework the dTSEC and FMan drivers to be more like a full bus relationship, so that dtsec can use bus_alloc_resource() instead of trying to handle the offset from the dts. This required taking some code from the sparc64 ebus driver to allow subdividing the fman region for the dTSEC devices. Modified: head/sys/contrib/ncsw/Peripherals/FM/Port/fm_port.c head/sys/contrib/ncsw/Peripherals/QM/qm_portal_fqr.c head/sys/contrib/ncsw/etc/memcpy.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.h head/sys/dev/dpaa/if_dtsec_fdt.c head/sys/dev/dpaa/if_dtsec_rm.c head/sys/powerpc/conf/QORIQ64 Modified: head/sys/contrib/ncsw/Peripherals/FM/Port/fm_port.c ============================================================================== --- head/sys/contrib/ncsw/Peripherals/FM/Port/fm_port.c Tue Oct 31 02:52:59 2017 (r325203) +++ head/sys/contrib/ncsw/Peripherals/FM/Port/fm_port.c Tue Oct 31 02:53:50 2017 (r325204) @@ -1996,7 +1996,7 @@ t_Error FmPortGetSetCcParams(t_Handle h_FmPort, t_FmPortGetSetCcParams *p_CcParams) { t_FmPort *p_FmPort = (t_FmPort*)h_FmPort; - int tmpInt; + uint32_t tmpInt; volatile uint32_t *p_BmiPrsStartOffset = NULL; /* this function called from Cc for pass and receive parameters port params between CC and PORT*/ Modified: head/sys/contrib/ncsw/Peripherals/QM/qm_portal_fqr.c ============================================================================== --- head/sys/contrib/ncsw/Peripherals/QM/qm_portal_fqr.c Tue Oct 31 02:52:59 2017 (r325203) +++ head/sys/contrib/ncsw/Peripherals/QM/qm_portal_fqr.c Tue Oct 31 02:53:50 2017 (r325204) @@ -78,8 +78,7 @@ aligned_int_from_ptr(const void *p) KASSERT(ctx >= VM_MIN_KERNEL_ADDRESS, ("%p is too low!\n", p)); ctx -= VM_MIN_KERNEL_ADDRESS; KASSERT((ctx & 0x07) == 0, ("Pointer %p is not 8-byte aligned!\n", p)); - if ((ctx & (0x7)) != 0) - return (0); + return (ctx >> 3); } @@ -88,7 +87,8 @@ ptr_from_aligned_int(uint32_t ctx) { uintptr_t p; - p = VM_MIN_KERNEL_ADDRESS + (ctx << 3); + p = ctx; + p = VM_MIN_KERNEL_ADDRESS + (p << 3); return ((void *)p); } Modified: head/sys/contrib/ncsw/etc/memcpy.c ============================================================================== --- head/sys/contrib/ncsw/etc/memcpy.c Tue Oct 31 02:52:59 2017 (r325203) +++ head/sys/contrib/ncsw/etc/memcpy.c Tue Oct 31 02:53:50 2017 (r325204) @@ -38,7 +38,7 @@ void * MemCpy8(void* pDst, void* pSrc, uint32_t size) { - int i; + uint32_t i; for(i = 0; i < size; ++i) *(((uint8_t*)(pDst)) + i) = *(((uint8_t*)(pSrc)) + i); @@ -48,7 +48,7 @@ void * MemCpy8(void* pDst, void* pSrc, uint32_t size) void * MemSet8(void* pDst, int c, uint32_t size) { - int i; + uint32_t i; for(i = 0; i < size; ++i) *(((uint8_t*)(pDst)) + i) = (uint8_t)(c); Modified: head/sys/dev/dpaa/fman.c ============================================================================== --- head/sys/dev/dpaa/fman.c Tue Oct 31 02:52:59 2017 (r325203) +++ head/sys/dev/dpaa/fman.c Tue Oct 31 02:53:50 2017 (r325204) @@ -39,6 +39,8 @@ __FBSDID("$FreeBSD$"); #include #include +#include + #include "opt_platform.h" #include @@ -87,10 +89,184 @@ const uint32_t fman_firmware[] = FMAN_UC_IMG; const uint32_t fman_firmware_size = sizeof(fman_firmware); static struct fman_softc *fm_sc = NULL; +int +fman_activate_resource(device_t bus, device_t child, int type, int rid, + struct resource *res) +{ + struct fman_softc *sc; + bus_space_tag_t bt; + bus_space_handle_t bh; + int i, rv; + + sc = device_get_softc(bus); + if (type != SYS_RES_IRQ) { + for (i = 0; i < sc->sc_base.nranges; i++) { + if (rman_is_region_manager(res, &sc->rman) != 0) { + bt = rman_get_bustag(sc->mem_res); + rv = bus_space_subregion(bt, + rman_get_bushandle(sc->mem_res), + rman_get_start(res) - + rman_get_start(sc->mem_res), + rman_get_size(res), &bh); + if (rv != 0) + return (rv); + rman_set_bustag(res, bt); + rman_set_bushandle(res, bh); + return (rman_activate_resource(res)); + } + } + return (EINVAL); + } + return (bus_generic_activate_resource(bus, child, type, rid, res)); +} + +int +fman_release_resource(device_t bus, device_t child, int type, int rid, + struct resource *res) +{ + struct fman_softc *sc; + struct resource_list *rl; + struct resource_list_entry *rle; + int passthrough, rv; + + passthrough = (device_get_parent(child) != bus); + rl = BUS_GET_RESOURCE_LIST(bus, child); + sc = device_get_softc(bus); + if (type != SYS_RES_IRQ) { + if ((rman_get_flags(res) & RF_ACTIVE) != 0 ){ + rv = bus_deactivate_resource(child, type, rid, res); + if (rv != 0) + return (rv); + } + rv = rman_release_resource(res); + if (rv != 0) + return (rv); + if (!passthrough) { + rle = resource_list_find(rl, type, rid); + KASSERT(rle != NULL, + ("%s: resource entry not found!", __func__)); + KASSERT(rle->res != NULL, + ("%s: resource entry is not busy", __func__)); + rle->res = NULL; + } + return (0); + } + return (resource_list_release(rl, bus, child, type, rid, res)); +} + +struct resource * +fman_alloc_resource(device_t bus, device_t child, int type, int *rid, + rman_res_t start, rman_res_t end, rman_res_t count, u_int flags) +{ + struct fman_softc *sc; + struct resource_list *rl; + struct resource_list_entry *rle = NULL; + struct resource *res; + int i, isdefault, passthrough; + + isdefault = RMAN_IS_DEFAULT_RANGE(start, end); + passthrough = (device_get_parent(child) != bus); + sc = device_get_softc(bus); + rl = BUS_GET_RESOURCE_LIST(bus, child); + switch (type) { + case SYS_RES_MEMORY: + KASSERT(!(isdefault && passthrough), + ("%s: passthrough of default allocation", __func__)); + if (!passthrough) { + rle = resource_list_find(rl, type, *rid); + if (rle == NULL) + return (NULL); + KASSERT(rle->res == NULL, + ("%s: resource entry is busy", __func__)); + if (isdefault) { + start = rle->start; + count = ulmax(count, rle->count); + end = ulmax(rle->end, start + count - 1); + } + } + + res = NULL; + /* Map fman ranges to nexus ranges. */ + for (i = 0; i < sc->sc_base.nranges; i++) { + if (start >= sc->sc_base.ranges[i].bus && end < + sc->sc_base.ranges[i].bus + sc->sc_base.ranges[i].size) { + start += rman_get_start(sc->mem_res); + end += rman_get_start(sc->mem_res); + res = rman_reserve_resource(&sc->rman, start, + end, count, flags & ~RF_ACTIVE, child); + if (res == NULL) + return (NULL); + rman_set_rid(res, *rid); + if ((flags & RF_ACTIVE) != 0 && bus_activate_resource( + child, type, *rid, res) != 0) { + rman_release_resource(res); + return (NULL); + } + break; + } + } + if (!passthrough) + rle->res = res; + return (res); + case SYS_RES_IRQ: + return (resource_list_alloc(rl, bus, child, type, rid, start, + end, count, flags)); + } + return (NULL); +} + +static int +fman_fill_ranges(phandle_t node, struct simplebus_softc *sc) +{ + int host_address_cells; + cell_t *base_ranges; + ssize_t nbase_ranges; + int err; + int i, j, k; + + err = OF_searchencprop(OF_parent(node), "#address-cells", + &host_address_cells, sizeof(host_address_cells)); + if (err <= 0) + return (-1); + + nbase_ranges = OF_getproplen(node, "ranges"); + if (nbase_ranges < 0) + return (-1); + sc->nranges = nbase_ranges / sizeof(cell_t) / + (sc->acells + host_address_cells + sc->scells); + if (sc->nranges == 0) + return (0); + + sc->ranges = malloc(sc->nranges * sizeof(sc->ranges[0]), + M_DEVBUF, M_WAITOK); + base_ranges = malloc(nbase_ranges, M_DEVBUF, M_WAITOK); + OF_getencprop(node, "ranges", base_ranges, nbase_ranges); + + for (i = 0, j = 0; i < sc->nranges; i++) { + sc->ranges[i].bus = 0; + for (k = 0; k < sc->acells; k++) { + sc->ranges[i].bus <<= 32; + sc->ranges[i].bus |= base_ranges[j++]; + } + sc->ranges[i].host = 0; + for (k = 0; k < host_address_cells; k++) { + sc->ranges[i].host <<= 32; + sc->ranges[i].host |= base_ranges[j++]; + } + sc->ranges[i].size = 0; + for (k = 0; k < sc->scells; k++) { + sc->ranges[i].size <<= 32; + sc->ranges[i].size |= base_ranges[j++]; + } + } + + free(base_ranges, M_DEVBUF); + return (sc->nranges); +} + static t_Handle fman_init(struct fman_softc *sc, struct fman_config *cfg) { - struct ofw_bus_devinfo obd; phandle_t node; t_FmParams fm_params; t_Handle muram_handle, fm_handle; @@ -166,9 +342,11 @@ fman_init(struct fman_softc *sc, struct fman_config *c simplebus_init(sc->sc_base.dev, 0); node = ofw_bus_get_node(sc->sc_base.dev); + fman_fill_ranges(node, &sc->sc_base); + sc->rman.rm_type = RMAN_ARRAY; + sc->rman.rm_descr = "FMan range"; + rman_init_from_resource(&sc->rman, sc->mem_res); for (node = OF_child(node); node > 0; node = OF_peer(node)) { - if (ofw_bus_gen_setup_devinfo(&obd, node) != 0) - continue; simplebus_add_device(sc->sc_base.dev, node, 0, NULL, -1, NULL); } Modified: head/sys/dev/dpaa/fman.h ============================================================================== --- head/sys/dev/dpaa/fman.h Tue Oct 31 02:52:59 2017 (r325203) +++ head/sys/dev/dpaa/fman.h Tue Oct 31 02:53:50 2017 (r325204) @@ -39,6 +39,7 @@ struct fman_softc { struct resource *mem_res; struct resource *irq_res; struct resource *err_irq_res; + struct rman rman; int mem_rid; int irq_rid; int err_irq_rid; @@ -54,6 +55,12 @@ struct fman_softc { * @group QMan bus interface. * @{ */ +struct resource * fman_alloc_resource(device_t bus, device_t child, int type, + int *rid, rman_res_t start, rman_res_t end, rman_res_t count, u_int flags); +int fman_activate_resource(device_t bus, device_t child, + int type, int rid, struct resource *res); +int fman_release_resource(device_t bus, device_t child, int type, int rid, + struct resource *res); int fman_attach(device_t dev); int fman_detach(device_t dev); int fman_suspend(device_t dev); Modified: head/sys/dev/dpaa/fman_fdt.c ============================================================================== --- head/sys/dev/dpaa/fman_fdt.c Tue Oct 31 02:52:59 2017 (r325203) +++ head/sys/dev/dpaa/fman_fdt.c Tue Oct 31 02:53:50 2017 (r325204) @@ -56,6 +56,9 @@ static device_method_t fman_methods[] = { DEVMETHOD(device_suspend, fman_suspend), DEVMETHOD(device_resume, fman_resume_dev), + DEVMETHOD(bus_alloc_resource, fman_alloc_resource), + DEVMETHOD(bus_activate_resource, fman_activate_resource), + DEVMETHOD(bus_release_resource, fman_release_resource), { 0, 0 } }; Modified: head/sys/dev/dpaa/if_dtsec.c ============================================================================== --- head/sys/dev/dpaa/if_dtsec.c Tue Oct 31 02:52:59 2017 (r325203) +++ head/sys/dev/dpaa/if_dtsec.c Tue Oct 31 02:53:50 2017 (r325204) @@ -188,7 +188,7 @@ dtsec_fm_mac_init(struct dtsec_softc *sc, uint8_t *mac memset(¶ms, 0, sizeof(params)); memcpy(¶ms.addr, mac, sizeof(params.addr)); - params.baseAddr = sc->sc_fm_base + sc->sc_mac_mem_offset; + params.baseAddr = rman_get_bushandle(sc->sc_mem); params.enetMode = sc->sc_mac_enet_mode; params.macId = sc->sc_eth_id; params.mdioIrq = sc->sc_mac_mdio_irq; Modified: head/sys/dev/dpaa/if_dtsec.h ============================================================================== --- head/sys/dev/dpaa/if_dtsec.h Tue Oct 31 02:52:59 2017 (r325203) +++ head/sys/dev/dpaa/if_dtsec.h Tue Oct 31 02:53:50 2017 (r325204) @@ -52,6 +52,7 @@ struct dtsec_softc { struct ifnet *sc_ifnet; device_t sc_dev; + struct resource *sc_mem; struct mtx sc_lock; int sc_mode; Modified: head/sys/dev/dpaa/if_dtsec_fdt.c ============================================================================== --- head/sys/dev/dpaa/if_dtsec_fdt.c Tue Oct 31 02:52:59 2017 (r325203) +++ head/sys/dev/dpaa/if_dtsec_fdt.c Tue Oct 31 02:53:50 2017 (r325204) @@ -32,8 +32,11 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include +#include + #include #include @@ -134,6 +137,7 @@ dtsec_fdt_attach(device_t dev) phandle_t fman_rxtx_node[2]; char phy_type[6]; pcell_t fman_tx_cell; + int rid; sc = device_get_softc(dev); enet_node = ofw_bus_get_node(dev); @@ -154,8 +158,9 @@ dtsec_fdt_attach(device_t dev) return(ENXIO); /* Get MAC memory offset in SoC */ - if (OF_getprop(enet_node, "reg", (void *)&sc->sc_mac_mem_offset, - sizeof(sc->sc_mac_mem_offset)) <= 0) + rid = 0; + sc->sc_mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); + if (sc->sc_mem == NULL) return (ENXIO); /* Get PHY address */ Modified: head/sys/dev/dpaa/if_dtsec_rm.c ============================================================================== --- head/sys/dev/dpaa/if_dtsec_rm.c Tue Oct 31 02:52:59 2017 (r325203) +++ head/sys/dev/dpaa/if_dtsec_rm.c Tue Oct 31 02:53:50 2017 (r325204) @@ -161,7 +161,7 @@ dtsec_rm_fm_port_rx_init(struct dtsec_softc *sc, int u params.h_Fm = sc->sc_fmh; params.portType = dtsec_fm_port_rx_type(sc->sc_eth_dev_type); params.portId = sc->sc_eth_id; - params.independentModeEnable = FALSE; + params.independentModeEnable = false; params.liodnBase = FM_PORT_LIODN_BASE; params.f_Exception = dtsec_fm_port_rx_exception_callback; params.h_App = sc; @@ -209,7 +209,7 @@ dtsec_rm_fm_port_tx_init(struct dtsec_softc *sc, int u params.h_Fm = sc->sc_fmh; params.portType = dtsec_fm_port_tx_type(sc->sc_eth_dev_type); params.portId = sc->sc_eth_id; - params.independentModeEnable = FALSE; + params.independentModeEnable = false; params.liodnBase = FM_PORT_LIODN_BASE; params.f_Exception = dtsec_fm_port_tx_exception_callback; params.h_App = sc; @@ -458,7 +458,7 @@ dtsec_rm_fqr_rx_init(struct dtsec_softc *sc) /* Default Frame Queue */ fqr = qman_fqr_create(1, DTSEC_RM_FQR_RX_CHANNEL, DTSEC_RM_FQR_RX_WQ, - FALSE, 0, FALSE, FALSE, TRUE, FALSE, 0, 0, 0); + false, 0, false, false, true, false, 0, 0, 0); if (fqr == NULL) { device_printf(sc->sc_dev, "could not create default RX queue" "\n"); @@ -497,7 +497,7 @@ dtsec_rm_fqr_tx_init(struct dtsec_softc *sc) /* TX Frame Queue */ fqr = qman_fqr_create(1, sc->sc_port_tx_qman_chan, - DTSEC_RM_FQR_TX_WQ, FALSE, 0, FALSE, FALSE, TRUE, FALSE, 0, 0, 0); + DTSEC_RM_FQR_TX_WQ, false, 0, false, false, true, false, 0, 0, 0); if (fqr == NULL) { device_printf(sc->sc_dev, "could not create default TX queue" "\n"); @@ -508,7 +508,7 @@ dtsec_rm_fqr_tx_init(struct dtsec_softc *sc) /* TX Confirmation Frame Queue */ fqr = qman_fqr_create(1, DTSEC_RM_FQR_TX_CONF_CHANNEL, - DTSEC_RM_FQR_TX_CONF_WQ, FALSE, 0, FALSE, FALSE, TRUE, FALSE, 0, 0, + DTSEC_RM_FQR_TX_CONF_WQ, false, 0, false, false, true, false, 0, 0, 0); if (fqr == NULL) { device_printf(sc->sc_dev, "could not create TX confirmation " Modified: head/sys/powerpc/conf/QORIQ64 ============================================================================== --- head/sys/powerpc/conf/QORIQ64 Tue Oct 31 02:52:59 2017 (r325203) +++ head/sys/powerpc/conf/QORIQ64 Tue Oct 31 02:53:50 2017 (r325204) @@ -11,6 +11,7 @@ ident MPC85XX machine powerpc powerpc64 +include "dpaa/config.dpaa" makeoptions DEBUG="-Wa,-me500 -g" makeoptions WERROR="-Werror -Wno-format -Wno-redundant-decls" makeoptions NO_MODULES=yes @@ -73,6 +74,7 @@ device da device ds1553 device em device alc +device dpaa device ether device fxp device gpio From owner-svn-src-all@freebsd.org Tue Oct 31 03:39: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 A6D98E4C0C8; Tue, 31 Oct 2017 03:39:37 +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 74E1A1271; Tue, 31 Oct 2017 03:39:37 +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 v9V3daIj035887; Tue, 31 Oct 2017 03:39:36 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9V3daYM035885; Tue, 31 Oct 2017 03:39:36 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201710310339.v9V3daYM035885@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Tue, 31 Oct 2017 03:39:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325206 - in head/sbin: reboot shutdown X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head/sbin: reboot shutdown X-SVN-Commit-Revision: 325206 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: Tue, 31 Oct 2017 03:39:37 -0000 Author: imp Date: Tue Oct 31 03:39:36 2017 New Revision: 325206 URL: https://svnweb.freebsd.org/changeset/base/325206 Log: Add -c to the usage statements. Submitted by: Maxim Konovalov Modified: head/sbin/reboot/reboot.c head/sbin/shutdown/shutdown.c Modified: head/sbin/reboot/reboot.c ============================================================================== --- head/sbin/reboot/reboot.c Tue Oct 31 03:14:35 2017 (r325205) +++ head/sbin/reboot/reboot.c Tue Oct 31 03:39:36 2017 (r325206) @@ -259,8 +259,8 @@ usage(void) { (void)fprintf(stderr, dohalt ? - "usage: halt [-lNnpq] [-k kernel]\n" : - "usage: reboot [-dlNnpqr] [-k kernel]\n"); + "usage: halt [-clNnpq] [-k kernel]\n" : + "usage: reboot [-cdlNnpqr] [-k kernel]\n"); exit(1); } Modified: head/sbin/shutdown/shutdown.c ============================================================================== --- head/sbin/shutdown/shutdown.c Tue Oct 31 03:14:35 2017 (r325205) +++ head/sbin/shutdown/shutdown.c Tue Oct 31 03:39:36 2017 (r325206) @@ -566,7 +566,7 @@ usage(const char *cp) if (cp != NULL) warnx("%s", cp); (void)fprintf(stderr, - "usage: shutdown [-] [-h | -p | -r | -k] [-o [-n]] time [warning-message ...]\n" + "usage: shutdown [-] [-c | -h | -p | -r | -k] [-o [-n]] time [warning-message ...]\n" " poweroff\n"); exit(1); } From owner-svn-src-all@freebsd.org Tue Oct 31 03:54: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 21E7EE4C7E1; Tue, 31 Oct 2017 03:54:37 +0000 (UTC) (envelope-from yaneurabeya@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 CE6291D22; Tue, 31 Oct 2017 03:54:36 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pg0-x22a.google.com with SMTP id r25so13521891pgn.4; Mon, 30 Oct 2017 20:54:36 -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=P9UXhFF1tN/oemBuDqkNbJRW5xeIIGX9JGWRI4jSFuQ=; b=T6ezO43N7ccLSRzm5jpmOEJw77ATJducBjhneM8x7vQGjOTjxRfA0nmMy3aiz5IyyY 4YocUa5kDDDJtsmlK9MCLKRjTPfUO9MZmEvFODhLh/R/XYN0BcEpfy5+Z6SJuEXKiese HQ5bHNgQhNLH3UN8WI9oauDMLcj4nkhu5E09lx1lVc0YYVo1nDPbWX0h9uQdnZjyMqMC amH4WC/XyHmibyLBkGc0gpGG8oTMLOaY260HUSMrRXP0KOx7Q7HjfIYdfNfyortwS8xi zrHMGg0kykfiQe0I7/oUCmEVst1keiaw6wfsQYQj4IAaCy7PAdeW2AqJtCFNtyIJMtPu mBrw== 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=P9UXhFF1tN/oemBuDqkNbJRW5xeIIGX9JGWRI4jSFuQ=; b=VszLWGJZAaoudXiCoE3/5x/8NJEwQq+w4oF1CLAEtERrs38kQGoPYIOOGGhGHX7diA 0NevKJwnZSV9VGDolQALTbl+Uu1M8WE6xcm6a5K2E4tHI6CBZBFKs04aYPYv5tUrpDA5 Pmt2GEsRODmEa3kiLHR834e5OLA3+0JTtvdL+k+JOzfmI1f1Vf+ZM069GK9YHdEF9uw5 hDI8qtrWjPbqov0c7PSZyaT6GWXtBbwEcYZ+73dIJazUPXd92fwWa+FDbHtaUAsWcVe5 1jHKoEBQFfpcchDzo0JB8m2T0GKFc2FcJ1LgWx1KxgZ4NFHERShup0Fq7ZkzY4X5l993 kX8A== X-Gm-Message-State: AMCzsaXTqC01ZQ4wlj2d5wPyI0aNAmUz0z2tWjehoUA/RVYYT3z2fG0a +eUo7m9M/0dtbyVd8aXkBJj5pFC4 X-Google-Smtp-Source: ABhQp+QE3/9dI4hJGHFiqI9EfGxpUyo00JL0gaCV2ErZKC0k2X0d6IjUEFmDVBjLo1yv8JQcfTQL/g== X-Received: by 10.84.229.5 with SMTP id b5mr589951plk.405.1509422075936; Mon, 30 Oct 2017 20:54:35 -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 f191sm508001pgc.32.2017.10.30.20.54.34 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 30 Oct 2017 20:54:35 -0700 (PDT) Content-Type: multipart/signed; boundary="Apple-Mail=_774282D6-59C0-4AF4-8B5E-8E2F46DA909F"; protocol="application/pgp-signature"; micalg=pgp-sha512 Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\)) 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... From: "Ngie Cooper (yaneurabeya)" In-Reply-To: <201710281923.v9SJNvE5021346@repo.freebsd.org> Date: Mon, 30 Oct 2017 20:54:33 -0700 Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-Id: References: <201710281923.v9SJNvE5021346@repo.freebsd.org> To: Mariusz Zaborski 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: Tue, 31 Oct 2017 03:54:37 -0000 --Apple-Mail=_774282D6-59C0-4AF4-8B5E-8E2F46DA909F Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii > On Oct 28, 2017, at 12:23, Mariusz Zaborski = wrote: >=20 > Author: oshogbo > Date: Sat Oct 28 19:23:57 2017 > New Revision: 325062 > URL: https://svnweb.freebsd.org/changeset/base/325062 >=20 > Log: > Introduce caspermocks. >=20 > 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 = additional > libraries. Unfortunately there are also some disadvantages for = example it is > easy to get library out of sync between two versions of functions or = that 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 = simplify > capsicumizing programs. This also doesn't close us any other ways to = do those > mocks and this should evolve in time. >=20 > Discussed with: pjd, emaste, ed, rwatson, bapt, cem, bdrewery > Differential Revision: https://reviews.freebsd.org/D8753 This change broke tinderbox/Jenkins for powerpc and sparc64: = https://ci.freebsd.org/job/FreeBSD-head-powerpc-build/1865/console . -Ngie --Apple-Mail=_774282D6-59C0-4AF4-8B5E-8E2F46DA909F 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----- iQIzBAEBCgAdFiEE5bk3FaGcY5rvqmb79YOpJmkwhhUFAln38/kACgkQ9YOpJmkw hhWHtBAAjhWrS+O8inpXwa0pBsQZPJocfW8uWIb9IRs9wCd9mOwxdc3vTpelmr2U N9/7q96KmeebQxIwBOCyzB7GyXHniVmmO96mhCTtMC1SBvUpJOc67mbklG94GfJ2 BKJmvb6WcGz/tjvgc+OiUcl1MKzcRjX7cenzv24TGylRJ9Ej0p2KrpXB4s4rRb3R MS0Z0ZjrXaYduiTy28qs8IwYamiSDdMkX9c7AbD0ItL/uJLZjpV4QOmFOh4CFY0Z pYAUwPY+zuOdzCN/6wplnAJrLWIAd7kb+MI2QREJVHYLFsZZ82xlOHSvHBStiEHa SqJXss5w6NkRFf1ev2sQVllXIu2OH2Mpvx0tpNLUOeSA3xfdaC2CPtm1KEzbHxCE Sy8gManeOQV3u1V2GorDn1wGDtngrT1YaYj2CBNmd5xDkkn/5jvzeosy3+lebU9R /plj8h1juW9jGpCsfOfmaS3kRGp8bhhGcBDOITCNlnMigjnyWm/0ewEVQWDSV4ZO t5g+8nFc8r1si3u8pV3d6vN5+jSOj3HaxyrEEQp49kY/Zz9ZTJ+so4ykWTEX8ogi RyCHje28aA33xkGb31vbax5gaaTLL76yxVmhSK6xPtNu226Q6t/ZDUzCBhx4rj3+ 5Pf7Upjxy/juJENTpnyEiDjkNWOgG3sIFaibW6HYLZ6EWUlUIzU= =EiDE -----END PGP SIGNATURE----- --Apple-Mail=_774282D6-59C0-4AF4-8B5E-8E2F46DA909F-- From owner-svn-src-all@freebsd.org Tue Oct 31 03:59: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 3D09CE4C9A4; Tue, 31 Oct 2017 03:59:37 +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 283201F22; Tue, 31 Oct 2017 03:59:37 +0000 (UTC) (envelope-from devin@shxd.cx) Received: from [64.201.244.132] (port=50453 helo=[10.0.0.105]) by shxd.cx with esmtps (TLSv1:AES256-SHA:256) (Exim 4.77 (FreeBSD)) (envelope-from ) id 1e9LpW-000Mdb-9F; Tue, 31 Oct 2017 01:59:02 +0000 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: Date: Mon, 30 Oct 2017 20:59:33 -0700 Cc: Alexey Dokuchaev , "src-committers@freebsd.org" , Eitan Adler , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" , Cy Schubert , Ed Maste , Warner Losh Message-Id: <2D640E63-6C20-4904-ADF6-DAF422797604@shxd.cx> References: <201710291851.v9TIpM0I073542@slippy.cwsent.com> <20171030151627.GA74374@FreeBSD.org> <3CB26689-0D12-4E69-9BBA-58CCC3B71F3F@shxd.cx> To: Dan Mack Content-Type: text/plain; charset=us-ascii 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: Tue, 31 Oct 2017 03:59:37 -0000 > On Oct 30, 2017, at 2:35 PM, Dan Mack wrote: >=20 > Devin Teske writes: >=20 >> Better in bash which allows you to filter not only on "begins with" >> but also "contains" (which is arguably more valuable than "begins >> with"). >=20 > Definately different. Better? Maybe for some. I most always search > command history by prefix and then just using multiple ESC-p invocations > to find the one command to edit/re-execute. Less frequently I want to > search the whole text of history for the whole command line sequence > like bash Ctrl-R accomplishes. >=20 >>>> To emulate this behaviour in bash, I simply create a .inputrc file in m= y >>>> $HOME with the following contents: >>>>=20 >>>> # .inputrc file >>>> "\ep": history-search-backward >>>> "\en": history-search-forward >=20 >> Interesting that you mapped these to cursor-up/cursor-down. >>=20 >> That may cause unexpected results. >=20 >> For example, typing something and then pressing up-arrow will cause >> the shell to give you the previous command that started with that >> rather than the previous command in-general. >=20 > It's ESC-p/ESC-n, not just plain up-arrow/down-arrow. =20 You cut too important context from your reply. Before I said "Interesting th= at you mapped ...", ... > On Oct 30, 2017, at 8:16 AM, Alexey Dokuchaev wrote: >=20 > On GNU/Linux boxes mine has: >=20 > "\e[A": history-search-backward > "\e[B": history-search-forward And according to wikipedia: https://en.m.wikipedia.org/wiki/ANSI_escape_code Under "CSI Sequences" ... \e[A is really "cursor up" (CUU; with syntax of CSI [n] A) \e[B is really "cursor down" (CUD; with syntax of CSI [n] B) NB: CSI is \e[ > Up arrow still > does up without any search. Not if you do what danfe did above, in the restored context. > At least with my config using \ep as shown. > My up arrows work for me as expected - they just iterate forward and > backward through shell history. >=20 That is expected behavior. --=20 Devin From owner-svn-src-all@freebsd.org Tue Oct 31 04:02: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 C7496E4CBCE; Tue, 31 Oct 2017 04:02:51 +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 96BE0240E; Tue, 31 Oct 2017 04:02:51 +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 v9V42oQN048005; Tue, 31 Oct 2017 04:02:50 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9V42oPm048004; Tue, 31 Oct 2017 04:02:50 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710310402.v9V42oPm048004@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Tue, 31 Oct 2017 04:02:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325208 - head/lib/libcasper/services/cap_grp X-SVN-Group: head X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: head/lib/libcasper/services/cap_grp X-SVN-Commit-Revision: 325208 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: Tue, 31 Oct 2017 04:02:51 -0000 Author: ngie Date: Tue Oct 31 04:02:50 2017 New Revision: 325208 URL: https://svnweb.freebsd.org/changeset/base/325208 Log: Add `static` to `cap_setgrent` prototype in !WITH_CASPER case This unbreaks the default powerpc/sparc64 build configuration after r325062. Modified: head/lib/libcasper/services/cap_grp/cap_grp.h Modified: head/lib/libcasper/services/cap_grp/cap_grp.h ============================================================================== --- head/lib/libcasper/services/cap_grp/cap_grp.h Tue Oct 31 03:47:22 2017 (r325207) +++ head/lib/libcasper/services/cap_grp/cap_grp.h Tue Oct 31 04:02:50 2017 (r325208) @@ -65,7 +65,7 @@ int cap_grp_limit_groups(cap_channel_t *chan, const ch #define cap_setgroupent(chan, stayopen) etgroupent(stayopen) #define endgrent(chan) endgrent() -inline int +static inline int cap_setgrent(cap_channel_t *chan __unused) { From owner-svn-src-all@freebsd.org Tue Oct 31 04:33: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 4996AE4D6C4; Tue, 31 Oct 2017 04:33:38 +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 376AF3249; Tue, 31 Oct 2017 04:33:38 +0000 (UTC) (envelope-from devin@shxd.cx) Received: from [64.201.244.132] (port=50555 helo=[10.0.0.105]) by shxd.cx with esmtps (TLSv1:AES256-SHA:256) (Exim 4.77 (FreeBSD)) (envelope-from ) id 1e9MMS-000Mze-AL; Tue, 31 Oct 2017 02:33:04 +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: Date: Mon, 30 Oct 2017 21:33:35 -0700 Cc: Alexey Dokuchaev , "src-committers@freebsd.org" , Eitan Adler , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" , Cy Schubert , Ed Maste , Warner Losh Content-Transfer-Encoding: quoted-printable Message-Id: <9CD7866D-BF74-4618-8FFE-E9C47D4DA328@shxd.cx> References: <201710291851.v9TIpM0I073542@slippy.cwsent.com> <20171030151627.GA74374@FreeBSD.org> <3CB26689-0D12-4E69-9BBA-58CCC3B71F3F@shxd.cx> To: Dan Mack 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: Tue, 31 Oct 2017 04:33:38 -0000 > On Oct 30, 2017, at 2:35 PM, Dan Mack wrote: >=20 > Devin Teske writes: >=20 >> Better in bash which allows you to filter not only on "begins with" >> but also "contains" (which is arguably more valuable than "begins >> with"). >=20 > Definately different. Better? Typical session of editing exim acls on the mail server: 1. Log in via ssh to bash 2. Esc-P vi ENTER (pulls up "sudo vi /usr/local/etc/exim/acls/relay_domains") 3. ENTER 4. Make changes in vi, save, exit 5. Esc-P restart ENTER (pulls up "sudo service exim restart") 6. ENTER Ok, so if I was using tcsh, I cannot call this "better": 1. Log in via ssh to tcsh 2. sudo vi Esc-P (pulls up "sudo vi /usr/local/etc/exim/acls/relay_domains") 3. ENTER 4. Make changes in vi, save, exit 5. sudo service exim r Esc-P (pulls up "sudo service exim restart") 6. ENTER As you can see, being able to match on contents rather than begins-with save= s me valuable keystrokes and allows me to find history elements faster with l= ess effort. Take the example of using "service". Imagine: 1. Esc-P restart 2. Esc-P stop 3. Esc-P reloas Etc. Using the tcsh implementation you simply cannot navigate the history sequent= ially like that. However... there is the fallback of history substitution to pluck elements i= n tcsh which also works in bash: !?text?:p This will copy the most recent history element containing "text" onto the to= p of the history. In bash you can turn on histverify (using shopt) which will allow you to use= simply "!?text" (without quotes) to pull up the previous command containing= "text". In tcsh and zsh -- which lack the histverify shell option -- the sy= ntax "!?text" will still work but without the "?:p" modifier will execute th= e match right away. However, this cross-shell history substitution feature does not allow matchi= ng on "begins-with", only "contains," and as-such is not as flexible as bash= 's Esc-[PN] feature. Though, I admittedly use history expansion a lot too. --=20 Devin From owner-svn-src-all@freebsd.org Tue Oct 31 06:06: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 EA87AE4F481; Tue, 31 Oct 2017 06:06:31 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 C73136476B; Tue, 31 Oct 2017 06:06:31 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1033) id 2378A1D1E8; Tue, 31 Oct 2017 06:06:31 +0000 (UTC) Date: Tue, 31 Oct 2017 06:06:31 +0000 From: Alexey Dokuchaev To: Dan Mack Cc: Devin Teske , "src-committers@freebsd.org" , Eitan Adler , "svn-src-all@freebsd.org" , Cy Schubert , "svn-src-head@freebsd.org" , Ed Maste , Warner Losh Subject: Re: svn commit: r325092 - head/usr.bin/fortune/datfiles Message-ID: <20171031060631.GA78809@FreeBSD.org> References: <201710291851.v9TIpM0I073542@slippy.cwsent.com> <20171030151627.GA74374@FreeBSD.org> <3CB26689-0D12-4E69-9BBA-58CCC3B71F3F@shxd.cx> 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: Tue, 31 Oct 2017 06:06:32 -0000 On Mon, Oct 30, 2017 at 04:35:04PM -0500, Dan Mack wrote: > Definately different. Better? Maybe for some. I most always search > command history by prefix and then just using multiple ESC-p invocations > to find the one command to edit/re-execute. Less frequently I want to > search the whole text of history for the whole command line sequence > like bash Ctrl-R accomplishes. Agreed, search-by-prefix needed a lot more often than ^R one (search anywhere). That's why it makes sense to bind it to the arrows. > >>> "\ep": history-search-backward > >>> "\en": history-search-forward > > > Interesting that you mapped these to cursor-up/cursor-down. > > > > That may cause unexpected results. > > > For example, typing something and then pressing up-arrow will cause > > the shell to give you the previous command that started with that > > rather than the previous command in-general. That's exactly what I want, to type vi and instantly get to the editing command (skipping all cd's and ls's I might've done in between). > It's ESC-p/ESC-n, not just plain up-arrow/down-arrow. Up arrow still > does up without any search. At least with my config using \ep as shown. > My up arrows work for me as expected - they just iterate forward and > backward through shell history. I find this separation useless and actually mitigating the good. When I want to scroll the history without any search I'd simply won't type anything. Binding prefix-search to ESC-p/ESC-n, not up-arrow/down-arrow is beyond me. Empty command line gives you plain iteratation, typing anything limit iteratation over commands starting with typed prefix. ./danfe From owner-svn-src-all@freebsd.org Tue Oct 31 06:35:18 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 AA077E4FCEE; Tue, 31 Oct 2017 06:35:18 +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 69449653AB; Tue, 31 Oct 2017 06:35:18 +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 v9V6ZHx6010312; Tue, 31 Oct 2017 06:35:17 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9V6ZHvl010311; Tue, 31 Oct 2017 06:35:17 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201710310635.v9V6ZHvl010311@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Tue, 31 Oct 2017 06:35:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325215 - head/share/man/man7 X-SVN-Group: head X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: head/share/man/man7 X-SVN-Commit-Revision: 325215 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: Tue, 31 Oct 2017 06:35:18 -0000 Author: eadler Date: Tue Oct 31 06:35:17 2017 New Revision: 325215 URL: https://svnweb.freebsd.org/changeset/base/325215 Log: Update tuning(7) some more At this point its unclear how much help tuning(7) is whatsoever but leave it around in case someone decides to spend some time on it. Modified: head/share/man/man7/tuning.7 Modified: head/share/man/man7/tuning.7 ============================================================================== --- head/share/man/man7/tuning.7 Tue Oct 31 06:16:40 2017 (r325214) +++ head/share/man/man7/tuning.7 Tue Oct 31 06:35:17 2017 (r325215) @@ -41,8 +41,7 @@ Configuring too little swap can lead to inefficiencies in the VM page scanning code as well as create issues later on if you add more memory to your machine. On larger systems -with multiple SCSI disks (or multiple IDE disks operating on different -controllers), configure swap on each drive. +with multiple disks, configure swap on each drive. The swap partitions on the drives should be approximately the same size. The kernel can handle arbitrary sizes but internal data structures scale to 4 times the largest swap partition. @@ -176,11 +175,6 @@ This means you want to use a large off-center stripe size such as 1152 sectors so sequential I/O does not seek both disks and so meta-data is distributed across both disks rather than concentrated on a single disk. -If -you really need to get sophisticated, we recommend using a real hardware -RAID controller from the list of -.Fx -supported controllers. .Sh SYSCTL TUNING .Xr sysctl 8 variables permit system behavior to be monitored and controlled at @@ -347,9 +341,6 @@ is adhered to. .Pp There are various other buffer-cache and VM page cache related sysctls. We do not recommend modifying these values. -As of -.Fx 4.3 , -the VM system does an extremely good job tuning itself. .Pp The .Va net.inet.tcp.sendspace @@ -547,30 +538,12 @@ and reboot the system. .Va kern.maxusers controls the scaling of a number of static system tables, including defaults for the maximum number of open files, sizing of network memory resources, etc. -As of -.Fx 4.5 , .Va kern.maxusers is automatically sized at boot based on the amount of memory available in the system, and may be determined at run-time by inspecting the value of the read-only .Va kern.maxusers sysctl. -Some sites will require larger or smaller values of -.Va kern.maxusers -and may set it as a loader tunable; values of 64, 128, and 256 are not -uncommon. -We do not recommend going above 256 unless you need a huge number -of file descriptors; many of the tunable values set to their defaults by -.Va kern.maxusers -may be individually overridden at boot-time or run-time as described -elsewhere in this document. -Systems older than -.Fx 4.4 -must set this value via the kernel -.Xr config 8 -option -.Cd maxusers -instead. .Pp The .Va kern.dfldsiz @@ -619,14 +592,6 @@ The option to .Xr netstat 1 may be used to observe network cluster use. -Older versions of -.Fx -do not have this tunable and require that the -kernel -.Xr config 8 -option -.Dv NMBCLUSTERS -be set instead. .Pp More and more programs are using the .Xr sendfile 2 @@ -705,11 +670,6 @@ can be used to monitor this. There are many solutions to saturated disks: increasing memory for caching, mirroring disks, distributing operations across several machines, and so forth. -If disk performance is an issue and you -are using IDE drives, switching to SCSI can help a great deal. -While modern -IDE drives compare with SCSI in raw sequential bandwidth, the moment you -start seeking around the disk SCSI drives usually win. .Pp Finally, you might run out of network suds. Optimize the network path @@ -718,10 +678,7 @@ For example, in .Xr firewall 7 we describe a firewall protecting internal hosts with a topology where the externally visible hosts are not routed through it. -Use 1000BaseT rather -than 100BaseT, depending on your needs. -Most bottlenecks occur at the WAN link (e.g.,\& -modem, T1, DSL, whatever). +Most bottlenecks occur at the WAN link. If expanding the link is not an option it may be possible to use the .Xr dummynet 4 feature to implement peak shaving or other forms of traffic shaping to From owner-svn-src-all@freebsd.org Tue Oct 31 06:36: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 321CEE4FDDF; Tue, 31 Oct 2017 06:36: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 006F46551B; Tue, 31 Oct 2017 06:36: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 v9V6aY31010396; Tue, 31 Oct 2017 06:36:34 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9V6aYK2010395; Tue, 31 Oct 2017 06:36:34 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201710310636.v9V6aYK2010395@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Tue, 31 Oct 2017 06:36:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325216 - head/share/man/man7 X-SVN-Group: head X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: head/share/man/man7 X-SVN-Commit-Revision: 325216 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: Tue, 31 Oct 2017 06:36:35 -0000 Author: eadler Date: Tue Oct 31 06:36:33 2017 New Revision: 325216 URL: https://svnweb.freebsd.org/changeset/base/325216 Log: Also bump Dd Modified: head/share/man/man7/tuning.7 Modified: head/share/man/man7/tuning.7 ============================================================================== --- head/share/man/man7/tuning.7 Tue Oct 31 06:35:17 2017 (r325215) +++ head/share/man/man7/tuning.7 Tue Oct 31 06:36:33 2017 (r325216) @@ -23,7 +23,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 22, 2017 +.Dd October 30, 2017 .Dt TUNING 7 .Os .Sh NAME From owner-svn-src-all@freebsd.org Tue Oct 31 06:43: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 AA14EE50089; Tue, 31 Oct 2017 06:43:38 +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 770AE6592E; Tue, 31 Oct 2017 06:43:38 +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 v9V6hbvh014575; Tue, 31 Oct 2017 06:43:37 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9V6hbvL014574; Tue, 31 Oct 2017 06:43:37 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201710310643.v9V6hbvL014574@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Tue, 31 Oct 2017 06:43:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325217 - head/share/man/man7 X-SVN-Group: head X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: head/share/man/man7 X-SVN-Commit-Revision: 325217 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: Tue, 31 Oct 2017 06:43:38 -0000 Author: eadler Date: Tue Oct 31 06:43:37 2017 New Revision: 325217 URL: https://svnweb.freebsd.org/changeset/base/325217 Log: Fix '\' in binary ascii table Modified: head/share/man/man7/ascii.7 Modified: head/share/man/man7/ascii.7 ============================================================================== --- head/share/man/man7/ascii.7 Tue Oct 31 06:36:33 2017 (r325216) +++ head/share/man/man7/ascii.7 Tue Oct 31 06:43:37 2017 (r325217) @@ -28,7 +28,7 @@ .\" @(#)ascii.7 8.1 (Berkeley) 6/5/93 .\" $FreeBSD$ .\" -.Dd March 10, 2017 +.Dd October 30, 2017 .Dt ASCII 7 .Os .Sh NAME @@ -137,7 +137,7 @@ CAN 8 X x 11000 EM 9 Y y 11001 SUB : Z z 11010 ESC ; [ { 11011 - FS < \ | 11100 + FS < \e\ | 11100 GS = ] } 11101 RS > ^ - 11110 US ? _ DEL 11111 From owner-svn-src-all@freebsd.org Tue Oct 31 07:47: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 AE08DE51174; Tue, 31 Oct 2017 07:47:58 +0000 (UTC) (envelope-from yuri@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 7B1EE67570; Tue, 31 Oct 2017 07:47:58 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9V7lvAR039451; Tue, 31 Oct 2017 07:47:57 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9V7lv3q039450; Tue, 31 Oct 2017 07:47:57 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201710310747.v9V7lv3q039450@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Tue, 31 Oct 2017 07:47:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325220 - head/share/misc X-SVN-Group: head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: head/share/misc X-SVN-Commit-Revision: 325220 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: Tue, 31 Oct 2017 07:47:58 -0000 Author: yuri (ports committer) Date: Tue Oct 31 07:47:57 2017 New Revision: 325220 URL: https://svnweb.freebsd.org/changeset/base/325220 Log: Add myself as a new committer Reviewed by: tcberner Approved by: tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D12845 Modified: head/share/misc/committers-ports.dot Modified: head/share/misc/committers-ports.dot ============================================================================== --- head/share/misc/committers-ports.dot Tue Oct 31 07:16:18 2017 (r325219) +++ head/share/misc/committers-ports.dot Tue Oct 31 07:47:57 2017 (r325220) @@ -254,6 +254,7 @@ woodsb02 [label="Ben Woods\nwoodsb02@FreeBSD.org\n2016 wxs [label="Wesley Shields\nwxs@FreeBSD.org\n2008/01/03"] xmj [label="Johannes Jost Meixner\nxmj@FreeBSD.org\n2014/04/07"] xride [label="Soeren Straarup\nxride@FreeBSD.org\n2006/09/27"] +yuri [label="Yuri Victorovich\nyuri@FreeBSD.org\n2017/10/30"] yzlin [label="Yi-Jheng Lin\nyzlin@FreeBSD.org\n2009/07/19"] zeising [label="Niclas Zeising\nzeising@FreeBSD.org\n2012/07/03"] zi [label="Ryan Steinmetz\nzi@FreeBSD.org\n2011/07/14"] @@ -652,6 +653,7 @@ tabthorpe -> zi tabthorpe -> gblach tcberner -> adridg +tcberner -> yuri thierry -> jadawin thierry -> riggs From owner-svn-src-all@freebsd.org Tue Oct 31 08:56:16 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 99F43E5284E; Tue, 31 Oct 2017 08:56:16 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 7A20369CD1; Tue, 31 Oct 2017 08:56:16 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1235) id D63911F3E0; Tue, 31 Oct 2017 08:56:15 +0000 (UTC) Date: Tue, 31 Oct 2017 09:56:15 +0100 From: Baptiste Daroussin To: Eitan Adler Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Subject: Re: svn commit: r325092 - head/usr.bin/fortune/datfiles Message-ID: <20171031085615.5k7qqe3zeclw2yde@ivaldir.net> References: <201710290453.v9T4rX3E060010@repo.freebsd.org> <20171030151519.lbda66rwlkcmhprp@ivaldir.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="einh2hpoynlnzbhr" Content-Disposition: inline In-Reply-To: User-Agent: NeoMutt/20171013 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: Tue, 31 Oct 2017 08:56:16 -0000 --einh2hpoynlnzbhr Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Oct 30, 2017 at 10:33:20AM -0700, Eitan Adler wrote: > On 30 October 2017 at 08:15, Baptiste Daroussin wrote: > >> > >> - Prefer UTF-8 over ISO-8859-1 > >> - Remove some references to printing man pages > > > > Why? it was still valid. >=20 > (a) Virtually no one needs this anymore Subjective but let's say maybe > (b) it uses non-CUPS utilities, which while they still work are non-moder= n. cups do provide lpr as well, so it works both with cups and lpr from base a= nd as for the non modern part I would have said different as cups is different fr= om lpr, but lpr is still working fine and wildly used (I do use both). Never the less, the tips is still very valid, and useful in a sense that it allows people to learn about tools lot of people have forgotten about. col(= 1) for instance which is still very useful. when I see how lots of people are reinventing col(1) all the time in sed,awk,python,etc... I think having tips that tell them col(1) and other utilities do exist is a good idea. Bapt --einh2hpoynlnzbhr Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEgOTj3suS2urGXVU3Y4mL3PG3PloFAln4On4ACgkQY4mL3PG3 PlpN6A//dQd9iikRtCb7qdg47lRfsoOzs3ns8sF76xQwIaUf6foFVU15kuq72o7U qKGxqMxZ1N2elEPCqB302SFtoV5RDR5F3ZtZD5LczTuvmKbgBjzKYh4CLco2zD6m P922tiFEbW1w6Irk3G2Ud2p8fztFPVqFwvcc3XHdhVI6ILK0s18/xTGJrUqPetz2 kC5k8IdINRzy2aEYMXmn3zX2QcYvEeGVHm0xRgJqqg1wexq+O9yJ/yEkTmofXcJL FgMl48rrG0Eus7V8KziVbeU5Xg9t80ioFnrZo2ZPI9gia1sQ313jNzvPTlBOeSzh lf/501cbhqMrl9UM6WKxfqv5RMs1Mn+D0Fs+J+/hQyDJ6I06duaVkLfSY/i7hg/z lt9+VeGmE0zNNQMX6sM9OU3AVc2ftuA2938uiJ7YVD0hZX0p+XIKDhmM3/gRaSfO TnJUN6XQ1BgaeRIG977JG63K8Hys0CFQqF9jgBhp3g26ydaLzKuaPg2SsjsvGiLm FJFdMmXF9whJeDCLxuLloRyD5C/YuPaGtwgrPkvTgzzXF38xpfIPWNYO+AssFonc xgRX85zxEvl+hwoNl4M3SKQJdfJbsyYjoJK3W/Ka1xmO3bpvajMw+yrl0bWHEGZp sU4AOghZ4HQutHpv/BOo01mJ9YBEcqgYveVEyqouZGQCHMEWaOE= =VO+g -----END PGP SIGNATURE----- --einh2hpoynlnzbhr-- From owner-svn-src-all@freebsd.org Tue Oct 31 09:15:15 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 2F693E52E60; Tue, 31 Oct 2017 09:15:15 +0000 (UTC) (envelope-from oshogbo.vx@gmail.com) Received: from mail-pf0-x230.google.com (mail-pf0-x230.google.com [IPv6:2607:f8b0:400e:c00::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 F404C6A578; Tue, 31 Oct 2017 09:15:14 +0000 (UTC) (envelope-from oshogbo.vx@gmail.com) Received: by mail-pf0-x230.google.com with SMTP id n89so13273389pfk.11; Tue, 31 Oct 2017 02:15:14 -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=m3nr0PSkiDVA5C2P9CA/suHsHT9aZqIqzNMREGdTVPs=; b=JYfywafIdRYKH94Onp9vEwKf6cH/PWB2XodLGBymhPvnxtxg4hqYetacRvuXpNeGYY rgXnZ7uRb09KIKpqla2Z3JDw1LDzAMMRo11oMOyJ0zSM96H3TCGisFTWZo6DxJSgiSIh nd1CNiqh6Oeew004ez9/GLm3BIEMqWx1IIMRQAfXnixJ5nsXNdynCehVq2E1qdm7rGBT BlIsFre4BiNIbEVnLz52S4PI+TwT6rrBHdbteknp94T9ksO/tdYyYinhhNXsdz4su0cI p99Vs2SLYYkw+Bic5D0qVmq4/+65KZNuxC9eedw5+ZxvSedqn7yLFgL+/AnpGLpODFWp FUPQ== 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=m3nr0PSkiDVA5C2P9CA/suHsHT9aZqIqzNMREGdTVPs=; b=dF6Ce2fEEdCVMy+V+Jph6R51GUwOHisCaH8vruED7HxtH3rE+0XveZRFg/69j5XvZ5 Dnz4VVPkYGjc7ou5haeF3rb7t9IFdkzh01p5P+GRitYx0CoTDyCu7g7+UyJ0OW24oBj/ I/3lSeDvw4Maa3shhO5ucz/AmiD13l0ATn+4Yo+KxN51Kzu5f99UUdEaULpIm5dmFtVi rCxI/KR5BFZq8/IDOBRCqB3mNLKNS/zvC/hk1xuYvw5fIHHlZ3EdBPCcD6fObNtHoxbb +pRBnQmVVidb28p5Pj17xo/bt+tnqu4fR9tRV4RGYeuqDHdtENPEnO2N2Obax1Cpg+SB zZhg== X-Gm-Message-State: AMCzsaXBiyBlajqaEaaLxqDCFHMQkGBV35qUPT3pcsUuo/RoZU3RGwZi fTE6I/sBc7TNjtKCkEa9eXOxN1cZy9cAhyUiP7ECSA== X-Google-Smtp-Source: ABhQp+QEwiN4gMlyJnY/6l0oJLnOHkM3O8sBFzHyFwfvJovSK+/AqpGtiJAT56EBoe/YMUQBN5KdnhoIzjgoTv1v4/E= X-Received: by 10.99.168.13 with SMTP id o13mr1213386pgf.435.1509441314324; Tue, 31 Oct 2017 02:15:14 -0700 (PDT) MIME-Version: 1.0 Sender: oshogbo.vx@gmail.com Received: by 10.100.130.73 with HTTP; Tue, 31 Oct 2017 02:15:13 -0700 (PDT) In-Reply-To: <201710310402.v9V42oPm048004@repo.freebsd.org> References: <201710310402.v9V42oPm048004@repo.freebsd.org> From: Mariusz Zaborski Date: Tue, 31 Oct 2017 10:15:13 +0100 X-Google-Sender-Auth: dXsEB_laUDbpnsoF-WK2Id7W_1s Message-ID: Subject: Re: svn commit: r325208 - head/lib/libcasper/services/cap_grp To: Ngie Cooper Cc: src-committers , 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: Tue, 31 Oct 2017 09:15:15 -0000 Thanks for fixing that! On 31 October 2017 at 05:02, Ngie Cooper wrote: > Author: ngie > Date: Tue Oct 31 04:02:50 2017 > New Revision: 325208 > URL: https://svnweb.freebsd.org/changeset/base/325208 > > Log: > Add `static` to `cap_setgrent` prototype in !WITH_CASPER case > > This unbreaks the default powerpc/sparc64 build configuration after r325062. > > Modified: > head/lib/libcasper/services/cap_grp/cap_grp.h > > Modified: head/lib/libcasper/services/cap_grp/cap_grp.h > ============================================================================== > --- head/lib/libcasper/services/cap_grp/cap_grp.h Tue Oct 31 03:47:22 2017 (r325207) > +++ head/lib/libcasper/services/cap_grp/cap_grp.h Tue Oct 31 04:02:50 2017 (r325208) > @@ -65,7 +65,7 @@ int cap_grp_limit_groups(cap_channel_t *chan, const ch > > #define cap_setgroupent(chan, stayopen) etgroupent(stayopen) > #define endgrent(chan) endgrent() > -inline int > +static inline int > cap_setgrent(cap_channel_t *chan __unused) > { > > _______________________________________________ > svn-src-head@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org" From owner-svn-src-all@freebsd.org Tue Oct 31 09:54: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 79FAAE53CBF; Tue, 31 Oct 2017 09:54:42 +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 475976BD5F; Tue, 31 Oct 2017 09:54:42 +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 v9V9sf7S093046; Tue, 31 Oct 2017 09:54:41 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9V9sfFZ093045; Tue, 31 Oct 2017 09:54:41 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201710310954.v9V9sfFZ093045@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Tue, 31 Oct 2017 09:54:41 +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: r325221 - stable/11/sys/dev/iscsi X-SVN-Group: stable-11 X-SVN-Commit-Author: avg X-SVN-Commit-Paths: stable/11/sys/dev/iscsi X-SVN-Commit-Revision: 325221 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: Tue, 31 Oct 2017 09:54:42 -0000 Author: avg Date: Tue Oct 31 09:54:41 2017 New Revision: 325221 URL: https://svnweb.freebsd.org/changeset/base/325221 Log: MFC r324689: iscsi: do not hold the global lock while tearing down a session Modified: stable/11/sys/dev/iscsi/iscsi.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/iscsi/iscsi.c ============================================================================== --- stable/11/sys/dev/iscsi/iscsi.c Tue Oct 31 07:47:57 2017 (r325220) +++ stable/11/sys/dev/iscsi/iscsi.c Tue Oct 31 09:54:41 2017 (r325221) @@ -434,6 +434,8 @@ iscsi_maintenance_thread_terminate(struct iscsi_sessio sc = is->is_softc; sx_xlock(&sc->sc_lock); + TAILQ_REMOVE(&sc->sc_sessions, is, is_next); + sx_xunlock(&sc->sc_lock); icl_conn_close(is->is_conn); callout_drain(&is->is_callout); @@ -465,8 +467,6 @@ iscsi_maintenance_thread_terminate(struct iscsi_sessio #ifdef ICL_KERNEL_PROXY cv_destroy(&is->is_login_cv); #endif - TAILQ_REMOVE(&sc->sc_sessions, is, is_next); - sx_xunlock(&sc->sc_lock); ISCSI_SESSION_DEBUG(is, "terminated"); free(is, M_ISCSI); From owner-svn-src-all@freebsd.org Tue Oct 31 09:55: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 F0F3AE53D29; Tue, 31 Oct 2017 09:55: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 C00BD6BE9A; Tue, 31 Oct 2017 09:55: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 v9V9tNqc093149; Tue, 31 Oct 2017 09:55:23 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9V9tMb8093148; Tue, 31 Oct 2017 09:55:22 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201710310955.v9V9tMb8093148@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Tue, 31 Oct 2017 09:55:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r325222 - stable/10/sys/dev/iscsi X-SVN-Group: stable-10 X-SVN-Commit-Author: avg X-SVN-Commit-Paths: stable/10/sys/dev/iscsi X-SVN-Commit-Revision: 325222 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: Tue, 31 Oct 2017 09:55:24 -0000 Author: avg Date: Tue Oct 31 09:55:22 2017 New Revision: 325222 URL: https://svnweb.freebsd.org/changeset/base/325222 Log: MFC r324689: iscsi: do not hold the global lock while tearing down a session Modified: stable/10/sys/dev/iscsi/iscsi.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/iscsi/iscsi.c ============================================================================== --- stable/10/sys/dev/iscsi/iscsi.c Tue Oct 31 09:54:41 2017 (r325221) +++ stable/10/sys/dev/iscsi/iscsi.c Tue Oct 31 09:55:22 2017 (r325222) @@ -429,6 +429,8 @@ iscsi_maintenance_thread_terminate(struct iscsi_sessio sc = is->is_softc; sx_xlock(&sc->sc_lock); + TAILQ_REMOVE(&sc->sc_sessions, is, is_next); + sx_xunlock(&sc->sc_lock); icl_conn_close(is->is_conn); callout_drain(&is->is_callout); @@ -460,8 +462,6 @@ iscsi_maintenance_thread_terminate(struct iscsi_sessio #ifdef ICL_KERNEL_PROXY cv_destroy(&is->is_login_cv); #endif - TAILQ_REMOVE(&sc->sc_sessions, is, is_next); - sx_xunlock(&sc->sc_lock); ISCSI_SESSION_DEBUG(is, "terminated"); free(is, M_ISCSI); From owner-svn-src-all@freebsd.org Tue Oct 31 09:56: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 B35D4E53DB3; Tue, 31 Oct 2017 09:56:38 +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 819206C003; Tue, 31 Oct 2017 09:56:38 +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 v9V9ubVU093238; Tue, 31 Oct 2017 09:56:37 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9V9uboX093237; Tue, 31 Oct 2017 09:56:37 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201710310956.v9V9uboX093237@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Tue, 31 Oct 2017 09:56:37 +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: r325223 - stable/11/sys/dev/iscsi X-SVN-Group: stable-11 X-SVN-Commit-Author: avg X-SVN-Commit-Paths: stable/11/sys/dev/iscsi X-SVN-Commit-Revision: 325223 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: Tue, 31 Oct 2017 09:56:38 -0000 Author: avg Date: Tue Oct 31 09:56:37 2017 New Revision: 325223 URL: https://svnweb.freebsd.org/changeset/base/325223 Log: MFC r324694: never retry oustanding requests when terminating iscsi session Modified: stable/11/sys/dev/iscsi/iscsi.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/iscsi/iscsi.c ============================================================================== --- stable/11/sys/dev/iscsi/iscsi.c Tue Oct 31 09:55:22 2017 (r325222) +++ stable/11/sys/dev/iscsi/iscsi.c Tue Oct 31 09:56:37 2017 (r325223) @@ -291,17 +291,14 @@ iscsi_session_logout(struct iscsi_session *is) static void iscsi_session_terminate_task(struct iscsi_session *is, - struct iscsi_outstanding *io, bool requeue) + struct iscsi_outstanding *io, cam_status status) { ISCSI_SESSION_LOCK_ASSERT(is); if (io->io_ccb != NULL) { io->io_ccb->ccb_h.status &= ~(CAM_SIM_QUEUED | CAM_STATUS_MASK); - if (requeue) - io->io_ccb->ccb_h.status |= CAM_REQUEUE_REQ; - else - io->io_ccb->ccb_h.status |= CAM_REQ_ABORTED; + io->io_ccb->ccb_h.status |= status; if ((io->io_ccb->ccb_h.status & CAM_DEV_QFRZN) == 0) { io->io_ccb->ccb_h.status |= CAM_DEV_QFRZN; xpt_freeze_devq(io->io_ccb->ccb_h.path, 1); @@ -313,14 +310,14 @@ iscsi_session_terminate_task(struct iscsi_session *is, } static void -iscsi_session_terminate_tasks(struct iscsi_session *is, bool requeue) +iscsi_session_terminate_tasks(struct iscsi_session *is, cam_status status) { struct iscsi_outstanding *io, *tmp; ISCSI_SESSION_LOCK_ASSERT(is); TAILQ_FOREACH_SAFE(io, &is->is_outstanding, io_next, tmp) { - iscsi_session_terminate_task(is, io, requeue); + iscsi_session_terminate_task(is, io, status); } } @@ -354,11 +351,11 @@ iscsi_session_cleanup(struct iscsi_session *is, bool d /* * Terminate SCSI tasks, asking CAM to requeue them. */ - iscsi_session_terminate_tasks(is, true); + iscsi_session_terminate_tasks(is, CAM_REQUEUE_REQ); return; } - iscsi_session_terminate_tasks(is, false); + iscsi_session_terminate_tasks(is, CAM_DEV_NOT_THERE); if (is->is_sim == NULL) return; @@ -1021,7 +1018,7 @@ iscsi_pdu_handle_task_response(struct icl_pdu *respons } else { aio = iscsi_outstanding_find(is, io->io_datasn); if (aio != NULL && aio->io_ccb != NULL) - iscsi_session_terminate_task(is, aio, false); + iscsi_session_terminate_task(is, aio, CAM_REQ_ABORTED); } iscsi_outstanding_remove(is, io); From owner-svn-src-all@freebsd.org Tue Oct 31 09:57:12 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 48087E53E12; Tue, 31 Oct 2017 09:57:12 +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 156956C145; Tue, 31 Oct 2017 09:57:12 +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 v9V9vBp4093312; Tue, 31 Oct 2017 09:57:11 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9V9vBRH093311; Tue, 31 Oct 2017 09:57:11 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201710310957.v9V9vBRH093311@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Tue, 31 Oct 2017 09:57:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r325224 - stable/10/sys/dev/iscsi X-SVN-Group: stable-10 X-SVN-Commit-Author: avg X-SVN-Commit-Paths: stable/10/sys/dev/iscsi X-SVN-Commit-Revision: 325224 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: Tue, 31 Oct 2017 09:57:12 -0000 Author: avg Date: Tue Oct 31 09:57:10 2017 New Revision: 325224 URL: https://svnweb.freebsd.org/changeset/base/325224 Log: MFC r324694: never retry oustanding requests when terminating iscsi session Modified: stable/10/sys/dev/iscsi/iscsi.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/iscsi/iscsi.c ============================================================================== --- stable/10/sys/dev/iscsi/iscsi.c Tue Oct 31 09:56:37 2017 (r325223) +++ stable/10/sys/dev/iscsi/iscsi.c Tue Oct 31 09:57:10 2017 (r325224) @@ -293,15 +293,12 @@ iscsi_session_logout(struct iscsi_session *is) static void iscsi_session_terminate_task(struct iscsi_session *is, - struct iscsi_outstanding *io, bool requeue) + struct iscsi_outstanding *io, cam_status status) { if (io->io_ccb != NULL) { io->io_ccb->ccb_h.status &= ~(CAM_SIM_QUEUED | CAM_STATUS_MASK); - if (requeue) - io->io_ccb->ccb_h.status |= CAM_REQUEUE_REQ; - else - io->io_ccb->ccb_h.status |= CAM_REQ_ABORTED; + io->io_ccb->ccb_h.status |= status; if ((io->io_ccb->ccb_h.status & CAM_DEV_QFRZN) == 0) { io->io_ccb->ccb_h.status |= CAM_DEV_QFRZN; xpt_freeze_devq(io->io_ccb->ccb_h.path, 1); @@ -313,14 +310,14 @@ iscsi_session_terminate_task(struct iscsi_session *is, } static void -iscsi_session_terminate_tasks(struct iscsi_session *is, bool requeue) +iscsi_session_terminate_tasks(struct iscsi_session *is, cam_status status) { struct iscsi_outstanding *io, *tmp; ISCSI_SESSION_LOCK_ASSERT(is); TAILQ_FOREACH_SAFE(io, &is->is_outstanding, io_next, tmp) { - iscsi_session_terminate_task(is, io, requeue); + iscsi_session_terminate_task(is, io, status); } } @@ -354,11 +351,11 @@ iscsi_session_cleanup(struct iscsi_session *is, bool d /* * Terminate SCSI tasks, asking CAM to requeue them. */ - iscsi_session_terminate_tasks(is, true); + iscsi_session_terminate_tasks(is, CAM_REQUEUE_REQ); return; } - iscsi_session_terminate_tasks(is, false); + iscsi_session_terminate_tasks(is, CAM_DEV_NOT_THERE); if (is->is_sim == NULL) return; @@ -996,7 +993,7 @@ iscsi_pdu_handle_task_response(struct icl_pdu *respons } else { aio = iscsi_outstanding_find(is, io->io_datasn); if (aio != NULL && aio->io_ccb != NULL) - iscsi_session_terminate_task(is, aio, false); + iscsi_session_terminate_task(is, aio, CAM_REQ_ABORTED); } iscsi_outstanding_remove(is, io); From owner-svn-src-all@freebsd.org Tue Oct 31 09:58:21 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 35CAEE53ED1; Tue, 31 Oct 2017 09:58:21 +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 030076C2C2; Tue, 31 Oct 2017 09:58:20 +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 v9V9wKc1093400; Tue, 31 Oct 2017 09:58:20 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9V9wKXe093399; Tue, 31 Oct 2017 09:58:20 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201710310958.v9V9wKXe093399@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Tue, 31 Oct 2017 09:58:20 +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: r325225 - stable/11/sys/dev/iscsi X-SVN-Group: stable-11 X-SVN-Commit-Author: avg X-SVN-Commit-Paths: stable/11/sys/dev/iscsi X-SVN-Commit-Revision: 325225 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: Tue, 31 Oct 2017 09:58:21 -0000 Author: avg Date: Tue Oct 31 09:58:19 2017 New Revision: 325225 URL: https://svnweb.freebsd.org/changeset/base/325225 Log: MFC r324957: iscsi_shutdown_post: do nothing if panic-ing Modified: stable/11/sys/dev/iscsi/iscsi.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/iscsi/iscsi.c ============================================================================== --- stable/11/sys/dev/iscsi/iscsi.c Tue Oct 31 09:57:10 2017 (r325224) +++ stable/11/sys/dev/iscsi/iscsi.c Tue Oct 31 09:58:19 2017 (r325225) @@ -2448,8 +2448,10 @@ static void iscsi_shutdown_post(struct iscsi_softc *sc) { - ISCSI_DEBUG("removing all sessions due to shutdown"); - iscsi_terminate_sessions(sc); + if (panicstr == NULL) { + ISCSI_DEBUG("removing all sessions due to shutdown"); + iscsi_terminate_sessions(sc); + } } static int From owner-svn-src-all@freebsd.org Tue Oct 31 09:58: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 98B2CE53F2D; Tue, 31 Oct 2017 09:58:52 +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 67A9C6C3F7; Tue, 31 Oct 2017 09:58:52 +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 v9V9wpZP093473; Tue, 31 Oct 2017 09:58:51 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9V9wpSj093472; Tue, 31 Oct 2017 09:58:51 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201710310958.v9V9wpSj093472@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Tue, 31 Oct 2017 09:58:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r325226 - stable/10/sys/dev/iscsi X-SVN-Group: stable-10 X-SVN-Commit-Author: avg X-SVN-Commit-Paths: stable/10/sys/dev/iscsi X-SVN-Commit-Revision: 325226 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: Tue, 31 Oct 2017 09:58:52 -0000 Author: avg Date: Tue Oct 31 09:58:51 2017 New Revision: 325226 URL: https://svnweb.freebsd.org/changeset/base/325226 Log: MFC r324957: iscsi_shutdown_post: do nothing if panic-ing Modified: stable/10/sys/dev/iscsi/iscsi.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/iscsi/iscsi.c ============================================================================== --- stable/10/sys/dev/iscsi/iscsi.c Tue Oct 31 09:58:19 2017 (r325225) +++ stable/10/sys/dev/iscsi/iscsi.c Tue Oct 31 09:58:51 2017 (r325226) @@ -2384,8 +2384,10 @@ static void iscsi_shutdown_post(struct iscsi_softc *sc) { - ISCSI_DEBUG("removing all sessions due to shutdown"); - iscsi_terminate_sessions(sc); + if (panicstr == NULL) { + ISCSI_DEBUG("removing all sessions due to shutdown"); + iscsi_terminate_sessions(sc); + } } static int From owner-svn-src-all@freebsd.org Tue Oct 31 10:10:14 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 889BBE54271; Tue, 31 Oct 2017 10:10:14 +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 63FC86CB65; Tue, 31 Oct 2017 10:10:14 +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 v9VAADxJ097939; Tue, 31 Oct 2017 10:10:13 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9VAADcw097938; Tue, 31 Oct 2017 10:10:13 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201710311010.v9VAADcw097938@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Tue, 31 Oct 2017 10:10:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325227 - head/sys/geom X-SVN-Group: head X-SVN-Commit-Author: avg X-SVN-Commit-Paths: head/sys/geom X-SVN-Commit-Revision: 325227 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: Tue, 31 Oct 2017 10:10:14 -0000 Author: avg Date: Tue Oct 31 10:10:13 2017 New Revision: 325227 URL: https://svnweb.freebsd.org/changeset/base/325227 Log: geom_slice: do not destroy softc until providers are gone At present, g_slice_orphan and g_slice_spoiled destroy the softc (struct g_slicer) even before calling g_wither_geom, so there can be active and incoming io requests at that time and g_slice_start can access the softc. This commit changes the code to destroy the softc only after all providers are closed. While there, a couple of small cleanups. Reported by: Ben RUBSON Tested by: Ben RUBSON Reviewed by: mav, smh (earlier version) MFC after: 2 weeks Sponsored by: Panzura Differential Revision: https://reviews.freebsd.org/D12809 Modified: head/sys/geom/geom_slice.c Modified: head/sys/geom/geom_slice.c ============================================================================== --- head/sys/geom/geom_slice.c Tue Oct 31 09:58:51 2017 (r325226) +++ head/sys/geom/geom_slice.c Tue Oct 31 10:10:13 2017 (r325227) @@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include @@ -127,6 +126,15 @@ g_slice_access(struct g_provider *pp, int dr, int dw, if ((cp->acr + dr) == 0 && (cp->acw + dw) == 0 && (cp->ace + de) == 1) de--; error = g_access(cp, dr, dw, de); + + /* + * Free the softc if all providers have been closed and this geom + * is being removed. + */ + if (error == 0 && (gp->flags & G_GEOM_WITHER) != 0 && + (cp->acr + cp->acw + cp->ace) == 0) + g_slice_free(gsp); + return (error); } @@ -470,21 +478,32 @@ g_slice_conf_hot(struct g_geom *gp, u_int idx, off_t o } void -g_slice_spoiled(struct g_consumer *cp) +g_slice_orphan(struct g_consumer *cp) { struct g_geom *gp; - struct g_slicer *gsp; g_topology_assert(); gp = cp->geom; - g_trace(G_T_TOPOLOGY, "g_slice_spoiled(%p/%s)", cp, gp->name); - cp->flags |= G_CF_ORPHAN; - gsp = gp->softc; - gp->softc = NULL; - g_slice_free(gsp); + g_trace(G_T_TOPOLOGY, "%s(%p/%s)", __func__, cp, gp->name); g_wither_geom(gp, ENXIO); + + /* + * We can safely free the softc now if there are no accesses, + * otherwise g_slice_access() will do that after the last close. + */ + if ((cp->acr + cp->acw + cp->ace) == 0) + g_slice_free(gp->softc); } +void +g_slice_spoiled(struct g_consumer *cp) +{ + + g_trace(G_T_TOPOLOGY, "%s(%p/%s)", __func__, cp, cp->geom->name); + cp->flags |= G_CF_ORPHAN; + g_slice_orphan(cp); +} + int g_slice_destroy_geom(struct gctl_req *req, struct g_class *mp, struct g_geom *gp) { @@ -507,10 +526,10 @@ g_slice_new(struct g_class *mp, u_int slices, struct g gp = g_new_geomf(mp, "%s", pp->name); gsp = g_slice_alloc(slices, extra); gsp->start = start; - gp->access = g_slice_access; - gp->orphan = g_slice_orphan; gp->softc = gsp; gp->start = g_slice_start; + gp->access = g_slice_access; + gp->orphan = g_slice_orphan; gp->spoiled = g_slice_spoiled; if (gp->dumpconf == NULL) gp->dumpconf = g_slice_dumpconf; @@ -529,19 +548,4 @@ g_slice_new(struct g_class *mp, u_int slices, struct g *vp = gsp->softc; *cpp = cp; return (gp); -} - -void -g_slice_orphan(struct g_consumer *cp) -{ - struct g_slicer *gsp; - - g_trace(G_T_TOPOLOGY, "g_slice_orphan(%p/%s)", cp, cp->provider->name); - g_topology_assert(); - - /* XXX: Not good enough we leak the softc and its suballocations */ - gsp = cp->geom->softc; - cp->geom->softc = NULL; - g_slice_free(gsp); - g_wither_geom(cp->geom, ENXIO); } From owner-svn-src-all@freebsd.org Tue Oct 31 10:15: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 49C45E544DB; Tue, 31 Oct 2017 10:15: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 18C966CF8A; Tue, 31 Oct 2017 10:15: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 v9VAF3vK001792; Tue, 31 Oct 2017 10:15:03 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9VAF37E001791; Tue, 31 Oct 2017 10:15:03 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201710311015.v9VAF37E001791@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Tue, 31 Oct 2017 10:15:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325228 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Group: head X-SVN-Commit-Author: avg X-SVN-Commit-Paths: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Commit-Revision: 325228 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: Tue, 31 Oct 2017 10:15:04 -0000 Author: avg Date: Tue Oct 31 10:15:03 2017 New Revision: 325228 URL: https://svnweb.freebsd.org/changeset/base/325228 Log: vdev_geom_close: close errored consumer even if vdev_reopening is set If vdev_geom_close doesn't close the consumer, then the subsequent call to vdev_geom_open() would be just a NOP and would always return success. Thus, at present vdev_reopen() would always succeed for vdev_geom devices even if the underlying provider is in error state. The problem was introduced as a result of an optimization in rS308055. The most significant manifistation of the problem is that zio_vdev_io_done() --> vdev_probe() --> SPA_ASYNC_PROBE --> spa_async_probe() --> vdev_reopen() chain of calls and events becomes a NOP as well. This chain is invoked when zio_vdev_io_done() detects an "unexpected" error from the lower level I/O. Additionally, that call path may race with SPA_ASYNC_REMOVE path because of the asynchronous nature of them both. So, the SPA_ASYNC_PROBE may erroneously mark a vdev as being healthy after SPA_ASYNC_REMOVE marked it as removed. Reviewed by: asomers, mav MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D12731 Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c Tue Oct 31 10:10:13 2017 (r325227) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c Tue Oct 31 10:15:03 2017 (r325228) @@ -934,13 +934,18 @@ skip_open: static void vdev_geom_close(vdev_t *vd) { + struct g_consumer *cp; - if (vd->vdev_reopening) - return; + cp = vd->vdev_tsd; DROP_GIANT(); g_topology_lock(); - vdev_geom_close_locked(vd); + + if (!vd->vdev_reopening || + (cp != NULL && ((cp->flags & G_CF_ORPHAN) != 0 || + (cp->provider != NULL && cp->provider->error != 0)))) + vdev_geom_close_locked(vd); + g_topology_unlock(); PICKUP_GIANT(); } From owner-svn-src-all@freebsd.org Tue Oct 31 10:31: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 A7AB8E5490C; Tue, 31 Oct 2017 10:31:48 +0000 (UTC) (envelope-from ae@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 76F076DB4F; Tue, 31 Oct 2017 10:31:48 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9VAVlRC007908; Tue, 31 Oct 2017 10:31:47 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9VAVlui007907; Tue, 31 Oct 2017 10:31:47 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201710311031.v9VAVlui007907@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Tue, 31 Oct 2017 10:31:47 +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: r325229 - stable/11/sys/netpfil/ipfw X-SVN-Group: stable-11 X-SVN-Commit-Author: ae X-SVN-Commit-Paths: stable/11/sys/netpfil/ipfw X-SVN-Commit-Revision: 325229 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: Tue, 31 Oct 2017 10:31:48 -0000 Author: ae Date: Tue Oct 31 10:31:47 2017 New Revision: 325229 URL: https://svnweb.freebsd.org/changeset/base/325229 Log: MFC r324947: Add IPv6 support for O_TCPDATALEN opcode. PR: 222746 Modified: stable/11/sys/netpfil/ipfw/ip_fw2.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/netpfil/ipfw/ip_fw2.c ============================================================================== --- stable/11/sys/netpfil/ipfw/ip_fw2.c Tue Oct 31 10:15:03 2017 (r325228) +++ stable/11/sys/netpfil/ipfw/ip_fw2.c Tue Oct 31 10:31:47 2017 (r325229) @@ -963,7 +963,7 @@ ipfw_chk(struct ip_fw_args *args) uint8_t proto; uint16_t src_port = 0, dst_port = 0; /* NOTE: host format */ struct in_addr src_ip, dst_ip; /* NOTE: network format */ - uint16_t iplen=0; + int iplen = 0; int pktlen; uint16_t etype = 0; /* Host order stored ether type */ @@ -1205,6 +1205,7 @@ do { \ args->f_id.src_ip = 0; args->f_id.dst_ip = 0; args->f_id.flow_id6 = ntohl(ip6->ip6_flow); + iplen = ntohs(ip6->ip6_plen) + sizeof(*ip6); } else if (pktlen >= sizeof(struct ip) && (args->eh == NULL || etype == ETHERTYPE_IP) && ip->ip_v == 4) { is_ipv4 = 1; @@ -1219,7 +1220,6 @@ do { \ dst_ip = ip->ip_dst; offset = ntohs(ip->ip_off) & IP_OFFMASK; iplen = ntohs(ip->ip_len); - pktlen = iplen < pktlen ? iplen : pktlen; if (offset == 0) { switch (proto) { @@ -1258,6 +1258,7 @@ do { \ args->f_id.dst_ip = ntohl(dst_ip.s_addr); } #undef PULLUP_TO + pktlen = iplen < pktlen ? iplen: pktlen; if (proto) { /* we may have port numbers, store them */ args->f_id.proto = proto; args->f_id.src_port = src_port = ntohs(src_port); @@ -1771,10 +1772,25 @@ do { \ uint16_t x; uint16_t *p; int i; +#ifdef INET6 + if (is_ipv6) { + struct ip6_hdr *ip6; + ip6 = (struct ip6_hdr *)ip; + if (ip6->ip6_plen == 0) { + /* + * Jumbo payload is not + * supported by this + * opcode. + */ + break; + } + x = iplen - hlen; + } else +#endif /* INET6 */ + x = iplen - (ip->ip_hl << 2); tcp = TCP(ulp); - x = iplen - - ((ip->ip_hl + tcp->th_off) << 2); + x -= tcp->th_off << 2; if (cmdlen == 1) { match = (cmd->arg1 == x); break; From owner-svn-src-all@freebsd.org Tue Oct 31 10:55:03 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 CE4ADE555A5; Tue, 31 Oct 2017 10:55:03 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 458C26EBD9; Tue, 31 Oct 2017 10:55:03 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.15.2/8.15.2) with ESMTPS id v9VAsw7l046628 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 31 Oct 2017 12:54:58 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua v9VAsw7l046628 Received: (from kostik@localhost) by tom.home (8.15.2/8.15.2/Submit) id v9VAswQI046627; Tue, 31 Oct 2017 12:54:58 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Tue, 31 Oct 2017 12:54:58 +0200 From: Konstantin Belousov To: Baptiste Daroussin Cc: 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 Message-ID: <20171031105458.GB2566@kib.kiev.ua> References: <201710290453.v9T4rX3E060010@repo.freebsd.org> <20171030151519.lbda66rwlkcmhprp@ivaldir.net> <20171031085615.5k7qqe3zeclw2yde@ivaldir.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20171031085615.5k7qqe3zeclw2yde@ivaldir.net> User-Agent: Mutt/1.9.1 (2017-09-22) X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on tom.home 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: Tue, 31 Oct 2017 10:55:03 -0000 On Tue, Oct 31, 2017 at 09:56:15AM +0100, Baptiste Daroussin wrote: > On Mon, Oct 30, 2017 at 10:33:20AM -0700, Eitan Adler wrote: > > On 30 October 2017 at 08:15, Baptiste Daroussin wrote: > > >> > > >> - Prefer UTF-8 over ISO-8859-1 > > >> - Remove some references to printing man pages > > > > > > Why? it was still valid. > > > > (a) Virtually no one needs this anymore > > Subjective but let's say maybe > > > (b) it uses non-CUPS utilities, which while they still work are non-modern. > > cups do provide lpr as well, so it works both with cups and lpr from base and as > for the non modern part I would have said different as cups is different from > lpr, but lpr is still working fine and wildly used (I do use both). > > Never the less, the tips is still very valid, and useful in a sense that it > allows people to learn about tools lot of people have forgotten about. col(1) > for instance which is still very useful. when I see how lots of people are > reinventing col(1) all the time in sed,awk,python,etc... I think having tips > that tell them col(1) and other utilities do exist is a good idea. I think that some advise how to print man pages would be useful, but definitely not the advise which was removed. Printing tty rendering of the troff source would give very poor quality of the hard copy. The recipe should print the postscript rendering, which gives the proper exposure of the markup and makes the printing document much more satisfying appearance. From owner-svn-src-all@freebsd.org Tue Oct 31 11:09: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 737FDE55A41; Tue, 31 Oct 2017 11:09:40 +0000 (UTC) (envelope-from ae@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 4023F6F71A; Tue, 31 Oct 2017 11:09:40 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9VB9dUR022566; Tue, 31 Oct 2017 11:09:39 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9VB9dnt022565; Tue, 31 Oct 2017 11:09:39 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201710311109.v9VB9dnt022565@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Tue, 31 Oct 2017 11:09:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r325230 - stable/10/sys/netpfil/ipfw X-SVN-Group: stable-10 X-SVN-Commit-Author: ae X-SVN-Commit-Paths: stable/10/sys/netpfil/ipfw X-SVN-Commit-Revision: 325230 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: Tue, 31 Oct 2017 11:09:40 -0000 Author: ae Date: Tue Oct 31 11:09:39 2017 New Revision: 325230 URL: https://svnweb.freebsd.org/changeset/base/325230 Log: MFC r324947: Add IPv6 support for O_TCPDATALEN opcode. PR: 222746 Modified: stable/10/sys/netpfil/ipfw/ip_fw2.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/netpfil/ipfw/ip_fw2.c ============================================================================== --- stable/10/sys/netpfil/ipfw/ip_fw2.c Tue Oct 31 10:31:47 2017 (r325229) +++ stable/10/sys/netpfil/ipfw/ip_fw2.c Tue Oct 31 11:09:39 2017 (r325230) @@ -945,7 +945,7 @@ ipfw_chk(struct ip_fw_args *args) uint8_t proto; uint16_t src_port = 0, dst_port = 0; /* NOTE: host format */ struct in_addr src_ip, dst_ip; /* NOTE: network format */ - uint16_t iplen=0; + int iplen = 0; int pktlen; uint16_t etype = 0; /* Host order stored ether type */ @@ -1186,6 +1186,7 @@ do { \ args->f_id.src_ip = 0; args->f_id.dst_ip = 0; args->f_id.flow_id6 = ntohl(ip6->ip6_flow); + iplen = ntohs(ip6->ip6_plen) + sizeof(*ip6); } else if (pktlen >= sizeof(struct ip) && (args->eh == NULL || etype == ETHERTYPE_IP) && ip->ip_v == 4) { is_ipv4 = 1; @@ -1200,7 +1201,6 @@ do { \ dst_ip = ip->ip_dst; offset = ntohs(ip->ip_off) & IP_OFFMASK; iplen = ntohs(ip->ip_len); - pktlen = iplen < pktlen ? iplen : pktlen; if (offset == 0) { switch (proto) { @@ -1239,6 +1239,7 @@ do { \ args->f_id.dst_ip = ntohl(dst_ip.s_addr); } #undef PULLUP_TO + pktlen = iplen < pktlen ? iplen: pktlen; if (proto) { /* we may have port numbers, store them */ args->f_id.proto = proto; args->f_id.src_port = src_port = ntohs(src_port); @@ -1698,10 +1699,25 @@ do { \ uint16_t x; uint16_t *p; int i; +#ifdef INET6 + if (is_ipv6) { + struct ip6_hdr *ip6; + ip6 = (struct ip6_hdr *)ip; + if (ip6->ip6_plen == 0) { + /* + * Jumbo payload is not + * supported by this + * opcode. + */ + break; + } + x = iplen - hlen; + } else +#endif /* INET6 */ + x = iplen - (ip->ip_hl << 2); tcp = TCP(ulp); - x = iplen - - ((ip->ip_hl + tcp->th_off) << 2); + x -= tcp->th_off << 2; if (cmdlen == 1) { match = (cmd->arg1 == x); break; From owner-svn-src-all@freebsd.org Tue Oct 31 11:29: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 4C1F3E56047; Tue, 31 Oct 2017 11:29:17 +0000 (UTC) (envelope-from mizhka@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 1AEE46FF43; Tue, 31 Oct 2017 11:29:17 +0000 (UTC) (envelope-from mizhka@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9VBTGIq030580; Tue, 31 Oct 2017 11:29:16 GMT (envelope-from mizhka@FreeBSD.org) Received: (from mizhka@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9VBTG2a030578; Tue, 31 Oct 2017 11:29:16 GMT (envelope-from mizhka@FreeBSD.org) Message-Id: <201710311129.v9VBTG2a030578@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mizhka set sender to mizhka@FreeBSD.org using -f From: Michael Zhilin Date: Tue, 31 Oct 2017 11:29:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325231 - head/sys/mips/mediatek X-SVN-Group: head X-SVN-Commit-Author: mizhka X-SVN-Commit-Paths: head/sys/mips/mediatek X-SVN-Commit-Revision: 325231 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: Tue, 31 Oct 2017 11:29:17 -0000 Author: mizhka Date: Tue Oct 31 11:29:16 2017 New Revision: 325231 URL: https://svnweb.freebsd.org/changeset/base/325231 Log: [mips] Pin control configuration for MediaTek RT2880 RT2880 is MIPS4Kc SoC used in many SOHO routers. This commits adds GPIO pin control configuration of RT2880. Submitted by: Hiroki Mori Reviewed by: mizhka, sgalabov Differential Revision: https://reviews.freebsd.org/D12648 Modified: head/sys/mips/mediatek/mtk_pinctrl.c head/sys/mips/mediatek/mtk_pinctrl.h Modified: head/sys/mips/mediatek/mtk_pinctrl.c ============================================================================== --- head/sys/mips/mediatek/mtk_pinctrl.c Tue Oct 31 11:09:39 2017 (r325230) +++ head/sys/mips/mediatek/mtk_pinctrl.c Tue Oct 31 11:29:16 2017 (r325231) @@ -169,6 +169,9 @@ mtk_pinctrl_configure(device_t dev, phandle_t cfgxref) socid = mtk_soc_get_socid(); switch (socid) { + case MTK_SOC_RT2880: + pintable = rt2880_pintable; + break; case MTK_SOC_RT3050: /* fallthrough */ case MTK_SOC_RT3052: case MTK_SOC_RT3350: Modified: head/sys/mips/mediatek/mtk_pinctrl.h ============================================================================== --- head/sys/mips/mediatek/mtk_pinctrl.h Tue Oct 31 11:09:39 2017 (r325230) +++ head/sys/mips/mediatek/mtk_pinctrl.h Tue Oct 31 11:29:16 2017 (r325231) @@ -118,6 +118,14 @@ DECL_FUNC(gex_func) = { FUNC("ge1", 0), FUNC("ge2", 0), FUNC("gpio", 1) }; +DECL_FUNC(rt2880_uartf_func) = { + FUNC("uartf", 0), FUNC("gpio", 1) +}; + +DECL_FUNC(rt2880_pci_func) = { + FUNC("pci", 0), FUNC("gpio", 1) +}; + DECL_FUNC(rt3883_pci_func) = { FUNC("pci-dev", 0), FUNC("pci-host2", 1), FUNC("pci-host1", 2), FUNC("pci-fnc", 3), FUNC("gpio", 7) @@ -295,6 +303,18 @@ DECL_TABLE(mt7620_pintable) = { GROUP("nd_sd", SYSCTL_GPIOMODE, 18, 3, nd_sd_func), GROUP("pa", SYSCTL_GPIOMODE, 20, 1, pa_func), GROUP("wdt", SYSCTL_GPIOMODE, 21, 3, wdt_func), + GROUP_END +}; + +DECL_TABLE(rt2880_pintable) = { + GROUP("i2c", SYSCTL_GPIOMODE, 0, 1, i2c_func), + GROUP("uartf", SYSCTL_GPIOMODE, 1, 1, rt2880_uartf_func), + GROUP("spi", SYSCTL_GPIOMODE, 2, 1, spi_func), + GROUP("uartlite", SYSCTL_GPIOMODE, 3, 1, uartlite_func), + GROUP("jtag", SYSCTL_GPIOMODE, 4, 1, jtag_func), + GROUP("mdio", SYSCTL_GPIOMODE, 5, 1, mdio_func), + GROUP("sdram", SYSCTL_GPIOMODE, 6, 1, sdram_func), + GROUP("pci", SYSCTL_GPIOMODE, 7, 1, rt2880_pci_func), GROUP_END }; From owner-svn-src-all@freebsd.org Tue Oct 31 11:51:36 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 01617E56EB5; Tue, 31 Oct 2017 11:51:36 +0000 (UTC) (envelope-from tijl@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 C2D97718AA; Tue, 31 Oct 2017 11:51:35 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9VBpYND040547; Tue, 31 Oct 2017 11:51:34 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9VBpYI1040545; Tue, 31 Oct 2017 11:51:34 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201710311151.v9VBpYI1040545@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Tue, 31 Oct 2017 11:51:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325232 - in head/sys: amd64/amd64 i386/i386 X-SVN-Group: head X-SVN-Commit-Author: tijl X-SVN-Commit-Paths: in head/sys: amd64/amd64 i386/i386 X-SVN-Commit-Revision: 325232 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: Tue, 31 Oct 2017 11:51:36 -0000 Author: tijl Date: Tue Oct 31 11:51:34 2017 New Revision: 325232 URL: https://svnweb.freebsd.org/changeset/base/325232 Log: Set the return address for stack entry points to zero. Stack unwinders treat zero as a stop condition. The value on the stack can be non-zero because thread stacks may be arbitrary memory provided via pthread_attr_setstack(3) or may be recycled from previous threads. Reference: https://lists.freebsd.org/pipermail/freebsd-current/2017-August/066855.html https://lists.freebsd.org/pipermail/freebsd-current/2017-October/067254.html Discussed with: kib MFC after: 1 week Modified: head/sys/amd64/amd64/vm_machdep.c head/sys/i386/i386/vm_machdep.c Modified: head/sys/amd64/amd64/vm_machdep.c ============================================================================== --- head/sys/amd64/amd64/vm_machdep.c Tue Oct 31 11:29:16 2017 (r325231) +++ head/sys/amd64/amd64/vm_machdep.c Tue Oct 31 11:51:34 2017 (r325232) @@ -508,6 +508,9 @@ cpu_set_upcall(struct thread *td, void (*entry)(void * (((uintptr_t)stack->ss_sp + stack->ss_size - 4) & ~0x0f) - 4; td->td_frame->tf_rip = (uintptr_t)entry; + /* Return address sentinel value to stop stack unwinding. */ + suword32((void *)td->td_frame->tf_rsp, 0); + /* Pass the argument to the entry point. */ suword32((void *)(td->td_frame->tf_rsp + sizeof(int32_t)), (uint32_t)(uintptr_t)arg); @@ -530,6 +533,9 @@ cpu_set_upcall(struct thread *td, void (*entry)(void * td->td_frame->tf_fs = _ufssel; td->td_frame->tf_gs = _ugssel; td->td_frame->tf_flags = TF_HASSEGS; + + /* Return address sentinel value to stop stack unwinding. */ + suword((void *)td->td_frame->tf_rsp, 0); /* Pass the argument to the entry point. */ td->td_frame->tf_rdi = (register_t)arg; Modified: head/sys/i386/i386/vm_machdep.c ============================================================================== --- head/sys/i386/i386/vm_machdep.c Tue Oct 31 11:29:16 2017 (r325231) +++ head/sys/i386/i386/vm_machdep.c Tue Oct 31 11:51:34 2017 (r325232) @@ -524,6 +524,9 @@ cpu_set_upcall(struct thread *td, void (*entry)(void * (((int)stack->ss_sp + stack->ss_size - 4) & ~0x0f) - 4; td->td_frame->tf_eip = (int)entry; + /* Return address sentinel value to stop stack unwinding. */ + suword((void *)td->td_frame->tf_esp, 0); + /* Pass the argument to the entry point. */ suword((void *)(td->td_frame->tf_esp + sizeof(void *)), (int)arg); From owner-svn-src-all@freebsd.org Tue Oct 31 12:15: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 388CAE583EA; Tue, 31 Oct 2017 12:15:02 +0000 (UTC) (envelope-from mizhka@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 1292C72DBC; Tue, 31 Oct 2017 12:15:02 +0000 (UTC) (envelope-from mizhka@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9VCF1Fo051375; Tue, 31 Oct 2017 12:15:01 GMT (envelope-from mizhka@FreeBSD.org) Received: (from mizhka@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9VCF1Ge051373; Tue, 31 Oct 2017 12:15:01 GMT (envelope-from mizhka@FreeBSD.org) Message-Id: <201710311215.v9VCF1Ge051373@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mizhka set sender to mizhka@FreeBSD.org using -f From: Michael Zhilin Date: Tue, 31 Oct 2017 12:15:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325233 - in head/sys: conf dev/iicbus X-SVN-Group: head X-SVN-Commit-Author: mizhka X-SVN-Commit-Paths: in head/sys: conf dev/iicbus X-SVN-Commit-Revision: 325233 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: Tue, 31 Oct 2017 12:15:02 -0000 Author: mizhka Date: Tue Oct 31 12:15:00 2017 New Revision: 325233 URL: https://svnweb.freebsd.org/changeset/base/325233 Log: [i2c/clock] add support for EPSON RTC-8583 RTC-8583 is time-of-day clock used in some SOHO routers. This clock has only 2 bits for year values, but thanks to user SRAM it's possible to save year value and keep it up to date via driver code. Tested on Planex_MZK-W300NAG (SoC is RT2880) Submitted by: Hiroki Mori Differential Revision: https://reviews.freebsd.org/D12833 Added: head/sys/dev/iicbus/rtc8583.c (contents, props changed) Modified: head/sys/conf/files Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Tue Oct 31 11:51:34 2017 (r325232) +++ head/sys/conf/files Tue Oct 31 12:15:00 2017 (r325233) @@ -1789,6 +1789,7 @@ dev/iicbus/ds1307.c optional ds1307 dev/iicbus/ds13rtc.c optional ds13rtc | ds133x | ds1374 dev/iicbus/ds1672.c optional ds1672 dev/iicbus/ds3231.c optional ds3231 +dev/iicbus/rtc8583.c optional rtc8583 dev/iicbus/icee.c optional icee dev/iicbus/if_ic.c optional ic dev/iicbus/iic.c optional iic Added: head/sys/dev/iicbus/rtc8583.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/dev/iicbus/rtc8583.c Tue Oct 31 12:15:00 2017 (r325233) @@ -0,0 +1,295 @@ +/*- + * Copyright (c) 2017 Hiroki Mori. All rights reserved. + * Copyright (c) 2017 Ian Lepore. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * This code base on isl12xx.c + */ + +#include +__FBSDID("$FreeBSD$"); + +/* + * Driver for realtime clock EPSON RTC-8583 + */ + +#include "opt_platform.h" + +#include +#include +#include +#include +#include +#include +#include + +#ifdef FDT +#include +#include +#endif + +#include +#include + +#include "clock_if.h" +#include "iicbus_if.h" + +#define RTC8583_SC_REG 0x01 /* RTC Seconds */ +#define RTC8583_USERSRAM_REG 0x10 /* User SRAM register (first) */ +#define MAX_TRANSFER 16 + +/* + * A struct laid out in the same order as the time registers in the chip. + */ +struct time_regs { + uint8_t msec, sec, min, hour, day, month; +}; + +struct rtc8583_softc { + device_t dev; + device_t busdev; + struct intr_config_hook + init_hook; +}; + +#ifdef FDT +static struct ofw_compat_data compat_data[] = { + {"epson,rtc8583", 1}, + {NULL, 0}, +}; +#endif + +static void rtc8583_init(void *arg); +static int rtc8583_probe(device_t dev); +static int rtc8583_attach(device_t dev); +static int rtc8583_detach(device_t dev); + +static int rtc8583_gettime(device_t dev, struct timespec *ts); +static int rtc8583_settime(device_t dev, struct timespec *ts); + +static int rtc8583_writeto(device_t slavedev, uint8_t regaddr, + void *buffer, uint16_t buflen, int waithow); + +/* Implementation */ + +static int +rtc8583_writeto(device_t slavedev, uint8_t regaddr, void *buffer, + uint16_t buflen, int waithow) +{ + struct iic_msg msgs; + uint8_t slaveaddr; + uint8_t newbuf[MAX_TRANSFER]; + + slaveaddr = iicbus_get_addr(slavedev); + + newbuf[0] = regaddr; + memcpy(newbuf + 1, buffer, buflen); + msgs.slave = slaveaddr; + msgs.flags = IIC_M_WR; + msgs.len = 1 + buflen; + msgs.buf = newbuf; + + return (iicbus_transfer_excl(slavedev, &msgs, 1, waithow)); +} + +static inline int +rtc8583_read1(struct rtc8583_softc *sc, uint8_t reg, uint8_t *data) +{ + + return (iicdev_readfrom(sc->dev, reg, data, 1, IIC_WAIT)); +} + +static inline int +rtc8583_write1(struct rtc8583_softc *sc, uint8_t reg, uint8_t val) +{ + + return (rtc8583_writeto(sc->dev, reg, &val, 1, IIC_WAIT)); +} + +static void +rtc8583_init(void *arg) +{ + struct rtc8583_softc *sc; + + sc = (struct rtc8583_softc*)arg; + config_intrhook_disestablish(&sc->init_hook); + + /* + * Register as a system realtime clock. + */ + clock_register_flags(sc->dev, 1000000, CLOCKF_SETTIME_NO_ADJ); + clock_schedule(sc->dev, 1); + return; +} + +static int +rtc8583_probe(device_t dev) +{ + +#ifdef FDT + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + + if (ofw_bus_search_compatible(dev, compat_data)->ocd_data != 0) { + device_set_desc(dev, "EPSON RTC-8583"); + return (BUS_PROBE_DEFAULT); + } +#endif + return (ENXIO); +} + +static int +rtc8583_attach(device_t dev) +{ + struct rtc8583_softc *sc; + + sc = device_get_softc(dev); + sc->dev = dev; + sc->busdev = device_get_parent(sc->dev); + + /* + * Chip init must wait until interrupts are enabled. Often i2c access + * works only when the interrupts are available. + */ + sc->init_hook.ich_func = rtc8583_init; + sc->init_hook.ich_arg = sc; + if (config_intrhook_establish(&sc->init_hook) != 0) + return (ENOMEM); + + return (0); +} + +static int +rtc8583_detach(device_t dev) +{ + + clock_unregister(dev); + return (0); +} + +static int +rtc8583_gettime(device_t dev, struct timespec *ts) +{ + struct rtc8583_softc *sc; + struct clocktime ct; + struct time_regs tregs; + uint8_t y, ytmp, sreg; + int err; + + sc = device_get_softc(dev); + + /* Read the bcd time registers. */ + if ((err = iicdev_readfrom(sc->dev, RTC8583_SC_REG, &tregs, sizeof(tregs), + IIC_WAIT)) != 0) + return (err); + + y = tregs.day >> 6; + /* Get year from user SRAM */ + rtc8583_read1(sc, RTC8583_USERSRAM_REG, &sreg); + + /* + * Check if year adjustment is required. + * RTC has only 2 bits for year value (i.e. maximum is 4 years), so + * full year value is stored in user SRAM and updated manually or + * by this code. + */ + ytmp = sreg & 0x03; + if (ytmp != y) { + /* shift according to difference */ + sreg += y - ytmp; + + /* check if overflow happened */ + if (ytmp > y) + sreg += 4; + + if ((err = iicbus_request_bus(sc->busdev, sc->dev, IIC_WAIT)) != 0) + return (err); + rtc8583_write1(sc, RTC8583_USERSRAM_REG, sreg); + iicbus_release_bus(sc->busdev, sc->dev); + } + + ct.nsec = FROMBCD(tregs.msec) * 10 * 1000 * 1000; + ct.sec = FROMBCD(tregs.sec); + ct.min = FROMBCD(tregs.min); + ct.hour = FROMBCD(tregs.hour & 0x3f); + ct.day = FROMBCD(tregs.day & 0x3f); + ct.mon = FROMBCD(tregs.month & 0x1f); + ct.year = 2000 + sreg; + + return (clock_ct_to_ts(&ct, ts)); +} + +static int +rtc8583_settime(device_t dev, struct timespec *ts) +{ + struct rtc8583_softc *sc; + struct clocktime ct; + struct time_regs tregs; + uint8_t sreg; + int err; + + sc = device_get_softc(dev); + ts->tv_sec -= utc_offset(); + ts->tv_nsec = 0; + clock_ts_to_ct(ts, &ct); + + tregs.sec = TOBCD(ct.sec); + tregs.min = TOBCD(ct.min); + tregs.hour = TOBCD(ct.hour); + tregs.day = TOBCD(ct.day) | ((ct.year & 0x03) << 6); + tregs.month = TOBCD(ct.mon); + + if ((err = iicbus_request_bus(sc->busdev, sc->dev, IIC_WAIT)) != 0) + return (err); + err = rtc8583_writeto(sc->dev, RTC8583_SC_REG, &tregs, + sizeof(tregs), IIC_WAIT); + sreg = ct.year - 2000; + /* save to year to sram */ + rtc8583_write1(sc, RTC8583_USERSRAM_REG, sreg); + iicbus_release_bus(sc->busdev, sc->dev); + + return (err); +} + +static device_method_t rtc8583_methods[] = { + /* device_if methods */ + DEVMETHOD(device_probe, rtc8583_probe), + DEVMETHOD(device_attach, rtc8583_attach), + DEVMETHOD(device_detach, rtc8583_detach), + + /* clock_if methods */ + DEVMETHOD(clock_gettime, rtc8583_gettime), + DEVMETHOD(clock_settime, rtc8583_settime), + + DEVMETHOD_END, +}; + +static driver_t rtc8583_driver = { + "rtc8583", + rtc8583_methods, + sizeof(struct rtc8583_softc), +}; +static devclass_t rtc8583_devclass; + +DRIVER_MODULE(rtc8583, iicbus, rtc8583_driver, rtc8583_devclass, NULL, NULL); +MODULE_VERSION(rtc8583, 1); +MODULE_DEPEND(rtc8583, iicbus, IICBUS_MINVER, IICBUS_PREFVER, IICBUS_MAXVER); From owner-svn-src-all@freebsd.org Tue Oct 31 12:20: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 5F913E58588; Tue, 31 Oct 2017 12:20:50 +0000 (UTC) (envelope-from mw@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 1982473008; Tue, 31 Oct 2017 12:20:50 +0000 (UTC) (envelope-from mw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9VCKnRO051673; Tue, 31 Oct 2017 12:20:49 GMT (envelope-from mw@FreeBSD.org) Received: (from mw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9VCKnCv051669; Tue, 31 Oct 2017 12:20:49 GMT (envelope-from mw@FreeBSD.org) Message-Id: <201710311220.v9VCKnCv051669@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mw set sender to mw@FreeBSD.org using -f From: Marcin Wojtas Date: Tue, 31 Oct 2017 12:20:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r325234 - in vendor-sys/ena-com/dist: . ena_defs X-SVN-Group: vendor-sys X-SVN-Commit-Author: mw X-SVN-Commit-Paths: in vendor-sys/ena-com/dist: . ena_defs X-SVN-Commit-Revision: 325234 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: Tue, 31 Oct 2017 12:20:50 -0000 Author: mw Date: Tue Oct 31 12:20:48 2017 New Revision: 325234 URL: https://svnweb.freebsd.org/changeset/base/325234 Log: Update ena-com HAL to newest version The newest ena-com HAL supports LLQv2 and introduces numerous API changes. Obtained from: Amazon.com, Inc. Added: vendor-sys/ena-com/dist/ena_defs/ vendor-sys/ena-com/dist/ena_defs/ena_admin_defs.h (contents, props changed) vendor-sys/ena-com/dist/ena_defs/ena_common_defs.h (contents, props changed) vendor-sys/ena-com/dist/ena_defs/ena_eth_io_defs.h (contents, props changed) vendor-sys/ena-com/dist/ena_defs/ena_gen_info.h (contents, props changed) vendor-sys/ena-com/dist/ena_defs/ena_includes.h (contents, props changed) vendor-sys/ena-com/dist/ena_defs/ena_regs_defs.h (contents, props changed) Modified: vendor-sys/ena-com/dist/ena_com.c vendor-sys/ena-com/dist/ena_com.h vendor-sys/ena-com/dist/ena_eth_com.c vendor-sys/ena-com/dist/ena_eth_com.h vendor-sys/ena-com/dist/ena_plat.h Modified: vendor-sys/ena-com/dist/ena_com.c ============================================================================== --- vendor-sys/ena-com/dist/ena_com.c Tue Oct 31 12:15:00 2017 (r325233) +++ vendor-sys/ena-com/dist/ena_com.c Tue Oct 31 12:20:48 2017 (r325234) @@ -45,6 +45,13 @@ #define ENA_ASYNC_QUEUE_DEPTH 16 #define ENA_ADMIN_QUEUE_DEPTH 32 +#ifdef ENA_EXTENDED_STATS + +#define ENA_HISTOGRAM_ACTIVE_MASK_OFFSET 0xF08 +#define ENA_EXTENDED_STAT_GET_FUNCT(_funct_queue) (_funct_queue & 0xFFFF) +#define ENA_EXTENDED_STAT_GET_QUEUE(_funct_queue) (_funct_queue >> 16) + +#endif /* ENA_EXTENDED_STATS */ #define MIN_ENA_VER (((ENA_COMMON_SPEC_VERSION_MAJOR) << \ ENA_REGS_VERSION_MAJOR_VERSION_SHIFT) \ | (ENA_COMMON_SPEC_VERSION_MINOR)) @@ -65,6 +72,10 @@ #define ENA_MMIO_READ_TIMEOUT 0xFFFFFFFF +#define ENA_COM_BOUNCE_BUFFER_CNTRL_CNT 4 + +#define ENA_REGS_ADMIN_INTR_MASK 1 + /*****************************************************************************/ /*****************************************************************************/ /*****************************************************************************/ @@ -102,7 +113,7 @@ static inline int ena_com_mem_addr_set(struct ena_com_ } ena_addr->mem_addr_low = (u32)addr; - ena_addr->mem_addr_high = (u64)addr >> 32; + ena_addr->mem_addr_high = (u16)((u64)addr >> 32); return 0; } @@ -238,12 +249,9 @@ static struct ena_comp_ctx *__ena_com_submit_admin_cmd tail_masked = admin_queue->sq.tail & queue_size_mask; /* In case of queue FULL */ - cnt = admin_queue->sq.tail - admin_queue->sq.head; + cnt = ATOMIC32_READ(&admin_queue->outstanding_cmds); if (cnt >= admin_queue->q_depth) { - ena_trc_dbg("admin queue is FULL (tail %d head %d depth: %d)\n", - admin_queue->sq.tail, - admin_queue->sq.head, - admin_queue->q_depth); + ena_trc_dbg("admin queue is full.\n"); admin_queue->stats.out_of_space++; return ERR_PTR(ENA_COM_NO_SPACE); } @@ -278,6 +286,7 @@ static struct ena_comp_ctx *__ena_com_submit_admin_cmd if (unlikely((admin_queue->sq.tail & queue_size_mask) == 0)) admin_queue->sq.phase = !admin_queue->sq.phase; + ENA_DB_SYNC(&admin_queue->sq.mem_handle); ENA_REG_WRITE32(admin_queue->bus, admin_queue->sq.tail, admin_queue->sq.db_addr); @@ -362,21 +371,43 @@ static int ena_com_init_io_sq(struct ena_com_dev *ena_ io_sq->desc_addr.phys_addr, io_sq->desc_addr.mem_handle); } - } else { + + if (!io_sq->desc_addr.virt_addr) { + ena_trc_err("memory allocation failed"); + return ENA_COM_NO_MEM; + } + } + + if (io_sq->mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_DEV) { + /* Allocate bounce buffers */ + io_sq->bounce_buf_ctrl.buffer_size = ena_dev->llq_info.desc_list_entry_size; + io_sq->bounce_buf_ctrl.buffers_num = ENA_COM_BOUNCE_BUFFER_CNTRL_CNT; + io_sq->bounce_buf_ctrl.next_to_use = 0; + + size = io_sq->bounce_buf_ctrl.buffer_size * io_sq->bounce_buf_ctrl.buffers_num; + ENA_MEM_ALLOC_NODE(ena_dev->dmadev, size, - io_sq->desc_addr.virt_addr, + io_sq->bounce_buf_ctrl.base_buffer, ctx->numa_node, dev_node); - if (!io_sq->desc_addr.virt_addr) { - io_sq->desc_addr.virt_addr = - ENA_MEM_ALLOC(ena_dev->dmadev, size); + if (!io_sq->bounce_buf_ctrl.base_buffer) + io_sq->bounce_buf_ctrl.base_buffer = ENA_MEM_ALLOC(ena_dev->dmadev, size); + + if (!io_sq->bounce_buf_ctrl.base_buffer) { + ena_trc_err("bounce buffer memory allocation failed"); + return ENA_COM_NO_MEM; } - } - if (!io_sq->desc_addr.virt_addr) { - ena_trc_err("memory allocation failed"); - return ENA_COM_NO_MEM; + memcpy(&io_sq->llq_info, &ena_dev->llq_info, sizeof(io_sq->llq_info)); + + /* Initiate the first bounce buffer */ + io_sq->llq_buf_ctrl.curr_bounce_buf = + ena_com_get_next_bounce_buffer(&io_sq->bounce_buf_ctrl); + memset(io_sq->llq_buf_ctrl.curr_bounce_buf, + 0x0, io_sq->llq_info.desc_list_entry_size); + io_sq->llq_buf_ctrl.descs_left_in_line = + io_sq->llq_info.descs_num_before_header; } io_sq->tail = 0; @@ -507,7 +538,7 @@ static int ena_com_comp_status_to_errno(u8 comp_status case ENA_ADMIN_RESOURCE_ALLOCATION_FAILURE: return ENA_COM_NO_MEM; case ENA_ADMIN_UNSUPPORTED_OPCODE: - return ENA_COM_PERMISSION; + return ENA_COM_UNSUPPORTED; case ENA_ADMIN_BAD_OPCODE: case ENA_ADMIN_MALFORMED_REQUEST: case ENA_ADMIN_ILLEGAL_PARAMETER: @@ -532,7 +563,7 @@ static int ena_com_wait_and_process_admin_cq_polling(s ENA_SPINLOCK_UNLOCK(admin_queue->q_lock, flags); if (comp_ctx->status != ENA_CMD_SUBMITTED) - break; + break; if (ENA_TIME_EXPIRE(timeout)) { ena_trc_err("Wait for completion (polling) timeout\n"); @@ -567,6 +598,75 @@ err: return ret; } +static int ena_com_config_llq_info(struct ena_com_dev *ena_dev, + struct ena_admin_feature_llq_desc *llq_desc) +{ + struct ena_com_llq_info *llq_info = &ena_dev->llq_info; + + memset(llq_info, 0, sizeof(*llq_info)); + + switch (llq_desc->header_location_ctrl) { + case ENA_ADMIN_INLINE_HEADER: + llq_info->inline_header = true; + break; + case ENA_ADMIN_HEADER_RING: + llq_info->inline_header = false; + break; + default: + ena_trc_err("Invalid header location control\n"); + return -EINVAL; + } + + switch (llq_desc->entry_size_ctrl) { + case ENA_ADMIN_LIST_ENTRY_SIZE_128B: + llq_info->desc_list_entry_size = 128; + break; + case ENA_ADMIN_LIST_ENTRY_SIZE_192B: + llq_info->desc_list_entry_size = 192; + break; + case ENA_ADMIN_LIST_ENTRY_SIZE_256B: + llq_info->desc_list_entry_size = 256; + break; + default: + ena_trc_err("Invalid entry_size_ctrl %d\n", + llq_desc->entry_size_ctrl); + return -EINVAL; + } + + if ((llq_info->desc_list_entry_size & 0x7)) { + /* The desc list entry size should be whole multiply of 8 + * This requirement comes from __iowrite64_copy() + */ + ena_trc_err("illegal entry size %d\n", + llq_info->desc_list_entry_size); + return -EINVAL; + } + + if (llq_info->inline_header) { + llq_info->desc_stride_ctrl = llq_desc->descriptors_stride_ctrl; + if ((llq_info->desc_stride_ctrl != ENA_ADMIN_SINGLE_DESC_PER_ENTRY) && + (llq_info->desc_stride_ctrl != ENA_ADMIN_MULTIPLE_DESCS_PER_ENTRY)) { + ena_trc_err("Invalid desc_stride_ctrl %d\n", + llq_info->desc_stride_ctrl); + return -EINVAL; + } + } else { + llq_info->desc_stride_ctrl = ENA_ADMIN_SINGLE_DESC_PER_ENTRY; + } + + if (llq_info->desc_stride_ctrl == ENA_ADMIN_SINGLE_DESC_PER_ENTRY) + llq_info->descs_per_entry = llq_info->desc_list_entry_size / + sizeof(struct ena_eth_io_tx_desc); + else + llq_info->descs_per_entry = 1; + + llq_info->descs_num_before_header = llq_desc->desc_num_before_header_ctrl; + + return 0; +} + + + static int ena_com_wait_and_process_admin_cq_interrupts(struct ena_comp_ctx *comp_ctx, struct ena_com_admin_queue *admin_queue) { @@ -614,13 +714,14 @@ static u32 ena_com_reg_bar_read32(struct ena_com_dev * struct ena_com_mmio_read *mmio_read = &ena_dev->mmio_read; volatile struct ena_admin_ena_mmio_req_read_less_resp *read_resp = mmio_read->read_resp; - u32 mmio_read_reg, timeout, ret; + u32 mmio_read_reg, ret, i; unsigned long flags; - int i; + u32 timeout = mmio_read->reg_read_to; ENA_MIGHT_SLEEP(); - timeout = mmio_read->reg_read_to ? : ENA_REG_READ_TIMEOUT; + if (timeout == 0) + timeout = ENA_REG_READ_TIMEOUT; /* If readless is disabled, perform regular read */ if (!mmio_read->readless_supported) @@ -745,17 +846,20 @@ static void ena_com_io_queue_free(struct ena_com_dev * if (io_sq->desc_addr.virt_addr) { size = io_sq->desc_entry_size * io_sq->q_depth; - if (io_sq->mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_HOST) - ENA_MEM_FREE_COHERENT(ena_dev->dmadev, - size, - io_sq->desc_addr.virt_addr, - io_sq->desc_addr.phys_addr, - io_sq->desc_addr.mem_handle); - else - ENA_MEM_FREE(ena_dev->dmadev, io_sq->desc_addr.virt_addr); + ENA_MEM_FREE_COHERENT(ena_dev->dmadev, + size, + io_sq->desc_addr.virt_addr, + io_sq->desc_addr.phys_addr, + io_sq->desc_addr.mem_handle); io_sq->desc_addr.virt_addr = NULL; } + + if (io_sq->bounce_buf_ctrl.base_buffer) { + size = io_sq->llq_info.desc_list_entry_size * ENA_COM_BOUNCE_BUFFER_CNTRL_CNT; + ENA_MEM_FREE(ena_dev->dmadev, io_sq->bounce_buf_ctrl.base_buffer); + io_sq->bounce_buf_ctrl.base_buffer = NULL; + } } static int wait_for_reset_state(struct ena_com_dev *ena_dev, u32 timeout, @@ -807,7 +911,7 @@ static int ena_com_get_feature_ex(struct ena_com_dev * if (!ena_com_check_supported_feature_id(ena_dev, feature_id)) { ena_trc_dbg("Feature %d isn't supported\n", feature_id); - return ENA_COM_PERMISSION; + return ENA_COM_UNSUPPORTED; } memset(&get_cmd, 0x0, sizeof(get_cmd)); @@ -1366,7 +1470,7 @@ int ena_com_set_aenq_config(struct ena_com_dev *ena_de ena_trc_warn("Trying to set unsupported aenq events. supported flag: %x asked flag: %x\n", get_resp.u.aenq.supported_groups, groups_flag); - return ENA_COM_PERMISSION; + return ENA_COM_UNSUPPORTED; } memset(&cmd, 0x0, sizeof(cmd)); @@ -1480,7 +1584,6 @@ void ena_com_admin_destroy(struct ena_com_dev *ena_dev if (admin_queue->comp_ctx) ENA_MEM_FREE(ena_dev->dmadev, admin_queue->comp_ctx); - admin_queue->comp_ctx = NULL; size = ADMIN_SQ_SIZE(admin_queue->q_depth); if (sq->entries) @@ -1503,6 +1606,12 @@ void ena_com_admin_destroy(struct ena_com_dev *ena_dev void ena_com_set_admin_polling_mode(struct ena_com_dev *ena_dev, bool polling) { + u32 mask_value = 0; + + if (polling) + mask_value = ENA_REGS_ADMIN_INTR_MASK; + + ENA_REG_WRITE32(ena_dev->bus, mask_value, ena_dev->reg_bar + ENA_REGS_INTR_MASK_OFF); ena_dev->admin_queue.polling = polling; } @@ -1790,11 +1899,20 @@ int ena_com_get_dev_attr_feat(struct ena_com_dev *ena_ if (!rc) memcpy(&get_feat_ctx->hw_hints, &get_resp.u.hw_hints, sizeof(get_resp.u.hw_hints)); - else if (rc == ENA_COM_PERMISSION) + else if (rc == ENA_COM_UNSUPPORTED) memset(&get_feat_ctx->hw_hints, 0x0, sizeof(get_feat_ctx->hw_hints)); else return rc; + rc = ena_com_get_feature(ena_dev, &get_resp, ENA_ADMIN_LLQ); + if (!rc) + memcpy(&get_feat_ctx->llq, &get_resp.u.llq, + sizeof(get_resp.u.llq)); + else if (rc == ENA_COM_UNSUPPORTED) + memset(&get_feat_ctx->llq, 0x0, sizeof(get_feat_ctx->llq)); + else + return rc; + return 0; } @@ -1827,6 +1945,7 @@ void ena_com_aenq_intr_handler(struct ena_com_dev *dev struct ena_admin_aenq_common_desc *aenq_common; struct ena_com_aenq *aenq = &dev->aenq; ena_aenq_handler handler_cb; + unsigned long long timestamp; u16 masked_head, processed = 0; u8 phase; @@ -1838,11 +1957,12 @@ void ena_com_aenq_intr_handler(struct ena_com_dev *dev /* Go over all the events */ while ((aenq_common->flags & ENA_ADMIN_AENQ_COMMON_DESC_PHASE_MASK) == phase) { - ena_trc_dbg("AENQ! Group[%x] Syndrom[%x] timestamp: [%jus]\n", + timestamp = (unsigned long long)aenq_common->timestamp_low | + ((unsigned long long)aenq_common->timestamp_high << 32); + ena_trc_dbg("AENQ! Group[%x] Syndrom[%x] timestamp: [%llus]\n", aenq_common->group, aenq_common->syndrom, - (u64)aenq_common->timestamp_low + - ((u64)aenq_common->timestamp_high << 32)); + timestamp); /* Handle specific event*/ handler_cb = ena_com_get_specific_aenq_cb(dev, @@ -1872,8 +1992,30 @@ void ena_com_aenq_intr_handler(struct ena_com_dev *dev mb(); ENA_REG_WRITE32(dev->bus, (u32)aenq->head, dev->reg_bar + ENA_REGS_AENQ_HEAD_DB_OFF); } +#ifdef ENA_EXTENDED_STATS +/* + * Sets the function Idx and Queue Idx to be used for + * get full statistics feature + * + */ +int ena_com_extended_stats_set_func_queue(struct ena_com_dev *ena_dev, + u32 func_queue) +{ -int ena_com_dev_reset(struct ena_com_dev *ena_dev) + /* Function & Queue is acquired from user in the following format : + * Bottom Half word: funct + * Top Half Word: queue + */ + ena_dev->stats_func = ENA_EXTENDED_STAT_GET_FUNCT(func_queue); + ena_dev->stats_queue = ENA_EXTENDED_STAT_GET_QUEUE(func_queue); + + return 0; +} + +#endif /* ENA_EXTENDED_STATS */ + +int ena_com_dev_reset(struct ena_com_dev *ena_dev, + enum ena_regs_reset_reason_types reset_reason) { u32 stat, timeout, cap, reset_val; int rc; @@ -1901,6 +2043,8 @@ int ena_com_dev_reset(struct ena_com_dev *ena_dev) /* start reset */ reset_val = ENA_REGS_DEV_CTL_DEV_RESET_MASK; + reset_val |= (reset_reason << ENA_REGS_DEV_CTL_RESET_REASON_SHIFT) & + ENA_REGS_DEV_CTL_RESET_REASON_MASK; ENA_REG_WRITE32(ena_dev->bus, reset_val, ena_dev->reg_bar + ENA_REGS_DEV_CTL_OFF); /* Write again the MMIO read request address */ @@ -1973,7 +2117,52 @@ int ena_com_get_dev_basic_stats(struct ena_com_dev *en return ret; } +#ifdef ENA_EXTENDED_STATS +int ena_com_get_dev_extended_stats(struct ena_com_dev *ena_dev, char *buff, + u32 len) +{ + struct ena_com_stats_ctx ctx; + struct ena_admin_aq_get_stats_cmd *get_cmd = &ctx.get_cmd; + ena_mem_handle_t mem_handle; + void *virt_addr; + dma_addr_t phys_addr; + int ret; + + ENA_MEM_ALLOC_COHERENT(ena_dev->dmadev, len, + virt_addr, phys_addr, mem_handle); + if (!virt_addr) { + ret = ENA_COM_NO_MEM; + goto done; + } + memset(&ctx, 0x0, sizeof(ctx)); + ret = ena_com_mem_addr_set(ena_dev, + &get_cmd->u.control_buffer.address, + phys_addr); + if (unlikely(ret)) { + ena_trc_err("memory address set failed\n"); + return ret; + } + get_cmd->u.control_buffer.length = len; + + get_cmd->device_id = ena_dev->stats_func; + get_cmd->queue_idx = ena_dev->stats_queue; + + ret = ena_get_dev_stats(ena_dev, &ctx, + ENA_ADMIN_GET_STATS_TYPE_EXTENDED); + if (ret < 0) + goto free_ext_stats_mem; + + ret = snprintf(buff, len, "%s", (char *)virt_addr); + +free_ext_stats_mem: + ENA_MEM_FREE_COHERENT(ena_dev->dmadev, len, virt_addr, phys_addr, + mem_handle); +done: + return ret; +} +#endif + int ena_com_set_dev_mtu(struct ena_com_dev *ena_dev, int mtu) { struct ena_com_admin_queue *admin_queue; @@ -1983,7 +2172,7 @@ int ena_com_set_dev_mtu(struct ena_com_dev *ena_dev, i if (!ena_com_check_supported_feature_id(ena_dev, ENA_ADMIN_MTU)) { ena_trc_dbg("Feature %d isn't supported\n", ENA_ADMIN_MTU); - return ENA_COM_PERMISSION; + return ENA_COM_UNSUPPORTED; } memset(&cmd, 0x0, sizeof(cmd)); @@ -2037,7 +2226,7 @@ int ena_com_set_hash_function(struct ena_com_dev *ena_ ENA_ADMIN_RSS_HASH_FUNCTION)) { ena_trc_dbg("Feature %d isn't supported\n", ENA_ADMIN_RSS_HASH_FUNCTION); - return ENA_COM_PERMISSION; + return ENA_COM_UNSUPPORTED; } /* Validate hash function is supported */ @@ -2049,7 +2238,7 @@ int ena_com_set_hash_function(struct ena_com_dev *ena_ if (get_resp.u.flow_hash_func.supported_func & (1 << rss->hash_func)) { ena_trc_err("Func hash %d isn't supported by device, abort\n", rss->hash_func); - return ENA_COM_PERMISSION; + return ENA_COM_UNSUPPORTED; } memset(&cmd, 0x0, sizeof(cmd)); @@ -2108,7 +2297,7 @@ int ena_com_fill_hash_function(struct ena_com_dev *ena if (!((1 << func) & get_resp.u.flow_hash_func.supported_func)) { ena_trc_err("Flow hash function %d isn't supported\n", func); - return ENA_COM_PERMISSION; + return ENA_COM_UNSUPPORTED; } switch (func) { @@ -2201,7 +2390,7 @@ int ena_com_set_hash_ctrl(struct ena_com_dev *ena_dev) ENA_ADMIN_RSS_HASH_INPUT)) { ena_trc_dbg("Feature %d isn't supported\n", ENA_ADMIN_RSS_HASH_INPUT); - return ENA_COM_PERMISSION; + return ENA_COM_UNSUPPORTED; } memset(&cmd, 0x0, sizeof(cmd)); @@ -2282,7 +2471,7 @@ int ena_com_set_default_hash_ctrl(struct ena_com_dev * ena_trc_err("hash control doesn't support all the desire configuration. proto %x supported %x selected %x\n", i, hash_ctrl->supported_fields[i].fields, hash_ctrl->selected_fields[i].fields); - return ENA_COM_PERMISSION; + return ENA_COM_UNSUPPORTED; } } @@ -2360,7 +2549,7 @@ int ena_com_indirect_table_set(struct ena_com_dev *ena ENA_ADMIN_RSS_REDIRECTION_TABLE_CONFIG)) { ena_trc_dbg("Feature %d isn't supported\n", ENA_ADMIN_RSS_REDIRECTION_TABLE_CONFIG); - return ENA_COM_PERMISSION; + return ENA_COM_UNSUPPORTED; } ret = ena_com_ind_tbl_convert_to_device(ena_dev); @@ -2636,7 +2825,7 @@ int ena_com_init_interrupt_moderation(struct ena_com_d ENA_ADMIN_INTERRUPT_MODERATION); if (rc) { - if (rc == ENA_COM_PERMISSION) { + if (rc == ENA_COM_UNSUPPORTED) { ena_trc_dbg("Feature %d isn't supported\n", ENA_ADMIN_INTERRUPT_MODERATION); rc = 0; @@ -2758,4 +2947,34 @@ void ena_com_get_intr_moderation_entry(struct ena_com_ entry->pkts_per_interval = intr_moder_tbl[level].pkts_per_interval; entry->bytes_per_interval = intr_moder_tbl[level].bytes_per_interval; +} + +int ena_com_config_dev_mode(struct ena_com_dev *ena_dev, + struct ena_admin_feature_llq_desc *llq) +{ + int rc; + int size; + + if (llq->max_llq_num == 0) { + ena_dev->tx_mem_queue_type = ENA_ADMIN_PLACEMENT_POLICY_HOST; + return 0; + } + + rc = ena_com_config_llq_info(ena_dev, llq); + if (rc) + return rc; + + /* Validate the descriptor is not too big */ + size = ena_dev->tx_max_header_size; + size += ena_dev->llq_info.descs_num_before_header * + sizeof(struct ena_eth_io_tx_desc); + + if (unlikely(ena_dev->llq_info.desc_list_entry_size < size)) { + ena_trc_err("the size of the LLQ entry is smaller than needed\n"); + return ENA_COM_INVAL; + } + + ena_dev->tx_mem_queue_type = ENA_ADMIN_PLACEMENT_POLICY_DEV; + + return 0; } Modified: vendor-sys/ena-com/dist/ena_com.h ============================================================================== --- vendor-sys/ena-com/dist/ena_com.h Tue Oct 31 12:15:00 2017 (r325233) +++ vendor-sys/ena-com/dist/ena_com.h Tue Oct 31 12:20:48 2017 (r325234) @@ -133,6 +133,15 @@ struct ena_com_tx_meta { u16 l4_hdr_len; /* In words */ }; +struct ena_com_llq_info { + bool inline_header; + u16 desc_stride_ctrl; + + u16 desc_list_entry_size; + u16 descs_num_before_header; + u16 descs_per_entry; +}; + struct ena_com_io_cq { struct ena_com_io_desc_addr cdesc_addr; void *bus; @@ -171,6 +180,20 @@ struct ena_com_io_cq { } ____cacheline_aligned; +struct ena_com_io_bounce_buffer_control { + u8 *base_buffer; + u16 next_to_use; + u16 buffer_size; + u16 buffers_num; /* Must be a power of 2 */ +}; + +/* This struct is to keep tracking the current location of the next llq entry */ +struct ena_com_llq_pkt_ctrl { + u8 *curr_bounce_buf; + u16 idx; + u16 descs_left_in_line; +}; + struct ena_com_io_sq { struct ena_com_io_desc_addr desc_addr; void *bus; @@ -183,6 +206,9 @@ struct ena_com_io_sq { u32 msix_vector; struct ena_com_tx_meta cached_tx_meta; + struct ena_com_llq_info llq_info; + struct ena_com_llq_pkt_ctrl llq_buf_ctrl; + struct ena_com_io_bounce_buffer_control bounce_buf_ctrl; u16 q_depth; u16 qid; @@ -190,6 +216,7 @@ struct ena_com_io_sq { u16 idx; u16 tail; u16 next_to_comp; + u16 llq_last_copy_tail; u32 tx_max_header_size; u8 phase; u8 desc_entry_size; @@ -321,6 +348,7 @@ struct ena_com_dev { void __iomem *mem_bar; void *dmadev; void *bus; + enum ena_admin_placement_policy_type tx_mem_queue_type; u32 tx_max_header_size; u16 stats_func; /* Selected function for extended statistic dump */ @@ -337,6 +365,8 @@ struct ena_com_dev { u16 intr_delay_resolution; u32 intr_moder_tx_interval; struct ena_intr_moder_entry *intr_moder_tbl; + + struct ena_com_llq_info llq_info; }; struct ena_com_dev_get_features_ctx { @@ -345,6 +375,7 @@ struct ena_com_dev_get_features_ctx { struct ena_admin_feature_aenq_desc aenq; struct ena_admin_feature_offload_desc offload; struct ena_admin_ena_hw_hints hw_hints; + struct ena_admin_feature_llq_desc llq; }; struct ena_com_create_io_ctx { @@ -426,10 +457,12 @@ void ena_com_admin_destroy(struct ena_com_dev *ena_dev /* ena_com_dev_reset - Perform device FLR to the device. * @ena_dev: ENA communication layer struct + * @reset_reason: Specify what is the trigger for the reset in case of an error. * * @return - 0 on success, negative value on failure. */ -int ena_com_dev_reset(struct ena_com_dev *ena_dev); +int ena_com_dev_reset(struct ena_com_dev *ena_dev, + enum ena_regs_reset_reason_types reset_reason); /* ena_com_create_io_queue - Create io queue. * @ena_dev: ENA communication layer struct @@ -939,6 +972,15 @@ void ena_com_get_intr_moderation_entry(struct ena_com_ enum ena_intr_moder_level level, struct ena_intr_moder_entry *entry); + +/* ena_com_config_dev_mode - Configure the placement policy of the device. + * @ena_dev: ENA communication layer struct + * @llq: LLQ feature descriptor, retrieve via ena_com_get_dev_attr_feat. + * + */ +int ena_com_config_dev_mode(struct ena_com_dev *ena_dev, + struct ena_admin_feature_llq_desc *llq); + static inline bool ena_com_get_adaptive_moderation_enabled(struct ena_com_dev *ena_dev) { return ena_dev->adaptive_coalescing; @@ -1048,6 +1090,30 @@ static inline void ena_com_update_intr_reg(struct ena_ intr_reg->intr_control |= ENA_ETH_IO_INTR_REG_INTR_UNMASK_MASK; } +static inline u8 *ena_com_get_next_bounce_buffer(struct ena_com_io_bounce_buffer_control *bounce_buf_ctrl) +{ + u16 size, buffers_num; + u8 *buf; + + size = bounce_buf_ctrl->buffer_size; + buffers_num = bounce_buf_ctrl->buffers_num; + + buf = bounce_buf_ctrl->base_buffer + + (bounce_buf_ctrl->next_to_use++ & (buffers_num - 1)) * size; + + prefetch(bounce_buf_ctrl->base_buffer + + (bounce_buf_ctrl->next_to_use & (buffers_num - 1)) * size); + + return buf; +} + +#ifdef ENA_EXTENDED_STATS +int ena_com_get_dev_extended_stats(struct ena_com_dev *ena_dev, char *buff, + u32 len); + +int ena_com_extended_stats_set_func_queue(struct ena_com_dev *ena_dev, + u32 funct_queue); +#endif #if defined(__cplusplus) } #endif /* __cplusplus */ Added: vendor-sys/ena-com/dist/ena_defs/ena_admin_defs.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor-sys/ena-com/dist/ena_defs/ena_admin_defs.h Tue Oct 31 12:20:48 2017 (r325234) @@ -0,0 +1,1484 @@ +/*- + * BSD LICENSE + * + * Copyright (c) 2015-2017 Amazon.com, Inc. or its affiliates. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * * Neither the name of copyright holder nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +#ifndef _ENA_ADMIN_H_ +#define _ENA_ADMIN_H_ + +enum ena_admin_aq_opcode { + ENA_ADMIN_CREATE_SQ = 1, + + ENA_ADMIN_DESTROY_SQ = 2, + + ENA_ADMIN_CREATE_CQ = 3, + + ENA_ADMIN_DESTROY_CQ = 4, + + ENA_ADMIN_GET_FEATURE = 8, + + ENA_ADMIN_SET_FEATURE = 9, + + ENA_ADMIN_GET_STATS = 11, +}; + +enum ena_admin_aq_completion_status { + ENA_ADMIN_SUCCESS = 0, + + ENA_ADMIN_RESOURCE_ALLOCATION_FAILURE = 1, + + ENA_ADMIN_BAD_OPCODE = 2, + + ENA_ADMIN_UNSUPPORTED_OPCODE = 3, + + ENA_ADMIN_MALFORMED_REQUEST = 4, + + /* Additional status is provided in ACQ entry extended_status */ + ENA_ADMIN_ILLEGAL_PARAMETER = 5, + + ENA_ADMIN_UNKNOWN_ERROR = 6, +}; + +enum ena_admin_aq_feature_id { + ENA_ADMIN_DEVICE_ATTRIBUTES = 1, + + ENA_ADMIN_MAX_QUEUES_NUM = 2, + + ENA_ADMIN_HW_HINTS = 3, + + ENA_ADMIN_LLQ = 4, + + ENA_ADMIN_RSS_HASH_FUNCTION = 10, + + ENA_ADMIN_STATELESS_OFFLOAD_CONFIG = 11, + + ENA_ADMIN_RSS_REDIRECTION_TABLE_CONFIG = 12, + + ENA_ADMIN_MTU = 14, + + ENA_ADMIN_RSS_HASH_INPUT = 18, + + ENA_ADMIN_INTERRUPT_MODERATION = 20, + + ENA_ADMIN_AENQ_CONFIG = 26, + + ENA_ADMIN_LINK_CONFIG = 27, + + ENA_ADMIN_HOST_ATTR_CONFIG = 28, + + ENA_ADMIN_FEATURES_OPCODE_NUM = 32, +}; + +enum ena_admin_placement_policy_type { + /* descriptors and headers are in host memory */ + ENA_ADMIN_PLACEMENT_POLICY_HOST = 1, + + /* descriptors and headers are in device memory (a.k.a Low Latency + * Queue) + */ + ENA_ADMIN_PLACEMENT_POLICY_DEV = 3, +}; + +enum ena_admin_link_types { + ENA_ADMIN_LINK_SPEED_1G = 0x1, + + ENA_ADMIN_LINK_SPEED_2_HALF_G = 0x2, + + ENA_ADMIN_LINK_SPEED_5G = 0x4, + + ENA_ADMIN_LINK_SPEED_10G = 0x8, + + ENA_ADMIN_LINK_SPEED_25G = 0x10, + + ENA_ADMIN_LINK_SPEED_40G = 0x20, + + ENA_ADMIN_LINK_SPEED_50G = 0x40, + + ENA_ADMIN_LINK_SPEED_100G = 0x80, + + ENA_ADMIN_LINK_SPEED_200G = 0x100, + + ENA_ADMIN_LINK_SPEED_400G = 0x200, +}; + +enum ena_admin_completion_policy_type { + /* completion queue entry for each sq descriptor */ + ENA_ADMIN_COMPLETION_POLICY_DESC = 0, + + /* completion queue entry upon request in sq descriptor */ + ENA_ADMIN_COMPLETION_POLICY_DESC_ON_DEMAND = 1, + + /* current queue head pointer is updated in OS memory upon sq + * descriptor request + */ + ENA_ADMIN_COMPLETION_POLICY_HEAD_ON_DEMAND = 2, + + /* current queue head pointer is updated in OS memory for each sq + * descriptor + */ + ENA_ADMIN_COMPLETION_POLICY_HEAD = 3, +}; + +/* basic stats return ena_admin_basic_stats while extanded stats return a + * buffer (string format) with additional statistics per queue and per + * device id + */ +enum ena_admin_get_stats_type { + ENA_ADMIN_GET_STATS_TYPE_BASIC = 0, + + ENA_ADMIN_GET_STATS_TYPE_EXTENDED = 1, +}; + +enum ena_admin_get_stats_scope { + ENA_ADMIN_SPECIFIC_QUEUE = 0, + + ENA_ADMIN_ETH_TRAFFIC = 1, +}; + +struct ena_admin_aq_common_desc { + /* 11:0 : command_id + * 15:12 : reserved12 + */ + uint16_t command_id; + + /* as appears in ena_admin_aq_opcode */ + uint8_t opcode; + + /* 0 : phase + * 1 : ctrl_data - control buffer address valid + * 2 : ctrl_data_indirect - control buffer address + * points to list of pages with addresses of control + * buffers + * 7:3 : reserved3 + */ + uint8_t flags; +}; + +/* used in ena_admin_aq_entry. Can point directly to control data, or to a + * page list chunk. Used also at the end of indirect mode page list chunks, + * for chaining. + */ +struct ena_admin_ctrl_buff_info { + uint32_t length; + + struct ena_common_mem_addr address; +}; + +struct ena_admin_sq { + uint16_t sq_idx; + + /* 4:0 : reserved + * 7:5 : sq_direction - 0x1 - Tx; 0x2 - Rx + */ + uint8_t sq_identity; + + uint8_t reserved1; +}; + +struct ena_admin_aq_entry { + struct ena_admin_aq_common_desc aq_common_descriptor; + + union { + uint32_t inline_data_w1[3]; + + struct ena_admin_ctrl_buff_info control_buffer; + } u; + + uint32_t inline_data_w4[12]; +}; + +struct ena_admin_acq_common_desc { + /* command identifier to associate it with the aq descriptor + * 11:0 : command_id + * 15:12 : reserved12 + */ + uint16_t command; + + uint8_t status; + + /* 0 : phase + * 7:1 : reserved1 + */ + uint8_t flags; + + uint16_t extended_status; + + /* serves as a hint what AQ entries can be revoked */ + uint16_t sq_head_indx; +}; + +struct ena_admin_acq_entry { + struct ena_admin_acq_common_desc acq_common_descriptor; + + uint32_t response_specific_data[14]; +}; + +struct ena_admin_aq_create_sq_cmd { + struct ena_admin_aq_common_desc aq_common_descriptor; + + /* 4:0 : reserved0_w1 + * 7:5 : sq_direction - 0x1 - Tx, 0x2 - Rx + */ + uint8_t sq_identity; + + uint8_t reserved8_w1; + + /* 3:0 : placement_policy - Describing where the SQ + * descriptor ring and the SQ packet headers reside: + * 0x1 - descriptors and headers are in OS memory, + * 0x3 - descriptors and headers in device memory + * (a.k.a Low Latency Queue) + * 6:4 : completion_policy - Describing what policy + * to use for generation completion entry (cqe) in + * the CQ associated with this SQ: 0x0 - cqe for each + * sq descriptor, 0x1 - cqe upon request in sq + * descriptor, 0x2 - current queue head pointer is + * updated in OS memory upon sq descriptor request + * 0x3 - current queue head pointer is updated in OS + * memory for each sq descriptor + * 7 : reserved15_w1 + */ + uint8_t sq_caps_2; + + /* 0 : is_physically_contiguous - Described if the + * queue ring memory is allocated in physical + * contiguous pages or split. + * 7:1 : reserved17_w1 + */ + uint8_t sq_caps_3; + + /* associated completion queue id. This CQ must be created prior to + * SQ creation + */ + uint16_t cq_idx; + + /* submission queue depth in entries */ + uint16_t sq_depth; + + /* SQ physical base address in OS memory. This field should not be + * used for Low Latency queues. Has to be page aligned. + */ + struct ena_common_mem_addr sq_ba; + + /* specifies queue head writeback location in OS memory. Valid if + * completion_policy is set to completion_policy_head_on_demand or + * completion_policy_head. Has to be cache aligned + */ + struct ena_common_mem_addr sq_head_writeback; + + uint32_t reserved0_w7; + + uint32_t reserved0_w8; +}; + +enum ena_admin_sq_direction { + ENA_ADMIN_SQ_DIRECTION_TX = 1, + + ENA_ADMIN_SQ_DIRECTION_RX = 2, +}; + +struct ena_admin_acq_create_sq_resp_desc { + struct ena_admin_acq_common_desc acq_common_desc; + + uint16_t sq_idx; + + uint16_t reserved; + + /* queue doorbell address as an offset to PCIe MMIO REG BAR */ + uint32_t sq_doorbell_offset; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Tue Oct 31 12:23: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 40B30E5878A; Tue, 31 Oct 2017 12:23:04 +0000 (UTC) (envelope-from mw@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 E99D873388; Tue, 31 Oct 2017 12:23:03 +0000 (UTC) (envelope-from mw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9VCN33T055514; Tue, 31 Oct 2017 12:23:03 GMT (envelope-from mw@FreeBSD.org) Received: (from mw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9VCN32c055513; Tue, 31 Oct 2017 12:23:03 GMT (envelope-from mw@FreeBSD.org) Message-Id: <201710311223.v9VCN32c055513@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mw set sender to mw@FreeBSD.org using -f From: Marcin Wojtas Date: Tue, 31 Oct 2017 12:23:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r325235 - vendor-sys/ena-com/1.1.4.3 X-SVN-Group: vendor-sys X-SVN-Commit-Author: mw X-SVN-Commit-Paths: vendor-sys/ena-com/1.1.4.3 X-SVN-Commit-Revision: 325235 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: Tue, 31 Oct 2017 12:23:04 -0000 Author: mw Date: Tue Oct 31 12:23:02 2017 New Revision: 325235 URL: https://svnweb.freebsd.org/changeset/base/325235 Log: Create 1.1.4.3 tag in ena-com Obtained from: Amazon.com, Inc. Added: vendor-sys/ena-com/1.1.4.3/ - copied from r325234, vendor-sys/ena-com/dist/ From owner-svn-src-all@freebsd.org Tue Oct 31 12:41: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 DDAA4E5929D; Tue, 31 Oct 2017 12:41:08 +0000 (UTC) (envelope-from mw@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 A89727414C; Tue, 31 Oct 2017 12:41:08 +0000 (UTC) (envelope-from mw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9VCf8t9062986; Tue, 31 Oct 2017 12:41:08 GMT (envelope-from mw@FreeBSD.org) Received: (from mw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9VCf7jw062981; Tue, 31 Oct 2017 12:41:07 GMT (envelope-from mw@FreeBSD.org) Message-Id: <201710311241.v9VCf7jw062981@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mw set sender to mw@FreeBSD.org using -f From: Marcin Wojtas Date: Tue, 31 Oct 2017 12:41:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325236 - in head/sys: contrib/ena-com contrib/ena-com/ena_defs dev/ena X-SVN-Group: head X-SVN-Commit-Author: mw X-SVN-Commit-Paths: in head/sys: contrib/ena-com contrib/ena-com/ena_defs dev/ena X-SVN-Commit-Revision: 325236 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: Tue, 31 Oct 2017 12:41:09 -0000 Author: mw Date: Tue Oct 31 12:41:07 2017 New Revision: 325236 URL: https://svnweb.freebsd.org/changeset/base/325236 Log: Update ena-com HAL to v1.1.4.3 and update driver accordingly The newest ena-com HAL supports LLQv2 and introduces API changes. In order not to break the driver compilation it was updated/fixed in a following way: * Change version of the driver to 0.8.0 * Provide reset cause when triggering reset of the device * Reset device after attach fails * In the reset task free management irq after calling ena_down. Admin queue can still be used before ena_down is called, or when it is being handled * Do not reset device if ena_reset_task fails * Move call of the ena_com_dev_reset to the ena_down() routine - it should be called only if interface was up * Use different function for checking empty space on the sq ring (ena-com API change) * Fix typo on ENA_TX_CLEANUP_THRESHOLD * Change checking for EPERM with EOPNOTSUPP - change in the ena-com API * Minor style fixes Submitted by: Michal Krawczyk Obtained from: Amazon.com, Inc. Semihalf Sponsored by: Amazon.com, Inc. Differential Revision: https://reviews.freebsd.org/D12143 Added: head/sys/contrib/ena-com/ena_defs/ - copied from r325234, vendor-sys/ena-com/dist/ena_defs/ Modified: head/sys/contrib/ena-com/ena_com.c head/sys/contrib/ena-com/ena_com.h head/sys/contrib/ena-com/ena_eth_com.c head/sys/contrib/ena-com/ena_eth_com.h head/sys/contrib/ena-com/ena_plat.h head/sys/dev/ena/ena.c head/sys/dev/ena/ena.h head/sys/dev/ena/ena_sysctl.c Directory Properties: head/sys/contrib/ena-com/ (props changed) Modified: head/sys/contrib/ena-com/ena_com.c ============================================================================== --- head/sys/contrib/ena-com/ena_com.c Tue Oct 31 12:23:02 2017 (r325235) +++ head/sys/contrib/ena-com/ena_com.c Tue Oct 31 12:41:07 2017 (r325236) @@ -45,6 +45,13 @@ #define ENA_ASYNC_QUEUE_DEPTH 16 #define ENA_ADMIN_QUEUE_DEPTH 32 +#ifdef ENA_EXTENDED_STATS + +#define ENA_HISTOGRAM_ACTIVE_MASK_OFFSET 0xF08 +#define ENA_EXTENDED_STAT_GET_FUNCT(_funct_queue) (_funct_queue & 0xFFFF) +#define ENA_EXTENDED_STAT_GET_QUEUE(_funct_queue) (_funct_queue >> 16) + +#endif /* ENA_EXTENDED_STATS */ #define MIN_ENA_VER (((ENA_COMMON_SPEC_VERSION_MAJOR) << \ ENA_REGS_VERSION_MAJOR_VERSION_SHIFT) \ | (ENA_COMMON_SPEC_VERSION_MINOR)) @@ -65,6 +72,10 @@ #define ENA_MMIO_READ_TIMEOUT 0xFFFFFFFF +#define ENA_COM_BOUNCE_BUFFER_CNTRL_CNT 4 + +#define ENA_REGS_ADMIN_INTR_MASK 1 + /*****************************************************************************/ /*****************************************************************************/ /*****************************************************************************/ @@ -102,7 +113,7 @@ static inline int ena_com_mem_addr_set(struct ena_com_ } ena_addr->mem_addr_low = (u32)addr; - ena_addr->mem_addr_high = (u64)addr >> 32; + ena_addr->mem_addr_high = (u16)((u64)addr >> 32); return 0; } @@ -238,12 +249,9 @@ static struct ena_comp_ctx *__ena_com_submit_admin_cmd tail_masked = admin_queue->sq.tail & queue_size_mask; /* In case of queue FULL */ - cnt = admin_queue->sq.tail - admin_queue->sq.head; + cnt = ATOMIC32_READ(&admin_queue->outstanding_cmds); if (cnt >= admin_queue->q_depth) { - ena_trc_dbg("admin queue is FULL (tail %d head %d depth: %d)\n", - admin_queue->sq.tail, - admin_queue->sq.head, - admin_queue->q_depth); + ena_trc_dbg("admin queue is full.\n"); admin_queue->stats.out_of_space++; return ERR_PTR(ENA_COM_NO_SPACE); } @@ -278,6 +286,7 @@ static struct ena_comp_ctx *__ena_com_submit_admin_cmd if (unlikely((admin_queue->sq.tail & queue_size_mask) == 0)) admin_queue->sq.phase = !admin_queue->sq.phase; + ENA_DB_SYNC(&admin_queue->sq.mem_handle); ENA_REG_WRITE32(admin_queue->bus, admin_queue->sq.tail, admin_queue->sq.db_addr); @@ -362,21 +371,43 @@ static int ena_com_init_io_sq(struct ena_com_dev *ena_ io_sq->desc_addr.phys_addr, io_sq->desc_addr.mem_handle); } - } else { + + if (!io_sq->desc_addr.virt_addr) { + ena_trc_err("memory allocation failed"); + return ENA_COM_NO_MEM; + } + } + + if (io_sq->mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_DEV) { + /* Allocate bounce buffers */ + io_sq->bounce_buf_ctrl.buffer_size = ena_dev->llq_info.desc_list_entry_size; + io_sq->bounce_buf_ctrl.buffers_num = ENA_COM_BOUNCE_BUFFER_CNTRL_CNT; + io_sq->bounce_buf_ctrl.next_to_use = 0; + + size = io_sq->bounce_buf_ctrl.buffer_size * io_sq->bounce_buf_ctrl.buffers_num; + ENA_MEM_ALLOC_NODE(ena_dev->dmadev, size, - io_sq->desc_addr.virt_addr, + io_sq->bounce_buf_ctrl.base_buffer, ctx->numa_node, dev_node); - if (!io_sq->desc_addr.virt_addr) { - io_sq->desc_addr.virt_addr = - ENA_MEM_ALLOC(ena_dev->dmadev, size); + if (!io_sq->bounce_buf_ctrl.base_buffer) + io_sq->bounce_buf_ctrl.base_buffer = ENA_MEM_ALLOC(ena_dev->dmadev, size); + + if (!io_sq->bounce_buf_ctrl.base_buffer) { + ena_trc_err("bounce buffer memory allocation failed"); + return ENA_COM_NO_MEM; } - } - if (!io_sq->desc_addr.virt_addr) { - ena_trc_err("memory allocation failed"); - return ENA_COM_NO_MEM; + memcpy(&io_sq->llq_info, &ena_dev->llq_info, sizeof(io_sq->llq_info)); + + /* Initiate the first bounce buffer */ + io_sq->llq_buf_ctrl.curr_bounce_buf = + ena_com_get_next_bounce_buffer(&io_sq->bounce_buf_ctrl); + memset(io_sq->llq_buf_ctrl.curr_bounce_buf, + 0x0, io_sq->llq_info.desc_list_entry_size); + io_sq->llq_buf_ctrl.descs_left_in_line = + io_sq->llq_info.descs_num_before_header; } io_sq->tail = 0; @@ -507,7 +538,7 @@ static int ena_com_comp_status_to_errno(u8 comp_status case ENA_ADMIN_RESOURCE_ALLOCATION_FAILURE: return ENA_COM_NO_MEM; case ENA_ADMIN_UNSUPPORTED_OPCODE: - return ENA_COM_PERMISSION; + return ENA_COM_UNSUPPORTED; case ENA_ADMIN_BAD_OPCODE: case ENA_ADMIN_MALFORMED_REQUEST: case ENA_ADMIN_ILLEGAL_PARAMETER: @@ -532,7 +563,7 @@ static int ena_com_wait_and_process_admin_cq_polling(s ENA_SPINLOCK_UNLOCK(admin_queue->q_lock, flags); if (comp_ctx->status != ENA_CMD_SUBMITTED) - break; + break; if (ENA_TIME_EXPIRE(timeout)) { ena_trc_err("Wait for completion (polling) timeout\n"); @@ -567,6 +598,75 @@ err: return ret; } +static int ena_com_config_llq_info(struct ena_com_dev *ena_dev, + struct ena_admin_feature_llq_desc *llq_desc) +{ + struct ena_com_llq_info *llq_info = &ena_dev->llq_info; + + memset(llq_info, 0, sizeof(*llq_info)); + + switch (llq_desc->header_location_ctrl) { + case ENA_ADMIN_INLINE_HEADER: + llq_info->inline_header = true; + break; + case ENA_ADMIN_HEADER_RING: + llq_info->inline_header = false; + break; + default: + ena_trc_err("Invalid header location control\n"); + return -EINVAL; + } + + switch (llq_desc->entry_size_ctrl) { + case ENA_ADMIN_LIST_ENTRY_SIZE_128B: + llq_info->desc_list_entry_size = 128; + break; + case ENA_ADMIN_LIST_ENTRY_SIZE_192B: + llq_info->desc_list_entry_size = 192; + break; + case ENA_ADMIN_LIST_ENTRY_SIZE_256B: + llq_info->desc_list_entry_size = 256; + break; + default: + ena_trc_err("Invalid entry_size_ctrl %d\n", + llq_desc->entry_size_ctrl); + return -EINVAL; + } + + if ((llq_info->desc_list_entry_size & 0x7)) { + /* The desc list entry size should be whole multiply of 8 + * This requirement comes from __iowrite64_copy() + */ + ena_trc_err("illegal entry size %d\n", + llq_info->desc_list_entry_size); + return -EINVAL; + } + + if (llq_info->inline_header) { + llq_info->desc_stride_ctrl = llq_desc->descriptors_stride_ctrl; + if ((llq_info->desc_stride_ctrl != ENA_ADMIN_SINGLE_DESC_PER_ENTRY) && + (llq_info->desc_stride_ctrl != ENA_ADMIN_MULTIPLE_DESCS_PER_ENTRY)) { + ena_trc_err("Invalid desc_stride_ctrl %d\n", + llq_info->desc_stride_ctrl); + return -EINVAL; + } + } else { + llq_info->desc_stride_ctrl = ENA_ADMIN_SINGLE_DESC_PER_ENTRY; + } + + if (llq_info->desc_stride_ctrl == ENA_ADMIN_SINGLE_DESC_PER_ENTRY) + llq_info->descs_per_entry = llq_info->desc_list_entry_size / + sizeof(struct ena_eth_io_tx_desc); + else + llq_info->descs_per_entry = 1; + + llq_info->descs_num_before_header = llq_desc->desc_num_before_header_ctrl; + + return 0; +} + + + static int ena_com_wait_and_process_admin_cq_interrupts(struct ena_comp_ctx *comp_ctx, struct ena_com_admin_queue *admin_queue) { @@ -614,13 +714,14 @@ static u32 ena_com_reg_bar_read32(struct ena_com_dev * struct ena_com_mmio_read *mmio_read = &ena_dev->mmio_read; volatile struct ena_admin_ena_mmio_req_read_less_resp *read_resp = mmio_read->read_resp; - u32 mmio_read_reg, timeout, ret; + u32 mmio_read_reg, ret, i; unsigned long flags; - int i; + u32 timeout = mmio_read->reg_read_to; ENA_MIGHT_SLEEP(); - timeout = mmio_read->reg_read_to ? : ENA_REG_READ_TIMEOUT; + if (timeout == 0) + timeout = ENA_REG_READ_TIMEOUT; /* If readless is disabled, perform regular read */ if (!mmio_read->readless_supported) @@ -745,17 +846,20 @@ static void ena_com_io_queue_free(struct ena_com_dev * if (io_sq->desc_addr.virt_addr) { size = io_sq->desc_entry_size * io_sq->q_depth; - if (io_sq->mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_HOST) - ENA_MEM_FREE_COHERENT(ena_dev->dmadev, - size, - io_sq->desc_addr.virt_addr, - io_sq->desc_addr.phys_addr, - io_sq->desc_addr.mem_handle); - else - ENA_MEM_FREE(ena_dev->dmadev, io_sq->desc_addr.virt_addr); + ENA_MEM_FREE_COHERENT(ena_dev->dmadev, + size, + io_sq->desc_addr.virt_addr, + io_sq->desc_addr.phys_addr, + io_sq->desc_addr.mem_handle); io_sq->desc_addr.virt_addr = NULL; } + + if (io_sq->bounce_buf_ctrl.base_buffer) { + size = io_sq->llq_info.desc_list_entry_size * ENA_COM_BOUNCE_BUFFER_CNTRL_CNT; + ENA_MEM_FREE(ena_dev->dmadev, io_sq->bounce_buf_ctrl.base_buffer); + io_sq->bounce_buf_ctrl.base_buffer = NULL; + } } static int wait_for_reset_state(struct ena_com_dev *ena_dev, u32 timeout, @@ -807,7 +911,7 @@ static int ena_com_get_feature_ex(struct ena_com_dev * if (!ena_com_check_supported_feature_id(ena_dev, feature_id)) { ena_trc_dbg("Feature %d isn't supported\n", feature_id); - return ENA_COM_PERMISSION; + return ENA_COM_UNSUPPORTED; } memset(&get_cmd, 0x0, sizeof(get_cmd)); @@ -1366,7 +1470,7 @@ int ena_com_set_aenq_config(struct ena_com_dev *ena_de ena_trc_warn("Trying to set unsupported aenq events. supported flag: %x asked flag: %x\n", get_resp.u.aenq.supported_groups, groups_flag); - return ENA_COM_PERMISSION; + return ENA_COM_UNSUPPORTED; } memset(&cmd, 0x0, sizeof(cmd)); @@ -1480,7 +1584,6 @@ void ena_com_admin_destroy(struct ena_com_dev *ena_dev if (admin_queue->comp_ctx) ENA_MEM_FREE(ena_dev->dmadev, admin_queue->comp_ctx); - admin_queue->comp_ctx = NULL; size = ADMIN_SQ_SIZE(admin_queue->q_depth); if (sq->entries) @@ -1503,6 +1606,12 @@ void ena_com_admin_destroy(struct ena_com_dev *ena_dev void ena_com_set_admin_polling_mode(struct ena_com_dev *ena_dev, bool polling) { + u32 mask_value = 0; + + if (polling) + mask_value = ENA_REGS_ADMIN_INTR_MASK; + + ENA_REG_WRITE32(ena_dev->bus, mask_value, ena_dev->reg_bar + ENA_REGS_INTR_MASK_OFF); ena_dev->admin_queue.polling = polling; } @@ -1790,11 +1899,20 @@ int ena_com_get_dev_attr_feat(struct ena_com_dev *ena_ if (!rc) memcpy(&get_feat_ctx->hw_hints, &get_resp.u.hw_hints, sizeof(get_resp.u.hw_hints)); - else if (rc == ENA_COM_PERMISSION) + else if (rc == ENA_COM_UNSUPPORTED) memset(&get_feat_ctx->hw_hints, 0x0, sizeof(get_feat_ctx->hw_hints)); else return rc; + rc = ena_com_get_feature(ena_dev, &get_resp, ENA_ADMIN_LLQ); + if (!rc) + memcpy(&get_feat_ctx->llq, &get_resp.u.llq, + sizeof(get_resp.u.llq)); + else if (rc == ENA_COM_UNSUPPORTED) + memset(&get_feat_ctx->llq, 0x0, sizeof(get_feat_ctx->llq)); + else + return rc; + return 0; } @@ -1827,6 +1945,7 @@ void ena_com_aenq_intr_handler(struct ena_com_dev *dev struct ena_admin_aenq_common_desc *aenq_common; struct ena_com_aenq *aenq = &dev->aenq; ena_aenq_handler handler_cb; + unsigned long long timestamp; u16 masked_head, processed = 0; u8 phase; @@ -1838,11 +1957,12 @@ void ena_com_aenq_intr_handler(struct ena_com_dev *dev /* Go over all the events */ while ((aenq_common->flags & ENA_ADMIN_AENQ_COMMON_DESC_PHASE_MASK) == phase) { - ena_trc_dbg("AENQ! Group[%x] Syndrom[%x] timestamp: [%jus]\n", + timestamp = (unsigned long long)aenq_common->timestamp_low | + ((unsigned long long)aenq_common->timestamp_high << 32); + ena_trc_dbg("AENQ! Group[%x] Syndrom[%x] timestamp: [%llus]\n", aenq_common->group, aenq_common->syndrom, - (u64)aenq_common->timestamp_low + - ((u64)aenq_common->timestamp_high << 32)); + timestamp); /* Handle specific event*/ handler_cb = ena_com_get_specific_aenq_cb(dev, @@ -1872,8 +1992,30 @@ void ena_com_aenq_intr_handler(struct ena_com_dev *dev mb(); ENA_REG_WRITE32(dev->bus, (u32)aenq->head, dev->reg_bar + ENA_REGS_AENQ_HEAD_DB_OFF); } +#ifdef ENA_EXTENDED_STATS +/* + * Sets the function Idx and Queue Idx to be used for + * get full statistics feature + * + */ +int ena_com_extended_stats_set_func_queue(struct ena_com_dev *ena_dev, + u32 func_queue) +{ -int ena_com_dev_reset(struct ena_com_dev *ena_dev) + /* Function & Queue is acquired from user in the following format : + * Bottom Half word: funct + * Top Half Word: queue + */ + ena_dev->stats_func = ENA_EXTENDED_STAT_GET_FUNCT(func_queue); + ena_dev->stats_queue = ENA_EXTENDED_STAT_GET_QUEUE(func_queue); + + return 0; +} + +#endif /* ENA_EXTENDED_STATS */ + +int ena_com_dev_reset(struct ena_com_dev *ena_dev, + enum ena_regs_reset_reason_types reset_reason) { u32 stat, timeout, cap, reset_val; int rc; @@ -1901,6 +2043,8 @@ int ena_com_dev_reset(struct ena_com_dev *ena_dev) /* start reset */ reset_val = ENA_REGS_DEV_CTL_DEV_RESET_MASK; + reset_val |= (reset_reason << ENA_REGS_DEV_CTL_RESET_REASON_SHIFT) & + ENA_REGS_DEV_CTL_RESET_REASON_MASK; ENA_REG_WRITE32(ena_dev->bus, reset_val, ena_dev->reg_bar + ENA_REGS_DEV_CTL_OFF); /* Write again the MMIO read request address */ @@ -1973,7 +2117,52 @@ int ena_com_get_dev_basic_stats(struct ena_com_dev *en return ret; } +#ifdef ENA_EXTENDED_STATS +int ena_com_get_dev_extended_stats(struct ena_com_dev *ena_dev, char *buff, + u32 len) +{ + struct ena_com_stats_ctx ctx; + struct ena_admin_aq_get_stats_cmd *get_cmd = &ctx.get_cmd; + ena_mem_handle_t mem_handle; + void *virt_addr; + dma_addr_t phys_addr; + int ret; + + ENA_MEM_ALLOC_COHERENT(ena_dev->dmadev, len, + virt_addr, phys_addr, mem_handle); + if (!virt_addr) { + ret = ENA_COM_NO_MEM; + goto done; + } + memset(&ctx, 0x0, sizeof(ctx)); + ret = ena_com_mem_addr_set(ena_dev, + &get_cmd->u.control_buffer.address, + phys_addr); + if (unlikely(ret)) { + ena_trc_err("memory address set failed\n"); + return ret; + } + get_cmd->u.control_buffer.length = len; + + get_cmd->device_id = ena_dev->stats_func; + get_cmd->queue_idx = ena_dev->stats_queue; + + ret = ena_get_dev_stats(ena_dev, &ctx, + ENA_ADMIN_GET_STATS_TYPE_EXTENDED); + if (ret < 0) + goto free_ext_stats_mem; + + ret = snprintf(buff, len, "%s", (char *)virt_addr); + +free_ext_stats_mem: + ENA_MEM_FREE_COHERENT(ena_dev->dmadev, len, virt_addr, phys_addr, + mem_handle); +done: + return ret; +} +#endif + int ena_com_set_dev_mtu(struct ena_com_dev *ena_dev, int mtu) { struct ena_com_admin_queue *admin_queue; @@ -1983,7 +2172,7 @@ int ena_com_set_dev_mtu(struct ena_com_dev *ena_dev, i if (!ena_com_check_supported_feature_id(ena_dev, ENA_ADMIN_MTU)) { ena_trc_dbg("Feature %d isn't supported\n", ENA_ADMIN_MTU); - return ENA_COM_PERMISSION; + return ENA_COM_UNSUPPORTED; } memset(&cmd, 0x0, sizeof(cmd)); @@ -2037,7 +2226,7 @@ int ena_com_set_hash_function(struct ena_com_dev *ena_ ENA_ADMIN_RSS_HASH_FUNCTION)) { ena_trc_dbg("Feature %d isn't supported\n", ENA_ADMIN_RSS_HASH_FUNCTION); - return ENA_COM_PERMISSION; + return ENA_COM_UNSUPPORTED; } /* Validate hash function is supported */ @@ -2049,7 +2238,7 @@ int ena_com_set_hash_function(struct ena_com_dev *ena_ if (get_resp.u.flow_hash_func.supported_func & (1 << rss->hash_func)) { ena_trc_err("Func hash %d isn't supported by device, abort\n", rss->hash_func); - return ENA_COM_PERMISSION; + return ENA_COM_UNSUPPORTED; } memset(&cmd, 0x0, sizeof(cmd)); @@ -2108,7 +2297,7 @@ int ena_com_fill_hash_function(struct ena_com_dev *ena if (!((1 << func) & get_resp.u.flow_hash_func.supported_func)) { ena_trc_err("Flow hash function %d isn't supported\n", func); - return ENA_COM_PERMISSION; + return ENA_COM_UNSUPPORTED; } switch (func) { @@ -2201,7 +2390,7 @@ int ena_com_set_hash_ctrl(struct ena_com_dev *ena_dev) ENA_ADMIN_RSS_HASH_INPUT)) { ena_trc_dbg("Feature %d isn't supported\n", ENA_ADMIN_RSS_HASH_INPUT); - return ENA_COM_PERMISSION; + return ENA_COM_UNSUPPORTED; } memset(&cmd, 0x0, sizeof(cmd)); @@ -2282,7 +2471,7 @@ int ena_com_set_default_hash_ctrl(struct ena_com_dev * ena_trc_err("hash control doesn't support all the desire configuration. proto %x supported %x selected %x\n", i, hash_ctrl->supported_fields[i].fields, hash_ctrl->selected_fields[i].fields); - return ENA_COM_PERMISSION; + return ENA_COM_UNSUPPORTED; } } @@ -2360,7 +2549,7 @@ int ena_com_indirect_table_set(struct ena_com_dev *ena ENA_ADMIN_RSS_REDIRECTION_TABLE_CONFIG)) { ena_trc_dbg("Feature %d isn't supported\n", ENA_ADMIN_RSS_REDIRECTION_TABLE_CONFIG); - return ENA_COM_PERMISSION; + return ENA_COM_UNSUPPORTED; } ret = ena_com_ind_tbl_convert_to_device(ena_dev); @@ -2636,7 +2825,7 @@ int ena_com_init_interrupt_moderation(struct ena_com_d ENA_ADMIN_INTERRUPT_MODERATION); if (rc) { - if (rc == ENA_COM_PERMISSION) { + if (rc == ENA_COM_UNSUPPORTED) { ena_trc_dbg("Feature %d isn't supported\n", ENA_ADMIN_INTERRUPT_MODERATION); rc = 0; @@ -2758,4 +2947,34 @@ void ena_com_get_intr_moderation_entry(struct ena_com_ entry->pkts_per_interval = intr_moder_tbl[level].pkts_per_interval; entry->bytes_per_interval = intr_moder_tbl[level].bytes_per_interval; +} + +int ena_com_config_dev_mode(struct ena_com_dev *ena_dev, + struct ena_admin_feature_llq_desc *llq) +{ + int rc; + int size; + + if (llq->max_llq_num == 0) { + ena_dev->tx_mem_queue_type = ENA_ADMIN_PLACEMENT_POLICY_HOST; + return 0; + } + + rc = ena_com_config_llq_info(ena_dev, llq); + if (rc) + return rc; + + /* Validate the descriptor is not too big */ + size = ena_dev->tx_max_header_size; + size += ena_dev->llq_info.descs_num_before_header * + sizeof(struct ena_eth_io_tx_desc); + + if (unlikely(ena_dev->llq_info.desc_list_entry_size < size)) { + ena_trc_err("the size of the LLQ entry is smaller than needed\n"); + return ENA_COM_INVAL; + } + + ena_dev->tx_mem_queue_type = ENA_ADMIN_PLACEMENT_POLICY_DEV; + + return 0; } Modified: head/sys/contrib/ena-com/ena_com.h ============================================================================== --- head/sys/contrib/ena-com/ena_com.h Tue Oct 31 12:23:02 2017 (r325235) +++ head/sys/contrib/ena-com/ena_com.h Tue Oct 31 12:41:07 2017 (r325236) @@ -133,6 +133,15 @@ struct ena_com_tx_meta { u16 l4_hdr_len; /* In words */ }; +struct ena_com_llq_info { + bool inline_header; + u16 desc_stride_ctrl; + + u16 desc_list_entry_size; + u16 descs_num_before_header; + u16 descs_per_entry; +}; + struct ena_com_io_cq { struct ena_com_io_desc_addr cdesc_addr; void *bus; @@ -171,6 +180,20 @@ struct ena_com_io_cq { } ____cacheline_aligned; +struct ena_com_io_bounce_buffer_control { + u8 *base_buffer; + u16 next_to_use; + u16 buffer_size; + u16 buffers_num; /* Must be a power of 2 */ +}; + +/* This struct is to keep tracking the current location of the next llq entry */ +struct ena_com_llq_pkt_ctrl { + u8 *curr_bounce_buf; + u16 idx; + u16 descs_left_in_line; +}; + struct ena_com_io_sq { struct ena_com_io_desc_addr desc_addr; void *bus; @@ -183,6 +206,9 @@ struct ena_com_io_sq { u32 msix_vector; struct ena_com_tx_meta cached_tx_meta; + struct ena_com_llq_info llq_info; + struct ena_com_llq_pkt_ctrl llq_buf_ctrl; + struct ena_com_io_bounce_buffer_control bounce_buf_ctrl; u16 q_depth; u16 qid; @@ -190,6 +216,7 @@ struct ena_com_io_sq { u16 idx; u16 tail; u16 next_to_comp; + u16 llq_last_copy_tail; u32 tx_max_header_size; u8 phase; u8 desc_entry_size; @@ -321,6 +348,7 @@ struct ena_com_dev { void __iomem *mem_bar; void *dmadev; void *bus; + enum ena_admin_placement_policy_type tx_mem_queue_type; u32 tx_max_header_size; u16 stats_func; /* Selected function for extended statistic dump */ @@ -337,6 +365,8 @@ struct ena_com_dev { u16 intr_delay_resolution; u32 intr_moder_tx_interval; struct ena_intr_moder_entry *intr_moder_tbl; + + struct ena_com_llq_info llq_info; }; struct ena_com_dev_get_features_ctx { @@ -345,6 +375,7 @@ struct ena_com_dev_get_features_ctx { struct ena_admin_feature_aenq_desc aenq; struct ena_admin_feature_offload_desc offload; struct ena_admin_ena_hw_hints hw_hints; + struct ena_admin_feature_llq_desc llq; }; struct ena_com_create_io_ctx { @@ -426,10 +457,12 @@ void ena_com_admin_destroy(struct ena_com_dev *ena_dev /* ena_com_dev_reset - Perform device FLR to the device. * @ena_dev: ENA communication layer struct + * @reset_reason: Specify what is the trigger for the reset in case of an error. * * @return - 0 on success, negative value on failure. */ -int ena_com_dev_reset(struct ena_com_dev *ena_dev); +int ena_com_dev_reset(struct ena_com_dev *ena_dev, + enum ena_regs_reset_reason_types reset_reason); /* ena_com_create_io_queue - Create io queue. * @ena_dev: ENA communication layer struct @@ -939,6 +972,15 @@ void ena_com_get_intr_moderation_entry(struct ena_com_ enum ena_intr_moder_level level, struct ena_intr_moder_entry *entry); + +/* ena_com_config_dev_mode - Configure the placement policy of the device. + * @ena_dev: ENA communication layer struct + * @llq: LLQ feature descriptor, retrieve via ena_com_get_dev_attr_feat. + * + */ +int ena_com_config_dev_mode(struct ena_com_dev *ena_dev, + struct ena_admin_feature_llq_desc *llq); + static inline bool ena_com_get_adaptive_moderation_enabled(struct ena_com_dev *ena_dev) { return ena_dev->adaptive_coalescing; @@ -1048,6 +1090,30 @@ static inline void ena_com_update_intr_reg(struct ena_ intr_reg->intr_control |= ENA_ETH_IO_INTR_REG_INTR_UNMASK_MASK; } +static inline u8 *ena_com_get_next_bounce_buffer(struct ena_com_io_bounce_buffer_control *bounce_buf_ctrl) +{ + u16 size, buffers_num; + u8 *buf; + + size = bounce_buf_ctrl->buffer_size; + buffers_num = bounce_buf_ctrl->buffers_num; + + buf = bounce_buf_ctrl->base_buffer + + (bounce_buf_ctrl->next_to_use++ & (buffers_num - 1)) * size; + + prefetch(bounce_buf_ctrl->base_buffer + + (bounce_buf_ctrl->next_to_use & (buffers_num - 1)) * size); + + return buf; +} + +#ifdef ENA_EXTENDED_STATS +int ena_com_get_dev_extended_stats(struct ena_com_dev *ena_dev, char *buff, + u32 len); + +int ena_com_extended_stats_set_func_queue(struct ena_com_dev *ena_dev, + u32 funct_queue); +#endif #if defined(__cplusplus) } #endif /* __cplusplus */ Modified: head/sys/contrib/ena-com/ena_eth_com.c ============================================================================== --- head/sys/contrib/ena-com/ena_eth_com.c Tue Oct 31 12:23:02 2017 (r325235) +++ head/sys/contrib/ena-com/ena_eth_com.c Tue Oct 31 12:41:07 2017 (r325236) @@ -64,7 +64,7 @@ static inline void ena_com_cq_inc_head(struct ena_com_ io_cq->phase ^= 1; } -static inline void *get_sq_desc(struct ena_com_io_sq *io_sq) +static inline void *get_sq_desc_regular_queue(struct ena_com_io_sq *io_sq) { u16 tail_masked; u32 offset; @@ -76,22 +76,27 @@ static inline void *get_sq_desc(struct ena_com_io_sq * return (void *)((uintptr_t)io_sq->desc_addr.virt_addr + offset); } -static inline void ena_com_copy_curr_sq_desc_to_dev(struct ena_com_io_sq *io_sq) +static inline void ena_com_write_bounce_buffer_to_dev(struct ena_com_io_sq *io_sq, + u8 *bounce_buffer) { - u16 tail_masked = io_sq->tail & (io_sq->q_depth - 1); - u32 offset = tail_masked * io_sq->desc_entry_size; + struct ena_com_llq_info *llq_info = &io_sq->llq_info; - /* In case this queue isn't a LLQ */ - if (io_sq->mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_HOST) - return; + u16 dst_tail_mask; + u32 dst_offset; - memcpy_toio(io_sq->desc_addr.pbuf_dev_addr + offset, - io_sq->desc_addr.virt_addr + offset, - io_sq->desc_entry_size); -} + dst_tail_mask = io_sq->tail & (io_sq->q_depth - 1); + dst_offset = dst_tail_mask * llq_info->desc_list_entry_size; -static inline void ena_com_sq_update_tail(struct ena_com_io_sq *io_sq) -{ + /* Make sure everything was written into the bounce buffer before + * writing the bounce buffer to the device + */ + wmb(); + + /* The line is completed. Copy it to dev */ + ENA_MEMCPY_TO_DEVICE_64(io_sq->desc_addr.pbuf_dev_addr + dst_offset, + bounce_buffer, + llq_info->desc_list_entry_size); + io_sq->tail++; /* Switch phase bit in case of wrap around */ @@ -99,26 +104,124 @@ static inline void ena_com_sq_update_tail(struct ena_c io_sq->phase ^= 1; } -static inline int ena_com_write_header(struct ena_com_io_sq *io_sq, - u8 *head_src, u16 header_len) +static inline int ena_com_write_header_to_bounce(struct ena_com_io_sq *io_sq, + u8 *header_src, + u16 header_len) { - u16 tail_masked = io_sq->tail & (io_sq->q_depth - 1); - u8 __iomem *dev_head_addr = - io_sq->header_addr + (tail_masked * io_sq->tx_max_header_size); + struct ena_com_llq_pkt_ctrl *pkt_ctrl = &io_sq->llq_buf_ctrl; + struct ena_com_llq_info *llq_info = &io_sq->llq_info; + u8 *bounce_buffer = pkt_ctrl->curr_bounce_buf; + u16 header_offset; if (io_sq->mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_HOST) return 0; - if (unlikely(!io_sq->header_addr)) { - ena_trc_err("Push buffer header ptr is NULL\n"); - return ENA_COM_INVAL; + header_offset = + llq_info->descs_num_before_header * io_sq->desc_entry_size; + + if (unlikely((header_offset + header_len) > llq_info->desc_list_entry_size)) { + ena_trc_err("trying to write header larger than llq entry can accommodate\n"); + return ENA_COM_FAULT; } - memcpy_toio(dev_head_addr, head_src, header_len); + if (unlikely(!bounce_buffer)) { + ena_trc_err("bounce buffer is NULL\n"); + return ENA_COM_FAULT; + } + memcpy(bounce_buffer + header_offset, header_src, header_len); + return 0; } +static inline void *get_sq_desc_llq(struct ena_com_io_sq *io_sq) +{ + struct ena_com_llq_pkt_ctrl *pkt_ctrl = &io_sq->llq_buf_ctrl; + u8 *bounce_buffer; + void *sq_desc; + + bounce_buffer = pkt_ctrl->curr_bounce_buf; + + if (unlikely(!bounce_buffer)) { + ena_trc_err("bounce buffer is NULL\n"); + return NULL; + } + + sq_desc = bounce_buffer + pkt_ctrl->idx * io_sq->desc_entry_size; + pkt_ctrl->idx++; + pkt_ctrl->descs_left_in_line--; + + return sq_desc; +} + +static inline void ena_com_close_bounce_buffer(struct ena_com_io_sq *io_sq) +{ + struct ena_com_llq_pkt_ctrl *pkt_ctrl = &io_sq->llq_buf_ctrl; + struct ena_com_llq_info *llq_info = &io_sq->llq_info; + + if (io_sq->mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_HOST) + return; + + /* bounce buffer was used, so write it and get a new one */ + if (pkt_ctrl->idx) { + ena_com_write_bounce_buffer_to_dev(io_sq, + pkt_ctrl->curr_bounce_buf); + pkt_ctrl->curr_bounce_buf = + ena_com_get_next_bounce_buffer(&io_sq->bounce_buf_ctrl); + memset(io_sq->llq_buf_ctrl.curr_bounce_buf, + 0x0, llq_info->desc_list_entry_size); + } + + pkt_ctrl->idx = 0; + pkt_ctrl->descs_left_in_line = llq_info->descs_num_before_header; +} + +static inline void *get_sq_desc(struct ena_com_io_sq *io_sq) +{ + if (io_sq->mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_DEV) + return get_sq_desc_llq(io_sq); + + return get_sq_desc_regular_queue(io_sq); +} + +static inline void ena_com_sq_update_llq_tail(struct ena_com_io_sq *io_sq) +{ + struct ena_com_llq_pkt_ctrl *pkt_ctrl = &io_sq->llq_buf_ctrl; + struct ena_com_llq_info *llq_info = &io_sq->llq_info; + + if (!pkt_ctrl->descs_left_in_line) { + ena_com_write_bounce_buffer_to_dev(io_sq, + pkt_ctrl->curr_bounce_buf); + + pkt_ctrl->curr_bounce_buf = + ena_com_get_next_bounce_buffer(&io_sq->bounce_buf_ctrl); + memset(io_sq->llq_buf_ctrl.curr_bounce_buf, + 0x0, llq_info->desc_list_entry_size); + + pkt_ctrl->idx = 0; + if (llq_info->desc_stride_ctrl == ENA_ADMIN_SINGLE_DESC_PER_ENTRY) + pkt_ctrl->descs_left_in_line = 1; + else + pkt_ctrl->descs_left_in_line = + llq_info->desc_list_entry_size / io_sq->desc_entry_size; + } +} + +static inline void ena_com_sq_update_tail(struct ena_com_io_sq *io_sq) +{ + + if (io_sq->mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_DEV) { + ena_com_sq_update_llq_tail(io_sq); + return; + } + + io_sq->tail++; + + /* Switch phase bit in case of wrap around */ + if (unlikely((io_sq->tail & (io_sq->q_depth - 1)) == 0)) + io_sq->phase ^= 1; +} + static inline struct ena_eth_io_rx_cdesc_base * ena_com_rx_cdesc_idx_to_ptr(struct ena_com_io_cq *io_cq, u16 idx) { @@ -228,7 +331,6 @@ static inline void ena_com_create_and_store_tx_meta_de memcpy(&io_sq->cached_tx_meta, ena_meta, sizeof(struct ena_com_tx_meta)); - ena_com_copy_curr_sq_desc_to_dev(io_sq); ena_com_sq_update_tail(io_sq); } @@ -271,10 +373,11 @@ int ena_com_prepare_tx(struct ena_com_io_sq *io_sq, { struct ena_eth_io_tx_desc *desc = NULL; struct ena_com_buf *ena_bufs = ena_tx_ctx->ena_bufs; - void *push_header = ena_tx_ctx->push_header; + void *buffer_to_push = ena_tx_ctx->push_header; u16 header_len = ena_tx_ctx->header_len; u16 num_bufs = ena_tx_ctx->num_bufs; - int total_desc, i, rc; + u16 start_tail = io_sq->tail; + int i, rc; bool have_meta; u64 addr_hi; @@ -282,7 +385,7 @@ int ena_com_prepare_tx(struct ena_com_io_sq *io_sq, "wrong Q type"); /* num_bufs +1 for potential meta desc */ - if (ena_com_sq_empty_space(io_sq) < (num_bufs + 1)) { + if (!ena_com_sq_have_enough_space(io_sq, num_bufs + 1)) { ena_trc_err("Not enough space in the tx queue\n"); return ENA_COM_NO_MEM; } @@ -293,8 +396,10 @@ int ena_com_prepare_tx(struct ena_com_io_sq *io_sq, return ENA_COM_INVAL; } - /* start with pushing the header (if needed) */ - rc = ena_com_write_header(io_sq, push_header, header_len); + if (unlikely((io_sq->mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_DEV) && !buffer_to_push)) + return ENA_COM_INVAL; + + rc = ena_com_write_header_to_bounce(io_sq, buffer_to_push, header_len); if (unlikely(rc)) return rc; @@ -305,11 +410,14 @@ int ena_com_prepare_tx(struct ena_com_io_sq *io_sq, /* If the caller doesn't want send packets */ if (unlikely(!num_bufs && !header_len)) { - *nb_hw_desc = have_meta ? 0 : 1; + ena_com_close_bounce_buffer(io_sq); + *nb_hw_desc = io_sq->tail - start_tail; return 0; } desc = get_sq_desc(io_sq); + if (unlikely(!desc)) + return ENA_COM_FAULT; memset(desc, 0x0, sizeof(struct ena_eth_io_tx_desc)); /* Set first desc when we don't have meta descriptor */ @@ -361,10 +469,12 @@ int ena_com_prepare_tx(struct ena_com_io_sq *io_sq, for (i = 0; i < num_bufs; i++) { /* The first desc share the same desc as the header */ if (likely(i != 0)) { - ena_com_copy_curr_sq_desc_to_dev(io_sq); ena_com_sq_update_tail(io_sq); desc = get_sq_desc(io_sq); + if (unlikely(!desc)) + return ENA_COM_FAULT; + memset(desc, 0x0, sizeof(struct ena_eth_io_tx_desc)); desc->len_ctrl |= (io_sq->phase << @@ -387,14 +497,11 @@ int ena_com_prepare_tx(struct ena_com_io_sq *io_sq, /* set the last desc indicator */ desc->len_ctrl |= ENA_ETH_IO_TX_DESC_LAST_MASK; - ena_com_copy_curr_sq_desc_to_dev(io_sq); - ena_com_sq_update_tail(io_sq); - total_desc = ENA_MAX16(num_bufs, 1); - total_desc += have_meta ? 1 : 0; + ena_com_close_bounce_buffer(io_sq); - *nb_hw_desc = total_desc; + *nb_hw_desc = io_sq->tail - start_tail; return 0; } @@ -456,10 +563,13 @@ int ena_com_add_single_rx_desc(struct ena_com_io_sq *i ENA_WARN(io_sq->direction != ENA_COM_IO_QUEUE_DIRECTION_RX, "wrong Q type"); - if (unlikely(ena_com_sq_empty_space(io_sq) == 0)) + if (unlikely(!ena_com_sq_have_enough_space(io_sq, 1))) return ENA_COM_NO_SPACE; desc = get_sq_desc(io_sq); + if (unlikely(!desc)) + return ENA_COM_FAULT; + memset(desc, 0x0, sizeof(struct ena_eth_io_rx_desc)); desc->length = ena_buf->len; @@ -500,6 +610,11 @@ int ena_com_tx_comp_req_id_get(struct ena_com_io_cq *i cdesc_phase = READ_ONCE(cdesc->flags) & ENA_ETH_IO_TX_CDESC_PHASE_MASK; if (cdesc_phase != expected_phase) return ENA_COM_TRY_AGAIN; + + if (unlikely(cdesc->req_id >= io_cq->q_depth)) { + ena_trc_err("Invalid req id %d\n", cdesc->req_id); + return ENA_COM_INVAL; + } ena_com_cq_inc_head(io_cq); Modified: head/sys/contrib/ena-com/ena_eth_com.h ============================================================================== --- head/sys/contrib/ena-com/ena_eth_com.h Tue Oct 31 12:23:02 2017 (r325235) +++ head/sys/contrib/ena-com/ena_eth_com.h Tue Oct 31 12:41:07 2017 (r325236) @@ -98,7 +98,7 @@ static inline void ena_com_unmask_intr(struct ena_com_ ENA_REG_WRITE32(io_cq->bus, intr_reg->intr_control, io_cq->unmask_reg); } -static inline int ena_com_sq_empty_space(struct ena_com_io_sq *io_sq) +static inline int ena_com_free_desc(struct ena_com_io_sq *io_sq) { u16 tail, next_to_comp, cnt; @@ -107,6 +107,25 @@ static inline int ena_com_sq_empty_space(struct ena_co cnt = tail - next_to_comp; return io_sq->q_depth - 1 - cnt; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Tue Oct 31 14:49: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 9657FE5BCAC; Tue, 31 Oct 2017 14:49:30 +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 6E7397C829; Tue, 31 Oct 2017 14:49:29 +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 5A7DF529; Tue, 31 Oct 2017 09:49:22 -0500 (CDT) From: Dan Mack To: Devin Teske Cc: Alexey Dokuchaev , "src-committers\@freebsd.org" , Eitan Adler , "svn-src-all\@freebsd.org" , "svn-src-head\@freebsd.org" , Cy Schubert , Ed Maste , Warner Losh Subject: Re: svn commit: r325092 - head/usr.bin/fortune/datfiles In-Reply-To: <9CD7866D-BF74-4618-8FFE-E9C47D4DA328@shxd.cx> (Devin Teske's message of "Mon, 30 Oct 2017 21:33:35 -0700") References: <201710291851.v9TIpM0I073542@slippy.cwsent.com> <20171030151627.GA74374@FreeBSD.org> <3CB26689-0D12-4E69-9BBA-58CCC3B71F3F@shxd.cx> <9CD7866D-BF74-4618-8FFE-E9C47D4DA328@shxd.cx> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (darwin) Date: Tue, 31 Oct 2017 09:49:21 -0500 Message-ID: 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-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Oct 2017 14:49:30 -0000 Devin Teske writes: >> On Oct 30, 2017, at 2:35 PM, Dan Mack wrote: >> >> Devin Teske writes: >> >>> Better in bash which allows you to filter not only on "begins with" >>> but also "contains" (which is arguably more valuable than "begins >>> with"). >> >> Definately different. Better? > > Typical session of editing exim acls on the mail server: > > 1. Log in via ssh to bash > 2. Esc-P vi ENTER > (pulls up "sudo vi /usr/local/etc/exim/acls/relay_domains") > 3. ENTER > 4. Make changes in vi, save, exit > 5. Esc-P restart ENTER > (pulls up "sudo service exim restart") > 6. ENTER > > Ok, so if I was using tcsh, I cannot call this "better": > > 1. Log in via ssh to tcsh > 2. sudo vi Esc-P > (pulls up "sudo vi /usr/local/etc/exim/acls/relay_domains") > 3. ENTER > 4. Make changes in vi, save, exit > 5. sudo service exim r Esc-P > (pulls up "sudo service exim restart") > 6. ENTER > > As you can see, being able to match on contents rather than begins-with saves me valuable keystrokes and allows me to find history elements faster with less effort. > > Take the example of using "service". Imagine: > > 1. Esc-P restart > 2. Esc-P stop > 3. Esc-P reloas > > Etc. > > Using the tcsh implementation you simply cannot navigate the history sequentially like that. > > However... there is the fallback of history substitution to pluck elements in tcsh which also works in bash: > > !?text?:p > > This will copy the most recent history element containing "text" onto the top of the history. > > In bash you can turn on histverify (using shopt) which will allow you > to use simply "!?text" (without quotes) to pull up the previous > command containing "text". In tcsh and zsh -- which lack the > histverify shell option -- the syntax "!?text" will still work but > without the "?:p" modifier will execute the match right away. > > However, this cross-shell history substitution feature does not allow matching on "begins-with", only "contains," and as-such is not as flexible as bash's Esc-[PN] feature. > > Though, I admittedly use history expansion a lot too. ^^ i use '!$' constantly to pull up the last argument to the previous command Definately appreciate your perspective. My lack of doing this the bash way is really just a side effect of being an early tcsh user, bash not being everywhere I needed it, habbit, and prefix thinking with respect to searching command history. Dan From owner-svn-src-all@freebsd.org Tue Oct 31 14:56: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 EF6F2E5C03C; Tue, 31 Oct 2017 14:56:50 +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 C7F797CE10; Tue, 31 Oct 2017 14:56:50 +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 8A4D452C; Tue, 31 Oct 2017 09:56:48 -0500 (CDT) From: Dan Mack To: Alexey Dokuchaev Cc: Devin Teske , "src-committers\@freebsd.org" , Eitan Adler , "svn-src-all\@freebsd.org" , Cy Schubert , "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> <20171030151627.GA74374@FreeBSD.org> <3CB26689-0D12-4E69-9BBA-58CCC3B71F3F@shxd.cx> <20171031060631.GA78809@FreeBSD.org> Date: Tue, 31 Oct 2017 09:56:47 -0500 In-Reply-To: <20171031060631.GA78809@FreeBSD.org> (Alexey Dokuchaev's message of "Tue, 31 Oct 2017 06:06:31 +0000") 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-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Oct 2017 14:56:51 -0000 Alexey Dokuchaev writes: > On Mon, Oct 30, 2017 at 04:35:04PM -0500, Dan Mack wrote: >> Definately different. Better? Maybe for some. I most always search >> command history by prefix and then just using multiple ESC-p invocations >> to find the one command to edit/re-execute. Less frequently I want to >> search the whole text of history for the whole command line sequence >> like bash Ctrl-R accomplishes. > > Agreed, search-by-prefix needed a lot more often than ^R one (search > anywhere). That's why it makes sense to bind it to the arrows. > >> >>> "\ep": history-search-backward >> >>> "\en": history-search-forward >> >> > Interesting that you mapped these to cursor-up/cursor-down. >> > >> > That may cause unexpected results. >> >> > For example, typing something and then pressing up-arrow will cause >> > the shell to give you the previous command that started with that >> > rather than the previous command in-general. > > That's exactly what I want, to type vi and instantly get to the > editing command (skipping all cd's and ls's I might've done in between). > >> It's ESC-p/ESC-n, not just plain up-arrow/down-arrow. Up arrow still >> does up without any search. At least with my config using \ep as shown. >> My up arrows work for me as expected - they just iterate forward and >> backward through shell history. > > I find this separation useless and actually mitigating the good. When > I want to scroll the history without any search I'd simply won't type > anything. Binding prefix-search to ESC-p/ESC-n, not up-arrow/down-arrow > is beyond me. Empty command line gives you plain iteratation, typing > anything limit iteratation over commands starting with typed prefix. Maybe this disconnect is related to the fact that I never use the arrow keys. I used ctrl-n/p to cycle shell history down/up and put an esc in front if I am searching using history-search-backward/forward. Dan From owner-svn-src-all@freebsd.org Tue Oct 31 14:56: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 7F5D2E5C037; Tue, 31 Oct 2017 14:56:48 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pf0-x236.google.com (mail-pf0-x236.google.com [IPv6:2607:f8b0:400e:c00::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 4DE7E7CE0E; Tue, 31 Oct 2017 14:56:48 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pf0-x236.google.com with SMTP id i5so13976198pfe.6; Tue, 31 Oct 2017 07:56:48 -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 :content-transfer-encoding:message-id:references:to; bh=GvlcFfp6cgmEGpJRR9/0zZs5ANGYNUcMT6ygNrQQEig=; b=ZvL5BCMzyGXBPVdrpQNmz7HFS3nRzQ+YjHBccEvUaFXonN+9/Mj5VYfh9J4RWQLOiZ ld8Z/lPSP/9WyMEHJOtX3H58NE6cmbo+A/sPQd4oMNyATDPaS6m8gNfZ4YUjb7u8cvaU B6d3hDzw2ZYzvMSactcEf3GZpTMISWZqCNsNOz2iV5061Ku7gYzvgdnWwVMQKQ7nrcDi LyIHeR3mS9vuUuHK54vYFjjYwcbIK/NcCzpL+Q6EitBsiQdPEaoBBDQ8usu318NnY/Lf 5kamLulf3+kzd4hJtblZrCAU+/dQOwmPdO80QDdcxfWgnrs/zqng3G/TyNVBFQGetsRv nX7Q== 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 :content-transfer-encoding:message-id:references:to; bh=GvlcFfp6cgmEGpJRR9/0zZs5ANGYNUcMT6ygNrQQEig=; b=VWDEj2uROzr5r9yDUAuEU4JIbh5o50bzr+lKWQY7YdeiMnz4Ph9yCwvOqS65zT0WPX BVuWQvdQcZPkdCo2xI/BZsOnHjZxaOMZwcpf8YWavkp4gT8HG6MzJopY80c+h/mSkacy 8ENCCyJUpHYJ5yXWbZmFpNCap0YLBLPWv7CX6geFuwlCt4JWHMWA1Hr2oqqVQ02augDf b8JXBoCzo3bWCUXnZDZGHMKsqgvoLYhxRIO9X3eeG34TiWzxnUxL9rFV1dx5rrGJytcM 6/ggUcPFArz7PXvmvlxenCPLVV05OVOJ0RDzuljVA2jd21RvG0gurEFWMk1fqWSHQm79 qUNw== X-Gm-Message-State: AMCzsaX6jMO9Hyr7VFBPW7vNVEuFky0llmjo3bVW+2pGMe3nbyKNQh0R blw1y8OndxFo3hCRb2ZofhutV+s/ X-Google-Smtp-Source: ABhQp+Qu6OyoFU35c8WiirlRa0QrqjI8g73y4/Xu72b52CRA7yuTz2U0tKAybToHkLol99p/AnDocA== X-Received: by 10.159.216.131 with SMTP id s3mr2078120plp.434.1509461807628; Tue, 31 Oct 2017 07:56:47 -0700 (PDT) Received: from [192.168.20.13] (c-73-19-52-228.hsd1.wa.comcast.net. [73.19.52.228]) by smtp.gmail.com with ESMTPSA id f2sm3259102pgt.75.2017.10.31.07.56.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Oct 2017 07:56:47 -0700 (PDT) Content-Type: text/plain; charset=cp932 Mime-Version: 1.0 (1.0) Subject: Re: svn commit: r325192 - head/etc/mtree From: Ngie Cooper X-Mailer: iPhone Mail (15A432) In-Reply-To: <201710310143.v9V1haa9089063@repo.freebsd.org> Date: Tue, 31 Oct 2017 07:56:46 -0700 Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <32B8C7F0-40F3-4833-9CD3-84C5EC3E7429@gmail.com> References: <201710310143.v9V1haa9089063@repo.freebsd.org> To: Bryan Drewery 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: Tue, 31 Oct 2017 14:56:48 -0000 > On Oct 30, 2017, at 18:43, Bryan Drewery wrote: >=20 > Author: bdrewery > Date: Tue Oct 31 01:43:36 2017 > New Revision: 325192 > URL: https://svnweb.freebsd.org/changeset/base/325192 >=20 > Log: > Fix installworld/distrib-dirs for pathconv after r325186. *sigh* Julian never completed the tests. They=81fre breaking Jenkins since they=81f= re now integrated into the build.. Please test test commits next time (make obj depend all; sudo make check ins= tall). I=81fll go fix them ;/.. > Sponsored by: Dell EMC Isilon >=20 > Modified: > head/etc/mtree/BSD.tests.dist >=20 > Modified: head/etc/mtree/BSD.tests.dist > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=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/etc/mtree/BSD.tests.dist Tue Oct 31 00:26:42 2017 (r325191)= > +++ head/etc/mtree/BSD.tests.dist Tue Oct 31 01:43:36 2017 (r325192)= > @@ -358,6 +358,8 @@ > dlopen > .. > .. > + libpathconv > + .. > libutil > .. > libxo >=20 From owner-svn-src-all@freebsd.org Tue Oct 31 15:01: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 5D423E5C2D9; Tue, 31 Oct 2017 15:01:53 +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 2C30E7D500; Tue, 31 Oct 2017 15:01:53 +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 v9VF1qu5021538; Tue, 31 Oct 2017 15:01:52 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9VF1q4i021537; Tue, 31 Oct 2017 15:01:52 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201710311501.v9VF1q4i021537@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Tue, 31 Oct 2017 15:01:52 +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: r325237 - stable/11/sys/sys X-SVN-Group: stable-11 X-SVN-Commit-Author: markj X-SVN-Commit-Paths: stable/11/sys/sys X-SVN-Commit-Revision: 325237 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: Tue, 31 Oct 2017 15:01:53 -0000 Author: markj Date: Tue Oct 31 15:01:52 2017 New Revision: 325237 URL: https://svnweb.freebsd.org/changeset/base/325237 Log: MFC r324923: Remove resource_set_*() declarations from sys/bus.h. PR: 223189 Modified: stable/11/sys/sys/bus.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/sys/bus.h ============================================================================== --- stable/11/sys/sys/bus.h Tue Oct 31 12:41:07 2017 (r325236) +++ stable/11/sys/sys/bus.h Tue Oct 31 15:01:52 2017 (r325237) @@ -632,7 +632,6 @@ struct sysctl_oid *devclass_get_sysctl_tree(devclass_t /* * Access functions for device resources. */ - int resource_int_value(const char *name, int unit, const char *resname, int *result); int resource_long_value(const char *name, int unit, const char *resname, @@ -644,12 +643,6 @@ int resource_find_match(int *anchor, const char **name const char *resname, const char *value); int resource_find_dev(int *anchor, const char *name, int *unit, const char *resname, const char *value); -int resource_set_int(const char *name, int unit, const char *resname, - int value); -int resource_set_long(const char *name, int unit, const char *resname, - long value); -int resource_set_string(const char *name, int unit, const char *resname, - const char *value); int resource_unset_value(const char *name, int unit, const char *resname); /* From owner-svn-src-all@freebsd.org Tue Oct 31 15:06: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 96BE5E5C4F3; Tue, 31 Oct 2017 15:06:27 +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 7295D7D831; Tue, 31 Oct 2017 15:06:27 +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 v9VF6QoH024112; Tue, 31 Oct 2017 15:06:26 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9VF6QhF024108; Tue, 31 Oct 2017 15:06:26 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201710311506.v9VF6QhF024108@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Tue, 31 Oct 2017 15:06: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: r325238 - in stable/11/sys: amd64/amd64 arm/arm arm64/arm64 i386/i386 X-SVN-Group: stable-11 X-SVN-Commit-Author: markj X-SVN-Commit-Paths: in stable/11/sys: amd64/amd64 arm/arm arm64/arm64 i386/i386 X-SVN-Commit-Revision: 325238 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: Tue, 31 Oct 2017 15:06:27 -0000 Author: markj Date: Tue Oct 31 15:06:26 2017 New Revision: 325238 URL: https://svnweb.freebsd.org/changeset/base/325238 Log: MFC r324920: Fix the VM_NRESERVLEVEL == 0 build. Modified: stable/11/sys/amd64/amd64/pmap.c stable/11/sys/arm/arm/pmap-v6.c stable/11/sys/arm64/arm64/pmap.c stable/11/sys/i386/i386/pmap.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/amd64/amd64/pmap.c ============================================================================== --- stable/11/sys/amd64/amd64/pmap.c Tue Oct 31 15:01:52 2017 (r325237) +++ stable/11/sys/amd64/amd64/pmap.c Tue Oct 31 15:06:26 2017 (r325238) @@ -608,8 +608,10 @@ static void pmap_pv_demote_pde(pmap_t pmap, vm_offset_ struct rwlock **lockp); static bool pmap_pv_insert_pde(pmap_t pmap, vm_offset_t va, pd_entry_t pde, u_int flags, struct rwlock **lockp); +#if VM_NRESERVLEVEL > 0 static void pmap_pv_promote_pde(pmap_t pmap, vm_offset_t va, vm_paddr_t pa, struct rwlock **lockp); +#endif static void pmap_pvh_free(struct md_page *pvh, pmap_t pmap, vm_offset_t va); static pv_entry_t pmap_pvh_remove(struct md_page *pvh, pmap_t pmap, vm_offset_t va); @@ -632,8 +634,10 @@ static void pmap_invalidate_pde_page(pmap_t pmap, vm_o pd_entry_t pde); static void pmap_kenter_attr(vm_offset_t va, vm_paddr_t pa, int mode); static void pmap_pde_attr(pd_entry_t *pde, int cache_bits, int mask); +#if VM_NRESERVLEVEL > 0 static void pmap_promote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va, struct rwlock **lockp); +#endif static boolean_t pmap_protect_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t sva, vm_prot_t prot); static void pmap_pte_attr(pt_entry_t *pte, int cache_bits, int mask); @@ -3363,6 +3367,7 @@ out: PV_STAT(atomic_subtract_int(&pv_entry_spare, NPTEPG - 1)); } +#if VM_NRESERVLEVEL > 0 /* * After promotion from 512 4KB page mappings to a single 2MB page mapping, * replace the many pv entries for the 4KB page mappings by a single pv entry @@ -3403,6 +3408,7 @@ pmap_pv_promote_pde(pmap_t pmap, vm_offset_t va, vm_pa pmap_pvh_free(&m->md, pmap, va); } while (va < va_last); } +#endif /* VM_NRESERVLEVEL > 0 */ /* * First find and then destroy the pv entry for the specified pmap and virtual @@ -4247,6 +4253,7 @@ retry: PMAP_UNLOCK(pmap); } +#if VM_NRESERVLEVEL > 0 /* * Tries to promote the 512, contiguous 4KB page mappings that are within a * single page table page (PTP) to a single 2MB page mapping. For promotion @@ -4375,6 +4382,7 @@ setpte: CTR2(KTR_PMAP, "pmap_promote_pde: success for va %#lx" " in pmap %p", va, pmap); } +#endif /* VM_NRESERVLEVEL > 0 */ /* * Insert the given physical page (p) at @@ -4603,6 +4611,7 @@ validate: unchanged: +#if VM_NRESERVLEVEL > 0 /* * If both the page table page and the reservation are fully * populated, then attempt promotion. @@ -4612,6 +4621,7 @@ unchanged: (m->flags & PG_FICTITIOUS) == 0 && vm_reserv_level_iffullpop(m) == 0) pmap_promote_pde(pmap, pde, va, &lock); +#endif rv = KERN_SUCCESS; out: @@ -7195,7 +7205,9 @@ pmap_emulate_accessed_dirty(pmap_t pmap, vm_offset_t v { int rv; struct rwlock *lock; +#if VM_NRESERVLEVEL > 0 vm_page_t m, mpte; +#endif pd_entry_t *pde; pt_entry_t *pte, PG_A, PG_M, PG_RW, PG_V; @@ -7250,6 +7262,7 @@ pmap_emulate_accessed_dirty(pmap_t pmap, vm_offset_t v *pte |= PG_A; } +#if VM_NRESERVLEVEL > 0 /* try to promote the mapping */ if (va < VM_MAXUSER_ADDRESS) mpte = PHYS_TO_VM_PAGE(*pde & PG_FRAME); @@ -7267,6 +7280,8 @@ pmap_emulate_accessed_dirty(pmap_t pmap, vm_offset_t v atomic_add_long(&ad_emulation_superpage_promotions, 1); #endif } +#endif + #ifdef INVARIANTS if (ftype == VM_PROT_WRITE) atomic_add_long(&num_dirty_emulations, 1); Modified: stable/11/sys/arm/arm/pmap-v6.c ============================================================================== --- stable/11/sys/arm/arm/pmap-v6.c Tue Oct 31 15:01:52 2017 (r325237) +++ stable/11/sys/arm/arm/pmap-v6.c Tue Oct 31 15:06:26 2017 (r325238) @@ -3167,6 +3167,7 @@ pmap_pv_demote_pte1(pmap_t pmap, vm_offset_t va, vm_pa } while (va < va_last); } +#if VM_NRESERVLEVEL > 0 static void pmap_pv_promote_pte1(pmap_t pmap, vm_offset_t va, vm_paddr_t pa) { @@ -3200,6 +3201,7 @@ pmap_pv_promote_pte1(pmap_t pmap, vm_offset_t va, vm_p pmap_pvh_free(&m->md, pmap, va); } while (va < va_last); } +#endif /* * Conditionally create a pv entry. @@ -3407,6 +3409,7 @@ pmap_change_pte1(pmap_t pmap, pt1_entry_t *pte1p, vm_o } #endif +#if VM_NRESERVLEVEL > 0 /* * Tries to promote the NPTE2_IN_PT2, contiguous 4KB page mappings that are * within a single page table page (PT2) to a single 1MB page mapping. @@ -3534,6 +3537,7 @@ pmap_promote_pte1(pmap_t pmap, pt1_entry_t *pte1p, vm_ PDEBUG(6, printf("%s(%p): success for va %#x pte1 %#x(%#x) at %p\n", __func__, pmap, va, npte1, pte1_load(pte1p), pte1p)); } +#endif /* VM_NRESERVLEVEL > 0 */ /* * Zero L2 page table page. @@ -4055,6 +4059,8 @@ validate: va, opte2, npte2); } #endif + +#if VM_NRESERVLEVEL > 0 /* * If both the L2 page table page and the reservation are fully * populated, then attempt promotion. @@ -4063,6 +4069,7 @@ validate: sp_enabled && (m->flags & PG_FICTITIOUS) == 0 && vm_reserv_level_iffullpop(m) == 0) pmap_promote_pte1(pmap, pte1p, va); +#endif sched_unpin(); rw_wunlock(&pvh_global_lock); PMAP_UNLOCK(pmap); Modified: stable/11/sys/arm64/arm64/pmap.c ============================================================================== --- stable/11/sys/arm64/arm64/pmap.c Tue Oct 31 15:01:52 2017 (r325237) +++ stable/11/sys/arm64/arm64/pmap.c Tue Oct 31 15:06:26 2017 (r325238) @@ -105,6 +105,8 @@ __FBSDID("$FreeBSD$"); * and to when physical maps must be made correct. */ +#include "opt_vm.h" + #include #include #include @@ -2690,6 +2692,7 @@ pmap_update_entry(pmap_t pmap, pd_entry_t *pte, pd_ent intr_restore(intr); } +#if VM_NRESERVLEVEL > 0 /* * After promotion from 512 4KB page mappings to a single 2MB page mapping, * replace the many pv entries for the 4KB page mappings by a single pv entry @@ -2803,6 +2806,7 @@ pmap_promote_l2(pmap_t pmap, pd_entry_t *l2, vm_offset CTR2(KTR_PMAP, "pmap_promote_l2: success for va %#lx in pmap %p", va, pmap); } +#endif /* VM_NRESERVLEVEL > 0 */ /* * Insert the given physical page (p) at @@ -3067,12 +3071,14 @@ validate: (prot & VM_PROT_EXECUTE) != 0) cpu_icache_sync_range(va, PAGE_SIZE); +#if VM_NRESERVLEVEL > 0 if ((mpte == NULL || mpte->wire_count == NL3PG) && pmap_superpages_enabled() && (m->flags & PG_FICTITIOUS) == 0 && vm_reserv_level_iffullpop(m) == 0) { pmap_promote_l2(pmap, pde, va, &lock); } +#endif } if (lock != NULL) Modified: stable/11/sys/i386/i386/pmap.c ============================================================================== --- stable/11/sys/i386/i386/pmap.c Tue Oct 31 15:01:52 2017 (r325237) +++ stable/11/sys/i386/i386/pmap.c Tue Oct 31 15:06:26 2017 (r325238) @@ -100,6 +100,7 @@ __FBSDID("$FreeBSD$"); #include "opt_cpu.h" #include "opt_pmap.h" #include "opt_smp.h" +#include "opt_vm.h" #include "opt_xbox.h" #include @@ -288,7 +289,9 @@ static void free_pv_entry(pmap_t pmap, pv_entry_t pv); static pv_entry_t get_pv_entry(pmap_t pmap, boolean_t try); static void pmap_pv_demote_pde(pmap_t pmap, vm_offset_t va, vm_paddr_t pa); static boolean_t pmap_pv_insert_pde(pmap_t pmap, vm_offset_t va, vm_paddr_t pa); +#if VM_NRESERVLEVEL > 0 static void pmap_pv_promote_pde(pmap_t pmap, vm_offset_t va, vm_paddr_t pa); +#endif static void pmap_pvh_free(struct md_page *pvh, pmap_t pmap, vm_offset_t va); static pv_entry_t pmap_pvh_remove(struct md_page *pvh, pmap_t pmap, vm_offset_t va); @@ -309,7 +312,9 @@ static boolean_t pmap_is_referenced_pvh(struct md_page static void pmap_kenter_attr(vm_offset_t va, vm_paddr_t pa, int mode); static void pmap_kenter_pde(vm_offset_t va, pd_entry_t newpde); static void pmap_pde_attr(pd_entry_t *pde, int cache_bits); +#if VM_NRESERVLEVEL > 0 static void pmap_promote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va); +#endif static boolean_t pmap_protect_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t sva, vm_prot_t prot); static void pmap_pte_attr(pt_entry_t *pte, int cache_bits); @@ -2504,6 +2509,7 @@ pmap_pv_demote_pde(pmap_t pmap, vm_offset_t va, vm_pad } while (va < va_last); } +#if VM_NRESERVLEVEL > 0 static void pmap_pv_promote_pde(pmap_t pmap, vm_offset_t va, vm_paddr_t pa) { @@ -2537,6 +2543,7 @@ pmap_pv_promote_pde(pmap_t pmap, vm_offset_t va, vm_pa pmap_pvh_free(&m->md, pmap, va); } while (va < va_last); } +#endif /* VM_NRESERVLEVEL > 0 */ static void pmap_pvh_free(struct md_page *pvh, pmap_t pmap, vm_offset_t va) @@ -3312,6 +3319,7 @@ retry: PMAP_UNLOCK(pmap); } +#if VM_NRESERVLEVEL > 0 /* * Tries to promote the 512 or 1024, contiguous 4KB page mappings that are * within a single page table page (PTP) to a single 2- or 4MB page mapping. @@ -3448,6 +3456,7 @@ setpte: CTR2(KTR_PMAP, "pmap_promote_pde: success for va %#x" " in pmap %p", va, pmap); } +#endif /* VM_NRESERVLEVEL > 0 */ /* * Insert the given physical page (p) at @@ -3664,6 +3673,7 @@ validate: pte_store(pte, newpte); } +#if VM_NRESERVLEVEL > 0 /* * If both the page table page and the reservation are fully * populated, then attempt promotion. @@ -3672,6 +3682,7 @@ validate: pg_ps_enabled && (m->flags & PG_FICTITIOUS) == 0 && vm_reserv_level_iffullpop(m) == 0) pmap_promote_pde(pmap, pde, va); +#endif sched_unpin(); rw_wunlock(&pvh_global_lock); From owner-svn-src-all@freebsd.org Tue Oct 31 15:08:56 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 5AB5EE5C5FC; Tue, 31 Oct 2017 15:08:56 +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 374A57DA83; Tue, 31 Oct 2017 15:08:56 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1033) id 5EB0176A6; Tue, 31 Oct 2017 15:08:55 +0000 (UTC) Date: Tue, 31 Oct 2017 15:08:55 +0000 From: Alexey Dokuchaev To: Dan Mack Cc: Devin Teske , "src-committers@freebsd.org" , Eitan Adler , "svn-src-all@freebsd.org" , Cy Schubert , "svn-src-head@freebsd.org" , Ed Maste , Warner Losh Subject: Re: svn commit: r325092 - head/usr.bin/fortune/datfiles Message-ID: <20171031150855.GA55289@FreeBSD.org> References: <201710291851.v9TIpM0I073542@slippy.cwsent.com> <20171030151627.GA74374@FreeBSD.org> <3CB26689-0D12-4E69-9BBA-58CCC3B71F3F@shxd.cx> <20171031060631.GA78809@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: Tue, 31 Oct 2017 15:08:56 -0000 On Tue, Oct 31, 2017 at 09:56:47AM -0500, Dan Mack wrote: > Alexey Dokuchaev writes: > > ... > > I find this separation useless and actually mitigating the good. When > > I want to scroll the history without any search I'd simply won't type > > anything. Binding prefix-search to ESC-p/ESC-n, not up-arrow/down-arrow > > is beyond me. Empty command line gives you plain iteratation, typing > > anything limit iteratation over commands starting with typed prefix. > > Maybe this disconnect is related to the fact that I never use the > arrow keys. I used ctrl-n/p to cycle shell history down/up and put an > esc in front if I am searching using history-search-backward/forward. Okay, that explains it. I've just tried your setup, it makes sense (not that I would use it, but now I understand the reason behind ESC-p/ESC-n better). Thanks, ./danfe From owner-svn-src-all@freebsd.org Tue Oct 31 15:34: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 585F5E5D1BE; Tue, 31 Oct 2017 15:34:09 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io0-x22b.google.com (mail-io0-x22b.google.com [IPv6:2607:f8b0:4001:c06::22b]) (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 1DF027EBA5; Tue, 31 Oct 2017 15:34:09 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io0-x22b.google.com with SMTP id p186so35978346ioe.12; Tue, 31 Oct 2017 08:34:09 -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=/xv6OsPe8RnIYcIGHIMUvUjdUPIlW5vTjObR2FGn7Qo=; b=ptbwdi/MeknZYce3228zSy2fvBK9FnVwut5PEzsHd0eNx+xh1R+fAGAohkL7REEsUB JaZwkm1fpO30N65Gw8qZIot9JirBqO/sGeUsLSJzU4hFFyXSWJMKPhGdaEaGFGJ6xU1j VqC5DOXNA3VWe3BQwzt0R7f1dE2MocgqOsyjDwBL+BUPAeQiX84eiL3zlnGBMYHfQYVs m78CTaL2L0JHi+TEwkMLcmV92IE9ahdydAi59MpmFM6JT07b5xK+9rIZePs6dCEUYl9I pA2wJqQ2FbMp1evbFCkSZjL2XWi+YntuzfnEml8E6CyFRC2qwVpvA/9xF1nbeq1ELs8m LGxQ== 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=/xv6OsPe8RnIYcIGHIMUvUjdUPIlW5vTjObR2FGn7Qo=; b=RfVoBKqKe1215S8HYeeg2Q/LfPj5HiUe8tqhrpSa9frP+PfLPtEHGfLnu96E5V3RU7 ed4GOmR6BeNxhpIkUwdndmm1dAG6zlYT6nTPl7/CB/3zi+a2YwrgNLNlpnW9pltqi1GM eOpXUItS2knCmyFX33rFZ36hBG3ERm/rhfSjvAY6fqeRgi4F9m5b0POEgOFO+q0fqkDQ 5puezGeq4J9dcucm7pfaGAWIRInr0zdmQSUlaMNQhkN/l9sJ7ld1+YGjtoO+40L71PEi FtbTHcVUXf90gbKTerziF7z/a2HC6lAEcpB6wkw/54sKeIo/bgWHw9fuYMWFQGuJ88WE RAsA== X-Gm-Message-State: AMCzsaV1yWiYmCrMNWUMrLsuxKxGtlkCwgC179ca/Oqa3lGtx3k4/DQp RpNmwkF1+VvNraXWRmqhxr1/PBXzc7I+WSa0UuE= X-Google-Smtp-Source: ABhQp+QCm7ktNCMkAEQDVJPZpOZoSO9e1OePF14a8FFECDczbQlgVqjTNRUGvCpu6aSjUq+TkEPmpyp4mDwZNjffaV8= X-Received: by 10.36.22.13 with SMTP id a13mr3733341ita.69.1509464048438; Tue, 31 Oct 2017 08:34:08 -0700 (PDT) MIME-Version: 1.0 Sender: carpeddiem@gmail.com Received: by 10.107.14.208 with HTTP; Tue, 31 Oct 2017 08:33:47 -0700 (PDT) In-Reply-To: <5e94395e-9feb-0f17-db3b-43583c461242@gmail.com> References: <201710271623.v9RGNjec047721@repo.freebsd.org> <5e94395e-9feb-0f17-db3b-43583c461242@gmail.com> From: Ed Maste Date: Tue, 31 Oct 2017 11:33:47 -0400 X-Google-Sender-Auth: dripmaB94OF1XhkRZ0FpA0c-6qM Message-ID: Subject: Re: svn commit: r325042 - head/cddl/contrib/opensolaris/lib/libdtrace/common To: meloun.michal@gmail.com 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: Tue, 31 Oct 2017 15:34:09 -0000 On 27 October 2017 at 12:39, Michal Meloun wrote: > > On 27.10.2017 18:23, Ed Maste wrote: >> Author: emaste >> Date: Fri Oct 27 16:23:45 2017 >> New Revision: 325042 >> URL: https://svnweb.freebsd.org/changeset/base/325042 >> >> Log: >> libdtrace: replace "DOODAD" with more descriptive string >> > Imho, assert would be much more appropriate. Perhaps, or I suspect we should just return an error. I'll take a look at it later on. From owner-svn-src-all@freebsd.org Tue Oct 31 16:31: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 E228BE5E349; Tue, 31 Oct 2017 16:31:24 +0000 (UTC) (envelope-from mw@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 BC65B8054D; Tue, 31 Oct 2017 16:31:24 +0000 (UTC) (envelope-from mw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9VGVNaR058258; Tue, 31 Oct 2017 16:31:23 GMT (envelope-from mw@FreeBSD.org) Received: (from mw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9VGVNOs058255; Tue, 31 Oct 2017 16:31:23 GMT (envelope-from mw@FreeBSD.org) Message-Id: <201710311631.v9VGVNOs058255@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mw set sender to mw@FreeBSD.org using -f From: Marcin Wojtas Date: Tue, 31 Oct 2017 16:31:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325239 - head/sys/dev/ena X-SVN-Group: head X-SVN-Commit-Author: mw X-SVN-Commit-Paths: head/sys/dev/ena X-SVN-Commit-Revision: 325239 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: Tue, 31 Oct 2017 16:31:25 -0000 Author: mw Date: Tue Oct 31 16:31:23 2017 New Revision: 325239 URL: https://svnweb.freebsd.org/changeset/base/325239 Log: Rework counting of hardware statistics in ENA driver Do not read all statistics from the device, instead count them in the driver except from RX drops - they are received directly from the NIC in the AENQ descriptor. Submitted by: Michal Krawczyk Reviewed by: imp Obtained from: Semihalf Sponsored by: Amazon.com, Inc. Differential Revision: https://reviews.freebsd.org/D12852 Modified: head/sys/dev/ena/ena.c head/sys/dev/ena/ena.h head/sys/dev/ena/ena_sysctl.c Modified: head/sys/dev/ena/ena.c ============================================================================== --- head/sys/dev/ena/ena.c Tue Oct 31 15:06:26 2017 (r325238) +++ head/sys/dev/ena/ena.c Tue Oct 31 16:31:23 2017 (r325239) @@ -141,7 +141,6 @@ static void ena_free_irqs(struct ena_adapter*); static void ena_disable_msix(struct ena_adapter *); static void ena_unmask_all_io_irqs(struct ena_adapter *); static int ena_rss_configure(struct ena_adapter *); -static void ena_update_hw_stats(void *, int); static int ena_up_complete(struct ena_adapter *); static int ena_up(struct ena_adapter *); static void ena_down(struct ena_adapter *); @@ -1582,7 +1581,12 @@ ena_rx_cleanup(struct ena_ring *rx_ring) ena_rx_checksum(rx_ring, &ena_rx_ctx, mbuf); } - counter_u64_add(rx_ring->rx_stats.bytes, mbuf->m_pkthdr.len); + counter_enter(); + counter_u64_add_protected(rx_ring->rx_stats.bytes, + mbuf->m_pkthdr.len); + counter_u64_add_protected(adapter->hw_stats.rx_bytes, + mbuf->m_pkthdr.len); + counter_exit(); /* * LRO is only for IP/TCP packets and TCP checksum of the packet * should be computed by hardware. @@ -1607,7 +1611,10 @@ ena_rx_cleanup(struct ena_ring *rx_ring) (*ifp->if_input)(ifp, mbuf); } - counter_u64_add(rx_ring->rx_stats.cnt, 1); + counter_enter(); + counter_u64_add_protected(rx_ring->rx_stats.cnt, 1); + counter_u64_add_protected(adapter->hw_stats.rx_packets, 1); + counter_exit(); } while (--budget); rx_ring->next_to_clean = next_to_clean; @@ -2063,25 +2070,6 @@ static int ena_rss_configure(struct ena_adapter *adapt return 0; } -static void -ena_update_hw_stats(void *arg, int pending) -{ - struct ena_adapter *adapter = arg; - int rc; - - for (;;) { - if (!adapter->up) - return; - - rc = ena_update_stats_counters(adapter); - if (rc) - ena_trace(ENA_WARNING, - "Error updating stats counters, rc = %d", rc); - - pause("ena update hw stats", hz); - } -} - static int ena_up_complete(struct ena_adapter *adapter) { @@ -2095,6 +2083,8 @@ ena_up_complete(struct ena_adapter *adapter) ena_change_mtu(adapter->ifp, adapter->ifp->if_mtu); ena_refill_all_rx_bufs(adapter); + ena_reset_counters((counter_u64_t *)&adapter->hw_stats, + sizeof(adapter->hw_stats)); return (0); } @@ -2164,8 +2154,6 @@ ena_up(struct ena_adapter *adapter) callout_reset_sbt(&adapter->timer_service, SBT_1S, SBT_1S, ena_timer_service, (void *)adapter, 0); - taskqueue_enqueue(adapter->stats_tq, &adapter->stats_task); - adapter->up = true; ena_unmask_all_io_irqs(adapter); @@ -2185,36 +2173,6 @@ err_req_irq: return (rc); } -int -ena_update_stats_counters(struct ena_adapter *adapter) -{ - struct ena_admin_basic_stats ena_stats; - struct ena_hw_stats *stats = &adapter->hw_stats; - int rc = 0; - - if (!adapter->up) - return (rc); - - rc = ena_com_get_dev_basic_stats(adapter->ena_dev, &ena_stats); - if (rc) - return (rc); - - stats->tx_bytes = ((uint64_t)ena_stats.tx_bytes_high << 32) | - ena_stats.tx_bytes_low; - stats->rx_bytes = ((uint64_t)ena_stats.rx_bytes_high << 32) | - ena_stats.rx_bytes_low; - - stats->rx_packets = ((uint64_t)ena_stats.rx_pkts_high << 32) | - ena_stats.rx_pkts_low; - stats->tx_packets = ((uint64_t)ena_stats.tx_pkts_high << 32) | - ena_stats.tx_pkts_low; - - stats->rx_drops = ((uint64_t)ena_stats.rx_drops_high << 32) | - ena_stats.rx_drops_low; - - return (0); -} - static uint64_t ena_get_counter(if_t ifp, ift_counter cnt) { @@ -2226,15 +2184,15 @@ ena_get_counter(if_t ifp, ift_counter cnt) switch (cnt) { case IFCOUNTER_IPACKETS: - return (stats->rx_packets); + return (counter_u64_fetch(stats->rx_packets)); case IFCOUNTER_OPACKETS: - return (stats->tx_packets); + return (counter_u64_fetch(stats->tx_packets)); case IFCOUNTER_IBYTES: - return (stats->rx_bytes); + return (counter_u64_fetch(stats->rx_bytes)); case IFCOUNTER_OBYTES: - return (stats->tx_bytes); + return (counter_u64_fetch(stats->tx_bytes)); case IFCOUNTER_IQDROPS: - return (stats->rx_drops); + return (counter_u64_fetch(stats->rx_drops)); default: return (if_get_counter_default(ifp, cnt)); } @@ -2517,10 +2475,6 @@ ena_down(struct ena_adapter *adapter) if_setdrvflagbits(adapter->ifp, IFF_DRV_OACTIVE, IFF_DRV_RUNNING); - /* Drain task responsible for updating hw stats */ - while (taskqueue_cancel(adapter->stats_tq, &adapter->stats_task, NULL)) - taskqueue_drain(adapter->stats_tq, &adapter->stats_task); - ena_free_io_irq(adapter); if (adapter->trigger_reset) { @@ -2754,6 +2708,10 @@ ena_xmit_mbuf(struct ena_ring *tx_ring, struct mbuf ** counter_enter(); counter_u64_add_protected(tx_ring->tx_stats.cnt, 1); counter_u64_add_protected(tx_ring->tx_stats.bytes, (*mbuf)->m_pkthdr.len); + + counter_u64_add_protected(adapter->hw_stats.tx_packets, 1); + counter_u64_add_protected(adapter->hw_stats.tx_bytes, + (*mbuf)->m_pkthdr.len); counter_exit(); tx_info->tx_descs = nb_hw_desc; @@ -3243,8 +3201,16 @@ static void ena_keep_alive_wd(void *adapter_data, struct ena_admin_aenq_entry *aenq_e) { struct ena_adapter *adapter = (struct ena_adapter *)adapter_data; + struct ena_admin_aenq_keep_alive_desc *desc; sbintime_t stime; + uint64_t rx_drops; + desc = (struct ena_admin_aenq_keep_alive_desc *)aenq_e; + + rx_drops = ((uint64_t)desc->rx_drops_high << 32) | desc->rx_drops_low; + counter_u64_zero(adapter->hw_stats.rx_drops); + counter_u64_add(adapter->hw_stats.rx_drops, rx_drops); + stime = getsbinuptime(); atomic_store_rel_64(&adapter->keep_alive_timestamp, stime); } @@ -3653,22 +3619,11 @@ ena_attach(device_t pdev) taskqueue_start_threads(&adapter->reset_tq, 1, PI_NET, "%s rstq", device_get_nameunit(adapter->pdev)); - /* Initialize task queue responsible for updating hw stats */ - TASK_INIT(&adapter->stats_task, 0, ena_update_hw_stats, adapter); - adapter->stats_tq = taskqueue_create_fast("ena_stats_update", - M_WAITOK | M_ZERO, taskqueue_thread_enqueue, &adapter->stats_tq); - if (adapter->stats_tq == NULL) { - device_printf(adapter->pdev, - "Unable to create taskqueue for updating hw stats\n"); - goto err_stats_tq; - } - taskqueue_start_threads(&adapter->stats_tq, 1, PI_REALTIME, - "%s stats tq", device_get_nameunit(adapter->pdev)); - /* Initialize statistics */ ena_alloc_counters((counter_u64_t *)&adapter->dev_stats, sizeof(struct ena_stats_dev)); - ena_update_stats_counters(adapter); + ena_alloc_counters((counter_u64_t *)&adapter->hw_stats, + sizeof(struct ena_hw_stats)); ena_sysctl_add_nodes(adapter); /* Tell the stack that the interface is not active */ @@ -3677,8 +3632,6 @@ ena_attach(device_t pdev) adapter->running = true; return (0); -err_stats_tq: - taskqueue_free(adapter->reset_tq); err_reset_tq: ena_com_dev_reset(ena_dev, ENA_REGS_RESET_INIT_ERR); ena_free_mgmnt_irq(adapter); @@ -3735,8 +3688,6 @@ ena_detach(device_t pdev) ena_down(adapter); sx_unlock(&adapter->ioctl_sx); - taskqueue_free(adapter->stats_tq); - if (adapter->ifp != NULL) { ether_ifdetach(adapter->ifp); if_free(adapter->ifp); @@ -3744,6 +3695,8 @@ ena_detach(device_t pdev) ena_free_all_io_rings_resources(adapter); + ena_free_counters((counter_u64_t *)&adapter->hw_stats, + sizeof(struct ena_hw_stats)); ena_free_counters((counter_u64_t *)&adapter->dev_stats, sizeof(struct ena_stats_dev)); Modified: head/sys/dev/ena/ena.h ============================================================================== --- head/sys/dev/ena/ena.h Tue Oct 31 15:06:26 2017 (r325238) +++ head/sys/dev/ena/ena.h Tue Oct 31 16:31:23 2017 (r325239) @@ -307,13 +307,13 @@ struct ena_stats_dev { }; struct ena_hw_stats { - uint64_t rx_packets; - uint64_t tx_packets; + counter_u64_t rx_packets; + counter_u64_t tx_packets; - uint64_t rx_bytes; - uint64_t tx_bytes; + counter_u64_t rx_bytes; + counter_u64_t tx_bytes; - uint64_t rx_drops; + counter_u64_t rx_drops; }; /* Board specific private data structure */ @@ -403,10 +403,6 @@ struct ena_adapter { uint32_t missing_tx_max_queues; uint32_t missing_tx_threshold; - /* Task updating hw stats */ - struct task stats_task; - struct taskqueue *stats_tq; - /* Statistics */ struct ena_stats_dev dev_stats; struct ena_hw_stats hw_stats; @@ -426,8 +422,6 @@ struct ena_dev *ena_efa_enadev_get(device_t pdev); int ena_register_adapter(struct ena_adapter *adapter); void ena_unregister_adapter(struct ena_adapter *adapter); - -int ena_update_stats_counters(struct ena_adapter *adapter); static inline int ena_mbuf_count(struct mbuf *mbuf) { Modified: head/sys/dev/ena/ena_sysctl.c ============================================================================== --- head/sys/dev/ena/ena_sysctl.c Tue Oct 31 15:06:26 2017 (r325238) +++ head/sys/dev/ena/ena_sysctl.c Tue Oct 31 16:31:23 2017 (r325239) @@ -32,7 +32,6 @@ __FBSDID("$FreeBSD$"); #include "ena_sysctl.h" -static int ena_sysctl_update_stats(SYSCTL_HANDLER_ARGS); static void ena_sysctl_add_stats(struct ena_adapter *); void @@ -205,21 +204,17 @@ ena_sysctl_add_stats(struct ena_adapter *adapter) CTLFLAG_RD, NULL, "Statistics from hardware"); hw_list = SYSCTL_CHILDREN(hw_node); - SYSCTL_ADD_U64(ctx, hw_list, OID_AUTO, "rx_packets", CTLFLAG_RD, - &hw_stats->rx_packets, 0, "Packets received"); - SYSCTL_ADD_U64(ctx, hw_list, OID_AUTO, "tx_packets", CTLFLAG_RD, - &hw_stats->tx_packets, 0, "Packets transmitted"); - SYSCTL_ADD_U64(ctx, hw_list, OID_AUTO, "rx_bytes", CTLFLAG_RD, - &hw_stats->rx_bytes, 0, "Bytes received"); - SYSCTL_ADD_U64(ctx, hw_list, OID_AUTO, "tx_bytes", CTLFLAG_RD, - &hw_stats->tx_bytes, 0, "Bytes transmitted"); - SYSCTL_ADD_U64(ctx, hw_list, OID_AUTO, "rx_drops", CTLFLAG_RD, - &hw_stats->rx_drops, 0, "Receive packet drops"); + SYSCTL_ADD_COUNTER_U64(ctx, hw_list, OID_AUTO, "rx_packets", CTLFLAG_RD, + &hw_stats->rx_packets, "Packets received"); + SYSCTL_ADD_COUNTER_U64(ctx, hw_list, OID_AUTO, "tx_packets", CTLFLAG_RD, + &hw_stats->tx_packets, "Packets transmitted"); + SYSCTL_ADD_COUNTER_U64(ctx, hw_list, OID_AUTO, "rx_bytes", CTLFLAG_RD, + &hw_stats->rx_bytes, "Bytes received"); + SYSCTL_ADD_COUNTER_U64(ctx, hw_list, OID_AUTO, "tx_bytes", CTLFLAG_RD, + &hw_stats->tx_bytes, "Bytes transmitted"); + SYSCTL_ADD_COUNTER_U64(ctx, hw_list, OID_AUTO, "rx_drops", CTLFLAG_RD, + &hw_stats->rx_drops, "Receive packet drops"); - SYSCTL_ADD_PROC(ctx, hw_list, OID_AUTO, "update_stats", - CTLTYPE_INT|CTLFLAG_RD, adapter, 0, ena_sysctl_update_stats, - "A", "Update stats from hardware"); - /* ENA Admin queue stats */ admin_node = SYSCTL_ADD_NODE(ctx, child, OID_AUTO, "admin_stats", CTLFLAG_RD, NULL, "ENA Admin Queue statistics"); @@ -235,18 +230,5 @@ ena_sysctl_add_stats(struct ena_adapter *adapter) &admin_stats->out_of_space, 0, "Queue out of space"); SYSCTL_ADD_U32(ctx, admin_list, OID_AUTO, "no_completion", CTLFLAG_RD, &admin_stats->no_completion, 0, "Commands not completed"); -} - -static int -ena_sysctl_update_stats(SYSCTL_HANDLER_ARGS) -{ - struct ena_adapter *adapter = (struct ena_adapter *)arg1; - int rc; - - if (adapter->up) - ena_update_stats_counters(adapter); - - rc = sysctl_handle_string(oidp, "", 1, req); - return (rc); } From owner-svn-src-all@freebsd.org Tue Oct 31 17:16: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 DF76CE5F1E6; Tue, 31 Oct 2017 17:16:07 +0000 (UTC) (envelope-from bdrewery@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 AF6D681C2E; Tue, 31 Oct 2017 17:16:07 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (unknown [127.0.1.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id BA7119045; Tue, 31 Oct 2017 17:16:06 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id 4C6C528F4; Tue, 31 Oct 2017 17:16:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id M3mabczorALi; Tue, 31 Oct 2017 17:16:02 +0000 (UTC) Subject: Re: svn commit: r325192 - head/etc/mtree DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com 7658C28EE To: Ngie Cooper Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201710310143.v9V1haa9089063@repo.freebsd.org> <32B8C7F0-40F3-4833-9CD3-84C5EC3E7429@gmail.com> From: Bryan Drewery Openpgp: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Organization: FreeBSD Message-ID: <64bd6e3d-b593-fba1-87b8-a732a418b078@FreeBSD.org> Date: Tue, 31 Oct 2017 10:15:44 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <32B8C7F0-40F3-4833-9CD3-84C5EC3E7429@gmail.com> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="Qa6xjEOiMjFKEA14dOr6uNHO7JI5SlkXL" 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: Tue, 31 Oct 2017 17:16:08 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --Qa6xjEOiMjFKEA14dOr6uNHO7JI5SlkXL Content-Type: multipart/mixed; boundary="fpBtADk8NUOJvUPf3vXKhf1guP5hSSQeX"; protected-headers="v1" From: Bryan Drewery To: Ngie Cooper Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <64bd6e3d-b593-fba1-87b8-a732a418b078@FreeBSD.org> Subject: Re: svn commit: r325192 - head/etc/mtree References: <201710310143.v9V1haa9089063@repo.freebsd.org> <32B8C7F0-40F3-4833-9CD3-84C5EC3E7429@gmail.com> In-Reply-To: <32B8C7F0-40F3-4833-9CD3-84C5EC3E7429@gmail.com> --fpBtADk8NUOJvUPf3vXKhf1guP5hSSQeX Content-Type: text/plain; charset=shift_jis Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 10/31/2017 7:56 AM, Ngie Cooper wrote: >=20 >> On Oct 30, 2017, at 18:43, Bryan Drewery wrote:= >> >> Author: bdrewery >> Date: Tue Oct 31 01:43:36 2017 >> New Revision: 325192 >> URL: https://svnweb.freebsd.org/changeset/base/325192 >> >> Log: >> Fix installworld/distrib-dirs for pathconv after r325186. >=20 > *sigh* >=20 > Julian never completed the tests. They=81fre breaking Jenkins since the= y=81fre now integrated into the build.. >=20 > Please test test commits next time (make obj depend all; sudo make chec= k install). >=20 > I=81fll go fix them ;/.. >=20 Hm I thought I had tested the runtime. I must have only tested another I reconnected or only half of it. libc/tests/time is another disconnected one FYI. >> Sponsored by: Dell EMC Isilon >> >> Modified: >> head/etc/mtree/BSD.tests.dist >> >> Modified: head/etc/mtree/BSD.tests.dist >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=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/etc/mtree/BSD.tests.dist Tue Oct 31 00:26:42 2017 (r325= 191) >> +++ head/etc/mtree/BSD.tests.dist Tue Oct 31 01:43:36 2017 (r325= 192) >> @@ -358,6 +358,8 @@ >> dlopen >> .. >> .. >> + libpathconv >> + .. >> libutil >> .. >> libxo >> --=20 Regards, Bryan Drewery --fpBtADk8NUOJvUPf3vXKhf1guP5hSSQeX-- --Qa6xjEOiMjFKEA14dOr6uNHO7JI5SlkXL Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJZ+K/BAAoJEDXXcbtuRpfPYRsIAJ/E/IjmmtT3eF5gdf/M0UVQ 22wym8qngMPdz4nszBRMZPmMBolaQccec86AgqfJ8CDjEhXjEe7AE7kaqGNEdJMd 2kMOK+TW8NEthvbCJh/y4z21Qr6SkSzxA+0mW9EJHblgZv15V/vVYQNR2xW/38a5 cLz5AIbKkCl0WcYtTB9mBdqfm2x2V+E5DjiyQ+6xS6tgyX+yd6AqaLhg69jxaSOR GyDK3MTB4veLpmJvkVsaRNmCgPKPFQZ0nwYnpnem8lq6QYjp4RfU6Sad8+LC9vMD tRD+qnja+bo5H75Fwqy9gdyfs26Z70H5CpJf72d2IrGAN9rSZiLUv1UfWr/fLac= =4Cyv -----END PGP SIGNATURE----- --Qa6xjEOiMjFKEA14dOr6uNHO7JI5SlkXL-- From owner-svn-src-all@freebsd.org Tue Oct 31 17:16: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 30B90E5F25A; Tue, 31 Oct 2017 17:16: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 0004181D92; Tue, 31 Oct 2017 17:16: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 v9VHGlcC078698; Tue, 31 Oct 2017 17:16:47 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9VHGlXT078697; Tue, 31 Oct 2017 17:16:47 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710311716.v9VHGlXT078697@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 31 Oct 2017 17:16:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325240 - head X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 325240 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: Tue, 31 Oct 2017 17:16:48 -0000 Author: bdrewery Date: Tue Oct 31 17:16:46 2017 New Revision: 325240 URL: https://svnweb.freebsd.org/changeset/base/325240 Log: Follow-up r297998: Remove redundant TOOLS_PREFIX in XMAKE. Sponsored by: Dell EMC Isilon Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Tue Oct 31 16:31:23 2017 (r325239) +++ head/Makefile.inc1 Tue Oct 31 17:16:46 2017 (r325240) @@ -556,7 +556,8 @@ TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \ MK_LLDB=no MK_TESTS=no # cross-tools stage -XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \ +# TOOLS_PREFIX set in BMAKE +XMAKE= ${BMAKE} \ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ MK_GDB=no MK_LLD_IS_LD=${MK_LLD_BOOTSTRAP} MK_TESTS=no From owner-svn-src-all@freebsd.org Tue Oct 31 17:50: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 449B2E5FD9A; Tue, 31 Oct 2017 17:50:44 +0000 (UTC) (envelope-from shurd@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 1098482F5A; Tue, 31 Oct 2017 17:50:43 +0000 (UTC) (envelope-from shurd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9VHohux095795; Tue, 31 Oct 2017 17:50:43 GMT (envelope-from shurd@FreeBSD.org) Received: (from shurd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9VHohcI095794; Tue, 31 Oct 2017 17:50:43 GMT (envelope-from shurd@FreeBSD.org) Message-Id: <201710311750.v9VHohcI095794@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: shurd set sender to shurd@FreeBSD.org using -f From: Stephen Hurd Date: Tue, 31 Oct 2017 17:50:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325241 - head/sys/net X-SVN-Group: head X-SVN-Commit-Author: shurd X-SVN-Commit-Paths: head/sys/net X-SVN-Commit-Revision: 325241 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: Tue, 31 Oct 2017 17:50:44 -0000 Author: shurd Date: Tue Oct 31 17:50:42 2017 New Revision: 325241 URL: https://svnweb.freebsd.org/changeset/base/325241 Log: Fix PR221990 - Assertion at iflib.c:1947 ifl_pidx and ifl_credits are going out of sync in _iflib_fl_refill() as they use different update log. Use the same update logic for both, and add a final call to isc_rxd_refill() to handle early exits from the loop. PR: 221990 Reported by: pho Reviewed by: sbruno Approved by: sbruno (mentor) Sponsored by: Limelight Networks Differential Revision: https://reviews.freebsd.org/D12798 Modified: head/sys/net/iflib.c Modified: head/sys/net/iflib.c ============================================================================== --- head/sys/net/iflib.c Tue Oct 31 17:16:46 2017 (r325240) +++ head/sys/net/iflib.c Tue Oct 31 17:50:42 2017 (r325241) @@ -1818,20 +1818,22 @@ _iflib_fl_refill(if_ctx_t ctx, iflib_fl_t fl, int coun int n, i = 0; uint64_t bus_addr; int err; + qidx_t credits; sd_m = fl->ifl_sds.ifsd_m; sd_map = fl->ifl_sds.ifsd_map; sd_cl = fl->ifl_sds.ifsd_cl; sd_flags = fl->ifl_sds.ifsd_flags; idx = pidx; + credits = fl->ifl_credits; n = count; MPASS(n > 0); - MPASS(fl->ifl_credits + n <= fl->ifl_size); + MPASS(credits + n <= fl->ifl_size); if (pidx < fl->ifl_cidx) MPASS(pidx + n <= fl->ifl_cidx); - if (pidx == fl->ifl_cidx && (fl->ifl_credits < fl->ifl_size)) + if (pidx == fl->ifl_cidx && (credits < fl->ifl_size)) MPASS(fl->ifl_gen == 0); if (pidx > fl->ifl_cidx) MPASS(n <= fl->ifl_size - pidx + fl->ifl_cidx); @@ -1904,9 +1906,9 @@ _iflib_fl_refill(if_ctx_t ctx, iflib_fl_t fl, int coun fl->ifl_rxd_idxs[i] = frag_idx; fl->ifl_bus_addrs[i] = bus_addr; fl->ifl_vm_addrs[i] = cl; - fl->ifl_credits++; + credits++; i++; - MPASS(fl->ifl_credits <= fl->ifl_size); + MPASS(credits <= fl->ifl_size); if (++idx == fl->ifl_size) { fl->ifl_gen = 1; idx = 0; @@ -1918,10 +1920,18 @@ _iflib_fl_refill(if_ctx_t ctx, iflib_fl_t fl, int coun i = 0; pidx = idx; fl->ifl_pidx = idx; + fl->ifl_credits = credits; } } done: + if (i) { + iru.iru_pidx = pidx; + iru.iru_count = i; + ctx->isc_rxd_refill(ctx->ifc_softc, &iru); + fl->ifl_pidx = idx; + fl->ifl_credits = credits; + } DBG_COUNTER_INC(rxd_flush); if (fl->ifl_pidx == 0) pidx = fl->ifl_size - 1; From owner-svn-src-all@freebsd.org Tue Oct 31 18:22: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 7E2BFE60622; Tue, 31 Oct 2017 18:22:22 +0000 (UTC) (envelope-from andrew@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 4DB72843D4; Tue, 31 Oct 2017 18:22:22 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9VIMLMY042308; Tue, 31 Oct 2017 18:22:21 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9VIMLP6042293; Tue, 31 Oct 2017 18:22:21 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201710311822.v9VIMLP6042293@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Tue, 31 Oct 2017 18:22:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325242 - head/sys/arm64/arm64 X-SVN-Group: head X-SVN-Commit-Author: andrew X-SVN-Commit-Paths: head/sys/arm64/arm64 X-SVN-Commit-Revision: 325242 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: Tue, 31 Oct 2017 18:22:22 -0000 Author: andrew Date: Tue Oct 31 18:22:21 2017 New Revision: 325242 URL: https://svnweb.freebsd.org/changeset/base/325242 Log: Use mp_maxid when iterating over CPUs as we may have sparse id allocations. Sponsored by: DARPA, AFRL Modified: head/sys/arm64/arm64/gicv3_its.c Modified: head/sys/arm64/arm64/gicv3_its.c ============================================================================== --- head/sys/arm64/arm64/gicv3_its.c Tue Oct 31 17:50:42 2017 (r325241) +++ head/sys/arm64/arm64/gicv3_its.c Tue Oct 31 18:22:21 2017 (r325242) @@ -557,7 +557,7 @@ gicv3_its_pendtables_init(struct gicv3_its_softc *sc) { int i; - for (i = 0; i < mp_ncpus; i++) { + for (i = 0; i <= mp_maxid; i++) { if (CPU_ISSET(i, &sc->sc_cpus) == 0) continue; @@ -736,7 +736,7 @@ gicv3_its_attach(device_t dev) gicv3_its_cmdq_init(sc); /* Allocate the per-CPU collections */ - for (int cpu = 0; cpu < mp_ncpus; cpu++) + for (int cpu = 0; cpu <= mp_maxid; cpu++) if (CPU_ISSET(cpu, &sc->sc_cpus) != 0) sc->sc_its_cols[cpu] = malloc( sizeof(*sc->sc_its_cols[0]), M_GICV3_ITS, From owner-svn-src-all@freebsd.org Tue Oct 31 19:02:15 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 AA681E611D3; Tue, 31 Oct 2017 19:02:15 +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 5E5C8AF8; Tue, 31 Oct 2017 19:02:15 +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 v9VJ2Eic064273; Tue, 31 Oct 2017 19:02:14 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9VJ2EoF064248; Tue, 31 Oct 2017 19:02:14 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710311902.v9VJ2EoF064248@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 31 Oct 2017 19:02:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325244 - head X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 325244 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: Tue, 31 Oct 2017 19:02:15 -0000 Author: bdrewery Date: Tue Oct 31 19:02:14 2017 New Revision: 325244 URL: https://svnweb.freebsd.org/changeset/base/325244 Log: kernel-toolchain: Skip world _obj and _cleanobj phases. There's no good reason to treewalk the entire tree removing old OBJDIRS and creating new ones when 'includes', 'libraries', and 'everything' are all skipped. The only shared directory in the existing toolchain target and world is build-tools. So handle cleaning in it directly if needed only for the directories it wants to build. The extra _obj/_cleanobj walks came in the initial kernel-toolchain addition in r128189. MFC after: 2 weeks Sponsored by: Dell EMC Isilon Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Tue Oct 31 19:02:05 2017 (r325243) +++ head/Makefile.inc1 Tue Oct 31 19:02:14 2017 (r325244) @@ -996,7 +996,7 @@ buildenv: .PHONY TOOLCHAIN_TGTS= ${WMAKE_TGTS:Neverything:Nbuild${libcompat}} toolchain: ${TOOLCHAIN_TGTS} .PHONY -kernel-toolchain: ${TOOLCHAIN_TGTS:N_includes:N_libraries} .PHONY +kernel-toolchain: ${TOOLCHAIN_TGTS:N_obj:N_cleanobj:N_includes:N_libraries} .PHONY # # installcheck @@ -1974,6 +1974,12 @@ _rescue=rescue/rescue _tcsh=bin/csh .endif +# kernel-toolchain skips _cleanobj, so handle cleaning up previous +# build-tools directories if needed. +.if !defined(NO_CLEAN) && make(kernel-toolchain) +_bt_clean= ${CLEANDIR} +.endif + .for _tool in \ ${_tcsh} \ bin/sh \ @@ -1989,8 +1995,9 @@ _tcsh=bin/csh usr.bin/vi/catalog \ ${_gcc_tools} build-tools_${_tool}: .PHONY - ${_+_}@${ECHODIR} "===> ${_tool} (obj,build-tools)"; \ + ${_+_}@${ECHODIR} "===> ${_tool} (${_bt_clean:D${_bt_clean},}obj,build-tools)"; \ cd ${.CURDIR}/${_tool}; \ + if [ -n "${_bt_clean}" ]; then ${MAKE} DIRPRFX=${_tool}/ ${_bt_clean}; fi; \ if [ -z "${NO_OBJ}" ]; then ${MAKE} DIRPRFX=${_tool}/ obj; fi; \ ${MAKE} DIRPRFX=${_tool}/ build-tools build-tools: build-tools_${_tool} From owner-svn-src-all@freebsd.org Tue Oct 31 19:02: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 0BD71E611B7; Tue, 31 Oct 2017 19:02: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 CEA74AA5; Tue, 31 Oct 2017 19:02:06 +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 v9VJ25tO063697; Tue, 31 Oct 2017 19:02:05 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9VJ25OB063695; Tue, 31 Oct 2017 19:02:05 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710311902.v9VJ25OB063695@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 31 Oct 2017 19:02:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325243 - in head: . gnu/usr.bin/cc/cc_tools X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: in head: . gnu/usr.bin/cc/cc_tools X-SVN-Commit-Revision: 325243 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: Tue, 31 Oct 2017 19:02:07 -0000 Author: bdrewery Date: Tue Oct 31 19:02:05 2017 New Revision: 325243 URL: https://svnweb.freebsd.org/changeset/base/325243 Log: build-tools: De-special-case the gcc tools build. It merely wanted to use 'all' rather than 'build-tools' so just add a build-tools target to the Makefile. MFC after: 2 weeks Sponsored by: Dell EMC Isilon Modified: head/Makefile.inc1 head/gnu/usr.bin/cc/cc_tools/Makefile Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Tue Oct 31 18:22:21 2017 (r325242) +++ head/Makefile.inc1 Tue Oct 31 19:02:05 2017 (r325243) @@ -1986,21 +1986,13 @@ _tcsh=bin/csh lib/libmagic \ usr.bin/mkesdb_static \ usr.bin/mkcsmapper_static \ - usr.bin/vi/catalog + usr.bin/vi/catalog \ + ${_gcc_tools} build-tools_${_tool}: .PHONY ${_+_}@${ECHODIR} "===> ${_tool} (obj,build-tools)"; \ cd ${.CURDIR}/${_tool}; \ if [ -z "${NO_OBJ}" ]; then ${MAKE} DIRPRFX=${_tool}/ obj; fi; \ ${MAKE} DIRPRFX=${_tool}/ build-tools -build-tools: build-tools_${_tool} -.endfor -.for _tool in \ - ${_gcc_tools} -build-tools_${_tool}: .PHONY - ${_+_}@${ECHODIR} "===> ${_tool} (obj,all)"; \ - cd ${.CURDIR}/${_tool}; \ - if [ -z "${NO_OBJ}" ]; then ${MAKE} DIRPRFX=${_tool}/ obj; fi; \ - ${MAKE} DIRPRFX=${_tool}/ all build-tools: build-tools_${_tool} .endfor Modified: head/gnu/usr.bin/cc/cc_tools/Makefile ============================================================================== --- head/gnu/usr.bin/cc/cc_tools/Makefile Tue Oct 31 18:22:21 2017 (r325242) +++ head/gnu/usr.bin/cc/cc_tools/Makefile Tue Oct 31 19:02:05 2017 (r325243) @@ -391,6 +391,7 @@ GNTOOLS+= genattr genattrtab genautomata gencodes genc ${GNTOOLS:C,$,.o,} ${GNTOOLS}: ${BUILD_TOOLS_META} all: ${GNTOOLS} ${GENSRCS} ${GENONLY} +build-tools: all beforedepend: ${GENONLY} # From owner-svn-src-all@freebsd.org Tue Oct 31 19:03:36 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 B16D3E61346; Tue, 31 Oct 2017 19:03:36 +0000 (UTC) (envelope-from shurd@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 7F134EA2; Tue, 31 Oct 2017 19:03:36 +0000 (UTC) (envelope-from shurd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9VJ3ZDk064594; Tue, 31 Oct 2017 19:03:35 GMT (envelope-from shurd@FreeBSD.org) Received: (from shurd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9VJ3ZDD064593; Tue, 31 Oct 2017 19:03:35 GMT (envelope-from shurd@FreeBSD.org) Message-Id: <201710311903.v9VJ3ZDD064593@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: shurd set sender to shurd@FreeBSD.org using -f From: Stephen Hurd Date: Tue, 31 Oct 2017 19:03:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325245 - head/sys/net X-SVN-Group: head X-SVN-Commit-Author: shurd X-SVN-Commit-Paths: head/sys/net X-SVN-Commit-Revision: 325245 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: Tue, 31 Oct 2017 19:03:36 -0000 Author: shurd Date: Tue Oct 31 19:03:35 2017 New Revision: 325245 URL: https://svnweb.freebsd.org/changeset/base/325245 Log: Preserve TSO checksum flags r323941 incorrectly disabled TSO flags based on MTU. Reported by: Yuri Pankov Reviewed by: sbruno Approved by: sbruno (mentor) Sponsored by: Limelight Networks Differential Revision: https://reviews.freebsd.org/D12880 Modified: head/sys/net/iflib.c Modified: head/sys/net/iflib.c ============================================================================== --- head/sys/net/iflib.c Tue Oct 31 19:02:14 2017 (r325244) +++ head/sys/net/iflib.c Tue Oct 31 19:03:35 2017 (r325245) @@ -2718,10 +2718,6 @@ iflib_parse_header(iflib_txq_t txq, if_pkt_info_t pi, pi->ipi_ehdrlen = ETHER_HDR_LEN; } - if (if_getmtu(txq->ift_ctx->ifc_ifp) >= pi->ipi_len) { - pi->ipi_csum_flags &= ~(CSUM_IP_TSO|CSUM_IP6_TSO); - } - switch (pi->ipi_etype) { #ifdef INET case ETHERTYPE_IP: From owner-svn-src-all@freebsd.org Tue Oct 31 19:26: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 173D4E61A58; Tue, 31 Oct 2017 19:26:09 +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 D82611A58; Tue, 31 Oct 2017 19:26:08 +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 v9VJQ7ur072993; Tue, 31 Oct 2017 19:26:07 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9VJQ7qO072992; Tue, 31 Oct 2017 19:26:07 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710311926.v9VJQ7qO072992@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 31 Oct 2017 19:26:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325246 - head/tools/tools/build_option_survey X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/tools/tools/build_option_survey X-SVN-Commit-Revision: 325246 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: Tue, 31 Oct 2017 19:26:09 -0000 Author: bdrewery Date: Tue Oct 31 19:26:07 2017 New Revision: 325246 URL: https://svnweb.freebsd.org/changeset/base/325246 Log: Use -j hw.ncpu for build/install. MFC after: 2 weeks Sponsored by: Dell EMC Isilon Modified: head/tools/tools/build_option_survey/option_survey.sh Modified: head/tools/tools/build_option_survey/option_survey.sh ============================================================================== --- head/tools/tools/build_option_survey/option_survey.sh Tue Oct 31 19:03:35 2017 (r325245) +++ head/tools/tools/build_option_survey/option_survey.sh Tue Oct 31 19:26:07 2017 (r325246) @@ -13,6 +13,7 @@ ODIR=/usr/obj/`pwd` FDIR=${ODIR}/files MNT=${ODIR}/_.mnt RDIR=${ODIR}/_.result +: ${MAKE_JOBS:="-j$(sysctl -n hw.ncpu)"} export ODIR MNT RDIR FDIR @@ -26,7 +27,7 @@ bw ( ) ( if [ $a -ne 0 ] ; then exit 1 fi - make -j 4 buildworld \ + make ${MAKE_JOBS} buildworld \ SRCCONF=${ODIR}/src.conf __MAKE_CONF=/dev/null \ > ${FDIR}/_.bw 2>&1 a=$? @@ -34,7 +35,7 @@ bw ( ) ( if [ $a -ne 0 ] ; then exit 1 fi - make -j 4 buildkernel \ + make ${MAKE_JOBS} buildkernel \ KERNCONF=GENERIC \ SRCCONF=${ODIR}/src.conf __MAKE_CONF=/dev/null \ > ${FDIR}/_.bk 2>&1 @@ -53,7 +54,7 @@ iw ( ) ( mount /dev/md${MDUNIT} ${MNT} cd ../../.. - make installworld \ + make ${MAKE_JOBS} installworld \ SRCCONF=${ODIR}/src.conf __MAKE_CONF=/dev/null \ DESTDIR=${MNT} \ > ${FDIR}/_.iw 2>&1 @@ -73,7 +74,7 @@ iw ( ) ( exit 1 fi cd .. - make installkernel \ + make ${MAKE_JOBS} installkernel \ KERNCONF=GENERIC \ DESTDIR=${MNT} \ SRCCONF=${ODIR}/src.conf __MAKE_CONF=/dev/null \ From owner-svn-src-all@freebsd.org Tue Oct 31 19:49: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 43478E62012; Tue, 31 Oct 2017 19:49:13 +0000 (UTC) (envelope-from bdrewery@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 ECEC62923; Tue, 31 Oct 2017 19:49:12 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (unknown [127.0.1.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id 0D068BA7F; Tue, 31 Oct 2017 19:49:12 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id EB3072C20; Tue, 31 Oct 2017 19:49:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id VJ8bFuvWL5Uw; Tue, 31 Oct 2017 19:49:08 +0000 (UTC) Subject: Re: svn commit: r325192 - head/etc/mtree DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com E5E6F2C1A From: Bryan Drewery To: Ngie Cooper Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201710310143.v9V1haa9089063@repo.freebsd.org> <32B8C7F0-40F3-4833-9CD3-84C5EC3E7429@gmail.com> <64bd6e3d-b593-fba1-87b8-a732a418b078@FreeBSD.org> Openpgp: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Organization: FreeBSD Message-ID: <65f80409-bf95-0cf6-389b-cfc894e1f805@FreeBSD.org> Date: Tue, 31 Oct 2017 12:48:48 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <64bd6e3d-b593-fba1-87b8-a732a418b078@FreeBSD.org> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="7sjp4xDCc5uhVF5RlrkB7qFOhqkGQTLsh" 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: Tue, 31 Oct 2017 19:49:13 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --7sjp4xDCc5uhVF5RlrkB7qFOhqkGQTLsh Content-Type: multipart/mixed; boundary="xCw3aQQNWs63dLnfnbEx6DSTfd6hwdNRo"; protected-headers="v1" From: Bryan Drewery To: Ngie Cooper Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <65f80409-bf95-0cf6-389b-cfc894e1f805@FreeBSD.org> Subject: Re: svn commit: r325192 - head/etc/mtree References: <201710310143.v9V1haa9089063@repo.freebsd.org> <32B8C7F0-40F3-4833-9CD3-84C5EC3E7429@gmail.com> <64bd6e3d-b593-fba1-87b8-a732a418b078@FreeBSD.org> In-Reply-To: <64bd6e3d-b593-fba1-87b8-a732a418b078@FreeBSD.org> --xCw3aQQNWs63dLnfnbEx6DSTfd6hwdNRo Content-Type: text/plain; charset=shift_jis Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 10/31/2017 10:15 AM, Bryan Drewery wrote: > On 10/31/2017 7:56 AM, Ngie Cooper wrote: >> >>> On Oct 30, 2017, at 18:43, Bryan Drewery wrote= : >>> >>> Author: bdrewery >>> Date: Tue Oct 31 01:43:36 2017 >>> New Revision: 325192 >>> URL: https://svnweb.freebsd.org/changeset/base/325192 >>> >>> Log: >>> Fix installworld/distrib-dirs for pathconv after r325186. >> >> *sigh* >> >> Julian never completed the tests. They=81fre breaking Jenkins since th= ey=81fre now integrated into the build.. >> >> Please test test commits next time (make obj depend all; sudo make che= ck install). >> >> I=81fll go fix them ;/.. >> >=20 > Hm I thought I had tested the runtime. I must have only tested another = I > reconnected or only half of it. >=20 > libc/tests/time is another disconnected one FYI. >=20 Yeah I failed to test this one. The tests requires perl too, so I am just going to disconnect them. >>> Sponsored by: Dell EMC Isilon >>> >>> Modified: >>> head/etc/mtree/BSD.tests.dist >>> >>> Modified: head/etc/mtree/BSD.tests.dist >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=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/etc/mtree/BSD.tests.dist Tue Oct 31 00:26:42 2017 (r32= 5191) >>> +++ head/etc/mtree/BSD.tests.dist Tue Oct 31 01:43:36 2017 (r32= 5192) >>> @@ -358,6 +358,8 @@ >>> dlopen >>> .. >>> .. >>> + libpathconv >>> + .. >>> libutil >>> .. >>> libxo >>> >=20 >=20 --=20 Regards, Bryan Drewery --xCw3aQQNWs63dLnfnbEx6DSTfd6hwdNRo-- --7sjp4xDCc5uhVF5RlrkB7qFOhqkGQTLsh Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJZ+NOgAAoJEDXXcbtuRpfPTJ4H/ixuL8KasejkqI71vFuEQXoi 4q5lky9bxHj3WNjzYhq5jj57YW/xOT1UzHhD3JsIAa2u+FphPph4lXnbKpF0Zpsl JPcS6YhAQubdpA50jDr/hN9xWRmHhMvJsXreG5jWHWGLrOS+OM2OPGF20V9hMaG7 i6Xs7GNblDqiIGqmbZlDK2GKNSRLZDmhrD2t2QmlwKLoeDakCOT82sSDjAufq0PJ 6IwuAR5I9XPOVbivaMYEdgvmJc7dmRE1A4qDhermWOz30cyZLOc8IA8Kug1HsP8Z qFkaAZN4UC5TfspYiroLwv+xYuTi9ezjqjEpfgi2iS9Dx6AqEb6vRROyPCax1rc= =tKLi -----END PGP SIGNATURE----- --7sjp4xDCc5uhVF5RlrkB7qFOhqkGQTLsh-- From owner-svn-src-all@freebsd.org Tue Oct 31 19:52: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 1DB9FE622AC; Tue, 31 Oct 2017 19:52:32 +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 DE9912E69; Tue, 31 Oct 2017 19:52: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 v9VJqVBI085095; Tue, 31 Oct 2017 19:52:31 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9VJqUKY085091; Tue, 31 Oct 2017 19:52:30 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710311952.v9VJqUKY085091@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 31 Oct 2017 19:52:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325247 - in head: . etc/mtree lib/libpathconv targets/pseudo/tests X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: in head: . etc/mtree lib/libpathconv targets/pseudo/tests X-SVN-Commit-Revision: 325247 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: Tue, 31 Oct 2017 19:52:32 -0000 Author: bdrewery Date: Tue Oct 31 19:52:30 2017 New Revision: 325247 URL: https://svnweb.freebsd.org/changeset/base/325247 Log: Disconnect libpathconv tests since they require external perl and do not work with kyua. This reverts r325192 and is due to libpathconv being connected in r325186. Reported by: ngie Sponsored by: Dell EMC Isilon Modified: head/ObsoleteFiles.inc head/etc/mtree/BSD.tests.dist head/lib/libpathconv/Makefile head/targets/pseudo/tests/Makefile.depend Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Tue Oct 31 19:26:07 2017 (r325246) +++ head/ObsoleteFiles.inc Tue Oct 31 19:52:30 2017 (r325247) @@ -38,6 +38,8 @@ # xargs -n1 | sort | uniq -d; # done +# 20171031: Disconnected libpathconv tests +OLD_DIRS+=usr/tests/lib/libpathconv # 20171017: Removal of mbpool(9) OLD_FILES+=usr/include/sys/mbpool.h OLD_FILES+=usr/share/man/man9/mbpool.9.gz Modified: head/etc/mtree/BSD.tests.dist ============================================================================== --- head/etc/mtree/BSD.tests.dist Tue Oct 31 19:26:07 2017 (r325246) +++ head/etc/mtree/BSD.tests.dist Tue Oct 31 19:52:30 2017 (r325247) @@ -358,8 +358,6 @@ dlopen .. .. - libpathconv - .. libutil .. libxo Modified: head/lib/libpathconv/Makefile ============================================================================== --- head/lib/libpathconv/Makefile Tue Oct 31 19:26:07 2017 (r325246) +++ head/lib/libpathconv/Makefile Tue Oct 31 19:52:30 2017 (r325247) @@ -14,6 +14,6 @@ SRCS= abs2rel.c rel2abs.c #SYMBOL_MAPS= ${.CURDIR}/Symbol.map HAS_TESTS= -SUBDIR.${MK_TESTS}+= tests +#SUBDIR.${MK_TESTS}+= tests .include Modified: head/targets/pseudo/tests/Makefile.depend ============================================================================== --- head/targets/pseudo/tests/Makefile.depend Tue Oct 31 19:26:07 2017 (r325246) +++ head/targets/pseudo/tests/Makefile.depend Tue Oct 31 19:52:30 2017 (r325247) @@ -170,7 +170,6 @@ DIRDEPS= \ lib/libkvm/tests \ lib/libmp/tests \ lib/libnv/tests \ - lib/libpathconv/tests \ lib/libproc/tests \ lib/librt/tests \ lib/libsbuf/tests \ From owner-svn-src-all@freebsd.org Tue Oct 31 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 58EBEE62C67; Tue, 31 Oct 2017 20:29:32 +0000 (UTC) (envelope-from tsoome@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 26BF13F28; Tue, 31 Oct 2017 20:29:32 +0000 (UTC) (envelope-from tsoome@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9VKTVm5097823; Tue, 31 Oct 2017 20:29:31 GMT (envelope-from tsoome@FreeBSD.org) Received: (from tsoome@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9VKTV7P097822; Tue, 31 Oct 2017 20:29:31 GMT (envelope-from tsoome@FreeBSD.org) Message-Id: <201710312029.v9VKTV7P097822@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tsoome set sender to tsoome@FreeBSD.org using -f From: Toomas Soome Date: Tue, 31 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: r325248 - head/sys/boot/common X-SVN-Group: head X-SVN-Commit-Author: tsoome X-SVN-Commit-Paths: head/sys/boot/common X-SVN-Commit-Revision: 325248 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: Tue, 31 Oct 2017 20:29:32 -0000 Author: tsoome Date: Tue Oct 31 20:29:31 2017 New Revision: 325248 URL: https://svnweb.freebsd.org/changeset/base/325248 Log: loader ptblread() is broken with >512B sectors The loader strategy() function is assuming 512B blocks, so we need to adjust ptblread() for other sector sizes. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D12847 Modified: head/sys/boot/common/disk.c Modified: head/sys/boot/common/disk.c ============================================================================== --- head/sys/boot/common/disk.c Tue Oct 31 19:52:30 2017 (r325247) +++ head/sys/boot/common/disk.c Tue Oct 31 20:29:31 2017 (r325248) @@ -89,6 +89,12 @@ ptblread(void *d, void *buf, size_t blocks, uint64_t o od = (struct open_disk *)dev->d_opendata; /* + * The strategy function assumes the offset is in units of 512 byte + * sectors. For larger sector sizes, we need to adjust the offset to + * match the actual sector size. + */ + offset *= (od->sectorsize / 512); + /* * As the GPT backup partition is located at the end of the disk, * to avoid reading past disk end, flag bcache not to use RA. */ From owner-svn-src-all@freebsd.org Tue Oct 31 21:51: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 00836E63ED3; Tue, 31 Oct 2017 21:51:35 +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 BEE7365688; Tue, 31 Oct 2017 21:51: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 v9VLpXSu032538; Tue, 31 Oct 2017 21:51:33 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9VLpXoh032537; Tue, 31 Oct 2017 21:51:33 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710312151.v9VLpXoh032537@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 31 Oct 2017 21:51:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325249 - head X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 325249 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: Tue, 31 Oct 2017 21:51:35 -0000 Author: bdrewery Date: Tue Oct 31 21:51:33 2017 New Revision: 325249 URL: https://svnweb.freebsd.org/changeset/base/325249 Log: kernel-toolchain: Fix improper build order after r325244. Due to removing some targets that the previous .ORDER: ${WMAKE_TGTS} set, it was no longer being respected; _build_tools was coming immediately. Pointyhat to: bdrewery X-MFC-with: r325244 MFC after: 2 weeks Sponsored by: Dell EMC Isilon Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Tue Oct 31 20:29:31 2017 (r325248) +++ head/Makefile.inc1 Tue Oct 31 21:51:33 2017 (r325249) @@ -996,7 +996,11 @@ buildenv: .PHONY TOOLCHAIN_TGTS= ${WMAKE_TGTS:Neverything:Nbuild${libcompat}} toolchain: ${TOOLCHAIN_TGTS} .PHONY -kernel-toolchain: ${TOOLCHAIN_TGTS:N_obj:N_cleanobj:N_includes:N_libraries} .PHONY +KERNEL_TOOLCHAIN_TGTS= ${TOOLCHAIN_TGTS:N_obj:N_cleanobj:N_includes:N_libraries} +.if make(kernel-toolchain) +.ORDER: ${KERNEL_TOOLCHAIN_TGTS} +.endif +kernel-toolchain: ${KERNEL_TOOLCHAIN_TGTS} .PHONY # # installcheck From owner-svn-src-all@freebsd.org Tue Oct 31 22:12:15 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 5738AE3A50B; Tue, 31 Oct 2017 22:12:15 +0000 (UTC) (envelope-from andrew@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 24A00660C9; Tue, 31 Oct 2017 22:12:15 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9VMCERr043044; Tue, 31 Oct 2017 22:12:14 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9VMCEm7043043; Tue, 31 Oct 2017 22:12:14 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201710312212.v9VMCEm7043043@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Tue, 31 Oct 2017 22:12:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325250 - head/sys/arm64/arm64 X-SVN-Group: head X-SVN-Commit-Author: andrew X-SVN-Commit-Paths: head/sys/arm64/arm64 X-SVN-Commit-Revision: 325250 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: Tue, 31 Oct 2017 22:12:15 -0000 Author: andrew Date: Tue Oct 31 22:12:14 2017 New Revision: 325250 URL: https://svnweb.freebsd.org/changeset/base/325250 Log: As with r325242 use mp_maxid when iterating over CPUs in the GICv3 driver. Sponsored by: DARPA, AFRL Modified: head/sys/arm64/arm64/gic_v3.c Modified: head/sys/arm64/arm64/gic_v3.c ============================================================================== --- head/sys/arm64/arm64/gic_v3.c Tue Oct 31 21:51:33 2017 (r325249) +++ head/sys/arm64/arm64/gic_v3.c Tue Oct 31 22:12:14 2017 (r325250) @@ -343,7 +343,7 @@ gic_v3_detach(device_t dev) for (rid = 0; rid < (sc->gic_redists.nregions + 1); rid++) bus_release_resource(dev, SYS_RES_MEMORY, rid, sc->gic_res[rid]); - for (i = 0; i < mp_ncpus; i++) + for (i = 0; i <= mp_maxid; i++) free(sc->gic_redists.pcpu[i], M_GIC_V3); free(sc->gic_res, M_GIC_V3); @@ -895,7 +895,7 @@ gic_v3_ipi_send(device_t dev, struct intr_irqsrc *isrc val = 0; /* Iterate through all CPUs in set */ - for (i = 0; i < mp_ncpus; i++) { + for (i = 0; i <= mp_maxid; i++) { /* Move to the next affinity group */ if (aff != GIC_AFFINITY(i)) { /* Send the IPI */ @@ -1103,7 +1103,7 @@ gic_v3_redist_alloc(struct gic_v3_softc *sc) u_int cpuid; /* Allocate struct resource for all CPU's Re-Distributor registers */ - for (cpuid = 0; cpuid < mp_ncpus; cpuid++) + for (cpuid = 0; cpuid <= mp_maxid; cpuid++) if (CPU_ISSET(cpuid, &all_cpus) != 0) sc->gic_redists.pcpu[cpuid] = malloc(sizeof(*sc->gic_redists.pcpu[0]), From owner-svn-src-all@freebsd.org Tue Oct 31 23:17:19 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 097E3E3EA88; Tue, 31 Oct 2017 23:17:19 +0000 (UTC) (envelope-from andrew@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 CD4CB68390; Tue, 31 Oct 2017 23:17:18 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9VNHHEU069091; Tue, 31 Oct 2017 23:17:17 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9VNHH7W069090; Tue, 31 Oct 2017 23:17:17 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201710312317.v9VNHH7W069090@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Tue, 31 Oct 2017 23:17:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325251 - head/sys/arm64/arm64 X-SVN-Group: head X-SVN-Commit-Author: andrew X-SVN-Commit-Paths: head/sys/arm64/arm64 X-SVN-Commit-Revision: 325251 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: Tue, 31 Oct 2017 23:17:19 -0000 Author: andrew Date: Tue Oct 31 23:17:17 2017 New Revision: 325251 URL: https://svnweb.freebsd.org/changeset/base/325251 Log: Allocate the ITS translation table with a 64k page alignment. This is the largest alignment the ITS can require. This fixes a bug with the ARM Architecture Envelope Model (AEM) where it only allows 64k pages so will fail to attach the ITS device when this table is not sufficiently aligned. Sponsored by: DARPA, AFRL Modified: head/sys/arm64/arm64/gicv3_its.c Modified: head/sys/arm64/arm64/gicv3_its.c ============================================================================== --- head/sys/arm64/arm64/gicv3_its.c Tue Oct 31 22:12:14 2017 (r325250) +++ head/sys/arm64/arm64/gicv3_its.c Tue Oct 31 23:17:17 2017 (r325251) @@ -457,7 +457,7 @@ gicv3_its_table_init(device_t dev, struct gicv3_its_so /* Allocate the table */ table = (vm_offset_t)contigmalloc(npages * PAGE_SIZE, M_GICV3_ITS, M_WAITOK | M_ZERO, 0, (1ul << 48) - 1, - PAGE_SIZE, 0); + PAGE_SIZE_64K, 0); sc->sc_its_ptab[i].ptab_vaddr = table; sc->sc_its_ptab[i].ptab_size = npages * PAGE_SIZE; From owner-svn-src-all@freebsd.org Tue Oct 31 23:33:26 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 47C23E442C0; Tue, 31 Oct 2017 23:33:26 +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 12FB668C11; Tue, 31 Oct 2017 23:33:25 +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 v9VNXOL4076888; Tue, 31 Oct 2017 23:33:24 GMT (envelope-from avos@FreeBSD.org) Received: (from avos@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9VNXOCS076887; Tue, 31 Oct 2017 23:33:24 GMT (envelope-from avos@FreeBSD.org) Message-Id: <201710312333.v9VNXOCS076887@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avos set sender to avos@FreeBSD.org using -f From: Andriy Voskoboinyk Date: Tue, 31 Oct 2017 23:33:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325252 - head/etc/devd X-SVN-Group: head X-SVN-Commit-Author: avos X-SVN-Commit-Paths: head/etc/devd X-SVN-Commit-Revision: 325252 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: Tue, 31 Oct 2017 23:33:26 -0000 Author: avos Date: Tue Oct 31 23:33:24 2017 New Revision: 325252 URL: https://svnweb.freebsd.org/changeset/base/325252 Log: Regenerate etc/devd/usb.conf Reminded by: hselasky Modified: head/etc/devd/usb.conf Modified: head/etc/devd/usb.conf ============================================================================== --- head/etc/devd/usb.conf Tue Oct 31 23:17:17 2017 (r325251) +++ head/etc/devd/usb.conf Tue Oct 31 23:33:24 2017 (r325252) @@ -1401,6 +1401,14 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x067b"; + match "product" "0x27a1"; + action "kldload -n udbp"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; + match "vendor" "0x067b"; match "product" "(0x331a|0xaaa0|0xaaa2)"; action "kldload -n uplcom"; }; @@ -5313,7 +5321,7 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x2357"; - match "product" "(0x0101|0x0108|0x0109)"; + match "product" "(0x0101|0x0108|0x0109|0x010d|0x010e)"; action "kldload -n if_rtwn_usb"; }; @@ -5913,5 +5921,5 @@ nomatch 32 { action "kldload -n umass"; }; -# 2757 USB entries processed +# 2760 USB entries processed From owner-svn-src-all@freebsd.org Tue Oct 31 23:48: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 CAE90E44A98; Tue, 31 Oct 2017 23:48:58 +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 99A0B699F5; Tue, 31 Oct 2017 23:48:58 +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 v9VNmvOn081364; Tue, 31 Oct 2017 23:48:57 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9VNmvjR081363; Tue, 31 Oct 2017 23:48:57 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710312348.v9VNmvjR081363@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 31 Oct 2017 23:48:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325253 - head X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 325253 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: Tue, 31 Oct 2017 23:48:58 -0000 Author: bdrewery Date: Tue Oct 31 23:48:57 2017 New Revision: 325253 URL: https://svnweb.freebsd.org/changeset/base/325253 Log: xdev: Follow-up r325087: Need to build lib/clang before lld. LLD needs headers generated by the full libllvm. X-MFC-With: r325087 MFC after: 2 weeks Sponsored by: Dell EMC Isilon Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Tue Oct 31 23:33:24 2017 (r325252) +++ head/Makefile.inc1 Tue Oct 31 23:48:57 2017 (r325253) @@ -2853,11 +2853,11 @@ _xb-build-tools: .PHONY ${CDBENV} ${MAKE} -f Makefile.inc1 ${NOFUN} build-tools XDEVDIRS= \ + ${_clang_libs} \ ${_lld} \ ${_binutils} \ ${_elftctools} \ usr.bin/ar \ - ${_clang_libs} \ ${_clang} \ ${_gcc} From owner-svn-src-all@freebsd.org Wed Nov 1 00:33:56 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 1AED9E47E4A; Wed, 1 Nov 2017 00:33:56 +0000 (UTC) (envelope-from cperciva@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 DC7FE6ADAA; Wed, 1 Nov 2017 00:33:55 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA10Xtlo001801; Wed, 1 Nov 2017 00:33:55 GMT (envelope-from cperciva@FreeBSD.org) Received: (from cperciva@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA10Xtnw001800; Wed, 1 Nov 2017 00:33:55 GMT (envelope-from cperciva@FreeBSD.org) Message-Id: <201711010033.vA10Xtnw001800@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cperciva set sender to cperciva@FreeBSD.org using -f From: Colin Percival Date: Wed, 1 Nov 2017 00:33:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325254 - head/release/tools X-SVN-Group: head X-SVN-Commit-Author: cperciva X-SVN-Commit-Paths: head/release/tools X-SVN-Commit-Revision: 325254 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: Wed, 01 Nov 2017 00:33:56 -0000 Author: cperciva Date: Wed Nov 1 00:33:54 2017 New Revision: 325254 URL: https://svnweb.freebsd.org/changeset/base/325254 Log: Add the amazon-ssm-agent package to EC2 AMI builds. This makes it immediately available on instances which are running without internet access (or which can't rely on firstboot_pkgs to install it for some other reason). Note that this agent is not enabled by default; to enable it, add amazon_ssm_agent_enable="YES" to /etc/rc.conf, e.g., by placing the lines >>/etc/rc.conf amazon_ssm_agent_enable="YES" into the EC2 user-data. In addition to being enabled, the agent requires keys to be provided via IAM Roles; users are encouraged to be very careful in using this functionality due to the inherent vulnerability in the idea of providing credentials via a service accessible to any process which can open an HTTP connection. Requested by: Amazon No objection from: re@ Relnotes: FreeBSD/EC2 AMIs now include the Amazon EC2 Systems Manager (SSM) Agent. Modified: head/release/tools/ec2.conf Modified: head/release/tools/ec2.conf ============================================================================== --- head/release/tools/ec2.conf Tue Oct 31 23:48:57 2017 (r325253) +++ head/release/tools/ec2.conf Wed Nov 1 00:33:54 2017 (r325254) @@ -6,7 +6,7 @@ # Packages to install into the image we're creating. This is a deliberately # minimalist set, providing only the packages necessary to bootstrap further # package installation as specified via EC2 user-data. -export VM_EXTRA_PACKAGES="ec2-scripts firstboot-freebsd-update firstboot-pkgs dual-dhclient" +export VM_EXTRA_PACKAGES="ec2-scripts firstboot-freebsd-update firstboot-pkgs dual-dhclient amazon-ssm-agent" # Set to a list of third-party software to enable in rc.conf(5). export VM_RC_LIST="ec2_configinit ec2_fetchkey ec2_ephemeralswap ec2_loghostkey firstboot_freebsd_update firstboot_pkgs" From owner-svn-src-all@freebsd.org Wed Nov 1 00:46:49 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 A7F23E48700; Wed, 1 Nov 2017 00:46:49 +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 83E606B37D; Wed, 1 Nov 2017 00:46:49 +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 vA10kmMc005875; Wed, 1 Nov 2017 00:46:48 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA10kmGS005870; Wed, 1 Nov 2017 00:46:48 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201711010046.vA10kmGS005870@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Wed, 1 Nov 2017 00:46:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325255 - in head: share/man/man4/man4.powerpc sys/dev/dpaa X-SVN-Group: head X-SVN-Commit-Author: jhibbits X-SVN-Commit-Paths: in head: share/man/man4/man4.powerpc sys/dev/dpaa X-SVN-Commit-Revision: 325255 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: Wed, 01 Nov 2017 00:46:49 -0000 Author: jhibbits Date: Wed Nov 1 00:46:48 2017 New Revision: 325255 URL: https://svnweb.freebsd.org/changeset/base/325255 Log: Remove a singleton in the DPAA driver, to allow multiple fman instances Some devices (P5040, P4080) have multiple frame managers in their DPAA subsystems. This was prevented by use of a softc singleton in the DPAA driver. Since if_dtsec(4) has moved to be a child of fman, it can access the fman device data via the parent object. Modified: head/share/man/man4/man4.powerpc/dtsec.4 head/sys/dev/dpaa/fman.c head/sys/dev/dpaa/fman.h head/sys/dev/dpaa/fman_mdio.c head/sys/dev/dpaa/if_dtsec.c Modified: head/share/man/man4/man4.powerpc/dtsec.4 ============================================================================== --- head/share/man/man4/man4.powerpc/dtsec.4 Wed Nov 1 00:33:54 2017 (r325254) +++ head/share/man/man4/man4.powerpc/dtsec.4 Wed Nov 1 00:46:48 2017 (r325255) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 16, 2017 +.Dd October 31, 2017 .Dt DTSEC 4 .Os .Sh NAME @@ -89,6 +89,14 @@ P2041, P3041 .It P5010, P5020 .El +.Pp +Additionally, the following devices are expected to work, but are untested: +.Bl -bullet -compact +.It +P4080, P4040 +.It +P5040 +.El .Sh SEE ALSO .Xr altq 4 , .Xr arp 4 , @@ -96,13 +104,6 @@ P5010, P5020 .Xr netintro 4 , .Xr ng_ether 4 , .Xr ifconfig 8 -.Sh BUGS -The -.Nm -driver assumes that there is only one Frame Manager, and that dtsec0 controls -the MDIO interface. Though this is the case for the supported devices, other -SoCs with the DPAA controller may not work correctly. Particularly, the P5040 -and P4080 SoCs have two frame managers, which breaks this assumption. .Sh HISTORY The .Nm Modified: head/sys/dev/dpaa/fman.c ============================================================================== --- head/sys/dev/dpaa/fman.c Wed Nov 1 00:33:54 2017 (r325254) +++ head/sys/dev/dpaa/fman.c Wed Nov 1 00:46:48 2017 (r325255) @@ -87,7 +87,6 @@ struct fman_config { */ const uint32_t fman_firmware[] = FMAN_UC_IMG; const uint32_t fman_firmware_size = sizeof(fman_firmware); -static struct fman_softc *fm_sc = NULL; int fman_activate_resource(device_t bus, device_t child, int type, int rid, @@ -386,54 +385,36 @@ fman_error_callback(t_Handle app_handle, e_FmPortType */ int -fman_get_handle(t_Handle *fmh) +fman_get_handle(device_t dev, t_Handle *fmh) { + struct fman_softc *sc = device_get_softc(dev); - if (fm_sc == NULL) - return (ENOMEM); + *fmh = sc->fm_handle; - *fmh = fm_sc->fm_handle; - return (0); } int -fman_get_muram_handle(t_Handle *muramh) +fman_get_muram_handle(device_t dev, t_Handle *muramh) { + struct fman_softc *sc = device_get_softc(dev); - if (fm_sc == NULL) - return (ENOMEM); + *muramh = sc->muram_handle; - *muramh = fm_sc->muram_handle; - return (0); } int -fman_get_bushandle(vm_offset_t *fm_base) +fman_get_bushandle(device_t dev, vm_offset_t *fm_base) { + struct fman_softc *sc = device_get_softc(dev); - if (fm_sc == NULL) - return (ENOMEM); + *fm_base = rman_get_bushandle(sc->mem_res); - *fm_base = rman_get_bushandle(fm_sc->mem_res); - return (0); } int -fman_get_dev(device_t *fm_dev) -{ - - if (fm_sc == NULL) - return (ENOMEM); - - *fm_dev = fm_sc->sc_base.dev; - - return (0); -} - -int fman_attach(device_t dev) { struct fman_softc *sc; @@ -443,7 +424,6 @@ fman_attach(device_t dev) sc = device_get_softc(dev); sc->sc_base.dev = dev; - fm_sc = sc; /* Check if MallocSmart allocator is ready */ if (XX_MallocSmartInit() != E_OK) { Modified: head/sys/dev/dpaa/fman.h ============================================================================== --- head/sys/dev/dpaa/fman.h Wed Nov 1 00:33:54 2017 (r325254) +++ head/sys/dev/dpaa/fman.h Wed Nov 1 00:46:48 2017 (r325255) @@ -72,9 +72,8 @@ int fman_qman_channel_id(device_t, int); /** @} */ uint32_t fman_get_clock(struct fman_softc *sc); -int fman_get_handle(t_Handle *fmh); -int fman_get_muram_handle(t_Handle *muramh); -int fman_get_bushandle(vm_offset_t *fm_base); -int fman_get_dev(device_t *fmd); +int fman_get_handle(device_t dev, t_Handle *fmh); +int fman_get_muram_handle(device_t dev, t_Handle *muramh); +int fman_get_bushandle(device_t dev, vm_offset_t *fm_base); #endif /* FMAN_H_ */ Modified: head/sys/dev/dpaa/fman_mdio.c ============================================================================== --- head/sys/dev/dpaa/fman_mdio.c Wed Nov 1 00:33:54 2017 (r325254) +++ head/sys/dev/dpaa/fman_mdio.c Wed Nov 1 00:46:48 2017 (r325255) @@ -130,7 +130,7 @@ pqmdio_fdt_attach(device_t dev) sc = device_get_softc(dev); - fman_get_bushandle(&sc->sc_handle); + fman_get_bushandle(device_get_parent(dev), &sc->sc_handle); bus_get_resource(dev, SYS_RES_MEMORY, 0, &start, &count); sc->sc_offset = start; Modified: head/sys/dev/dpaa/if_dtsec.c ============================================================================== --- head/sys/dev/dpaa/if_dtsec.c Wed Nov 1 00:33:54 2017 (r325254) +++ head/sys/dev/dpaa/if_dtsec.c Wed Nov 1 00:46:48 2017 (r325255) @@ -569,11 +569,13 @@ int dtsec_attach(device_t dev) { struct dtsec_softc *sc; + device_t parent; int error; struct ifnet *ifp; sc = device_get_softc(dev); + parent = device_get_parent(dev); sc->sc_dev = dev; sc->sc_mac_mdio_irq = NO_IRQ; sc->sc_eth_id = device_get_unit(dev); @@ -594,13 +596,13 @@ dtsec_attach(device_t dev) callout_init(&sc->sc_tick_callout, CALLOUT_MPSAFE); /* Read configuraton */ - if ((error = fman_get_handle(&sc->sc_fmh)) != 0) + if ((error = fman_get_handle(parent, &sc->sc_fmh)) != 0) return (error); - if ((error = fman_get_muram_handle(&sc->sc_muramh)) != 0) + if ((error = fman_get_muram_handle(parent, &sc->sc_muramh)) != 0) return (error); - if ((error = fman_get_bushandle(&sc->sc_fm_base)) != 0) + if ((error = fman_get_bushandle(parent, &sc->sc_fm_base)) != 0) return (error); /* Configure working mode */ From owner-svn-src-all@freebsd.org Wed Nov 1 01:03: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 D3239E48E1A; Wed, 1 Nov 2017 01:03:45 +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 9FF766BDE2; Wed, 1 Nov 2017 01:03:45 +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 vA113itk014259; Wed, 1 Nov 2017 01:03:44 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA113iPh014257; Wed, 1 Nov 2017 01:03:44 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201711010103.vA113iPh014257@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Wed, 1 Nov 2017 01:03:44 +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: r325256 - in stable/11/etc: periodic/daily rc.d X-SVN-Group: stable-11 X-SVN-Commit-Author: cy X-SVN-Commit-Paths: in stable/11/etc: periodic/daily rc.d X-SVN-Commit-Revision: 325256 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: Wed, 01 Nov 2017 01:03:45 -0000 Author: cy Date: Wed Nov 1 01:03:44 2017 New Revision: 325256 URL: https://svnweb.freebsd.org/changeset/base/325256 Log: MFC r324681, r324738 Anticongestion refinements for ntpd rc script. This checks if ntp leapfile needs fetching before entering into the anticongestion sleep. Unfortunately some ports still use their own sleeps so, this commit doesn't address the complete problem which is compounded by every port that uses its own anticongestion mechanism. Discussed with: asomers, feld Modified: stable/11/etc/periodic/daily/480.leapfile-ntpd stable/11/etc/rc.d/ntpd Directory Properties: stable/11/ (props changed) Modified: stable/11/etc/periodic/daily/480.leapfile-ntpd ============================================================================== --- stable/11/etc/periodic/daily/480.leapfile-ntpd Wed Nov 1 00:46:48 2017 (r325255) +++ stable/11/etc/periodic/daily/480.leapfile-ntpd Wed Nov 1 01:03:44 2017 (r325256) @@ -13,8 +13,10 @@ fi case "$daily_ntpd_leapfile_enable" in [Yy][Ee][Ss]) - anticongestion - service ntpd onefetch + if service ntpd oneneedfetch; then + anticongestion + service ntpd onefetch + fi ;; esac Modified: stable/11/etc/rc.d/ntpd ============================================================================== --- stable/11/etc/rc.d/ntpd Wed Nov 1 00:46:48 2017 (r325255) +++ stable/11/etc/rc.d/ntpd Wed Nov 1 01:03:44 2017 (r325256) @@ -15,8 +15,9 @@ desc="Network Time Protocol daemon" rcvar="ntpd_enable" command="/usr/sbin/${name}" pidfile="/var/run/${name}.pid" -extra_commands="fetch" +extra_commands="fetch needfetch" fetch_cmd="ntpd_fetch_leapfile" +needfetch_cmd="ntpd_needfetch_leapfile" start_precmd="ntpd_precmd" load_rc_config $name @@ -90,7 +91,7 @@ ntpd_init_leapfile() { fi } -ntpd_fetch_leapfile() { +ntpd_needfetch_leapfile() { local ntp_tmp_leapfile rc verbose if checkyesno ntp_leapfile_fetch_verbose; then @@ -122,6 +123,21 @@ ntpd_fetch_leapfile() { ntp_leap_fetch_date=$((ntp_leap_expiry-ntp_leapfile_expiry_seconds)) if [ $(current_ntp_ts) -ge $ntp_leap_fetch_date ]; then $verbose Within ntp leapfile expiry limit, initiating fetch + # Return code 0: ntp leapfile fetch needed + return 0 + fi + # Return code 1: ntp leapfile fetch not needed + return 1 +} + +ntpd_fetch_leapfile() { + if checkyesno ntp_leapfile_fetch_verbose; then + verbose=echo + else + verbose=: + fi + + if ntpd_needfetch_leapfile ; then for url in $ntp_leapfile_sources ; do $verbose fetching $url fetch $ntp_leapfile_fetch_opts -o $ntp_tmp_leapfile $url && break From owner-svn-src-all@freebsd.org Wed Nov 1 01:22: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 59520E49379; Wed, 1 Nov 2017 01:22: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 226146C51C; Wed, 1 Nov 2017 01:22: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 vA11MYPm022155; Wed, 1 Nov 2017 01:22:34 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA11MYw2022152; Wed, 1 Nov 2017 01:22:34 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201711010122.vA11MYw2022152@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Wed, 1 Nov 2017 01:22:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325257 - in head: . share/man/man7 usr.sbin/adduser X-SVN-Group: head X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: in head: . share/man/man7 usr.sbin/adduser X-SVN-Commit-Revision: 325257 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: Wed, 01 Nov 2017 01:22:35 -0000 Author: eadler Date: Wed Nov 1 01:22:33 2017 New Revision: 325257 URL: https://svnweb.freebsd.org/changeset/base/325257 Log: Remove 'adding_user.7' Not to be confused with adduser. Not to be confused with useful information. Differential Revision: https://reviews.freebsd.org/D12848 Deleted: head/share/man/man7/adding_user.7 Modified: head/ObsoleteFiles.inc head/share/man/man7/Makefile head/usr.sbin/adduser/adduser.8 Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Wed Nov 1 01:03:44 2017 (r325256) +++ head/ObsoleteFiles.inc Wed Nov 1 01:22:33 2017 (r325257) @@ -38,6 +38,8 @@ # xargs -n1 | sort | uniq -d; # done +# 20171031: Removal of obsolete man files +OLD_FILES+=usr/share/man/man7/adding_user.7.gz # 20171031: Disconnected libpathconv tests OLD_DIRS+=usr/tests/lib/libpathconv # 20171017: Removal of mbpool(9) Modified: head/share/man/man7/Makefile ============================================================================== --- head/share/man/man7/Makefile Wed Nov 1 01:03:44 2017 (r325256) +++ head/share/man/man7/Makefile Wed Nov 1 01:22:33 2017 (r325257) @@ -6,8 +6,7 @@ PACKAGE=runtime-manuals #MISSING: eqnchar.7 ms.7 term.7 -MAN= adding_user.7 \ - arch.7 \ +MAN= arch.7 \ ascii.7 \ bsd.snmpmod.mk.7 \ build.7 \ Modified: head/usr.sbin/adduser/adduser.8 ============================================================================== --- head/usr.sbin/adduser/adduser.8 Wed Nov 1 01:03:44 2017 (r325256) +++ head/usr.sbin/adduser/adduser.8 Wed Nov 1 01:22:33 2017 (r325257) @@ -436,7 +436,6 @@ logfile for .Xr login.conf 5 , .Xr passwd 5 , .Xr shells 5 , -.Xr adding_user 8 , .Xr pw 8 , .Xr pwd_mkdb 8 , .Xr rmuser 8 , From owner-svn-src-all@freebsd.org Wed Nov 1 02:40: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 087A4E4B7D9; Wed, 1 Nov 2017 02:40:17 +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 C9B066DCD0; Wed, 1 Nov 2017 02:40:16 +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 vA12eFmN051094; Wed, 1 Nov 2017 02:40:15 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA12eFqX051092; Wed, 1 Nov 2017 02:40:15 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201711010240.vA12eFqX051092@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Wed, 1 Nov 2017 02:40:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325258 - head/sys/powerpc/booke X-SVN-Group: head X-SVN-Commit-Author: jhibbits X-SVN-Commit-Paths: head/sys/powerpc/booke X-SVN-Commit-Revision: 325258 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: Wed, 01 Nov 2017 02:40:17 -0000 Author: jhibbits Date: Wed Nov 1 02:40:15 2017 New Revision: 325258 URL: https://svnweb.freebsd.org/changeset/base/325258 Log: Fix debug interrupts on 64-bit Book-E Use a WORD_SIZE macro to define the correct offset to the second word needed. This corrects the offset calculation in 64-bit builds. Modified: head/sys/powerpc/booke/locore.S head/sys/powerpc/booke/trap_subr.S Modified: head/sys/powerpc/booke/locore.S ============================================================================== --- head/sys/powerpc/booke/locore.S Wed Nov 1 01:22:33 2017 (r325257) +++ head/sys/powerpc/booke/locore.S Wed Nov 1 02:40:15 2017 (r325258) @@ -57,6 +57,7 @@ #define THREAD_REG %r13 #define ADDR(x) \ .llong x +#define WORD_SIZE 8 #else #define GET_TOCBASE(r) #define TOC_RESTORE @@ -72,6 +73,7 @@ #define THREAD_REG %r2 #define ADDR(x) \ .long x +#define WORD_SIZE 4 #endif .text Modified: head/sys/powerpc/booke/trap_subr.S ============================================================================== --- head/sys/powerpc/booke/trap_subr.S Wed Nov 1 01:22:33 2017 (r325257) +++ head/sys/powerpc/booke/trap_subr.S Wed Nov 1 02:40:15 2017 (r325258) @@ -970,19 +970,14 @@ int_debug_int: GET_CPUINFO(%r3) LOAD %r3, (PC_BOOKE_CRITSAVE+CPUSAVE_SRR0)(%r3) bl 0f -#ifdef __powerpc64__ - .llong interrupt_vector_base-. - .llong interrupt_vector_top-. -#else - .long interrupt_vector_base-. - .long interrupt_vector_top-. -#endif + ADDR(interrupt_vector_base-.) + ADDR(interrupt_vector_top-.) 0: mflr %r5 LOAD %r4,0(%r5) /* interrupt_vector_base in r4 */ add %r4,%r4,%r5 CMPL cr0, %r3, %r4 blt trap_common - LOAD %r4,4(%r5) /* interrupt_vector_top in r4 */ + LOAD %r4,WORD_SIZE(%r5) /* interrupt_vector_top in r4 */ add %r4,%r4,%r5 addi %r4,%r4,4 CMPL cr0, %r3, %r4 From owner-svn-src-all@freebsd.org Wed Nov 1 02:54: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 4A68CE4BC64; Wed, 1 Nov 2017 02:54:50 +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 117756E3BC; Wed, 1 Nov 2017 02:54:49 +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 vA12snjE059315; Wed, 1 Nov 2017 02:54:49 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA12snJO059313; Wed, 1 Nov 2017 02:54:49 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201711010254.vA12snJO059313@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Wed, 1 Nov 2017 02:54:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325259 - in head/sys/powerpc: include powerpc X-SVN-Group: head X-SVN-Commit-Author: jhibbits X-SVN-Commit-Paths: in head/sys/powerpc: include powerpc X-SVN-Commit-Revision: 325259 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: Wed, 01 Nov 2017 02:54:50 -0000 Author: jhibbits Date: Wed Nov 1 02:54:48 2017 New Revision: 325259 URL: https://svnweb.freebsd.org/changeset/base/325259 Log: Add Guest State (GS) bit to MSR bits For completeness only. It will be used by a hypervisor if/when one is written. While here, sort the MSR bits into the proper categories. Modified: head/sys/powerpc/include/psl.h head/sys/powerpc/powerpc/genassym.c Modified: head/sys/powerpc/include/psl.h ============================================================================== --- head/sys/powerpc/include/psl.h Wed Nov 1 02:40:15 2017 (r325258) +++ head/sys/powerpc/include/psl.h Wed Nov 1 02:54:48 2017 (r325259) @@ -45,15 +45,16 @@ #define PSL_FP 0x00002000UL /* floating point enable */ #define PSL_ME 0x00001000UL /* machine check enable */ #define PSL_FE0 0x00000800UL /* floating point interrupt mode 0 */ -#define PSL_BE 0x00000200UL /* branch trace enable */ #define PSL_FE1 0x00000100UL /* floating point interrupt mode 1 */ #define PSL_PMM 0x00000004UL /* performance monitor mark */ +#define PSL_RI 0x00000002UL /* recoverable interrupt */ /* Machine State Register - Book-E cores */ #ifdef __powerpc64__ #define PSL_CM 0x80000000UL /* Computation Mode (64-bit) */ #endif +#define PSL_GS 0x10000000UL /* Guest state */ #define PSL_UCLE 0x04000000UL /* User mode cache lock enable */ #define PSL_WE 0x00040000UL /* Wait state enable */ #define PSL_CE 0x00020000UL /* Critical interrupt enable */ @@ -72,10 +73,10 @@ #define PSL_POW 0x00040000UL /* power management */ #define PSL_ILE 0x00010000UL /* interrupt endian mode (1 == le) */ #define PSL_SE 0x00000400UL /* single-step trace enable */ +#define PSL_BE 0x00000200UL /* branch trace enable */ #define PSL_IP 0x00000040UL /* interrupt prefix - 601 only */ #define PSL_IR 0x00000020UL /* instruction address relocation */ #define PSL_DR 0x00000010UL /* data address relocation */ -#define PSL_RI 0x00000002UL /* recoverable interrupt */ #define PSL_LE 0x00000001UL /* endian mode (1 == le) */ /* Modified: head/sys/powerpc/powerpc/genassym.c ============================================================================== --- head/sys/powerpc/powerpc/genassym.c Wed Nov 1 02:40:15 2017 (r325258) +++ head/sys/powerpc/powerpc/genassym.c Wed Nov 1 02:54:48 2017 (r325259) @@ -225,6 +225,7 @@ ASSYM(MAXCOMLEN, MAXCOMLEN); #ifdef __powerpc64__ ASSYM(PSL_CM, PSL_CM); #endif +ASSYM(PSL_GS, PSL_GS); ASSYM(PSL_DE, PSL_DE); ASSYM(PSL_DS, PSL_DS); ASSYM(PSL_IS, PSL_IS); From owner-svn-src-all@freebsd.org Wed Nov 1 03:09: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 86F33E4C15F; Wed, 1 Nov 2017 03:09:17 +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 3080C6ED98; Wed, 1 Nov 2017 03:09:17 +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 vA139GSu064294; Wed, 1 Nov 2017 03:09:16 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA139GAf064293; Wed, 1 Nov 2017 03:09:16 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201711010309.vA139GAf064293@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Wed, 1 Nov 2017 03:09:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325260 - in head/sys: contrib/ncsw/Peripherals/FM contrib/ncsw/etc powerpc/conf/dpaa X-SVN-Group: head X-SVN-Commit-Author: jhibbits X-SVN-Commit-Paths: in head/sys: contrib/ncsw/Peripherals/FM contrib/ncsw/etc powerpc/conf/dpaa X-SVN-Commit-Revision: 325260 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: Wed, 01 Nov 2017 03:09:17 -0000 Author: jhibbits Date: Wed Nov 1 03:09:16 2017 New Revision: 325260 URL: https://svnweb.freebsd.org/changeset/base/325260 Log: Rename a couple files to not conflict with ZFS filenames Now a kernel can be built with both ZFS and DPAA compiled in. Added: head/sys/contrib/ncsw/Peripherals/FM/fm_ncsw.c - copied unchanged from r325259, head/sys/contrib/ncsw/Peripherals/FM/fm.c head/sys/contrib/ncsw/etc/ncsw_list.c - copied unchanged from r325259, head/sys/contrib/ncsw/etc/list.c Deleted: head/sys/contrib/ncsw/Peripherals/FM/fm.c head/sys/contrib/ncsw/etc/list.c Modified: head/sys/powerpc/conf/dpaa/files.dpaa Copied: head/sys/contrib/ncsw/Peripherals/FM/fm_ncsw.c (from r325259, head/sys/contrib/ncsw/Peripherals/FM/fm.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/contrib/ncsw/Peripherals/FM/fm_ncsw.c Wed Nov 1 03:09:16 2017 (r325260, copy of r325259, head/sys/contrib/ncsw/Peripherals/FM/fm.c) @@ -0,0 +1,5213 @@ +/* + * 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: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of Freescale Semiconductor nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * + * ALTERNATIVELY, this software may be distributed under the terms of the + * GNU General Public License ("GPL") as published by the Free Software + * Foundation, either version 2 of that License or (at your option) any + * later version. + * + * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + + +/****************************************************************************** + @File fm.c + + @Description FM driver routines implementation. +*//***************************************************************************/ +#include "std_ext.h" +#include "error_ext.h" +#include "xx_ext.h" +#include "string_ext.h" +#include "sprint_ext.h" +#include "debug_ext.h" +#include "fm_muram_ext.h" +#include + +#include "fm_common.h" +#include "fm_ipc.h" +#include "fm.h" +#include "fsl_fman.h" + + +/****************************************/ +/* static functions */ +/****************************************/ + +static volatile bool blockingFlag = FALSE; +static void IpcMsgCompletionCB(t_Handle h_Fm, + uint8_t *p_Msg, + uint8_t *p_Reply, + uint32_t replyLength, + t_Error status) +{ + UNUSED(h_Fm);UNUSED(p_Msg);UNUSED(p_Reply);UNUSED(replyLength);UNUSED(status); + blockingFlag = FALSE; +} + +static void FreeInitResources(t_Fm *p_Fm) +{ + if (p_Fm->camBaseAddr) + FM_MURAM_FreeMem(p_Fm->h_FmMuram, UINT_TO_PTR(p_Fm->camBaseAddr)); + if (p_Fm->fifoBaseAddr) + FM_MURAM_FreeMem(p_Fm->h_FmMuram, UINT_TO_PTR(p_Fm->fifoBaseAddr)); + if (p_Fm->resAddr) + FM_MURAM_FreeMem(p_Fm->h_FmMuram, UINT_TO_PTR(p_Fm->resAddr)); +} + +static bool IsFmanCtrlCodeLoaded(t_Fm *p_Fm) +{ + t_FMIramRegs *p_Iram; + + ASSERT_COND(p_Fm); + p_Iram = (t_FMIramRegs *)UINT_TO_PTR(p_Fm->baseAddr + FM_MM_IMEM); + + return (bool)!!(GET_UINT32(p_Iram->iready) & IRAM_READY); +} + +static t_Error CheckFmParameters(t_Fm *p_Fm) +{ + if (IsFmanCtrlCodeLoaded(p_Fm) && !p_Fm->resetOnInit) + RETURN_ERROR(MAJOR, E_INVALID_VALUE, ("Old FMan CTRL code is loaded; FM must be reset!")); +#if (DPAA_VERSION < 11) + if (!p_Fm->p_FmDriverParam->dma_axi_dbg_num_of_beats || + (p_Fm->p_FmDriverParam->dma_axi_dbg_num_of_beats > DMA_MODE_MAX_AXI_DBG_NUM_OF_BEATS)) + RETURN_ERROR(MAJOR, E_INVALID_VALUE, + ("axiDbgNumOfBeats has to be in the range 1 - %d", DMA_MODE_MAX_AXI_DBG_NUM_OF_BEATS)); +#endif /* (DPAA_VERSION < 11) */ + if (p_Fm->p_FmDriverParam->dma_cam_num_of_entries % DMA_CAM_UNITS) + RETURN_ERROR(MAJOR, E_INVALID_VALUE, ("dma_cam_num_of_entries has to be divisble by %d", DMA_CAM_UNITS)); +// if (!p_Fm->p_FmDriverParam->dma_cam_num_of_entries || (p_Fm->p_FmDriverParam->dma_cam_num_of_entries > DMA_MODE_MAX_CAM_NUM_OF_ENTRIES)) +// RETURN_ERROR(MAJOR, E_INVALID_VALUE, ("dma_cam_num_of_entries has to be in the range 1 - %d", DMA_MODE_MAX_CAM_NUM_OF_ENTRIES)); + if (p_Fm->p_FmDriverParam->dma_comm_qtsh_asrt_emer > DMA_THRESH_MAX_COMMQ) + RETURN_ERROR(MAJOR, E_INVALID_VALUE, ("dma_comm_qtsh_asrt_emer can not be larger than %d", DMA_THRESH_MAX_COMMQ)); + if (p_Fm->p_FmDriverParam->dma_comm_qtsh_clr_emer > DMA_THRESH_MAX_COMMQ) + RETURN_ERROR(MAJOR, E_INVALID_VALUE, ("dma_comm_qtsh_clr_emer can not be larger than %d", DMA_THRESH_MAX_COMMQ)); + if (p_Fm->p_FmDriverParam->dma_comm_qtsh_clr_emer >= p_Fm->p_FmDriverParam->dma_comm_qtsh_asrt_emer) + RETURN_ERROR(MAJOR, E_INVALID_VALUE, ("dma_comm_qtsh_clr_emer must be smaller than dma_comm_qtsh_asrt_emer")); +#if (DPAA_VERSION < 11) + if (p_Fm->p_FmDriverParam->dma_read_buf_tsh_asrt_emer > DMA_THRESH_MAX_BUF) + RETURN_ERROR(MAJOR, E_INVALID_VALUE, ("dma_read_buf_tsh_asrt_emer can not be larger than %d", DMA_THRESH_MAX_BUF)); + if (p_Fm->p_FmDriverParam->dma_read_buf_tsh_clr_emer > DMA_THRESH_MAX_BUF) + RETURN_ERROR(MAJOR, E_INVALID_VALUE, ("dma_read_buf_tsh_clr_emer can not be larger than %d", DMA_THRESH_MAX_BUF)); + if (p_Fm->p_FmDriverParam->dma_read_buf_tsh_clr_emer >= p_Fm->p_FmDriverParam->dma_read_buf_tsh_asrt_emer) + RETURN_ERROR(MAJOR, E_INVALID_VALUE, ("dma_read_buf_tsh_clr_emer must be smaller than dma_read_buf_tsh_asrt_emer")); + if (p_Fm->p_FmDriverParam->dma_write_buf_tsh_asrt_emer > DMA_THRESH_MAX_BUF) + RETURN_ERROR(MAJOR, E_INVALID_VALUE, ("dma_write_buf_tsh_asrt_emer can not be larger than %d", DMA_THRESH_MAX_BUF)); + if (p_Fm->p_FmDriverParam->dma_write_buf_tsh_clr_emer > DMA_THRESH_MAX_BUF) + RETURN_ERROR(MAJOR, E_INVALID_VALUE, ("dma_write_buf_tsh_clr_emer can not be larger than %d", DMA_THRESH_MAX_BUF)); + if (p_Fm->p_FmDriverParam->dma_write_buf_tsh_clr_emer >= p_Fm->p_FmDriverParam->dma_write_buf_tsh_asrt_emer) + RETURN_ERROR(MAJOR, E_INVALID_VALUE, ("dma_write_buf_tsh_clr_emer must be smaller than dma_write_buf_tsh_asrt_emer")); +#else /* (DPAA_VERSION >= 11) */ + if ((p_Fm->p_FmDriverParam->dma_dbg_cnt_mode == E_FMAN_DMA_DBG_CNT_INT_READ_EM)|| + (p_Fm->p_FmDriverParam->dma_dbg_cnt_mode == E_FMAN_DMA_DBG_CNT_INT_WRITE_EM) || + (p_Fm->p_FmDriverParam->dma_dbg_cnt_mode == E_FMAN_DMA_DBG_CNT_RAW_WAR_PROT)) + RETURN_ERROR(MAJOR, E_INVALID_VALUE, ("dma_dbg_cnt_mode value not supported by this integration.")); + if ((p_Fm->p_FmDriverParam->dma_emergency_bus_select == FM_DMA_MURAM_READ_EMERGENCY)|| + (p_Fm->p_FmDriverParam->dma_emergency_bus_select == FM_DMA_MURAM_WRITE_EMERGENCY)) + RETURN_ERROR(MAJOR, E_INVALID_VALUE, ("emergencyBusSelect value not supported by this integration.")); + if (p_Fm->p_FmDriverParam->dma_stop_on_bus_error) + RETURN_ERROR(MAJOR, E_INVALID_VALUE, ("dma_stop_on_bus_error not supported by this integration.")); +#ifdef FM_AID_MODE_NO_TNUM_SW005 + if (p_Fm->p_FmDriverParam->dma_aid_mode != E_FMAN_DMA_AID_OUT_PORT_ID) + RETURN_ERROR(MAJOR, E_INVALID_VALUE, ("dma_aid_mode not supported by this integration.")); +#endif /* FM_AID_MODE_NO_TNUM_SW005 */ + if (p_Fm->p_FmDriverParam->dma_axi_dbg_num_of_beats) + RETURN_ERROR(MAJOR, E_INVALID_VALUE, ("dma_axi_dbg_num_of_beats not supported by this integration.")); +#endif /* (DPAA_VERSION < 11) */ + + if (!p_Fm->p_FmStateStruct->fmClkFreq) + RETURN_ERROR(MAJOR, E_INVALID_VALUE, ("fmClkFreq must be set.")); + if (USEC_TO_CLK(p_Fm->p_FmDriverParam->dma_watchdog, p_Fm->p_FmStateStruct->fmClkFreq) > DMA_MAX_WATCHDOG) + RETURN_ERROR(MAJOR, E_INVALID_VALUE, + ("dma_watchdog depends on FM clock. dma_watchdog(in microseconds) * clk (in Mhz), may not exceed 0x08x", DMA_MAX_WATCHDOG)); + +#if (DPAA_VERSION >= 11) + if ((p_Fm->partVSPBase + p_Fm->partNumOfVSPs) > FM_VSP_MAX_NUM_OF_ENTRIES) + RETURN_ERROR(MAJOR, E_INVALID_VALUE, ("partVSPBase+partNumOfVSPs out of range!!!")); +#endif /* (DPAA_VERSION >= 11) */ + + if (p_Fm->p_FmStateStruct->totalFifoSize % BMI_FIFO_UNITS) + RETURN_ERROR(MAJOR, E_INVALID_VALUE, ("totalFifoSize number has to be divisible by %d", BMI_FIFO_UNITS)); + if (!p_Fm->p_FmStateStruct->totalFifoSize || + (p_Fm->p_FmStateStruct->totalFifoSize > BMI_MAX_FIFO_SIZE)) + RETURN_ERROR(MAJOR, E_INVALID_VALUE, + ("totalFifoSize (currently defined as %d) has to be in the range of 256 to %d", + p_Fm->p_FmStateStruct->totalFifoSize, + BMI_MAX_FIFO_SIZE)); + if (!p_Fm->p_FmStateStruct->totalNumOfTasks || + (p_Fm->p_FmStateStruct->totalNumOfTasks > BMI_MAX_NUM_OF_TASKS)) + RETURN_ERROR(MAJOR, E_INVALID_VALUE, ("totalNumOfTasks number has to be in the range 1 - %d", BMI_MAX_NUM_OF_TASKS)); + +#ifdef FM_HAS_TOTAL_DMAS + if (!p_Fm->p_FmStateStruct->maxNumOfOpenDmas || + (p_Fm->p_FmStateStruct->maxNumOfOpenDmas > BMI_MAX_NUM_OF_DMAS)) + RETURN_ERROR(MAJOR, E_INVALID_VALUE, ("maxNumOfOpenDmas number has to be in the range 1 - %d", BMI_MAX_NUM_OF_DMAS)); +#endif /* FM_HAS_TOTAL_DMAS */ + + if (p_Fm->p_FmDriverParam->disp_limit_tsh > FPM_MAX_DISP_LIMIT) + RETURN_ERROR(MAJOR, E_INVALID_VALUE, ("disp_limit_tsh can't be greater than %d", FPM_MAX_DISP_LIMIT)); + + if (!p_Fm->f_Exception) + RETURN_ERROR(MAJOR, E_INVALID_VALUE, ("Exceptions callback not provided")); + if (!p_Fm->f_BusError) + RETURN_ERROR(MAJOR, E_INVALID_VALUE, ("Exceptions callback not provided")); + +#ifdef FM_NO_WATCHDOG + if ((p_Fm->p_FmStateStruct->revInfo.majorRev == 2) && + (p_Fm->p_FmDriverParam->dma_watchdog)) + RETURN_ERROR(MAJOR, E_NOT_SUPPORTED, ("watchdog!")); +#endif /* FM_NO_WATCHDOG */ + +#ifdef FM_ECC_HALT_NO_SYNC_ERRATA_10GMAC_A008 + if ((p_Fm->p_FmStateStruct->revInfo.majorRev < 6) && + (p_Fm->p_FmDriverParam->halt_on_unrecov_ecc_err)) + RETURN_ERROR(MAJOR, E_NOT_SUPPORTED, ("HaltOnEccError!")); +#endif /* FM_ECC_HALT_NO_SYNC_ERRATA_10GMAC_A008 */ + +#ifdef FM_NO_TNUM_AGING + if ((p_Fm->p_FmStateStruct->revInfo.majorRev != 4) && + (p_Fm->p_FmStateStruct->revInfo.majorRev < 6)) + if (p_Fm->p_FmDriverParam->tnum_aging_period) + RETURN_ERROR(MAJOR, E_NOT_SUPPORTED, ("Tnum aging!")); +#endif /* FM_NO_TNUM_AGING */ + + /* check that user did not set revision-dependent exceptions */ +#ifdef FM_NO_DISPATCH_RAM_ECC + if ((p_Fm->p_FmStateStruct->revInfo.majorRev != 4) && + (p_Fm->p_FmStateStruct->revInfo.majorRev < 6)) + if (p_Fm->userSetExceptions & FM_EX_BMI_DISPATCH_RAM_ECC) + RETURN_ERROR(MAJOR, E_NOT_SUPPORTED, ("exception e_FM_EX_BMI_DISPATCH_RAM_ECC!")); +#endif /* FM_NO_DISPATCH_RAM_ECC */ + +#ifdef FM_QMI_NO_ECC_EXCEPTIONS + if (p_Fm->p_FmStateStruct->revInfo.majorRev == 4) + if (p_Fm->userSetExceptions & (FM_EX_QMI_SINGLE_ECC | FM_EX_QMI_DOUBLE_ECC)) + RETURN_ERROR(MAJOR, E_NOT_SUPPORTED, ("exception e_FM_EX_QMI_SINGLE_ECC/e_FM_EX_QMI_DOUBLE_ECC!")); +#endif /* FM_QMI_NO_ECC_EXCEPTIONS */ + +#ifdef FM_QMI_NO_SINGLE_ECC_EXCEPTION + if (p_Fm->p_FmStateStruct->revInfo.majorRev >= 6) + if (p_Fm->userSetExceptions & FM_EX_QMI_SINGLE_ECC) + RETURN_ERROR(MAJOR, E_NOT_SUPPORTED, ("exception e_FM_EX_QMI_SINGLE_ECC!")); +#endif /* FM_QMI_NO_SINGLE_ECC_EXCEPTION */ + + return E_OK; +} + + +static void SendIpcIsr(t_Fm *p_Fm, uint32_t macEvent, uint32_t pendingReg) +{ + ASSERT_COND(p_Fm->guestId == NCSW_MASTER_ID); + + if (p_Fm->intrMng[macEvent].guestId == NCSW_MASTER_ID) + p_Fm->intrMng[macEvent].f_Isr(p_Fm->intrMng[macEvent].h_SrcHandle); + + /* If the MAC is running on guest-partition and we have IPC session with it, + we inform him about the event through IPC; otherwise, we ignore the event. */ + else if (p_Fm->h_IpcSessions[p_Fm->intrMng[macEvent].guestId]) + { + t_Error err; + t_FmIpcIsr fmIpcIsr; + t_FmIpcMsg msg; + + memset(&msg, 0, sizeof(msg)); + msg.msgId = FM_GUEST_ISR; + fmIpcIsr.pendingReg = pendingReg; + fmIpcIsr.boolErr = FALSE; + memcpy(msg.msgBody, &fmIpcIsr, sizeof(fmIpcIsr)); + err = XX_IpcSendMessage(p_Fm->h_IpcSessions[p_Fm->intrMng[macEvent].guestId], + (uint8_t*)&msg, + sizeof(msg.msgId) + sizeof(fmIpcIsr), + NULL, + NULL, + NULL, + NULL); + if (err != E_OK) + REPORT_ERROR(MINOR, err, NO_MSG); + } + else + DBG(TRACE, ("FM Guest mode, without IPC - can't call ISR!")); +} + +static void BmiErrEvent(t_Fm *p_Fm) +{ + uint32_t event; + struct fman_bmi_regs *bmi_rg = p_Fm->p_FmBmiRegs; + + + event = fman_get_bmi_err_event(bmi_rg); + + if (event & BMI_ERR_INTR_EN_STORAGE_PROFILE_ECC) + p_Fm->f_Exception(p_Fm->h_App,e_FM_EX_BMI_STORAGE_PROFILE_ECC); + if (event & BMI_ERR_INTR_EN_LIST_RAM_ECC) + p_Fm->f_Exception(p_Fm->h_App,e_FM_EX_BMI_LIST_RAM_ECC); + if (event & BMI_ERR_INTR_EN_STATISTICS_RAM_ECC) + p_Fm->f_Exception(p_Fm->h_App,e_FM_EX_BMI_STATISTICS_RAM_ECC); + if (event & BMI_ERR_INTR_EN_DISPATCH_RAM_ECC) + p_Fm->f_Exception(p_Fm->h_App,e_FM_EX_BMI_DISPATCH_RAM_ECC); +} + +static void QmiErrEvent(t_Fm *p_Fm) +{ + uint32_t event; + struct fman_qmi_regs *qmi_rg = p_Fm->p_FmQmiRegs; + + event = fman_get_qmi_err_event(qmi_rg); + + if (event & QMI_ERR_INTR_EN_DOUBLE_ECC) + p_Fm->f_Exception(p_Fm->h_App,e_FM_EX_QMI_DOUBLE_ECC); + if (event & QMI_ERR_INTR_EN_DEQ_FROM_DEF) + p_Fm->f_Exception(p_Fm->h_App,e_FM_EX_QMI_DEQ_FROM_UNKNOWN_PORTID); +} + +static void DmaErrEvent(t_Fm *p_Fm) +{ + uint32_t status, com_id; + uint8_t tnum; + uint8_t hardwarePortId; + uint8_t relativePortId; + uint16_t liodn; + struct fman_dma_regs *dma_rg = p_Fm->p_FmDmaRegs; + + status = fman_get_dma_err_event(dma_rg); + + if (status & DMA_STATUS_BUS_ERR) + { + com_id = fman_get_dma_com_id(dma_rg); + hardwarePortId = (uint8_t)(((com_id & DMA_TRANSFER_PORTID_MASK) >> DMA_TRANSFER_PORTID_SHIFT)); + ASSERT_COND(IN_RANGE(1, hardwarePortId, 63)); + HW_PORT_ID_TO_SW_PORT_ID(relativePortId, hardwarePortId); + tnum = (uint8_t)((com_id & DMA_TRANSFER_TNUM_MASK) >> DMA_TRANSFER_TNUM_SHIFT); + liodn = (uint16_t)(com_id & DMA_TRANSFER_LIODN_MASK); + ASSERT_COND(p_Fm->p_FmStateStruct->portsTypes[hardwarePortId] != e_FM_PORT_TYPE_DUMMY); + p_Fm->f_BusError(p_Fm->h_App, + p_Fm->p_FmStateStruct->portsTypes[hardwarePortId], + relativePortId, + fman_get_dma_addr(dma_rg), + tnum, + liodn); + } + if (status & DMA_STATUS_FM_SPDAT_ECC) + p_Fm->f_Exception(p_Fm->h_App, e_FM_EX_DMA_SINGLE_PORT_ECC); + if (status & DMA_STATUS_READ_ECC) + p_Fm->f_Exception(p_Fm->h_App, e_FM_EX_DMA_READ_ECC); + if (status & DMA_STATUS_SYSTEM_WRITE_ECC) + p_Fm->f_Exception(p_Fm->h_App, e_FM_EX_DMA_SYSTEM_WRITE_ECC); + if (status & DMA_STATUS_FM_WRITE_ECC) + p_Fm->f_Exception(p_Fm->h_App, e_FM_EX_DMA_FM_WRITE_ECC); + } + +static void FpmErrEvent(t_Fm *p_Fm) +{ + uint32_t event; + struct fman_fpm_regs *fpm_rg = p_Fm->p_FmFpmRegs; + + event = fman_get_fpm_err_event(fpm_rg); + + if ((event & FPM_EV_MASK_DOUBLE_ECC) && (event & FPM_EV_MASK_DOUBLE_ECC_EN)) + p_Fm->f_Exception(p_Fm->h_App,e_FM_EX_FPM_DOUBLE_ECC); + if ((event & FPM_EV_MASK_STALL) && (event & FPM_EV_MASK_STALL_EN)) + p_Fm->f_Exception(p_Fm->h_App,e_FM_EX_FPM_STALL_ON_TASKS); + if ((event & FPM_EV_MASK_SINGLE_ECC) && (event & FPM_EV_MASK_SINGLE_ECC_EN)) + p_Fm->f_Exception(p_Fm->h_App,e_FM_EX_FPM_SINGLE_ECC); +} + +static void MuramErrIntr(t_Fm *p_Fm) +{ + uint32_t event; + struct fman_fpm_regs *fpm_rg = p_Fm->p_FmFpmRegs; + + event = fman_get_muram_err_event(fpm_rg); + + if (event & FPM_RAM_MURAM_ECC) + p_Fm->f_Exception(p_Fm->h_App, e_FM_EX_MURAM_ECC); +} + +static void IramErrIntr(t_Fm *p_Fm) +{ + uint32_t event; + struct fman_fpm_regs *fpm_rg = p_Fm->p_FmFpmRegs; + + event = fman_get_iram_err_event(fpm_rg); + + if (event & FPM_RAM_IRAM_ECC) + p_Fm->f_Exception(p_Fm->h_App, e_FM_EX_IRAM_ECC); +} + +static void QmiEvent(t_Fm *p_Fm) +{ + uint32_t event; + struct fman_qmi_regs *qmi_rg = p_Fm->p_FmQmiRegs; + + event = fman_get_qmi_event(qmi_rg); + + if (event & QMI_INTR_EN_SINGLE_ECC) + p_Fm->f_Exception(p_Fm->h_App,e_FM_EX_QMI_SINGLE_ECC); +} + +static void UnimplementedIsr(t_Handle h_Arg) +{ + UNUSED(h_Arg); + + REPORT_ERROR(MAJOR, E_NOT_SUPPORTED, ("Unimplemented ISR!")); +} + +static void UnimplementedFmanCtrlIsr(t_Handle h_Arg, uint32_t event) +{ + UNUSED(h_Arg); UNUSED(event); + + REPORT_ERROR(MAJOR, E_NOT_SUPPORTED, ("Unimplemented FmCtl ISR!")); +} + +static void EnableTimeStamp(t_Fm *p_Fm) +{ + struct fman_fpm_regs *fpm_rg = p_Fm->p_FmFpmRegs; + + ASSERT_COND(p_Fm->p_FmStateStruct); + ASSERT_COND(p_Fm->p_FmStateStruct->count1MicroBit); + + fman_enable_time_stamp(fpm_rg, p_Fm->p_FmStateStruct->count1MicroBit, p_Fm->p_FmStateStruct->fmClkFreq); + + p_Fm->p_FmStateStruct->enabledTimeStamp = TRUE; +} + +static t_Error ClearIRam(t_Fm *p_Fm) +{ + t_FMIramRegs *p_Iram; + int i; + int iram_size; + + ASSERT_COND(p_Fm); + p_Iram = (t_FMIramRegs *)UINT_TO_PTR(p_Fm->baseAddr + FM_MM_IMEM); + iram_size = FM_IRAM_SIZE(p_Fm->p_FmStateStruct->revInfo.majorRev,p_Fm->p_FmStateStruct->revInfo.minorRev); + + /* Enable the auto-increment */ + WRITE_UINT32(p_Iram->iadd, IRAM_IADD_AIE); + while (GET_UINT32(p_Iram->iadd) != IRAM_IADD_AIE) ; + + for (i=0; i < (iram_size/4); i++) + WRITE_UINT32(p_Iram->idata, 0xffffffff); + + WRITE_UINT32(p_Iram->iadd, iram_size - 4); + CORE_MemoryBarrier(); + while (GET_UINT32(p_Iram->idata) != 0xffffffff) ; + + return E_OK; +} + +static t_Error LoadFmanCtrlCode(t_Fm *p_Fm) +{ + t_FMIramRegs *p_Iram; + int i; + uint32_t tmp; + uint8_t compTo16; + + ASSERT_COND(p_Fm); + p_Iram = (t_FMIramRegs *)UINT_TO_PTR(p_Fm->baseAddr + FM_MM_IMEM); + + /* Enable the auto-increment */ + WRITE_UINT32(p_Iram->iadd, IRAM_IADD_AIE); + while (GET_UINT32(p_Iram->iadd) != IRAM_IADD_AIE) ; + + for (i=0; i < (p_Fm->firmware.size / 4); i++) + WRITE_UINT32(p_Iram->idata, p_Fm->firmware.p_Code[i]); + + compTo16 = (uint8_t)(p_Fm->firmware.size % 16); + if (compTo16) + for (i=0; i < ((16-compTo16) / 4); i++) + WRITE_UINT32(p_Iram->idata, 0xffffffff); + + WRITE_UINT32(p_Iram->iadd,p_Fm->firmware.size-4); + while (GET_UINT32(p_Iram->iadd) != (p_Fm->firmware.size-4)) ; + + /* verify that writing has completed */ + while (GET_UINT32(p_Iram->idata) != p_Fm->firmware.p_Code[(p_Fm->firmware.size / 4)-1]) ; + + if (p_Fm->fwVerify) + { + WRITE_UINT32(p_Iram->iadd, IRAM_IADD_AIE); + while (GET_UINT32(p_Iram->iadd) != IRAM_IADD_AIE) ; + for (i=0; i < (p_Fm->firmware.size / 4); i++) + { + tmp = GET_UINT32(p_Iram->idata); + if (tmp != p_Fm->firmware.p_Code[i]) + RETURN_ERROR(MAJOR, E_WRITE_FAILED, + ("UCode write error : write 0x%x, read 0x%x", + p_Fm->firmware.p_Code[i],tmp)); + } + WRITE_UINT32(p_Iram->iadd, 0x0); + } + + /* Enable patch from IRAM */ + WRITE_UINT32(p_Iram->iready, IRAM_READY); + XX_UDelay(1000); + + DBG(INFO, ("FMan-Controller code (ver %d.%d.%d) loaded to IRAM.", + ((uint16_t *)p_Fm->firmware.p_Code)[2], + ((uint8_t *)p_Fm->firmware.p_Code)[6], + ((uint8_t *)p_Fm->firmware.p_Code)[7])); + + return E_OK; +} + +#ifdef FM_UCODE_NOT_RESET_ERRATA_BUGZILLA6173 +static t_Error FwNotResetErratumBugzilla6173WA(t_Fm *p_Fm) +{ + t_FMIramRegs *p_Iram = (t_FMIramRegs *)UINT_TO_PTR(p_Fm->baseAddr + FM_MM_IMEM); + uint32_t tmpReg; + uint32_t savedSpliodn[63]; + + /* write to IRAM first location the debug instruction */ + WRITE_UINT32(p_Iram->iadd, 0); + while (GET_UINT32(p_Iram->iadd) != 0) ; + WRITE_UINT32(p_Iram->idata, FM_FW_DEBUG_INSTRUCTION); + + WRITE_UINT32(p_Iram->iadd, 0); + while (GET_UINT32(p_Iram->iadd) != 0) ; + while (GET_UINT32(p_Iram->idata) != FM_FW_DEBUG_INSTRUCTION) ; + + /* Enable patch from IRAM */ + WRITE_UINT32(p_Iram->iready, IRAM_READY); + CORE_MemoryBarrier(); + XX_UDelay(100); + IO2MemCpy32((uint8_t *)savedSpliodn, + (uint8_t *)p_Fm->p_FmBmiRegs->fmbm_spliodn, + 63*sizeof(uint32_t)); + + /* reset FMAN */ + WRITE_UINT32(p_Fm->p_FmFpmRegs->fm_rstc, FPM_RSTC_FM_RESET); + CORE_MemoryBarrier(); + XX_UDelay(100); + + /* verify breakpoint debug status register */ + tmpReg = GET_UINT32(*(uint32_t *)UINT_TO_PTR(p_Fm->baseAddr + FM_DEBUG_STATUS_REGISTER_OFFSET)); + if (!tmpReg) + REPORT_ERROR(MAJOR, E_INVALID_STATE, ("Invalid debug status register value is '0'")); + + /*************************************/ + /* Load FMan-Controller code to IRAM */ + /*************************************/ + ClearIRam(p_Fm); + if (p_Fm->firmware.p_Code && + (LoadFmanCtrlCode(p_Fm) != E_OK)) + RETURN_ERROR(MAJOR, E_INVALID_STATE, NO_MSG); + XX_UDelay(100); + + /* reset FMAN again to start the microcode */ + WRITE_UINT32(p_Fm->p_FmFpmRegs->fm_rstc, FPM_RSTC_FM_RESET); + CORE_MemoryBarrier(); + XX_UDelay(100); + Mem2IOCpy32((uint8_t *)p_Fm->p_FmBmiRegs->fmbm_spliodn, + (uint8_t *)savedSpliodn, + 63*sizeof(uint32_t)); + + if (fman_is_qmi_halt_not_busy_state(p_Fm->p_FmQmiRegs)) + { + fman_resume(p_Fm->p_FmFpmRegs); + CORE_MemoryBarrier(); + XX_UDelay(100); + } + + return E_OK; +} +#endif /* FM_UCODE_NOT_RESET_ERRATA_BUGZILLA6173 */ + +static void GuestErrorIsr(t_Fm *p_Fm, uint32_t pending) +{ +#define FM_G_CALL_1G_MAC_ERR_ISR(_id) \ +do { \ + p_Fm->intrMng[(e_FmInterModuleEvent)(e_FM_EV_ERR_1G_MAC0+_id)].f_Isr(p_Fm->intrMng[(e_FmInterModuleEvent)(e_FM_EV_ERR_1G_MAC0+_id)].h_SrcHandle);\ +} while (0) +#define FM_G_CALL_10G_MAC_ERR_ISR(_id) \ +do { \ + p_Fm->intrMng[(e_FmInterModuleEvent)(e_FM_EV_ERR_10G_MAC0+_id)].f_Isr(p_Fm->intrMng[(e_FmInterModuleEvent)(e_FM_EV_ERR_10G_MAC0+_id)].h_SrcHandle);\ +} while (0) + + /* error interrupts */ + if (pending & ERR_INTR_EN_1G_MAC0) + FM_G_CALL_1G_MAC_ERR_ISR(0); + if (pending & ERR_INTR_EN_1G_MAC1) + FM_G_CALL_1G_MAC_ERR_ISR(1); + if (pending & ERR_INTR_EN_1G_MAC2) + FM_G_CALL_1G_MAC_ERR_ISR(2); + if (pending & ERR_INTR_EN_1G_MAC3) + FM_G_CALL_1G_MAC_ERR_ISR(3); + if (pending & ERR_INTR_EN_1G_MAC4) + FM_G_CALL_1G_MAC_ERR_ISR(4); + if (pending & ERR_INTR_EN_1G_MAC5) + FM_G_CALL_1G_MAC_ERR_ISR(5); + if (pending & ERR_INTR_EN_1G_MAC6) + FM_G_CALL_1G_MAC_ERR_ISR(6); + if (pending & ERR_INTR_EN_1G_MAC7) + FM_G_CALL_1G_MAC_ERR_ISR(7); + if (pending & ERR_INTR_EN_10G_MAC0) + FM_G_CALL_10G_MAC_ERR_ISR(0); + if (pending & ERR_INTR_EN_10G_MAC1) + FM_G_CALL_10G_MAC_ERR_ISR(1); +} + +static void GuestEventIsr(t_Fm *p_Fm, uint32_t pending) +{ +#define FM_G_CALL_1G_MAC_ISR(_id) \ +do { \ + p_Fm->intrMng[(e_FmInterModuleEvent)(e_FM_EV_1G_MAC0+_id)].f_Isr(p_Fm->intrMng[(e_FmInterModuleEvent)(e_FM_EV_1G_MAC0+_id)].h_SrcHandle);\ +} while (0) +#define FM_G_CALL_10G_MAC_ISR(_id) \ +do { \ + p_Fm->intrMng[(e_FmInterModuleEvent)(e_FM_EV_10G_MAC0+_id)].f_Isr(p_Fm->intrMng[(e_FmInterModuleEvent)(e_FM_EV_10G_MAC0+_id)].h_SrcHandle);\ +} while (0) + + if (pending & INTR_EN_1G_MAC0) + FM_G_CALL_1G_MAC_ISR(0); + if (pending & INTR_EN_1G_MAC1) + FM_G_CALL_1G_MAC_ISR(1); + if (pending & INTR_EN_1G_MAC2) + FM_G_CALL_1G_MAC_ISR(2); + if (pending & INTR_EN_1G_MAC3) + FM_G_CALL_1G_MAC_ISR(3); + if (pending & INTR_EN_1G_MAC4) + FM_G_CALL_1G_MAC_ISR(4); + if (pending & INTR_EN_1G_MAC5) + FM_G_CALL_1G_MAC_ISR(5); + if (pending & INTR_EN_1G_MAC6) + FM_G_CALL_1G_MAC_ISR(6); + if (pending & INTR_EN_1G_MAC7) + FM_G_CALL_1G_MAC_ISR(7); + if (pending & INTR_EN_10G_MAC0) + FM_G_CALL_10G_MAC_ISR(0); + if (pending & INTR_EN_10G_MAC1) + FM_G_CALL_10G_MAC_ISR(1); + if (pending & INTR_EN_TMR) + p_Fm->intrMng[e_FM_EV_TMR].f_Isr(p_Fm->intrMng[e_FM_EV_TMR].h_SrcHandle); +} + +#if (DPAA_VERSION >= 11) +static t_Error SetVSPWindow(t_Handle h_Fm, + uint8_t hardwarePortId, + uint8_t baseStorageProfile, + uint8_t log2NumOfProfiles) +{ + t_Fm *p_Fm = (t_Fm *)h_Fm; + + ASSERT_COND(h_Fm); + ASSERT_COND(IN_RANGE(1, hardwarePortId, 63)); + + if ((p_Fm->guestId != NCSW_MASTER_ID) && + !p_Fm->p_FmBmiRegs && + p_Fm->h_IpcSessions[0]) + { + t_FmIpcVspSetPortWindow fmIpcVspSetPortWindow; + t_FmIpcMsg msg; + t_Error err = E_OK; + + memset(&msg, 0, sizeof(msg)); + memset(&fmIpcVspSetPortWindow, 0, sizeof(t_FmIpcVspSetPortWindow)); + fmIpcVspSetPortWindow.hardwarePortId = hardwarePortId; + fmIpcVspSetPortWindow.baseStorageProfile = baseStorageProfile; + fmIpcVspSetPortWindow.log2NumOfProfiles = log2NumOfProfiles; + msg.msgId = FM_VSP_SET_PORT_WINDOW; + memcpy(msg.msgBody, &fmIpcVspSetPortWindow, sizeof(t_FmIpcVspSetPortWindow)); + + err = XX_IpcSendMessage(p_Fm->h_IpcSessions[0], + (uint8_t*)&msg, + sizeof(msg.msgId), + NULL, + NULL, + NULL, + NULL); + if (err != E_OK) + RETURN_ERROR(MINOR, err, NO_MSG); + return E_OK; + } + else if (!p_Fm->p_FmBmiRegs) + RETURN_ERROR(MINOR, E_NOT_SUPPORTED, + ("Either IPC or 'baseAddress' is required!")); + + fman_set_vsp_window(p_Fm->p_FmBmiRegs, + hardwarePortId, + baseStorageProfile, + log2NumOfProfiles); + + return E_OK; +} + +static uint8_t AllocVSPsForPartition(t_Handle h_Fm, uint8_t base, uint8_t numOfProfiles, uint8_t guestId) +{ + t_Fm *p_Fm = (t_Fm *)h_Fm; + uint8_t profilesFound = 0; + int i = 0; + uint32_t intFlags; + + if (!numOfProfiles) + return E_OK; + + if ((numOfProfiles > FM_VSP_MAX_NUM_OF_ENTRIES) || + (base + numOfProfiles > FM_VSP_MAX_NUM_OF_ENTRIES)) + return (uint8_t)ILLEGAL_BASE; + + if (p_Fm->h_IpcSessions[0]) + { + t_FmIpcResourceAllocParams ipcAllocParams; + t_FmIpcMsg msg; + t_FmIpcReply reply; + t_Error err; + uint32_t replyLength; + + memset(&msg, 0, sizeof(msg)); + memset(&reply, 0, sizeof(reply)); + memset(&ipcAllocParams, 0, sizeof(t_FmIpcResourceAllocParams)); + ipcAllocParams.guestId = p_Fm->guestId; + ipcAllocParams.num = p_Fm->partNumOfVSPs; + ipcAllocParams.base = p_Fm->partVSPBase; + msg.msgId = FM_VSP_ALLOC; + memcpy(msg.msgBody, &ipcAllocParams, sizeof(t_FmIpcResourceAllocParams)); + replyLength = sizeof(uint32_t) + sizeof(uint8_t); + err = XX_IpcSendMessage(p_Fm->h_IpcSessions[0], + (uint8_t*)&msg, + sizeof(msg.msgId) + sizeof(t_FmIpcResourceAllocParams), + (uint8_t*)&reply, + &replyLength, + NULL, + NULL); + if ((err != E_OK) || + (replyLength != (sizeof(uint32_t) + sizeof(uint8_t)))) + RETURN_ERROR(MAJOR, err, NO_MSG); + else + memcpy((uint8_t*)&p_Fm->partVSPBase, reply.replyBody, sizeof(uint8_t)); + if (p_Fm->partVSPBase == (uint8_t)(ILLEGAL_BASE)) + RETURN_ERROR(MAJOR, err, NO_MSG); + } + if (p_Fm->guestId != NCSW_MASTER_ID) + { + DBG(WARNING, ("FM Guest mode, without IPC - can't validate VSP range!")); + return (uint8_t)ILLEGAL_BASE; + } + + intFlags = XX_LockIntrSpinlock(p_Fm->h_Spinlock); + for (i = base; i < base + numOfProfiles; i++) + if (p_Fm->p_FmSp->profiles[i].profilesMng.ownerId == (uint8_t)ILLEGAL_BASE) + profilesFound++; + else + break; + + if (profilesFound == numOfProfiles) + for (i = base; ip_FmSp->profiles[i].profilesMng.ownerId = guestId; + else + { + XX_UnlockIntrSpinlock(p_Fm->h_Spinlock, intFlags); + return (uint8_t)ILLEGAL_BASE; + } + XX_UnlockIntrSpinlock(p_Fm->h_Spinlock, intFlags); + + return base; +} + +static void FreeVSPsForPartition(t_Handle h_Fm, uint8_t base, uint8_t numOfProfiles, uint8_t guestId) +{ + t_Fm *p_Fm = (t_Fm *)h_Fm; + int i = 0; + + ASSERT_COND(p_Fm); + + if (p_Fm->h_IpcSessions[0]) + { + t_FmIpcResourceAllocParams ipcAllocParams; + t_FmIpcMsg msg; + t_FmIpcReply reply; + uint32_t replyLength; + t_Error err; + + memset(&msg, 0, sizeof(msg)); + memset(&reply, 0, sizeof(reply)); + memset(&ipcAllocParams, 0, sizeof(t_FmIpcResourceAllocParams)); + ipcAllocParams.guestId = p_Fm->guestId; + ipcAllocParams.num = p_Fm->partNumOfVSPs; + ipcAllocParams.base = p_Fm->partVSPBase; + msg.msgId = FM_VSP_FREE; + memcpy(msg.msgBody, &ipcAllocParams, sizeof(t_FmIpcResourceAllocParams)); + replyLength = sizeof(uint32_t) + sizeof(uint8_t); + err = XX_IpcSendMessage(p_Fm->h_IpcSessions[0], + (uint8_t*)&msg, + sizeof(msg.msgId) + sizeof(t_FmIpcResourceAllocParams), + (uint8_t*)&reply, + &replyLength, + NULL, + NULL); + if (err != E_OK) + REPORT_ERROR(MAJOR, err, NO_MSG); + return; + } + if (p_Fm->guestId != NCSW_MASTER_ID) + { + DBG(WARNING, ("FM Guest mode, without IPC - can't validate VSP range!")); + return; + } + + ASSERT_COND(p_Fm->p_FmSp); + + for (i=base; ip_FmSp->profiles[i].profilesMng.ownerId == guestId) + p_Fm->p_FmSp->profiles[i].profilesMng.ownerId = (uint8_t)ILLEGAL_BASE; + else + DBG(WARNING, ("Request for freeing storage profile window which wasn't allocated to this partition")); + } +} +#endif /* (DPAA_VERSION >= 11) */ + +static t_Error FmGuestHandleIpcMsgCB(t_Handle h_Fm, + uint8_t *p_Msg, + uint32_t msgLength, + uint8_t *p_Reply, + uint32_t *p_ReplyLength) +{ + t_Fm *p_Fm = (t_Fm*)h_Fm; + t_FmIpcMsg *p_IpcMsg = (t_FmIpcMsg*)p_Msg; + + UNUSED(p_Reply); + SANITY_CHECK_RETURN_ERROR(p_Fm, E_INVALID_HANDLE); + SANITY_CHECK_RETURN_ERROR((msgLength > sizeof(uint32_t)), E_INVALID_VALUE); + +#ifdef DISABLE_SANITY_CHECKS + UNUSED(msgLength); +#endif /* DISABLE_SANITY_CHECKS */ + + ASSERT_COND(p_Msg); + + *p_ReplyLength = 0; + + switch (p_IpcMsg->msgId) + { + case (FM_GUEST_ISR): + { + t_FmIpcIsr ipcIsr; + + memcpy((uint8_t*)&ipcIsr, p_IpcMsg->msgBody, sizeof(t_FmIpcIsr)); + if (ipcIsr.boolErr) + GuestErrorIsr(p_Fm, ipcIsr.pendingReg); + else + GuestEventIsr(p_Fm, ipcIsr.pendingReg); + break; + } + default: + *p_ReplyLength = 0; + RETURN_ERROR(MINOR, E_INVALID_SELECTION, ("command not found!!!")); + } + return E_OK; +} + +static t_Error FmHandleIpcMsgCB(t_Handle h_Fm, + uint8_t *p_Msg, + uint32_t msgLength, + uint8_t *p_Reply, + uint32_t *p_ReplyLength) +{ + t_Error err; + t_Fm *p_Fm = (t_Fm*)h_Fm; + t_FmIpcMsg *p_IpcMsg = (t_FmIpcMsg*)p_Msg; + t_FmIpcReply *p_IpcReply = (t_FmIpcReply*)p_Reply; + + SANITY_CHECK_RETURN_ERROR(p_Fm, E_INVALID_HANDLE); + SANITY_CHECK_RETURN_ERROR((msgLength >= sizeof(uint32_t)), E_INVALID_VALUE); + +#ifdef DISABLE_SANITY_CHECKS + UNUSED(msgLength); +#endif /* DISABLE_SANITY_CHECKS */ + + ASSERT_COND(p_IpcMsg); + + memset(p_IpcReply, 0, (sizeof(uint8_t) * FM_IPC_MAX_REPLY_SIZE)); + *p_ReplyLength = 0; + + switch (p_IpcMsg->msgId) + { + case (FM_GET_SET_PORT_PARAMS): + { + t_FmIpcPortInInitParams ipcInitParams; + t_FmInterModulePortInitParams initParams; + t_FmIpcPortOutInitParams ipcOutInitParams; + + memcpy((uint8_t*)&ipcInitParams, p_IpcMsg->msgBody, sizeof(t_FmIpcPortInInitParams)); + initParams.hardwarePortId = ipcInitParams.hardwarePortId; + initParams.portType = (e_FmPortType)ipcInitParams.enumPortType; + initParams.independentMode = (bool)(ipcInitParams.boolIndependentMode); + initParams.liodnOffset = ipcInitParams.liodnOffset; + initParams.numOfTasks = ipcInitParams.numOfTasks; + initParams.numOfExtraTasks = ipcInitParams.numOfExtraTasks; + initParams.numOfOpenDmas = ipcInitParams.numOfOpenDmas; + initParams.numOfExtraOpenDmas = ipcInitParams.numOfExtraOpenDmas; + initParams.sizeOfFifo = ipcInitParams.sizeOfFifo; + initParams.extraSizeOfFifo = ipcInitParams.extraSizeOfFifo; + initParams.deqPipelineDepth = ipcInitParams.deqPipelineDepth; + initParams.maxFrameLength = ipcInitParams.maxFrameLength; + initParams.liodnBase = ipcInitParams.liodnBase; + + p_IpcReply->error = (uint32_t)FmGetSetPortParams(h_Fm, &initParams); + + ipcOutInitParams.ipcPhysAddr.high = initParams.fmMuramPhysBaseAddr.high; + ipcOutInitParams.ipcPhysAddr.low = initParams.fmMuramPhysBaseAddr.low; + ipcOutInitParams.sizeOfFifo = initParams.sizeOfFifo; + ipcOutInitParams.extraSizeOfFifo = initParams.extraSizeOfFifo; + ipcOutInitParams.numOfTasks = initParams.numOfTasks; + ipcOutInitParams.numOfExtraTasks = initParams.numOfExtraTasks; + ipcOutInitParams.numOfOpenDmas = initParams.numOfOpenDmas; + ipcOutInitParams.numOfExtraOpenDmas = initParams.numOfExtraOpenDmas; + memcpy(p_IpcReply->replyBody, (uint8_t*)&ipcOutInitParams, sizeof(ipcOutInitParams)); + *p_ReplyLength = sizeof(uint32_t) + sizeof(t_FmIpcPortOutInitParams); + break; + } + case (FM_SET_SIZE_OF_FIFO): + { + t_FmIpcPortRsrcParams ipcPortRsrcParams; + + memcpy((uint8_t*)&ipcPortRsrcParams, p_IpcMsg->msgBody, sizeof(t_FmIpcPortRsrcParams)); + p_IpcReply->error = (uint32_t)FmSetSizeOfFifo(h_Fm, + ipcPortRsrcParams.hardwarePortId, + &ipcPortRsrcParams.val, + &ipcPortRsrcParams.extra, + (bool)ipcPortRsrcParams.boolInitialConfig); + *p_ReplyLength = sizeof(uint32_t); + break; + } + case (FM_SET_NUM_OF_TASKS): + { + t_FmIpcPortRsrcParams ipcPortRsrcParams; + + memcpy((uint8_t*)&ipcPortRsrcParams, p_IpcMsg->msgBody, sizeof(t_FmIpcPortRsrcParams)); + p_IpcReply->error = (uint32_t)FmSetNumOfTasks(h_Fm, ipcPortRsrcParams.hardwarePortId, + (uint8_t*)&ipcPortRsrcParams.val, + (uint8_t*)&ipcPortRsrcParams.extra, + (bool)ipcPortRsrcParams.boolInitialConfig); + *p_ReplyLength = sizeof(uint32_t); + break; + } + case (FM_SET_NUM_OF_OPEN_DMAS): + { + t_FmIpcPortRsrcParams ipcPortRsrcParams; + + memcpy((uint8_t*)&ipcPortRsrcParams, p_IpcMsg->msgBody, sizeof(t_FmIpcPortRsrcParams)); + p_IpcReply->error = (uint32_t)FmSetNumOfOpenDmas(h_Fm, ipcPortRsrcParams.hardwarePortId, + (uint8_t*)&ipcPortRsrcParams.val, + (uint8_t*)&ipcPortRsrcParams.extra, + (bool)ipcPortRsrcParams.boolInitialConfig); + *p_ReplyLength = sizeof(uint32_t); + break; + } + case (FM_RESUME_STALLED_PORT): + *p_ReplyLength = sizeof(uint32_t); + p_IpcReply->error = (uint32_t)FmResumeStalledPort(h_Fm, p_IpcMsg->msgBody[0]); + break; + case (FM_MASTER_IS_ALIVE): + { + uint8_t guestId = p_IpcMsg->msgBody[0]; + /* build the FM master partition IPC address */ + memset(p_Fm->fmIpcHandlerModuleName[guestId], 0, (sizeof(char)) * MODULE_NAME_SIZE); + if (Sprint (p_Fm->fmIpcHandlerModuleName[guestId], "FM_%d_%d",p_Fm->p_FmStateStruct->fmId, guestId) != (guestId<10 ? 6:7)) + RETURN_ERROR(MAJOR, E_INVALID_STATE, ("Sprint failed")); + p_Fm->h_IpcSessions[guestId] = XX_IpcInitSession(p_Fm->fmIpcHandlerModuleName[guestId], p_Fm->fmModuleName); + if (p_Fm->h_IpcSessions[guestId] == NULL) + RETURN_ERROR(MAJOR, E_NOT_AVAILABLE, ("FM Master IPC session for guest %d", guestId)); + *(uint8_t*)(p_IpcReply->replyBody) = 1; + *p_ReplyLength = sizeof(uint32_t) + sizeof(uint8_t); + break; + } + case (FM_IS_PORT_STALLED): + { + bool tmp; + + p_IpcReply->error = (uint32_t)FmIsPortStalled(h_Fm, p_IpcMsg->msgBody[0], &tmp); + *(uint8_t*)(p_IpcReply->replyBody) = (uint8_t)tmp; + *p_ReplyLength = sizeof(uint32_t) + sizeof(uint8_t); + break; + } + case (FM_RESET_MAC): + { + t_FmIpcMacParams ipcMacParams; + + memcpy((uint8_t*)&ipcMacParams, p_IpcMsg->msgBody, sizeof(t_FmIpcMacParams)); + p_IpcReply->error = (uint32_t)FmResetMac(p_Fm, + (e_FmMacType)(ipcMacParams.enumType), + ipcMacParams.id); + *p_ReplyLength = sizeof(uint32_t); + break; + } + case (FM_SET_MAC_MAX_FRAME): + { + t_FmIpcMacMaxFrameParams ipcMacMaxFrameParams; + + memcpy((uint8_t*)&ipcMacMaxFrameParams, p_IpcMsg->msgBody, sizeof(t_FmIpcMacMaxFrameParams)); + err = FmSetMacMaxFrame(p_Fm, + (e_FmMacType)(ipcMacMaxFrameParams.macParams.enumType), + ipcMacMaxFrameParams.macParams.id, + ipcMacMaxFrameParams.maxFrameLength); + if (err != E_OK) + REPORT_ERROR(MINOR, err, NO_MSG); + break; + } +#if (DPAA_VERSION >= 11) + case (FM_VSP_ALLOC) : + { + t_FmIpcResourceAllocParams ipcAllocParams; + uint8_t vspBase; + memcpy(&ipcAllocParams, p_IpcMsg->msgBody, sizeof(t_FmIpcResourceAllocParams)); + vspBase = AllocVSPsForPartition(h_Fm, (uint8_t)ipcAllocParams.base, (uint8_t)ipcAllocParams.num, ipcAllocParams.guestId); + memcpy(p_IpcReply->replyBody, (uint8_t*)&vspBase, sizeof(uint8_t)); + *p_ReplyLength = sizeof(uint32_t) + sizeof(uint8_t); + break; + } + case (FM_VSP_FREE) : + { + t_FmIpcResourceAllocParams ipcAllocParams; + memcpy(&ipcAllocParams, p_IpcMsg->msgBody, sizeof(t_FmIpcResourceAllocParams)); + FreeVSPsForPartition(h_Fm, (uint8_t)ipcAllocParams.base, (uint8_t)ipcAllocParams.num, ipcAllocParams.guestId); + break; + } + case (FM_VSP_SET_PORT_WINDOW) : + { + t_FmIpcVspSetPortWindow ipcVspSetPortWindow; + memcpy(&ipcVspSetPortWindow, p_IpcMsg->msgBody, sizeof(t_FmIpcVspSetPortWindow)); + err = SetVSPWindow(h_Fm, + ipcVspSetPortWindow.hardwarePortId, + ipcVspSetPortWindow.baseStorageProfile, + ipcVspSetPortWindow.log2NumOfProfiles); + return err; + } *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Wed Nov 1 03:26: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 30CBEE4C5F0; Wed, 1 Nov 2017 03:26:54 +0000 (UTC) (envelope-from grehan@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 F41A26F4E7; Wed, 1 Nov 2017 03:26:53 +0000 (UTC) (envelope-from grehan@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA13Qrdb072446; Wed, 1 Nov 2017 03:26:53 GMT (envelope-from grehan@FreeBSD.org) Received: (from grehan@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA13QriH072445; Wed, 1 Nov 2017 03:26:53 GMT (envelope-from grehan@FreeBSD.org) Message-Id: <201711010326.vA13QriH072445@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: grehan set sender to grehan@FreeBSD.org using -f From: Peter Grehan Date: Wed, 1 Nov 2017 03:26:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325261 - head/sys/amd64/vmm X-SVN-Group: head X-SVN-Commit-Author: grehan X-SVN-Commit-Paths: head/sys/amd64/vmm X-SVN-Commit-Revision: 325261 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: Wed, 01 Nov 2017 03:26:54 -0000 Author: grehan Date: Wed Nov 1 03:26:53 2017 New Revision: 325261 URL: https://svnweb.freebsd.org/changeset/base/325261 Log: Emulate the "OR reg, r/m" instruction (opcode 0BH). This is needed for the HDA emulation with FreeBSD guests. Reviewed by: marcelo MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D12832 Modified: head/sys/amd64/vmm/vmm_instruction_emul.c Modified: head/sys/amd64/vmm/vmm_instruction_emul.c ============================================================================== --- head/sys/amd64/vmm/vmm_instruction_emul.c Wed Nov 1 03:09:16 2017 (r325260) +++ head/sys/amd64/vmm/vmm_instruction_emul.c Wed Nov 1 03:26:53 2017 (r325261) @@ -109,6 +109,10 @@ static const struct vie_op one_byte_opcodes[256] = { .op_byte = 0x0F, .op_type = VIE_OP_TYPE_TWO_BYTE }, + [0x0B] = { + .op_byte = 0x0B, + .op_type = VIE_OP_TYPE_OR, + }, [0x2B] = { .op_byte = 0x2B, .op_type = VIE_OP_TYPE_SUB, @@ -992,12 +996,38 @@ emulate_or(void *vm, int vcpuid, uint64_t gpa, struct mem_region_read_t memread, mem_region_write_t memwrite, void *arg) { int error, size; - uint64_t val1, result, rflags, rflags2; + enum vm_reg_name reg; + uint64_t result, rflags, rflags2, val1, val2; size = vie->opsize; error = EINVAL; switch (vie->op.op_byte) { + case 0x0B: + /* + * OR reg (ModRM:reg) and mem (ModRM:r/m) and store the + * result in reg. + * + * 0b/r or r16, r/m16 + * 0b/r or r32, r/m32 + * REX.W + 0b/r or r64, r/m64 + */ + + /* get the first operand */ + reg = gpr_map[vie->reg]; + error = vie_read_register(vm, vcpuid, reg, &val1); + if (error) + break; + + /* get the second operand */ + error = memread(vm, vcpuid, gpa, &val2, size, arg); + if (error) + break; + + /* perform the operation and write the result */ + result = val1 | val2; + error = vie_update_register(vm, vcpuid, reg, result, size); + break; case 0x81: case 0x83: /* From owner-svn-src-all@freebsd.org Wed Nov 1 03:54: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 A22FBE4CC6A; Wed, 1 Nov 2017 03:54:08 +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 7CC326FFE9; Wed, 1 Nov 2017 03:54:08 +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 vA13s7hv084831; Wed, 1 Nov 2017 03:54:07 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA13s75x084830; Wed, 1 Nov 2017 03:54:07 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201711010354.vA13s75x084830@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Wed, 1 Nov 2017 03:54:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325262 - head/sys/powerpc/conf X-SVN-Group: head X-SVN-Commit-Author: jhibbits X-SVN-Commit-Paths: head/sys/powerpc/conf X-SVN-Commit-Revision: 325262 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: Wed, 01 Nov 2017 03:54:08 -0000 Author: jhibbits Date: Wed Nov 1 03:54:07 2017 New Revision: 325262 URL: https://svnweb.freebsd.org/changeset/base/325262 Log: Enable a bunch more options in the QORIQ64 kernel This brings it closer to par with GENERIC64. In the future I hope to have a GENERIC64-E and GENERIC-E kernels as Book-E analogues to the GENERIC64/GENERIC AIM kernels. Modified: head/sys/powerpc/conf/QORIQ64 Modified: head/sys/powerpc/conf/QORIQ64 ============================================================================== --- head/sys/powerpc/conf/QORIQ64 Wed Nov 1 03:26:53 2017 (r325261) +++ head/sys/powerpc/conf/QORIQ64 Wed Nov 1 03:54:07 2017 (r325262) @@ -16,11 +16,8 @@ makeoptions DEBUG="-Wa,-me500 -g" makeoptions WERROR="-Werror -Wno-format -Wno-redundant-decls" makeoptions NO_MODULES=yes -#options EARLY_PRINTF - options FPU_EMU -options BOOTVERBOSE=1 options _KPOSIX_PRIORITY_SCHEDULING options ALT_BREAK_TO_DEBUGGER options BREAK_TO_DEBUGGER @@ -36,15 +33,22 @@ options DEVICE_POLLING #options DIAGNOSTIC options FDT #makeoptions FDT_DTS_FILE=mpc8555cds.dts -options FFS +options FFS #Berkeley Fast Filesystem +options SOFTUPDATES #Enable FFS soft updates support +options UFS_ACL #Support for access control lists +options UFS_DIRHASH #Improve performance on big directories +options UFS_GJOURNAL #Enable gjournal-based UFS journaling +options QUOTA #Enable disk quotas for UFS options GDB options GEOM_PART_GPT +options GEOM_LABEL #Provides labelization options INET options INET6 options TCP_HHOOK # hhook(9) framework for TCP options INVARIANTS options INVARIANT_SUPPORT options KDB +options KDB_TRACE # Print a stack trace for a panic. options KTRACE options MD_ROOT options MPC85XX @@ -52,18 +56,22 @@ options MSDOSFS options NFS_ROOT options NFSCL options NFSLOCKD -options PRINTF_BUFR_SIZE=128 # Prevent printf output being interspersed. +options PRINTF_BUFR_SIZE=128 # Prevent printf output being interspersed. options PROCFS options PSEUDOFS options SCHED_ULE options CAPABILITIES options CAPABILITY_MODE options SMP +options STACK #stack(9) support options SYSVMSG options SYSVSEM options SYSVSHM options WITNESS options WITNESS_SKIPSPIN +options HWPMC_HOOKS +options KDTRACE_HOOKS # Kernel DTrace hooks +options DDB_CTF # Kernel ELF linker loads CTF data device ata device bpf @@ -71,6 +79,7 @@ device cfi device crypto device cryptodev device da +device ds1307 device ds1553 device em device alc @@ -95,6 +104,8 @@ device scbus device scc device sdhci device sec +device spibus +device spigen device tun device uart options USB_DEBUG # enable debug msgs From owner-svn-src-all@freebsd.org Wed Nov 1 05:51:21 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 E4565E5B733; Wed, 1 Nov 2017 05:51:21 +0000 (UTC) (envelope-from mjg@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 AE0A0832CA; Wed, 1 Nov 2017 05:51:21 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA15pKwu031009; Wed, 1 Nov 2017 05:51:20 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA15pKSS031007; Wed, 1 Nov 2017 05:51:20 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201711010551.vA15pKSS031007@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Wed, 1 Nov 2017 05:51:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325263 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 325263 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: Wed, 01 Nov 2017 05:51:22 -0000 Author: mjg Date: Wed Nov 1 05:51:20 2017 New Revision: 325263 URL: https://svnweb.freebsd.org/changeset/base/325263 Log: Save on uihash table locking by checking if the caller already uses the struct In particular with poudriere this saves about 90% of lookups. Modified: head/sys/kern/init_main.c head/sys/kern/kern_resource.c Modified: head/sys/kern/init_main.c ============================================================================== --- head/sys/kern/init_main.c Wed Nov 1 03:54:07 2017 (r325262) +++ head/sys/kern/init_main.c Wed Nov 1 05:51:20 2017 (r325263) @@ -420,6 +420,7 @@ proc0_init(void *dummy __unused) struct proc *p; struct thread *td; struct ucred *newcred; + struct uidinfo tmpuinfo; vm_paddr_t pageablemem; int i; @@ -502,8 +503,14 @@ proc0_init(void *dummy __unused) /* Create credentials. */ newcred = crget(); newcred->cr_ngroups = 1; /* group 0 */ + /* A hack to prevent uifind from tripping over NULL pointers. */ + curthread->td_ucred = newcred; + tmpuinfo.ui_uid = 1; + newcred->cr_uidinfo = newcred->cr_ruidinfo = &tmpuinfo; newcred->cr_uidinfo = uifind(0); newcred->cr_ruidinfo = uifind(0); + /* End hack. creds get properly set later with thread_cow_get_proc */ + curthread->td_ucred = NULL; newcred->cr_prison = &prison0; newcred->cr_loginclass = loginclass_find("default"); proc_set_cred_init(p, newcred); Modified: head/sys/kern/kern_resource.c ============================================================================== --- head/sys/kern/kern_resource.c Wed Nov 1 03:54:07 2017 (r325262) +++ head/sys/kern/kern_resource.c Wed Nov 1 05:51:20 2017 (r325263) @@ -1253,6 +1253,18 @@ struct uidinfo * uifind(uid_t uid) { struct uidinfo *new_uip, *uip; + struct ucred *cred; + + cred = curthread->td_ucred; + if (cred->cr_uidinfo->ui_uid == uid) { + uip = cred->cr_uidinfo; + uihold(uip); + return (uip); + } else if (cred->cr_ruidinfo->ui_uid == uid) { + uip = cred->cr_ruidinfo; + uihold(uip); + return (uip); + } rw_rlock(&uihashtbl_lock); uip = uilookup(uid); From owner-svn-src-all@freebsd.org Wed Nov 1 06:45: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 DF9D7E60F4D; Wed, 1 Nov 2017 06:45:42 +0000 (UTC) (envelope-from mjg@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 AD81C84C75; Wed, 1 Nov 2017 06:45:42 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA16jfeW054904; Wed, 1 Nov 2017 06:45:41 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA16jf0E054903; Wed, 1 Nov 2017 06:45:41 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201711010645.vA16jf0E054903@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Wed, 1 Nov 2017 06:45:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325266 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 325266 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: Wed, 01 Nov 2017 06:45:43 -0000 Author: mjg Date: Wed Nov 1 06:45:41 2017 New Revision: 325266 URL: https://svnweb.freebsd.org/changeset/base/325266 Log: namecache: ncnegfactor 16 -> 12 It is used on each new entry addition to decide whether to whack an existing negative entry in order to prevent a blow out in size, but the parameter was set years ago and never revisited. Building with poudriere results in about 400 evictions per second which unnecessarily grab entries from the hot list. With the new parameter there are next to no evictions of the sort. Modified: head/sys/kern/vfs_cache.c Modified: head/sys/kern/vfs_cache.c ============================================================================== --- head/sys/kern/vfs_cache.c Wed Nov 1 06:38:46 2017 (r325265) +++ head/sys/kern/vfs_cache.c Wed Nov 1 06:45:41 2017 (r325266) @@ -194,7 +194,7 @@ static __read_mostly LIST_HEAD(nchashhead, namecache) static u_long __read_mostly nchash; /* size of hash table */ SYSCTL_ULONG(_debug, OID_AUTO, nchash, CTLFLAG_RD, &nchash, 0, "Size of namecache hash table"); -static u_long __read_mostly ncnegfactor = 16; /* ratio of negative entries */ +static u_long __read_mostly ncnegfactor = 12; /* ratio of negative entries */ SYSCTL_ULONG(_vfs, OID_AUTO, ncnegfactor, CTLFLAG_RW, &ncnegfactor, 0, "Ratio of negative namecache entries"); static u_long __exclusive_cache_line numneg; /* number of negative entries allocated */ From owner-svn-src-all@freebsd.org Wed Nov 1 06:47: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 020F4E61092; Wed, 1 Nov 2017 06:47:00 +0000 (UTC) (envelope-from mjg@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 C624884D6D; Wed, 1 Nov 2017 06:46:59 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA16kwpX054988; Wed, 1 Nov 2017 06:46:58 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA16kwvO054987; Wed, 1 Nov 2017 06:46:58 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201711010646.vA16kwvO054987@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Wed, 1 Nov 2017 06:46:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325267 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 325267 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: Wed, 01 Nov 2017 06:47:00 -0000 Author: mjg Date: Wed Nov 1 06:46:58 2017 New Revision: 325267 URL: https://svnweb.freebsd.org/changeset/base/325267 Log: Fixup r325264, take #2 whack an unused variable Modified: head/sys/kern/kern_loginclass.c Modified: head/sys/kern/kern_loginclass.c ============================================================================== --- head/sys/kern/kern_loginclass.c Wed Nov 1 06:45:41 2017 (r325266) +++ head/sys/kern/kern_loginclass.c Wed Nov 1 06:46:58 2017 (r325267) @@ -131,7 +131,6 @@ struct loginclass * loginclass_find(const char *name) { struct loginclass *lc, *new_lc; - struct ucred *cred; if (name[0] == '\0' || strlen(name) >= MAXLOGNAME) return (NULL); From owner-svn-src-all@freebsd.org Wed Nov 1 06:12:16 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 6D353E5DB28; Wed, 1 Nov 2017 06:12:16 +0000 (UTC) (envelope-from mjg@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 3AF0783CE6; Wed, 1 Nov 2017 06:12:16 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA16CFeU042390; Wed, 1 Nov 2017 06:12:15 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA16CF1S042388; Wed, 1 Nov 2017 06:12:15 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201711010612.vA16CF1S042388@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Wed, 1 Nov 2017 06:12:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325264 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 325264 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: Wed, 01 Nov 2017 06:12:16 -0000 Author: mjg Date: Wed Nov 1 06:12:14 2017 New Revision: 325264 URL: https://svnweb.freebsd.org/changeset/base/325264 Log: Save on loginclass list locking by checking if caller already uses the struct Modified: head/sys/kern/init_main.c head/sys/kern/kern_loginclass.c Modified: head/sys/kern/init_main.c ============================================================================== --- head/sys/kern/init_main.c Wed Nov 1 05:51:20 2017 (r325263) +++ head/sys/kern/init_main.c Wed Nov 1 06:12:14 2017 (r325264) @@ -421,6 +421,9 @@ proc0_init(void *dummy __unused) struct thread *td; struct ucred *newcred; struct uidinfo tmpuinfo; + struct loginclass tmplc = { + .lc_name = "", + }; vm_paddr_t pageablemem; int i; @@ -509,10 +512,11 @@ proc0_init(void *dummy __unused) newcred->cr_uidinfo = newcred->cr_ruidinfo = &tmpuinfo; newcred->cr_uidinfo = uifind(0); newcred->cr_ruidinfo = uifind(0); + newcred->cr_loginclass = &tmplc; + newcred->cr_loginclass = loginclass_find("default"); /* End hack. creds get properly set later with thread_cow_get_proc */ curthread->td_ucred = NULL; newcred->cr_prison = &prison0; - newcred->cr_loginclass = loginclass_find("default"); proc_set_cred_init(p, newcred); #ifdef AUDIT audit_cred_kproc0(newcred); Modified: head/sys/kern/kern_loginclass.c ============================================================================== --- head/sys/kern/kern_loginclass.c Wed Nov 1 05:51:20 2017 (r325263) +++ head/sys/kern/kern_loginclass.c Wed Nov 1 06:12:14 2017 (r325264) @@ -131,9 +131,16 @@ struct loginclass * loginclass_find(const char *name) { struct loginclass *lc, *new_lc; + struct ucred *cred; if (name[0] == '\0' || strlen(name) >= MAXLOGNAME) return (NULL); + + lc = cred->cr_loginclass; + if (strcmp(name, lc->lc_name) == 0) { + loginclass_hold(lc); + return (lc); + } rw_rlock(&loginclasses_lock); lc = loginclass_lookup(name); From owner-svn-src-all@freebsd.org Wed Nov 1 06:38: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 E8EDEE6040F; Wed, 1 Nov 2017 06:38:47 +0000 (UTC) (envelope-from mjg@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 B8B0084731; Wed, 1 Nov 2017 06:38:47 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA16ckPi050683; Wed, 1 Nov 2017 06:38:46 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA16ckQ6050682; Wed, 1 Nov 2017 06:38:46 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201711010638.vA16ckQ6050682@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Wed, 1 Nov 2017 06:38:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325265 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 325265 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: Wed, 01 Nov 2017 06:38:48 -0000 Author: mjg Date: Wed Nov 1 06:38:46 2017 New Revision: 325265 URL: https://svnweb.freebsd.org/changeset/base/325265 Log: Fixup r325264 Accidentally committed an incomplete diff. Modified: head/sys/kern/kern_loginclass.c Modified: head/sys/kern/kern_loginclass.c ============================================================================== --- head/sys/kern/kern_loginclass.c Wed Nov 1 06:12:14 2017 (r325264) +++ head/sys/kern/kern_loginclass.c Wed Nov 1 06:38:46 2017 (r325265) @@ -136,7 +136,7 @@ loginclass_find(const char *name) if (name[0] == '\0' || strlen(name) >= MAXLOGNAME) return (NULL); - lc = cred->cr_loginclass; + lc = curthread->td_ucred->cr_loginclass; if (strcmp(name, lc->lc_name) == 0) { loginclass_hold(lc); return (lc); From owner-svn-src-all@freebsd.org Wed Nov 1 08:40:05 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 56FCFE4D1D2; Wed, 1 Nov 2017 08:40:05 +0000 (UTC) (envelope-from mjg@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 23843375A; Wed, 1 Nov 2017 08:40:05 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA18e4a5001480; Wed, 1 Nov 2017 08:40:04 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA18e4Ab001479; Wed, 1 Nov 2017 08:40:04 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201711010840.vA18e4Ab001479@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Wed, 1 Nov 2017 08:40:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325268 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 325268 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: Wed, 01 Nov 2017 08:40:05 -0000 Author: mjg Date: Wed Nov 1 08:40:04 2017 New Revision: 325268 URL: https://svnweb.freebsd.org/changeset/base/325268 Log: namecache: fix .. check broken after r324378 wtf by: mjg Diagnosed by: avg Modified: head/sys/kern/vfs_cache.c Modified: head/sys/kern/vfs_cache.c ============================================================================== --- head/sys/kern/vfs_cache.c Wed Nov 1 06:46:58 2017 (r325267) +++ head/sys/kern/vfs_cache.c Wed Nov 1 08:40:04 2017 (r325268) @@ -1126,7 +1126,8 @@ cache_lookup_nomakeentry(struct vnode *dvp, struct vno uint32_t hash; int error; - if (cnp->cn_namelen == 2 && cnp->cn_nameptr[1] == '.') { + if (cnp->cn_namelen == 2 && + cnp->cn_nameptr[0] == '.' && cnp->cn_nameptr[1] == '.') { counter_u64_add(dotdothits, 1); dvlp = VP2VNODELOCK(dvp); dvlp2 = NULL; @@ -1219,7 +1220,8 @@ cache_lookup(struct vnode *dvp, struct vnode **vpp, st retry: blp = NULL; error = 0; - if (cnp->cn_namelen == 2 && cnp->cn_nameptr[1] == '.') { + if (cnp->cn_namelen == 2 && + cnp->cn_nameptr[0] == '.' && cnp->cn_nameptr[1] == '.') { counter_u64_add(dotdothits, 1); dvlp = VP2VNODELOCK(dvp); dvlp2 = NULL; From owner-svn-src-all@freebsd.org Wed Nov 1 08:46: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 6FBCAE4DB9E; Wed, 1 Nov 2017 08:46:25 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-qk0-x22b.google.com (mail-qk0-x22b.google.com [IPv6:2607:f8b0:400d:c09::22b]) (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 2783B3E74; Wed, 1 Nov 2017 08:46:25 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: by mail-qk0-x22b.google.com with SMTP id r64so1835997qkc.1; Wed, 01 Nov 2017 01:46:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=81q7hvfaPEtXP2PUtAGHkEdvJyRa93tbx2xZojxN7N8=; b=owkG1NhMAzDIjt5fMqBXRXxHTDxZH8RF5EHmnT1olX25OXdCQaTWF4DwJ9qwjasqA8 GwqbFHe1EqWb5YsRtywMziiFWVYlQRqJDBtB1tk1W7PbKTTDNnVlgR1XgCY91GxKdvVX hMXxt24BjXrTjJqohqVDomzVffSbdEF2+idBQskqY6nqErVR0bvsOITrXL2pmWAM183P /GKawW2aFsBHLUQ0fb8e/KmwcpmZOc9ufBl+kXzUwapeJ84fwCDKG0fSzTpf++iaCZko HB44wi2pZZYz9qO1MQNAo/n8/yvIbHl6gcG/4iHBpbaEnnRiUzlmZUWoeHPBfAFFTeUv 85Yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=81q7hvfaPEtXP2PUtAGHkEdvJyRa93tbx2xZojxN7N8=; b=VB1wyudZmunx8ArIMC3jf5BolWK9HoBHEq/+A7X/gMOenCRkUZmiAvfmriq3Aa8ku+ 8Kuwxw7zPQrH5Y832DtgD5z3bADVGnCu+tZxMpnrDUFYLIpdbIMJCrK8c5d1GQrXUbwP pAWIesrJtcVwGKcMGOmAXN1pdy+cCBMO+4fFa1KjSVVuwcqEHJybJsdrhOSPp4pfSmR1 0KS2Hb8BOTfHxtm89apDFOjpeFB9FnQ1wB+a99h9JzRrXf6NFIx9Ydie4RmQnOMwjfUl s8mYIA6EjGOeBaqmxA5rKbtImn9NuAfb1PFZxYTBUFEAp/pQ41S2dVEO2gkfrwyNuazN qEWg== X-Gm-Message-State: AMCzsaUfDT1KBO2w5UrPu5wqhMphoh31FA6iBEVAK3URL7QYtP/LhPlS 8e/TUybW8VZZKBx9xjsvFLych3Ke24ta3Plw3rE= X-Google-Smtp-Source: ABhQp+Sqc/AHGO3oowk8YJbVyZjazhjmVy5KcgHNmLX0aXOG7abNKN8+/dnZUWXJ2BEel7JkyrfKEXv3EdvCfM6SDZU= X-Received: by 10.55.15.139 with SMTP id 11mr6607233qkp.141.1509525984298; Wed, 01 Nov 2017 01:46:24 -0700 (PDT) MIME-Version: 1.0 Received: by 10.237.52.198 with HTTP; Wed, 1 Nov 2017 01:46:23 -0700 (PDT) In-Reply-To: <2c922b9b-cd6b-bb9a-00b8-97c137362769@selasky.org> References: <201711010645.vA16jf0E054903@repo.freebsd.org> <2c922b9b-cd6b-bb9a-00b8-97c137362769@selasky.org> From: Mateusz Guzik Date: Wed, 1 Nov 2017 09:46:23 +0100 Message-ID: Subject: Re: svn commit: r325266 - head/sys/kern To: Hans Petter Selasky Cc: Mateusz Guzik , "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: Wed, 01 Nov 2017 08:46:25 -0000 On Wed, Nov 1, 2017 at 9:41 AM, Hans Petter Selasky wrote: > On 11/01/17 07:45, Mateusz Guzik wrote: > >> +static u_long __read_mostly ncnegfactor = 12; /* ratio of negative >> entries */ >> SYSCTL_ULONG(_vfs, OID_AUTO, ncnegfactor, CTLFLAG_RW, &ncnegfactor, 0, >> "Ratio of negative namecache entries"); >> > > Should this SYSCTL entry use CTLFLAG_RWTUN ? > I don't see why. Worst case some negative entries will be whacked before someone's sysctl.conf is being read OR some will live a little bit longer, depending on which way the change is made. That said, feel free to change it if you want. -- Mateusz Guzik From owner-svn-src-all@freebsd.org Wed Nov 1 09:18: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 E26F9E50A57; Wed, 1 Nov 2017 09:18:42 +0000 (UTC) (envelope-from dumbbell@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 AD1D0643D6; Wed, 1 Nov 2017 09:18:42 +0000 (UTC) (envelope-from dumbbell@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA19IfDe018444; Wed, 1 Nov 2017 09:18:41 GMT (envelope-from dumbbell@FreeBSD.org) Received: (from dumbbell@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA19IfSO018443; Wed, 1 Nov 2017 09:18:41 GMT (envelope-from dumbbell@FreeBSD.org) Message-Id: <201711010918.vA19IfSO018443@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dumbbell set sender to dumbbell@FreeBSD.org using -f From: =?UTF-8?Q?Jean-S=c3=a9bastien_P=c3=a9dron?= Date: Wed, 1 Nov 2017 09:18:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325269 - head/sys/dev/evdev X-SVN-Group: head X-SVN-Commit-Author: dumbbell X-SVN-Commit-Paths: head/sys/dev/evdev X-SVN-Commit-Revision: 325269 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: Wed, 01 Nov 2017 09:18:43 -0000 Author: dumbbell Date: Wed Nov 1 09:18:41 2017 New Revision: 325269 URL: https://svnweb.freebsd.org/changeset/base/325269 Log: evdev: Translate KEY_102ND in evdev_scancode2key() This is the extra key on 102/105-keys keyboards, located on the right of the Left Shift key. For instance on a French layout, this is the '<' key. This fixes an issue where the key fires no evdev event and thus remains inactive in an evdev/libinput-enabled X.Org server. The issue only occurred on an AT keyboard; the same key on a USB keyboard worked fine. PR: 222609 (only for reference) Approved by: wulf@ Differential Revision: https://reviews.freebsd.org/D12883 Modified: head/sys/dev/evdev/evdev_utils.c Modified: head/sys/dev/evdev/evdev_utils.c ============================================================================== --- head/sys/dev/evdev/evdev_utils.c Wed Nov 1 08:40:04 2017 (r325268) +++ head/sys/dev/evdev/evdev_utils.c Wed Nov 1 09:18:41 2017 (r325269) @@ -138,7 +138,7 @@ static uint16_t evdev_at_set1_scancodes[] = { KEY_KP8, KEY_KP9, KEY_KPMINUS, KEY_KP4, KEY_KP5, KEY_KP6, KEY_KPPLUS, KEY_KP1, KEY_KP2, KEY_KP3, KEY_KP0, KEY_KPDOT, - NONE, NONE, NONE, KEY_F11, + NONE, NONE, KEY_102ND, KEY_F11, KEY_F12, NONE, NONE, NONE, NONE, NONE, NONE, NONE, /* 0x60 - 0x7f */ From owner-svn-src-all@freebsd.org Wed Nov 1 08:44: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 A8998E4D8B8; Wed, 1 Nov 2017 08:44:17 +0000 (UTC) (envelope-from hps@selasky.org) Received: from mail.turbocat.net (turbocat.net [88.99.82.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3B1523CFF; Wed, 1 Nov 2017 08:44:17 +0000 (UTC) (envelope-from hps@selasky.org) Received: from hps2016.home.selasky.org (unknown [62.141.128.70]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.turbocat.net (Postfix) with ESMTPSA id C642B260100; Wed, 1 Nov 2017 09:44:08 +0100 (CET) Subject: Re: svn commit: r325266 - head/sys/kern To: Mateusz Guzik , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201711010645.vA16jf0E054903@repo.freebsd.org> From: Hans Petter Selasky Message-ID: <2c922b9b-cd6b-bb9a-00b8-97c137362769@selasky.org> Date: Wed, 1 Nov 2017 09:41:29 +0100 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <201711010645.vA16jf0E054903@repo.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit 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: Wed, 01 Nov 2017 08:44:17 -0000 On 11/01/17 07:45, Mateusz Guzik wrote: > +static u_long __read_mostly ncnegfactor = 12; /* ratio of negative entries */ > SYSCTL_ULONG(_vfs, OID_AUTO, ncnegfactor, CTLFLAG_RW, &ncnegfactor, 0, > "Ratio of negative namecache entries"); Should this SYSCTL entry use CTLFLAG_RWTUN ? --HPS From owner-svn-src-all@freebsd.org Wed Nov 1 10:32: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 8E19DE56F70; Wed, 1 Nov 2017 10:32:45 +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 679CE67968; Wed, 1 Nov 2017 10:32:45 +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 vA1AWiko051331; Wed, 1 Nov 2017 10:32:44 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA1AWi8A051327; Wed, 1 Nov 2017 10:32:44 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201711011032.vA1AWi8A051327@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Wed, 1 Nov 2017 10:32:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325270 - in head/sys: amd64/amd64 i386/i386 i386/isa X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: in head/sys: amd64/amd64 i386/i386 i386/isa X-SVN-Commit-Revision: 325270 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: Wed, 01 Nov 2017 10:32:45 -0000 Author: kib Date: Wed Nov 1 10:32:44 2017 New Revision: 325270 URL: https://svnweb.freebsd.org/changeset/base/325270 Log: Consistently ensure that we do not load MXCSR with reserved bits set. Some callers of fpusetregs()/npxsetregs(), most importantly set_fpcontext(), clear reserved bits. But some did not. Do the clearing in fpusetregs() and remove now redundand operation from set_fpcontext(). Reported by: Maxime Villard Sponsored by: The FreeBSD Foundation MFC after: 1 week Modified: head/sys/amd64/amd64/fpu.c head/sys/amd64/amd64/machdep.c head/sys/i386/i386/machdep.c head/sys/i386/isa/npx.c Modified: head/sys/amd64/amd64/fpu.c ============================================================================== --- head/sys/amd64/amd64/fpu.c Wed Nov 1 09:18:41 2017 (r325269) +++ head/sys/amd64/amd64/fpu.c Wed Nov 1 10:32:44 2017 (r325270) @@ -806,6 +806,7 @@ fpusetregs(struct thread *td, struct savefpu *addr, ch struct pcb *pcb; int error; + addr->sv_env.en_mxcsr &= cpu_mxcsr_mask; pcb = td->td_pcb; critical_enter(); if (td == PCPU_GET(fpcurthread) && PCB_USER_FPU(pcb)) { Modified: head/sys/amd64/amd64/machdep.c ============================================================================== --- head/sys/amd64/amd64/machdep.c Wed Nov 1 09:18:41 2017 (r325269) +++ head/sys/amd64/amd64/machdep.c Wed Nov 1 10:32:44 2017 (r325270) @@ -2238,7 +2238,6 @@ static int set_fpcontext(struct thread *td, mcontext_t *mcp, char *xfpustate, size_t xfpustate_len) { - struct savefpu *fpstate; int error; if (mcp->mc_fpformat == _MC_FPFMT_NODEV) @@ -2251,9 +2250,8 @@ set_fpcontext(struct thread *td, mcontext_t *mcp, char error = 0; } else if (mcp->mc_ownedfp == _MC_FPOWNED_FPU || mcp->mc_ownedfp == _MC_FPOWNED_PCB) { - fpstate = (struct savefpu *)&mcp->mc_fpstate; - fpstate->sv_env.en_mxcsr &= cpu_mxcsr_mask; - error = fpusetregs(td, fpstate, xfpustate, xfpustate_len); + error = fpusetregs(td, (struct savefpu *)&mcp->mc_fpstate, + xfpustate, xfpustate_len); } else return (EINVAL); return (error); Modified: head/sys/i386/i386/machdep.c ============================================================================== --- head/sys/i386/i386/machdep.c Wed Nov 1 09:18:41 2017 (r325269) +++ head/sys/i386/i386/machdep.c Wed Nov 1 10:32:44 2017 (r325270) @@ -2851,7 +2851,6 @@ static int set_fpcontext(struct thread *td, mcontext_t *mcp, char *xfpustate, size_t xfpustate_len) { - union savefpu *fpstate; int error; if (mcp->mc_fpformat == _MC_FPFMT_NODEV) @@ -2865,10 +2864,8 @@ set_fpcontext(struct thread *td, mcontext_t *mcp, char error = 0; } else if (mcp->mc_ownedfp == _MC_FPOWNED_FPU || mcp->mc_ownedfp == _MC_FPOWNED_PCB) { - fpstate = (union savefpu *)&mcp->mc_fpstate; - if (cpu_fxsr) - fpstate->sv_xmm.sv_env.en_mxcsr &= cpu_mxcsr_mask; - error = npxsetregs(td, fpstate, xfpustate, xfpustate_len); + error = npxsetregs(td, (union savefpu *)&mcp->mc_fpstate, + xfpustate, xfpustate_len); } else return (EINVAL); return (error); Modified: head/sys/i386/isa/npx.c ============================================================================== --- head/sys/i386/isa/npx.c Wed Nov 1 09:18:41 2017 (r325269) +++ head/sys/i386/isa/npx.c Wed Nov 1 10:32:44 2017 (r325270) @@ -1045,6 +1045,8 @@ npxsetregs(struct thread *td, union savefpu *addr, cha if (!hw_float) return (ENXIO); + if (cpu_fxsr) + addr->sv_xmm.sv_env.en_mxcsr &= cpu_mxcsr_mask; pcb = td->td_pcb; critical_enter(); if (td == PCPU_GET(fpcurthread) && PCB_USER_FPU(pcb)) { From owner-svn-src-all@freebsd.org Wed Nov 1 10:49:14 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 A27F6E5731F; Wed, 1 Nov 2017 10:49:14 +0000 (UTC) (envelope-from herbert@mailbox.org) Received: from mx1.mailbox.org (mx1.mailbox.org [80.241.60.212]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.mailbox.org", Issuer "SwissSign Server Silver CA 2014 - G22" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 34AC567E47; Wed, 1 Nov 2017 10:49:13 +0000 (UTC) (envelope-from herbert@mailbox.org) Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id 989EB46FFC; Wed, 1 Nov 2017 11:49:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mailbox.org; h= content-type:content-type:mime-version:references:in-reply-to :subject:subject:from:from:message-id:date:date:received; s= mail20150812; t=1509533336; bh=YqEKgqu+L4NqtPhWqVC8+IdWXPNMvg0Wu Ap1ijbdtjg=; b=lcg1ehq1qE/8eyXx1LiiHiUpwWGFbXLkDmxnBfx8EddkpxxjG xCQ+ztrJCH046ZWXA5NtSNQdTtNGeQKmOq0TNV5ylgDg6bQRTm8b10d11B2vPqbl BsfBKTjyhHqNZRLCvau5C/BAjzbeD7nbslhSmyZJI/FtHipGBts/mY4Axz1OIpub Y0PNdynwGVUYIbuuJI/2BsAORjCr++f4IEUO8BxxhzRSlgB+ezQkDR3JG2Y++ZhL EgnNkFxrFJoDP/yp+4IsmueDvAlsSkUIwEnSVXKjRP3AqoL++YCP+RmSGVlPxKuj fBTxbaC8QGZ4jXzkjKTpSypdKlyQqEP+ql6Jw== X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter01.heinlein-hosting.de (spamfilter01.heinlein-hosting.de [80.241.56.115]) (amavisd-new, port 10030) with ESMTP id NBvjeHaDQotd; Wed, 1 Nov 2017 11:48:56 +0100 (CET) Date: Wed, 01 Nov 2017 11:48:54 +0100 Message-ID: <87h8uexoix.wl-herbert@mailbox.org> From: "Herbert J. Skuhra" To: Mariusz Zaborski Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org 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... In-Reply-To: <201710281923.v9SJNvE5021346@repo.freebsd.org> References: <201710281923.v9SJNvE5021346@repo.freebsd.org> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") 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: Wed, 01 Nov 2017 10:49:14 -0000 On Sat, 28 Oct 2017 21:23:57 +0200, 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 additional > libraries. Unfortunately there are also some disadvantages for example it is > easy to get library out of sync between two versions of functions or that 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 simplify > capsicumizing programs. This also doesn't close us any other ways to do those > mocks and this should evolve in time. > > Discussed with: pjd, emaste, ed, rwatson, bapt, cem, bdrewery > Differential Revision: https://reviews.freebsd.org/D8753 Again, after this commit libcasper.so.0 is installed to /usr/lib and not /lib: % ls -l /usr/lib/libcasper.so* lrwxr-xr-x 1 root wheel 14 Oct 29 10:51 /usr/lib/libcasper.so -> libcasper.so.0 -r--r--r-- 1 root wheel 22424 Oct 29 10:51 /usr/lib/libcasper.so.0 But usr/lib/libcasper.so.0 is listed in ObsoleteFiles.inc: % grep -B 2 libcasper.so /usr/src/ObsoleteFiles.inc # 20131202: libcapsicum and libcasper moved to /lib/ OLD_LIBS+=usr/lib/libcapsicum.so.0 OLD_LIBS+=usr/lib/libcasper.so.0 Thanks. -- Herbert From owner-svn-src-all@freebsd.org Wed Nov 1 10:49: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 4D3AAE57386; Wed, 1 Nov 2017 10:49:42 +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 1CD706809F; Wed, 1 Nov 2017 10:49:42 +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 vA1AnfgC055765; Wed, 1 Nov 2017 10:49:41 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA1AnfEJ055764; Wed, 1 Nov 2017 10:49:41 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201711011049.vA1AnfEJ055764@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Wed, 1 Nov 2017 10:49:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325271 - head/sys/dev/hwpmc X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/sys/dev/hwpmc X-SVN-Commit-Revision: 325271 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: Wed, 01 Nov 2017 10:49:42 -0000 Author: kib Date: Wed Nov 1 10:49:41 2017 New Revision: 325271 URL: https://svnweb.freebsd.org/changeset/base/325271 Log: Use designated initializers for pmc sysent and module data. Reviewed by: markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week X-Differential revision: https://reviews.freebsd.org/D12882 Modified: head/sys/dev/hwpmc/hwpmc_mod.c Modified: head/sys/dev/hwpmc/hwpmc_mod.c ============================================================================== --- head/sys/dev/hwpmc/hwpmc_mod.c Wed Nov 1 10:32:44 2017 (r325270) +++ head/sys/dev/hwpmc/hwpmc_mod.c Wed Nov 1 10:49:41 2017 (r325271) @@ -311,27 +311,23 @@ SYSCTL_INT(_security_bsd, OID_AUTO, unprivileged_syspm /* The `sysent' for the new syscall */ static struct sysent pmc_sysent = { - 2, /* sy_narg */ - pmc_syscall_handler /* sy_call */ + .sy_narg = 2, + .sy_call = pmc_syscall_handler, }; static struct syscall_module_data pmc_syscall_mod = { - load, - NULL, - &pmc_syscall_num, - &pmc_sysent, -#if (__FreeBSD_version >= 1100000) - { 0, NULL }, - SY_THR_STATIC_KLD, -#else - { 0, NULL } -#endif + .chainevh = load, + .chainarg = NULL, + .offset = &pmc_syscall_num, + .new_sysent = &pmc_sysent, + .old_sysent = { .sy_narg = 0, .sy_call = NULL }, + .flags = SY_THR_STATIC_KLD, }; static moduledata_t pmc_mod = { - PMC_MODULE_NAME, - syscall_module_handler, - &pmc_syscall_mod + .name = PMC_MODULE_NAME, + .evhand = syscall_module_handler, + .priv = &pmc_syscall_mod, }; #ifdef EARLY_AP_STARTUP From owner-svn-src-all@freebsd.org Wed Nov 1 10:53:12 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 1191AE575C5; Wed, 1 Nov 2017 10:53:12 +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 D58C56855E; Wed, 1 Nov 2017 10:53:11 +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 vA1ArA2H059660; Wed, 1 Nov 2017 10:53:10 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA1ArAw8059659; Wed, 1 Nov 2017 10:53:10 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201711011053.vA1ArAw8059659@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Wed, 1 Nov 2017 10:53:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325272 - head/sys/geom X-SVN-Group: head X-SVN-Commit-Author: avg X-SVN-Commit-Paths: head/sys/geom X-SVN-Commit-Revision: 325272 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: Wed, 01 Nov 2017 10:53:12 -0000 Author: avg Date: Wed Nov 1 10:53:10 2017 New Revision: 325272 URL: https://svnweb.freebsd.org/changeset/base/325272 Log: geom_slice: fix r325227, protect against multiple calls to g_slice_free This geom does not immediately detach its consumer relying on the wither-washer to do that. Since that happens asynchronously we may get additional spoiling events. So, we need to account for that. There are multiple options for fixing this issue like detaching immediately or checking for G_CF_ORPHAN in g_slice_spoiled(). The most reliable and least intrusive fix seems to be setting geom->softc to NULL on the first call and checking for NULL on subsequent calls. This is something that the code did before r325227. Reported by: David Wolfskill , O. Hartmann Tested by: David Wolfskill (earlier version) Discussed with: mav MFC after: 1 week X-MFC with: r325227 Modified: head/sys/geom/geom_slice.c Modified: head/sys/geom/geom_slice.c ============================================================================== --- head/sys/geom/geom_slice.c Wed Nov 1 10:49:41 2017 (r325271) +++ head/sys/geom/geom_slice.c Wed Nov 1 10:53:10 2017 (r325272) @@ -71,10 +71,19 @@ g_slice_alloc(unsigned nslice, unsigned scsize) } static void -g_slice_free(struct g_slicer *gsp) +g_slice_free(struct g_geom *gp) { + struct g_slicer *gsp; - if (gsp == NULL) /* XXX: phk thinks about this */ + gsp = gp->softc; + gp->softc = NULL; + + /* + * We can get multiple spoiled events before wither-washer + * detaches our consumer, so this can get called multiple + * times. + */ + if (gsp == NULL) return; g_free(gsp->slices); if (gsp->hotspot != NULL) @@ -133,7 +142,7 @@ g_slice_access(struct g_provider *pp, int dr, int dw, */ if (error == 0 && (gp->flags & G_GEOM_WITHER) != 0 && (cp->acr + cp->acw + cp->ace) == 0) - g_slice_free(gsp); + g_slice_free(gp); return (error); } @@ -492,7 +501,7 @@ g_slice_orphan(struct g_consumer *cp) * otherwise g_slice_access() will do that after the last close. */ if ((cp->acr + cp->acw + cp->ace) == 0) - g_slice_free(gp->softc); + g_slice_free(gp); } void From owner-svn-src-all@freebsd.org Wed Nov 1 11:05: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 8F2E8E5798F; Wed, 1 Nov 2017 11:05:48 +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 5CCDD68B39; Wed, 1 Nov 2017 11:05:48 +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 vA1B5l4P063935; Wed, 1 Nov 2017 11:05:47 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA1B5luP063934; Wed, 1 Nov 2017 11:05:47 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201711011105.vA1B5luP063934@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Wed, 1 Nov 2017 11:05:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325273 - head/sys/dev/hwpmc X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/sys/dev/hwpmc X-SVN-Commit-Revision: 325273 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: Wed, 01 Nov 2017 11:05:48 -0000 Author: kib Date: Wed Nov 1 11:05:47 2017 New Revision: 325273 URL: https://svnweb.freebsd.org/changeset/base/325273 Log: Minor style tweaks. Sponsored by: The FreeBSD Foundation MFC after: 1 week X-Differential revision: https://reviews.freebsd.org/D12882 Modified: head/sys/dev/hwpmc/hwpmc_mod.c Modified: head/sys/dev/hwpmc/hwpmc_mod.c ============================================================================== --- head/sys/dev/hwpmc/hwpmc_mod.c Wed Nov 1 10:53:10 2017 (r325272) +++ head/sys/dev/hwpmc/hwpmc_mod.c Wed Nov 1 11:05:47 2017 (r325273) @@ -2876,8 +2876,7 @@ pmc_syscall_handler(struct thread *td, void *syscall_a error = 0; atomic_add_int(&pmc_stats.pm_syscalls, 1); - switch(op) - { + switch (op) { /* @@ -4037,7 +4036,7 @@ pmc_syscall_handler(struct thread *td, void *syscall_a PICKUP_GIANT(); - return error; + return (error); } /* From owner-svn-src-all@freebsd.org Wed Nov 1 11:16:19 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 853BCE57F2A; Wed, 1 Nov 2017 11:16:19 +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 5303469676; Wed, 1 Nov 2017 11:16:19 +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 vA1BGIEg068053; Wed, 1 Nov 2017 11:16:18 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA1BGIiV068052; Wed, 1 Nov 2017 11:16:18 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201711011116.vA1BGIiV068052@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Wed, 1 Nov 2017 11:16:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325274 - head/sys/dev/hwpmc X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/sys/dev/hwpmc X-SVN-Commit-Revision: 325274 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: Wed, 01 Nov 2017 11:16:19 -0000 Author: kib Date: Wed Nov 1 11:16:18 2017 New Revision: 325274 URL: https://svnweb.freebsd.org/changeset/base/325274 Log: There is no use for dropping Giant in the pmc syscall. Reviewed by: markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week X-Differential revision: https://reviews.freebsd.org/D12882 Modified: head/sys/dev/hwpmc/hwpmc_mod.c Modified: head/sys/dev/hwpmc/hwpmc_mod.c ============================================================================== --- head/sys/dev/hwpmc/hwpmc_mod.c Wed Nov 1 11:05:47 2017 (r325273) +++ head/sys/dev/hwpmc/hwpmc_mod.c Wed Nov 1 11:16:18 2017 (r325274) @@ -2860,8 +2860,6 @@ pmc_syscall_handler(struct thread *td, void *syscall_a PMC_GET_SX_XLOCK(ENOSYS); - DROP_GIANT(); - is_sx_downgraded = 0; is_sx_locked = 1; @@ -4033,8 +4031,6 @@ pmc_syscall_handler(struct thread *td, void *syscall_a if (error) atomic_add_int(&pmc_stats.pm_syscall_errors, 1); - - PICKUP_GIANT(); return (error); } From owner-svn-src-all@freebsd.org Wed Nov 1 11:32: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 BC604E588DA; Wed, 1 Nov 2017 11:32:53 +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 960DC6A4C1; Wed, 1 Nov 2017 11:32:53 +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 vA1BWqoS076475; Wed, 1 Nov 2017 11:32:52 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA1BWqOc076474; Wed, 1 Nov 2017 11:32:52 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201711011132.vA1BWqOc076474@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Wed, 1 Nov 2017 11:32:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325275 - head/sys/dev/hwpmc X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/sys/dev/hwpmc X-SVN-Commit-Revision: 325275 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: Wed, 01 Nov 2017 11:32:53 -0000 Author: kib Date: Wed Nov 1 11:32:52 2017 New Revision: 325275 URL: https://svnweb.freebsd.org/changeset/base/325275 Log: In hwpmc, do not double-close the logging file. hwpmc(4) must not voluntarily call fo_close(), doing this causes double-close of the file. It seems to almost avoid bad consequences for pipes, but other types of files demonstrate random memory access. To fix, remove fo_close() calls, which also do not provide the declared wake-up of waiters consistently. Instead, send a signal to the logger and configure the logger process to not block it. Since logger never returns to userspace, the signal only causes termination of the interruptible sleeps in fo_write(). Reported and tested by: pho Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week X-Differential revision: https://reviews.freebsd.org/D12882 Modified: head/sys/dev/hwpmc/hwpmc_logging.c Modified: head/sys/dev/hwpmc/hwpmc_logging.c ============================================================================== --- head/sys/dev/hwpmc/hwpmc_logging.c Wed Nov 1 11:16:18 2017 (r325274) +++ head/sys/dev/hwpmc/hwpmc_logging.c Wed Nov 1 11:32:52 2017 (r325275) @@ -49,6 +49,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -250,6 +251,7 @@ pmclog_loop(void *arg) struct ucred *ownercred; struct ucred *mycred; struct thread *td; + sigset_t unb; struct uio auio; struct iovec aiov; size_t nbytes; @@ -257,6 +259,11 @@ pmclog_loop(void *arg) po = (struct pmc_owner *) arg; p = po->po_owner; td = curthread; + + SIGEMPTYSET(unb); + SIGADDSET(unb, SIGHUP); + (void)kern_sigprocmask(td, SIG_UNBLOCK, &unb, NULL, 0); + mycred = td->td_ucred; PROC_LOCK(p); @@ -291,16 +298,8 @@ pmclog_loop(void *arg) mtx_unlock_spin(&po->po_mtx); /* No more buffers and shutdown required. */ - if (po->po_flags & PMC_PO_SHUTDOWN) { - mtx_unlock(&pmc_kthread_mtx); - /* - * Close the file to get PMCLOG_EOF - * error in pmclog(3). - */ - fo_close(po->po_file, curthread); - mtx_lock(&pmc_kthread_mtx); + if (po->po_flags & PMC_PO_SHUTDOWN) break; - } (void) msleep(po, &pmc_kthread_mtx, PWAIT, "pmcloop", 0); @@ -541,19 +540,16 @@ pmclog_schedule_io(struct pmc_owner *po) static void pmclog_stop_kthread(struct pmc_owner *po) { - /* - * Close the file to force the thread out of fo_write, - * unset flag, wakeup the helper thread, - * wait for it to exit - */ - if (po->po_file != NULL) - fo_close(po->po_file, curthread); - mtx_lock(&pmc_kthread_mtx); po->po_flags &= ~PMC_PO_OWNS_LOGFILE; + if (po->po_kthread != NULL) { + PROC_LOCK(po->po_kthread); + kern_psignal(po->po_kthread, SIGHUP); + PROC_UNLOCK(po->po_kthread); + } wakeup_one(po); - if (po->po_kthread) + while (po->po_kthread) msleep(po->po_kthread, &pmc_kthread_mtx, PPAUSE, "pmckstp", 0); mtx_unlock(&pmc_kthread_mtx); } From owner-svn-src-all@freebsd.org Wed Nov 1 11:37: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 7C698E589AE; Wed, 1 Nov 2017 11:37:46 +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 4BEE06A743; Wed, 1 Nov 2017 11:37:46 +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 vA1BbjjD076807; Wed, 1 Nov 2017 11:37:45 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA1BbjK1076806; Wed, 1 Nov 2017 11:37:45 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201711011137.vA1BbjK1076806@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Wed, 1 Nov 2017 11:37:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325276 - head/sys/dev/hwpmc X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/sys/dev/hwpmc X-SVN-Commit-Revision: 325276 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: Wed, 01 Nov 2017 11:37:46 -0000 Author: kib Date: Wed Nov 1 11:37:45 2017 New Revision: 325276 URL: https://svnweb.freebsd.org/changeset/base/325276 Log: Be protective and check the po_file validity before dropping the ref. Reported and tested by: pho Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week X-Differential revision: https://reviews.freebsd.org/D12882 Modified: head/sys/dev/hwpmc/hwpmc_logging.c Modified: head/sys/dev/hwpmc/hwpmc_logging.c ============================================================================== --- head/sys/dev/hwpmc/hwpmc_logging.c Wed Nov 1 11:32:52 2017 (r325275) +++ head/sys/dev/hwpmc/hwpmc_logging.c Wed Nov 1 11:37:45 2017 (r325276) @@ -681,8 +681,11 @@ pmclog_deconfigure_log(struct pmc_owner *po) } /* drop a reference to the fd */ - error = fdrop(po->po_file, curthread); - po->po_file = NULL; + if (po->po_file != NULL) { + error = fdrop(po->po_file, curthread); + po->po_file = NULL; + } else + error = 0; po->po_error = 0; return (error); From owner-svn-src-all@freebsd.org Wed Nov 1 11:43: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 B47D7E58C94; Wed, 1 Nov 2017 11:43:40 +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 8E91B6AD95; Wed, 1 Nov 2017 11:43:40 +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 vA1BhdwY081101; Wed, 1 Nov 2017 11:43:39 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA1BhdPn081098; Wed, 1 Nov 2017 11:43:39 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201711011143.vA1BhdPn081098@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Wed, 1 Nov 2017 11:43:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325277 - in head/sys: dev/hwpmc sys X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: in head/sys: dev/hwpmc sys X-SVN-Commit-Revision: 325277 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: Wed, 01 Nov 2017 11:43:40 -0000 Author: kib Date: Wed Nov 1 11:43:39 2017 New Revision: 325277 URL: https://svnweb.freebsd.org/changeset/base/325277 Log: Do not run pmclog_configure_log() without pmc_sx protection. The r195005 unlocked pmc_sx before calling into pmclog_configure_log() to avoid the LOR, but it allows flush or closelog to run in parallel with the configuration, causing many failure modes. Revert r195005. Pre-create the logging process, allowing it to run after the set up succeeded, otherwise the process terminates itself. Reported and tested by: pho Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D12882 Modified: head/sys/dev/hwpmc/hwpmc_logging.c head/sys/dev/hwpmc/hwpmc_mod.c head/sys/sys/pmclog.h Modified: head/sys/dev/hwpmc/hwpmc_logging.c ============================================================================== --- head/sys/dev/hwpmc/hwpmc_logging.c Wed Nov 1 11:37:45 2017 (r325276) +++ head/sys/dev/hwpmc/hwpmc_logging.c Wed Nov 1 11:43:39 2017 (r325277) @@ -235,6 +235,54 @@ pmclog_get_buffer(struct pmc_owner *po) return (plb ? 0 : ENOMEM); } +struct pmclog_proc_init_args { + struct proc *kthr; + struct pmc_owner *po; + bool exit; + bool acted; +}; + +int +pmclog_proc_create(struct thread *td, void **handlep) +{ + struct pmclog_proc_init_args *ia; + int error; + + ia = malloc(sizeof(*ia), M_TEMP, M_WAITOK | M_ZERO); + error = kproc_create(pmclog_loop, ia, &ia->kthr, + RFHIGHPID, 0, "hwpmc: proc(%d)", td->td_proc->p_pid); + if (error == 0) + *handlep = ia; + return (error); +} + +void +pmclog_proc_ignite(void *handle, struct pmc_owner *po) +{ + struct pmclog_proc_init_args *ia; + + ia = handle; + mtx_lock(&pmc_kthread_mtx); + MPASS(!ia->acted); + MPASS(ia->po == NULL); + MPASS(!ia->exit); + MPASS(ia->kthr != NULL); + if (po == NULL) { + ia->exit = true; + } else { + ia->po = po; + KASSERT(po->po_kthread == NULL, + ("[pmclog,%d] po=%p kthread (%p) already present", + __LINE__, po, po->po_kthread)); + po->po_kthread = ia->kthr; + } + wakeup(ia); + while (!ia->acted) + msleep(ia, &pmc_kthread_mtx, PWAIT, "pmclogw", 0); + mtx_unlock(&pmc_kthread_mtx); + free(ia, M_TEMP); +} + /* * Log handler loop. * @@ -244,7 +292,7 @@ pmclog_get_buffer(struct pmc_owner *po) static void pmclog_loop(void *arg) { - int error; + struct pmclog_proc_init_args *ia; struct pmc_owner *po; struct pmclog_buffer *lb; struct proc *p; @@ -255,15 +303,34 @@ pmclog_loop(void *arg) struct uio auio; struct iovec aiov; size_t nbytes; + int error; - po = (struct pmc_owner *) arg; - p = po->po_owner; td = curthread; SIGEMPTYSET(unb); SIGADDSET(unb, SIGHUP); (void)kern_sigprocmask(td, SIG_UNBLOCK, &unb, NULL, 0); + ia = arg; + MPASS(ia->kthr == curproc); + MPASS(!ia->acted); + mtx_lock(&pmc_kthread_mtx); + while (ia->po == NULL && !ia->exit) + msleep(ia, &pmc_kthread_mtx, PWAIT, "pmclogi", 0); + if (ia->exit) { + ia->acted = true; + wakeup(ia); + mtx_unlock(&pmc_kthread_mtx); + kproc_exit(0); + } + MPASS(ia->po != NULL); + po = ia->po; + ia->acted = true; + wakeup(ia); + mtx_unlock(&pmc_kthread_mtx); + ia = NULL; + + p = po->po_owner; mycred = td->td_ucred; PROC_LOCK(p); @@ -568,15 +635,11 @@ pmclog_stop_kthread(struct pmc_owner *po) int pmclog_configure_log(struct pmc_mdep *md, struct pmc_owner *po, int logfd) { - int error; struct proc *p; cap_rights_t rights; - /* - * As long as it is possible to get a LOR between pmc_sx lock and - * proctree/allproc sx locks used for adding a new process, assure - * the former is not held here. - */ - sx_assert(&pmc_sx, SA_UNLOCKED); + int error; + + sx_assert(&pmc_sx, SA_XLOCKED); PMCDBG2(LOG,CFG,1, "config po=%p logfd=%d", po, logfd); p = po->po_owner; @@ -585,9 +648,6 @@ pmclog_configure_log(struct pmc_mdep *md, struct pmc_o if (po->po_flags & PMC_PO_OWNS_LOGFILE) return (EBUSY); - KASSERT(po->po_kthread == NULL, - ("[pmclog,%d] po=%p kthread (%p) already present", __LINE__, po, - po->po_kthread)); KASSERT(po->po_file == NULL, ("[pmclog,%d] po=%p file (%p) already present", __LINE__, po, po->po_file)); @@ -600,10 +660,6 @@ pmclog_configure_log(struct pmc_mdep *md, struct pmc_o /* mark process as owning a log file */ po->po_flags |= PMC_PO_OWNS_LOGFILE; - error = kproc_create(pmclog_loop, po, &po->po_kthread, - RFHIGHPID, 0, "hwpmc: proc(%d)", p->p_pid); - if (error) - goto error; /* mark process as using HWPMCs */ PROC_LOCK(p); @@ -620,10 +676,6 @@ pmclog_configure_log(struct pmc_mdep *md, struct pmc_o return (0); error: - /* shutdown the thread */ - if (po->po_kthread) - pmclog_stop_kthread(po); - KASSERT(po->po_kthread == NULL, ("[pmclog,%d] po=%p kthread not " "stopped", __LINE__, po)); Modified: head/sys/dev/hwpmc/hwpmc_mod.c ============================================================================== --- head/sys/dev/hwpmc/hwpmc_mod.c Wed Nov 1 11:37:45 2017 (r325276) +++ head/sys/dev/hwpmc/hwpmc_mod.c Wed Nov 1 11:43:39 2017 (r325277) @@ -2854,20 +2854,31 @@ static const char *pmc_op_to_name[] = { static int pmc_syscall_handler(struct thread *td, void *syscall_args) { - int error, is_sx_downgraded, is_sx_locked, op; + int error, is_sx_downgraded, op; struct pmc_syscall_args *c; + void *pmclog_proc_handle; void *arg; - PMC_GET_SX_XLOCK(ENOSYS); - - is_sx_downgraded = 0; - is_sx_locked = 1; - - c = (struct pmc_syscall_args *) syscall_args; - + c = (struct pmc_syscall_args *)syscall_args; op = c->pmop_code; arg = c->pmop_data; + if (op == PMC_OP_CONFIGURELOG) { + /* + * We cannot create the logging process inside + * pmclog_configure_log() because there is a LOR + * between pmc_sx and process structure locks. + * Instead, pre-create the process and ignite the loop + * if everything is fine, otherwise direct the process + * to exit. + */ + error = pmclog_proc_create(td, &pmclog_proc_handle); + if (error != 0) + goto done_syscall; + } + PMC_GET_SX_XLOCK(ENOSYS); + is_sx_downgraded = 0; + PMCDBG3(MOD,PMS,1, "syscall op=%d \"%s\" arg=%p", op, pmc_op_to_name[op], arg); @@ -2890,15 +2901,16 @@ pmc_syscall_handler(struct thread *td, void *syscall_a struct pmc_owner *po; struct pmc_op_configurelog cl; - sx_assert(&pmc_sx, SX_XLOCKED); - - if ((error = copyin(arg, &cl, sizeof(cl))) != 0) + if ((error = copyin(arg, &cl, sizeof(cl))) != 0) { + pmclog_proc_ignite(pmclog_proc_handle, NULL); break; + } /* mark this process as owning a log file */ p = td->td_proc; if ((po = pmc_find_owner_descriptor(p)) == NULL) if ((po = pmc_allocate_owner_descriptor(p)) == NULL) { + pmclog_proc_ignite(pmclog_proc_handle, NULL); error = ENOMEM; break; } @@ -2910,10 +2922,11 @@ pmc_syscall_handler(struct thread *td, void *syscall_a * de-configure it. */ if (cl.pm_logfd >= 0) { - sx_xunlock(&pmc_sx); - is_sx_locked = 0; error = pmclog_configure_log(md, po, cl.pm_logfd); + pmclog_proc_ignite(pmclog_proc_handle, error == 0 ? + po : NULL); } else if (po->po_flags & PMC_PO_OWNS_LOGFILE) { + pmclog_proc_ignite(pmclog_proc_handle, NULL); pmclog_process_closelog(po); error = pmclog_close(po); if (error == 0) { @@ -2923,11 +2936,10 @@ pmc_syscall_handler(struct thread *td, void *syscall_a pmc_stop(pm); error = pmclog_deconfigure_log(po); } - } else + } else { + pmclog_proc_ignite(pmclog_proc_handle, NULL); error = EINVAL; - - if (error) - break; + } } break; @@ -4022,13 +4034,11 @@ pmc_syscall_handler(struct thread *td, void *syscall_a break; } - if (is_sx_locked != 0) { - if (is_sx_downgraded) - sx_sunlock(&pmc_sx); - else - sx_xunlock(&pmc_sx); - } - + if (is_sx_downgraded) + sx_sunlock(&pmc_sx); + else + sx_xunlock(&pmc_sx); +done_syscall: if (error) atomic_add_int(&pmc_stats.pm_syscall_errors, 1); Modified: head/sys/sys/pmclog.h ============================================================================== --- head/sys/sys/pmclog.h Wed Nov 1 11:37:45 2017 (r325276) +++ head/sys/sys/pmclog.h Wed Nov 1 11:43:39 2017 (r325277) @@ -260,6 +260,8 @@ int pmclog_deconfigure_log(struct pmc_owner *_po); int pmclog_flush(struct pmc_owner *_po); int pmclog_close(struct pmc_owner *_po); void pmclog_initialize(void); +int pmclog_proc_create(struct thread *td, void **handlep); +void pmclog_proc_ignite(void *handle, struct pmc_owner *po); void pmclog_process_callchain(struct pmc *_pm, struct pmc_sample *_ps); void pmclog_process_closelog(struct pmc_owner *po); void pmclog_process_dropnotify(struct pmc_owner *po); From owner-svn-src-all@freebsd.org Wed Nov 1 12:21: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 43558E59F27; Wed, 1 Nov 2017 12:21:30 +0000 (UTC) (envelope-from hselasky@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 1070A6C26F; Wed, 1 Nov 2017 12:21:29 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA1CLTh7097162; Wed, 1 Nov 2017 12:21:29 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA1CLTTD097161; Wed, 1 Nov 2017 12:21:29 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201711011221.vA1CLTTD097161@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Wed, 1 Nov 2017 12:21:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325278 - head/sys/compat/linuxkpi/common/include/linux X-SVN-Group: head X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: head/sys/compat/linuxkpi/common/include/linux X-SVN-Commit-Revision: 325278 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: Wed, 01 Nov 2017 12:21:30 -0000 Author: hselasky Date: Wed Nov 1 12:21:28 2017 New Revision: 325278 URL: https://svnweb.freebsd.org/changeset/base/325278 Log: Unconditionally include "opt_inet6.h" in the LinuxKPI. This makes sure the INET6 macro gets properly defined, also for kernel module builds. MFC after: 1 week Sponsored by: Mellanox Technologies Modified: head/sys/compat/linuxkpi/common/include/linux/in6.h Modified: head/sys/compat/linuxkpi/common/include/linux/in6.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/in6.h Wed Nov 1 11:43:39 2017 (r325277) +++ head/sys/compat/linuxkpi/common/include/linux/in6.h Wed Nov 1 12:21:28 2017 (r325278) @@ -31,8 +31,6 @@ #ifndef _LINUX_IN6_H_ #define _LINUX_IN6_H_ -#ifndef KLD_MODULE #include "opt_inet6.h" -#endif #endif /* _LINUX_IN6_H_ */ From owner-svn-src-all@freebsd.org Wed Nov 1 12:34:19 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 733AEE5A95F; Wed, 1 Nov 2017 12:34:19 +0000 (UTC) (envelope-from hselasky@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 4235B6CBBC; Wed, 1 Nov 2017 12:34:19 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA1CYIXH002258; Wed, 1 Nov 2017 12:34:18 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA1CYIwJ002257; Wed, 1 Nov 2017 12:34:18 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201711011234.vA1CYIwJ002257@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Wed, 1 Nov 2017 12:34:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325279 - head/sys/compat/linuxkpi/common/include/linux X-SVN-Group: head X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: head/sys/compat/linuxkpi/common/include/linux X-SVN-Commit-Revision: 325279 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: Wed, 01 Nov 2017 12:34:19 -0000 Author: hselasky Date: Wed Nov 1 12:34:18 2017 New Revision: 325279 URL: https://svnweb.freebsd.org/changeset/base/325279 Log: Implement ioread16be() in the LinuxKPI. MFC after: 1 week Sponsored by: Mellanox Technologies Modified: head/sys/compat/linuxkpi/common/include/linux/io.h Modified: head/sys/compat/linuxkpi/common/include/linux/io.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/io.h Wed Nov 1 12:21:28 2017 (r325278) +++ head/sys/compat/linuxkpi/common/include/linux/io.h Wed Nov 1 12:34:18 2017 (r325279) @@ -109,6 +109,13 @@ ioread16(const volatile void *addr) return *(const volatile uint16_t *)addr; } +#undef ioread16be +static inline uint16_t +ioread16be(const volatile void *addr) +{ + return be16toh(*(const volatile uint16_t *)addr); +} + #undef ioread32 static inline uint32_t ioread32(const volatile void *addr) From owner-svn-src-all@freebsd.org Wed Nov 1 13:50:36 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 BDDEFE5C6F9; Wed, 1 Nov 2017 13:50:36 +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 89DDC6F765; Wed, 1 Nov 2017 13:50:36 +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 vA1DoZI6033509; Wed, 1 Nov 2017 13:50:35 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA1DoZ0w033508; Wed, 1 Nov 2017 13:50:35 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201711011350.vA1DoZ0w033508@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Wed, 1 Nov 2017 13:50:35 +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: r325281 - stable/11/sys/ufs/ffs X-SVN-Group: stable-11 X-SVN-Commit-Author: markj X-SVN-Commit-Paths: stable/11/sys/ufs/ffs X-SVN-Commit-Revision: 325281 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: Wed, 01 Nov 2017 13:50:36 -0000 Author: markj Date: Wed Nov 1 13:50:35 2017 New Revision: 325281 URL: https://svnweb.freebsd.org/changeset/base/325281 Log: MFC r324992: Make drain_output() use bufobj_wwait(). Modified: stable/11/sys/ufs/ffs/ffs_softdep.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/ufs/ffs/ffs_softdep.c ============================================================================== --- stable/11/sys/ufs/ffs/ffs_softdep.c Wed Nov 1 13:04:54 2017 (r325280) +++ stable/11/sys/ufs/ffs/ffs_softdep.c Wed Nov 1 13:50:35 2017 (r325281) @@ -14281,25 +14281,14 @@ softdep_get_depcounts(struct mount *mp, /* * Wait for pending output on a vnode to complete. - * Must be called with vnode lock and interlock locked. - * - * XXX: Should just be a call to bufobj_wwait(). */ static void drain_output(vp) struct vnode *vp; { - struct bufobj *bo; - bo = &vp->v_bufobj; ASSERT_VOP_LOCKED(vp, "drain_output"); - ASSERT_BO_WLOCKED(bo); - - while (bo->bo_numoutput) { - bo->bo_flag |= BO_WWAIT; - msleep((caddr_t)&bo->bo_numoutput, - BO_LOCKPTR(bo), PRIBIO + 1, "drainvp", 0); - } + (void)bufobj_wwait(&vp->v_bufobj, 0, 0); } /* From owner-svn-src-all@freebsd.org Wed Nov 1 13:54: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 80D29E5C8F6; Wed, 1 Nov 2017 13:54:17 +0000 (UTC) (envelope-from kp@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 4F75A6FB3A; Wed, 1 Nov 2017 13:54:17 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA1DsGFj037264; Wed, 1 Nov 2017 13:54:16 GMT (envelope-from kp@FreeBSD.org) Received: (from kp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA1DsGat037263; Wed, 1 Nov 2017 13:54:16 GMT (envelope-from kp@FreeBSD.org) Message-Id: <201711011354.vA1DsGat037263@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kp set sender to kp@FreeBSD.org using -f From: Kristof Provost Date: Wed, 1 Nov 2017 13:54:16 +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: r325282 - stable/11/sys/netinet6 X-SVN-Group: stable-11 X-SVN-Commit-Author: kp X-SVN-Commit-Paths: stable/11/sys/netinet6 X-SVN-Commit-Revision: 325282 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: Wed, 01 Nov 2017 13:54:17 -0000 Author: kp Date: Wed Nov 1 13:54:16 2017 New Revision: 325282 URL: https://svnweb.freebsd.org/changeset/base/325282 Log: MFC r324996: Evaluate packet size after the firewall had its chance in the ip6 fast path Defer the packet size check until after the firewall has had a look at it. This means that the firewall now has the opportunity to (re-)fragment an oversized packet. This mirrors what the slow path does. Modified: stable/11/sys/netinet6/ip6_fastfwd.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/netinet6/ip6_fastfwd.c ============================================================================== --- stable/11/sys/netinet6/ip6_fastfwd.c Wed Nov 1 13:50:35 2017 (r325281) +++ stable/11/sys/netinet6/ip6_fastfwd.c Wed Nov 1 13:54:16 2017 (r325282) @@ -194,7 +194,17 @@ passin: in6_ifstat_inc(rcvif, ifs6_in_noroute); goto dropin; } + /* + * Outgoing packet firewall processing. + */ + if (!PFIL_HOOKED(&V_inet6_pfil_hook)) + goto passout; + if (pfil_run_hooks(&V_inet6_pfil_hook, &m, nh.nh_ifp, PFIL_OUT, + NULL) != 0 || m == NULL) + goto dropout; + + /* * We used slow path processing for packets with scoped addresses. * So, scope checks aren't needed here. */ @@ -205,14 +215,6 @@ passin: goto dropout; } - /* - * Outgoing packet firewall processing. - */ - if (!PFIL_HOOKED(&V_inet6_pfil_hook)) - goto passout; - if (pfil_run_hooks(&V_inet6_pfil_hook, &m, nh.nh_ifp, PFIL_OUT, - NULL) != 0 || m == NULL) - goto dropout; /* * If packet filter sets the M_FASTFWD_OURS flag, this means * that new destination or next hop is our local address. From owner-svn-src-all@freebsd.org Wed Nov 1 14: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 A35B3E5D113; Wed, 1 Nov 2017 14:27:27 +0000 (UTC) (envelope-from kp@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 72A267090F; Wed, 1 Nov 2017 14:27:27 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA1ERQjW050051; Wed, 1 Nov 2017 14:27:26 GMT (envelope-from kp@FreeBSD.org) Received: (from kp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA1ERQTp050050; Wed, 1 Nov 2017 14:27:26 GMT (envelope-from kp@FreeBSD.org) Message-Id: <201711011427.vA1ERQTp050050@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kp set sender to kp@FreeBSD.org using -f From: Kristof Provost Date: Wed, 1 Nov 2017 14:27:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325283 - head/sys/net X-SVN-Group: head X-SVN-Commit-Author: kp X-SVN-Commit-Paths: head/sys/net X-SVN-Commit-Revision: 325283 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: Wed, 01 Nov 2017 14:27:27 -0000 Author: kp Date: Wed Nov 1 14:27:26 2017 New Revision: 325283 URL: https://svnweb.freebsd.org/changeset/base/325283 Log: epair: Fix panic on unload The VNET_SYSUNINIT() callback is executed after the MOD_UNLOAD. That means that netisr_unregister() has already been called when netisr_unregister_vnet() gets calls, leading to an assertion failure. Restore the expected order of operations by performing everything that was done in MOD_UNLOAD to a SYSUNINIT() (that will be called after the VNET_SYSUNINIT()). Differential Revision: https://reviews.freebsd.org/D12771 Modified: head/sys/net/if_epair.c Modified: head/sys/net/if_epair.c ============================================================================== --- head/sys/net/if_epair.c Wed Nov 1 13:54:16 2017 (r325282) +++ head/sys/net/if_epair.c Wed Nov 1 14:27:26 2017 (r325283) @@ -980,6 +980,17 @@ vnet_epair_uninit(const void *unused __unused) VNET_SYSUNINIT(vnet_epair_uninit, SI_SUB_INIT_IF, SI_ORDER_ANY, vnet_epair_uninit, NULL); +static void +epair_uninit(const void *unused __unused) +{ + netisr_unregister(&epair_nh); + epair_dpcpu_detach(); + if (bootverbose) + printf("%s unloaded.\n", epairname); +} +SYSUNINIT(epair_uninit, SI_SUB_INIT_IF, SI_ORDER_MIDDLE, + epair_uninit, NULL); + static int epair_modevent(module_t mod, int type, void *data) { @@ -997,10 +1008,7 @@ epair_modevent(module_t mod, int type, void *data) printf("%s initialized.\n", epairname); break; case MOD_UNLOAD: - netisr_unregister(&epair_nh); - epair_dpcpu_detach(); - if (bootverbose) - printf("%s unloaded.\n", epairname); + /* Handled in epair_uninit() */ break; default: return (EOPNOTSUPP); From owner-svn-src-all@freebsd.org Wed Nov 1 16:32:12 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 A6BB1E600CE; Wed, 1 Nov 2017 16:32:12 +0000 (UTC) (envelope-from tuexen@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 7074B75155; Wed, 1 Nov 2017 16:32:12 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA1GWB2x004338; Wed, 1 Nov 2017 16:32:11 GMT (envelope-from tuexen@FreeBSD.org) Received: (from tuexen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA1GWB04004326; Wed, 1 Nov 2017 16:32:11 GMT (envelope-from tuexen@FreeBSD.org) Message-Id: <201711011632.vA1GWB04004326@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tuexen set sender to tuexen@FreeBSD.org using -f From: Michael Tuexen Date: Wed, 1 Nov 2017 16:32:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325284 - head/sys/netinet X-SVN-Group: head X-SVN-Commit-Author: tuexen X-SVN-Commit-Paths: head/sys/netinet X-SVN-Commit-Revision: 325284 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: Wed, 01 Nov 2017 16:32:12 -0000 Author: tuexen Date: Wed Nov 1 16:32:11 2017 New Revision: 325284 URL: https://svnweb.freebsd.org/changeset/base/325284 Log: Fix the reporting of the MTU for SCTP sockets when using IPv6. MFC after: 1 week Modified: head/sys/netinet/sctp_usrreq.c Modified: head/sys/netinet/sctp_usrreq.c ============================================================================== --- head/sys/netinet/sctp_usrreq.c Wed Nov 1 14:27:26 2017 (r325283) +++ head/sys/netinet/sctp_usrreq.c Wed Nov 1 16:32:11 2017 (r325284) @@ -2412,7 +2412,7 @@ flags_out: #endif #ifdef INET6 case AF_INET6: - paddrp->spp_pathmtu -= SCTP_MIN_V4_OVERHEAD; + paddrp->spp_pathmtu -= SCTP_MIN_OVERHEAD; break; #endif default: From owner-svn-src-all@freebsd.org Wed Nov 1 18:06: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 05279E619E2; Wed, 1 Nov 2017 18:06:46 +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 D39677C49E; Wed, 1 Nov 2017 18:06:45 +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 vA1I6jNV043659; Wed, 1 Nov 2017 18:06:45 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA1I6jfs043658; Wed, 1 Nov 2017 18:06:45 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201711011806.vA1I6jfs043658@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Wed, 1 Nov 2017 18:06:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325285 - head/sys/amd64/amd64 X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/sys/amd64/amd64 X-SVN-Commit-Revision: 325285 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: Wed, 01 Nov 2017 18:06:46 -0000 Author: kib Date: Wed Nov 1 18:06:44 2017 New Revision: 325285 URL: https://svnweb.freebsd.org/changeset/base/325285 Log: Restore an optimization that was temporary disabled by r324665. In reclaim_pv_chunk(), rotate the pv chunks list so that next invocations of the reclaim do not scan the same pv chunks that could not be freed. Only do the rotation when there is no parallel scan, tracked by active_reclaims counter. To rotate, move all chunks that are before current iteration marker, after another marker that is inserted at the list tail on start of the reclaim. Reviewed by: alc Tested by: pho (previous version) Sponsored by: The FreeBSD Foundation MFC after: 1 week Modified: head/sys/amd64/amd64/pmap.c Modified: head/sys/amd64/amd64/pmap.c ============================================================================== --- head/sys/amd64/amd64/pmap.c Wed Nov 1 16:32:11 2017 (r325284) +++ head/sys/amd64/amd64/pmap.c Wed Nov 1 18:06:44 2017 (r325285) @@ -2892,8 +2892,8 @@ reclaim_pv_chunk_leave_pmap(pmap_t pmap, pmap_t locked static vm_page_t reclaim_pv_chunk(pmap_t locked_pmap, struct rwlock **lockp) { - struct pv_chunk *pc, *pc_marker; - struct pv_chunk_header pc_marker_b; + struct pv_chunk *pc, *pc_marker, *pc_marker_end; + struct pv_chunk_header pc_marker_b, pc_marker_end_b; struct md_page *pvh; pd_entry_t *pde; pmap_t next_pmap, pmap; @@ -2906,6 +2906,7 @@ reclaim_pv_chunk(pmap_t locked_pmap, struct rwlock **l uint64_t inuse; int bit, field, freed; bool start_di; + static int active_reclaims = 0; PMAP_LOCK_ASSERT(locked_pmap, MA_OWNED); KASSERT(lockp != NULL, ("reclaim_pv_chunk: lockp is NULL")); @@ -2914,7 +2915,9 @@ reclaim_pv_chunk(pmap_t locked_pmap, struct rwlock **l PG_G = PG_A = PG_M = PG_RW = 0; SLIST_INIT(&free); bzero(&pc_marker_b, sizeof(pc_marker_b)); + bzero(&pc_marker_end, sizeof(pc_marker_end)); pc_marker = (struct pv_chunk *)&pc_marker_b; + pc_marker_end = (struct pv_chunk *)&pc_marker_end_b; /* * A delayed invalidation block should already be active if @@ -2924,12 +2927,21 @@ reclaim_pv_chunk(pmap_t locked_pmap, struct rwlock **l start_di = pmap_not_in_di(); mtx_lock(&pv_chunks_mutex); + active_reclaims++; TAILQ_INSERT_HEAD(&pv_chunks, pc_marker, pc_lru); - while ((pc = TAILQ_NEXT(pc_marker, pc_lru)) != NULL && + TAILQ_INSERT_TAIL(&pv_chunks, pc_marker_end, pc_lru); + while ((pc = TAILQ_NEXT(pc_marker, pc_lru)) != pc_marker_end && SLIST_EMPTY(&free)) { next_pmap = pc->pc_pmap; - if (next_pmap == NULL) /* marker */ + if (next_pmap == NULL) { + /* + * The next chunk is a marker. However, it is + * not our marker, so active_reclaims must be + * > 1. Consequently, the next_chunk code + * will not rotate the pv_chunks list. + */ goto next_chunk; + } mtx_unlock(&pv_chunks_mutex); /* @@ -3043,8 +3055,24 @@ reclaim_pv_chunk(pmap_t locked_pmap, struct rwlock **l next_chunk: TAILQ_REMOVE(&pv_chunks, pc_marker, pc_lru); TAILQ_INSERT_AFTER(&pv_chunks, pc, pc_marker, pc_lru); + if (active_reclaims == 1 && pmap != NULL) { + /* + * Rotate the pv chunks list so that we do not + * scan the same pv chunks that could not be + * freed (because they contained a wired + * and/or superpage mapping) on every + * invocation of reclaim_pv_chunk(). + */ + while ((pc = TAILQ_FIRST(&pv_chunks)) != pc_marker) { + MPASS(pc->pc_pmap != NULL); + TAILQ_REMOVE(&pv_chunks, pc, pc_lru); + TAILQ_INSERT_TAIL(&pv_chunks, pc, pc_lru); + } + } } TAILQ_REMOVE(&pv_chunks, pc_marker, pc_lru); + TAILQ_REMOVE(&pv_chunks, pc_marker_end, pc_lru); + active_reclaims--; mtx_unlock(&pv_chunks_mutex); reclaim_pv_chunk_leave_pmap(pmap, locked_pmap, start_di); if (m_pc == NULL && !SLIST_EMPTY(&free)) { From owner-svn-src-all@freebsd.org Wed Nov 1 18:49: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 9633AE62405; Wed, 1 Nov 2017 18:49:46 +0000 (UTC) (envelope-from tsoome@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 63E0D7D82B; Wed, 1 Nov 2017 18:49:46 +0000 (UTC) (envelope-from tsoome@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA1Inj5F060288; Wed, 1 Nov 2017 18:49:45 GMT (envelope-from tsoome@FreeBSD.org) Received: (from tsoome@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA1Injt3060287; Wed, 1 Nov 2017 18:49:45 GMT (envelope-from tsoome@FreeBSD.org) Message-Id: <201711011849.vA1Injt3060287@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tsoome set sender to tsoome@FreeBSD.org using -f From: Toomas Soome Date: Wed, 1 Nov 2017 18:49:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325286 - head/sys/boot/efi/libefi X-SVN-Group: head X-SVN-Commit-Author: tsoome X-SVN-Commit-Paths: head/sys/boot/efi/libefi X-SVN-Commit-Revision: 325286 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: Wed, 01 Nov 2017 18:49:46 -0000 Author: tsoome Date: Wed Nov 1 18:49:45 2017 New Revision: 325286 URL: https://svnweb.freebsd.org/changeset/base/325286 Log: efipart_strategy is using wrong offset with >512B sectors The strategy() calls are assuming 512B sectors, so we need to adjust the offset accordingly. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D12849 Modified: head/sys/boot/efi/libefi/efipart.c Modified: head/sys/boot/efi/libefi/efipart.c ============================================================================== --- head/sys/boot/efi/libefi/efipart.c Wed Nov 1 18:06:44 2017 (r325285) +++ head/sys/boot/efi/libefi/efipart.c Wed Nov 1 18:49:45 2017 (r325286) @@ -877,7 +877,11 @@ efipart_strategy(void *devdata, int rw, daddr_t blk, s bcd.dv_cache = pd->pd_bcache; if (dev->d_dev->dv_type == DEVT_DISK) { - return (bcache_strategy(&bcd, rw, blk + dev->d_offset, + daddr_t offset; + + offset = dev->d_offset * pd->pd_blkio->Media->BlockSize; + offset /= 512; + return (bcache_strategy(&bcd, rw, blk + offset, size, buf, rsize)); } return (bcache_strategy(&bcd, rw, blk, size, buf, rsize)); From owner-svn-src-all@freebsd.org Wed Nov 1 18:54: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 1744AE625A4; Wed, 1 Nov 2017 18:54:31 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mail.baldwin.cx (bigwig.baldwin.cx [96.47.65.170]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E92807DC3D; Wed, 1 Nov 2017 18:54:30 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro-3.local (unknown [IPv6:2601:648:8500:5fb:c09d:da52:73d2:8219]) by mail.baldwin.cx (Postfix) with ESMTPSA id 2758310A7DB; Wed, 1 Nov 2017 14:54:23 -0400 (EDT) Subject: Re: svn commit: r325166 - head/sys/net To: Stephen Hurd , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201710302108.v9UL8CMP071651@repo.freebsd.org> From: John Baldwin Message-ID: Date: Wed, 1 Nov 2017 11:54:21 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <201710302108.v9UL8CMP071651@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3 (mail.baldwin.cx); Wed, 01 Nov 2017 14:54:23 -0400 (EDT) X-Virus-Scanned: clamav-milter 0.99.2 at mail.baldwin.cx X-Virus-Status: Clean 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: Wed, 01 Nov 2017 18:54:31 -0000 On 10/30/17 9:08 PM, Stephen Hurd wrote: > Author: shurd > Date: Mon Oct 30 21:08:12 2017 > New Revision: 325166 > URL: https://svnweb.freebsd.org/changeset/base/325166 > > Log: > Avoid enabling MSI-X if MSI-X is disabled globally > > It was reported on the community call that with > hw.pci.enable_msix=0, iflib would enable MSI-X on the device and attempt > to use it, which caused issues. Test the sysctl explicitly and do not > enable MSI-X if it's disabled globally. There are also various blacklists you should probably be honoring. If you just use the existing APIs (pci_*_msix()) that should all happen transparently however. Also, the 'enable_msi=0' tunable disables both MSI and MSI-X (again, if you used the existing API that is already handled) -- John Baldwin From owner-svn-src-all@freebsd.org Wed Nov 1 18:58: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 7D28AE626AC; Wed, 1 Nov 2017 18:58:55 +0000 (UTC) (envelope-from cem@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 3E1FF7DED6; Wed, 1 Nov 2017 18:58:55 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA1Iwsqm064366; Wed, 1 Nov 2017 18:58:54 GMT (envelope-from cem@FreeBSD.org) Received: (from cem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA1Iws0K064364; Wed, 1 Nov 2017 18:58:54 GMT (envelope-from cem@FreeBSD.org) Message-Id: <201711011858.vA1Iws0K064364@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org using -f From: Conrad Meyer Date: Wed, 1 Nov 2017 18:58:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325287 - in head/etc: defaults rc.d X-SVN-Group: head X-SVN-Commit-Author: cem X-SVN-Commit-Paths: in head/etc: defaults rc.d X-SVN-Commit-Revision: 325287 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: Wed, 01 Nov 2017 18:58:55 -0000 Author: cem Date: Wed Nov 1 18:58:54 2017 New Revision: 325287 URL: https://svnweb.freebsd.org/changeset/base/325287 Log: bluetooth: Default to discoverable off Try to not expose bluetooth devices to external devices unless the user explicitly configures it, like any other radio/network device. Bluetooth has a long history of security problems and it is probably best to keep it disabled if not needed. Users who do use the bluetooth device should enable "discoverable" in bluetooth.device.conf(5) after this change. Keep in mind that bluetooth addresses can be discovered by passive monitoring or whole address-space scans[0], so a safety conscious user should also disable "connectable" in bluetooth.device.conf(5). [0]: https://www.sans.edu/cyber-research/security-laboratory/article/bluetooth Reviewed by: emax, hselasky Security: maybe Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D12831 Modified: head/etc/defaults/bluetooth.device.conf head/etc/rc.d/bluetooth Modified: head/etc/defaults/bluetooth.device.conf ============================================================================== --- head/etc/defaults/bluetooth.device.conf Wed Nov 1 18:49:45 2017 (r325286) +++ head/etc/defaults/bluetooth.device.conf Wed Nov 1 18:58:54 2017 (r325287) @@ -65,7 +65,7 @@ # NO or 0 do not scan for inquiry requests; # YES or 1 scan for inquiry requests (default). -# discoverable="YES" +# discoverable="NO" # The encryption_mode parameter controls if the device requires encryption # to the remote device at connection setup. At connection setup, only the Modified: head/etc/rc.d/bluetooth ============================================================================== --- head/etc/rc.d/bluetooth Wed Nov 1 18:49:45 2017 (r325286) +++ head/etc/rc.d/bluetooth Wed Nov 1 18:58:54 2017 (r325287) @@ -287,7 +287,7 @@ bluetooth_start() bluetooth_device_authentication_enable="0" bluetooth_device_class="ff:01:0c" bluetooth_device_connectable="1" - bluetooth_device_discoverable="1" + bluetooth_device_discoverable="0" bluetooth_device_encryption_mode="0" bluetooth_device_hci_debug_level="3" bluetooth_device_l2cap_debug_level="3" From owner-svn-src-all@freebsd.org Wed Nov 1 21:22: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 27DA6E64625; Wed, 1 Nov 2017 21:22:08 +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 B671081CC4; Wed, 1 Nov 2017 21:22: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 vA1LM6FW025498; Wed, 1 Nov 2017 21:22:06 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA1LM57I025483; Wed, 1 Nov 2017 21:22:05 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201711012122.vA1LM57I025483@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Wed, 1 Nov 2017 21:22:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325288 - in head: . release/arm64 release/tools share/man/man7 share/mk tools/build/options X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: in head: . release/arm64 release/tools share/man/man7 share/mk tools/build/options X-SVN-Commit-Revision: 325288 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: Wed, 01 Nov 2017 21:22:08 -0000 Author: bdrewery Date: Wed Nov 1 21:22:05 2017 New Revision: 325288 URL: https://svnweb.freebsd.org/changeset/base/325288 Log: Add option UNIFIED_OBJDIR, on by default, which moves the default build OBJDIR. This changes the build OBJDIR from the older style of /usr/obj/ for native builds, and /usr/obj/./ for cross builds to a new simpler format of /usr/obj//.. This new format is used regardless of cross or native build. It allows easier management of multiple source tree object directories. The UNIFIED_OBJDIR option will be removed and its feature made permanent for the 12.0 release. Relnotes: yes (don't note UNIFIED_OBJDIR option since it will be removed) Prior work: D3711 D874 Reviewed by: gjb, sjg Discussed at: https://lists.freebsd.org/pipermail/freebsd-arch/2016-May/017805.html Discussed with: emaste Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D12840 Added: head/tools/build/options/WITHOUT_UNIFIED_OBJDIR (contents, props changed) head/tools/build/options/WITH_UNIFIED_OBJDIR (contents, props changed) Modified: head/Makefile.inc1 head/Makefile.libcompat head/UPDATING head/release/arm64/RPI3.conf head/release/tools/vmimage.subr head/share/man/man7/build.7 head/share/mk/bsd.obj.mk head/share/mk/local.meta.sys.mk head/share/mk/src.sys.env.mk head/share/mk/src.sys.obj.mk head/share/mk/sys.mk head/tools/build/options/makeman Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Wed Nov 1 18:58:54 2017 (r325287) +++ head/Makefile.inc1 Wed Nov 1 21:22:05 2017 (r325288) @@ -78,18 +78,11 @@ MK_CLANG_BOOTSTRAP= no MK_GCC_BOOTSTRAP= no .endif -MAKEOBJDIRPREFIX?= /usr/obj -.if ${MACHINE} == ${TARGET} && ${MACHINE_ARCH} == ${TARGET_ARCH} && !defined(CROSS_BUILD_TESTING) -OBJTREE= ${MAKEOBJDIRPREFIX} -.else -OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH} -.endif - # Pull in compiler metadata from buildworld/toolchain if possible to avoid # running CC from bsd.compiler.mk. .if make(installworld) || make(install) || make(distributeworld) || \ make(stageworld) -.-include "${OBJTREE}${.CURDIR}/compiler-metadata.mk" +.-include "${OBJTOP}/compiler-metadata.mk" .endif # Pull in COMPILER_TYPE and COMPILER_FREEBSD_VERSION early. @@ -450,7 +443,7 @@ BUILD_ARCH!= uname -p .error To cross-build, set TARGET_ARCH. .endif .endif -WORLDTMP= ${OBJTREE}${.CURDIR}/tmp +WORLDTMP?= ${OBJTOP}/tmp BPATH= ${CCACHE_WRAPPER_PATH_PFX}${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/bin XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin STRICTTMPPATH= ${BPATH}:${XPATH} @@ -508,7 +501,7 @@ MINIMUM_SUPPORTED_OSREL?= 900044 MINIMUM_SUPPORTED_REL?= 9.1 # Common environment for world related stages -CROSSENV+= MAKEOBJDIRPREFIX=${OBJTREE} \ +CROSSENV+= \ MACHINE_ARCH=${TARGET_ARCH} \ MACHINE=${TARGET} \ CPUTYPE=${TARGET_CPUTYPE} @@ -543,7 +536,7 @@ BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \ ${BSARGS} # build-tools stage -TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \ +TMAKE= \ ${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ DESTDIR= \ @@ -670,10 +663,10 @@ LIBCOMPAT= SOFT META_MODE_BAD_ABI_VERS+= 1200031 .if !defined(OBJDIR_HOST_OSRELDATE) -.if exists(${OBJTREE}${.CURDIR}/host-osreldate.h) +.if exists(${OBJTOP}/host-osreldate.h) OBJDIR_HOST_OSRELDATE!= \ awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \ - ${OBJTREE}${.CURDIR}/host-osreldate.h + ${OBJTOP}/host-osreldate.h .elif exists(${WORLDTMP}/usr/include/osreldate.h) OBJDIR_HOST_OSRELDATE= 0 .endif @@ -778,36 +771,36 @@ _cleanobj_fast_depend_hack: .PHONY # 20160829 r305012 ptrace # 20170624 r320278 fstat fstatat fstatfs getdirentries getfsstat statfs .for f in fstat fstatat fstatfs getdirentries getfsstat ptrace statfs -.if exists(${OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.o) +.if exists(${OBJTOP}/lib/libc/.depend.${f}.o) @if egrep -qw '${f}\.[sS]' \ - ${OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.o; then \ + ${OBJTOP}/lib/libc/.depend.${f}.o; then \ echo Removing stale dependencies for ${f} syscall wrappers; \ - rm -f ${OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.* \ - ${LIBCOMPAT:D${LIBCOMPAT_OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.*}; \ + rm -f ${OBJTOP}/lib/libc/.depend.${f}.* \ + ${LIBCOMPAT:D${LIBCOMPAT_OBJTOP}/lib/libc/.depend.${f}.*}; \ fi .endif .endfor # 20170607 remove stale dependencies for utimens* wrappers removed in r319663 .for f in futimens utimensat -.if exists(${OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.o) +.if exists(${OBJTOP}/lib/libc/.depend.${f}.o) @if egrep -q '/${f}.c' \ - ${OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.o; then \ + ${OBJTOP}/lib/libc/.depend.${f}.o; then \ echo Removing stale dependencies for ${f} syscall wrappers; \ - rm -f ${OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.* \ - ${LIBCOMPAT:D${LIBCOMPAT_OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.*}; \ + rm -f ${OBJTOP}/lib/libc/.depend.${f}.* \ + ${LIBCOMPAT:D${LIBCOMPAT_OBJTOP}/lib/libc/.depend.${f}.*}; \ fi .endif .endfor # 20170523 remove stale generated asm files for functions which are no longer # syscalls after r302092 (pipe) and r318736 (others) .for f in getdents lstat mknod pipe stat -.if exists(${OBJTREE}${.CURDIR}/lib/libc/${f}.s) || \ - exists(${OBJTREE}${.CURDIR}/lib/libc/${f}.S) +.if exists(${OBJTOP}/lib/libc/${f}.s) || \ + exists(${OBJTOP}/lib/libc/${f}.S) @echo Removing stale generated ${f} syscall files - @rm -f ${OBJTREE}${.CURDIR}/lib/libc/${f}.* \ - ${OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.* \ - ${LIBCOMPAT:D${LIBCOMPAT_OBJTREE}${.CURDIR}/lib/libc/${f}.*} \ - ${LIBCOMPAT:D${LIBCOMPAT_OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.*} + @rm -f ${OBJTOP}/lib/libc/${f}.* \ + ${OBJTOP}/lib/libc/.depend.${f}.* \ + ${LIBCOMPAT:D${LIBCOMPAT_OBJTOP}/lib/libc/${f}.*} \ + ${LIBCOMPAT:D${LIBCOMPAT_OBJTOP}/lib/libc/.depend.${f}.*} .endif .endfor @@ -899,7 +892,7 @@ _cross-tools: @echo "--------------------------------------------------------------" @echo ">>> stage 3: cross tools" @echo "--------------------------------------------------------------" - @rm -f ${OBJTREE}${.CURDIR}/compiler-metadata.mk + @rm -f ${OBJTOP}/compiler-metadata.mk ${_+_}cd ${.CURDIR}; ${XMAKE} cross-tools ${_+_}cd ${.CURDIR}; ${XMAKE} kernel-tools _build-metadata: @@ -1071,7 +1064,7 @@ __installcheck_UGID: .PHONY (empty(DESTDIR) || ${DESTDIR} == "/") && empty(BYPASS_INSTALLCHECK_SH) _installcheck_world: __installcheck_sh_check __installcheck_sh_check: .PHONY - @if [ "`${OBJTREE}${.CURDIR}/rescue/rescue/rescue sh -c 'echo OK'`" != \ + @if [ "`${OBJTOP}/rescue/rescue/rescue sh -c 'echo OK'`" != \ OK ]; then \ echo "rescue/sh check failed, installation aborted" >&2; \ false; \ @@ -1333,7 +1326,7 @@ INSTKERNNAME?= kernel KERNSRCDIR?= ${.CURDIR}/sys KRNLCONFDIR= ${KERNSRCDIR}/${TARGET}/conf -KRNLOBJDIR= ${OBJTREE}${KERNSRCDIR} +KRNLOBJDIR= ${OBJTOP}${KERNSRCDIR:C,^${.CURDIR},,} KERNCONFDIR?= ${KRNLCONFDIR} BUILDKERNELS= @@ -1541,9 +1534,9 @@ stagekernel: .PHONY ${_+_}${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} distributekernel PORTSDIR?= /usr/ports -WSTAGEDIR?= ${MAKEOBJDIRPREFIX}${.CURDIR}/${TARGET}.${TARGET_ARCH}/worldstage -KSTAGEDIR?= ${MAKEOBJDIRPREFIX}${.CURDIR}/${TARGET}.${TARGET_ARCH}/kernelstage -REPODIR?= ${MAKEOBJDIRPREFIX}${.CURDIR}/repo +WSTAGEDIR?= ${OBJTOP}/worldstage +KSTAGEDIR?= ${OBJTOP}/kernelstage +REPODIR?= ${OBJROOT}repo PKGSIGNKEY?= # empty .ORDER: stage-packages create-packages @@ -1806,10 +1799,10 @@ legacy: .PHONY ${_+_}@${ECHODIR} "===> ${_tool} (obj,includes,all,install)"; \ cd ${.CURDIR}/${_tool}; \ if [ -z "${NO_OBJ}" ]; then ${MAKE} DIRPRFX=${_tool}/ obj; fi; \ - ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy includes; \ + ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${WORLDTMP}/legacy includes; \ ${MAKE} DIRPRFX=${_tool}/ MK_INCLUDES=no all; \ ${MAKE} DIRPRFX=${_tool}/ MK_INCLUDES=no \ - DESTDIR=${MAKEOBJDIRPREFIX}/legacy install + DESTDIR=${WORLDTMP}/legacy install .endfor # @@ -1953,7 +1946,7 @@ ${_bt}-${_tool}: .PHONY .MAKE cd ${.CURDIR}/${_tool}; \ if [ -z "${NO_OBJ}" ]; then ${MAKE} DIRPRFX=${_tool}/ obj; fi; \ ${MAKE} DIRPRFX=${_tool}/ all; \ - ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy install + ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${WORLDTMP}/legacy install bootstrap-tools: ${_bt}-${_tool} .endfor @@ -2011,9 +2004,9 @@ build-tools: build-tools_${_tool} # kernel-tools: Build kernel-building tools # kernel-tools: .PHONY - mkdir -p ${MAKEOBJDIRPREFIX}/usr + mkdir -p ${WORLDTMP}/usr mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ - -p ${MAKEOBJDIRPREFIX}/usr >/dev/null + -p ${WORLDTMP}/usr >/dev/null # # cross-tools: All the tools needed to build the rest of the system after @@ -2089,7 +2082,7 @@ cross-tools: .MAKE .PHONY cd ${.CURDIR}/${_tool}; \ if [ -z "${NO_OBJ}" ]; then ${MAKE} DIRPRFX=${_tool}/ obj; fi; \ ${MAKE} DIRPRFX=${_tool}/ all; \ - ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX} install + ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${WORLDTMP} install .endfor # @@ -2100,7 +2093,8 @@ cross-tools: .MAKE .PHONY # already built. It then installs the static tools to NXBDESTDIR for Poudriere # to pickup. # -NXBOBJDIR= ${MAKEOBJDIRPREFIX}/nxb/${TARGET}.${TARGET_ARCH} +NXBOBJROOT= ${OBJROOT}nxb/ +NXBOBJTOP= ${NXBOBJROOT}${TARGET}.${TARGET_ARCH} NXTP?= /nxb-bin .if ${NXTP:N/*} .error NXTP variable should be an absolute path @@ -2181,11 +2175,9 @@ NXBDIRS+= gnu/usr.bin/cc NXBDIRS+= gnu/usr.bin/binutils .endif -NXBMAKEENV+= \ - MAKEOBJDIRPREFIX=${NXBOBJDIR:Q} - NXBMAKEARGS+= \ - OBJTREE=${NXBOBJDIR:Q} \ + OBJTOP=${NXBOBJTOP:Q} \ + OBJROOT=${NXBOBJROOT:Q} \ -DNO_SHARED \ -DNO_CPU_CFLAGS \ -DNO_PIC \ @@ -2759,7 +2751,7 @@ builddtb: .PHONY # in this makefile. We don't do a cleandir walk if MK_AUTO_OBJ is yes # since it is not possible for files to land in the wrong place. # -BW_CANONICALOBJDIR:=${OBJTREE}${.CURDIR} +BW_CANONICALOBJDIR:=${OBJTOP} cleanworld: .PHONY .if exists(${BW_CANONICALOBJDIR}/) -rm -rf ${BW_CANONICALOBJDIR}/* @@ -2791,7 +2783,7 @@ XDTP?=/usr/${XDDIR} .error XDTP variable should be an absolute path .endif -CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR} \ +CDBENV=MAKEOBJDIRPREFIX=${OBJTOP}/${XDDIR} \ INSTALL="sh ${.CURDIR}/tools/install.sh" CDENV= ${CDBENV} \ TOOLS_PREFIX=${XDTP} @@ -2816,7 +2808,7 @@ CD2ENV=${CDENV} CC="${CC} ${CD2CFLAGS}" CXX="${CXX} ${ CPP="${CPP} ${CD2CFLAGS}" \ MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH} -CDTMP= ${MAKEOBJDIRPREFIX}/${XDDIR}/${.CURDIR}/tmp +CDTMP= ${OBJTOP}/${XDDIR}/tmp CDMAKE=${CDENV} PATH=${CDTMP}/usr/bin:${PATH} ${MAKE} ${NOFUN} CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDDESTDIR}/usr/bin:${PATH} ${MAKE} ${NOFUN} .if ${MK_META_MODE} != "no" Modified: head/Makefile.libcompat ============================================================================== --- head/Makefile.libcompat Wed Nov 1 18:58:54 2017 (r325287) +++ head/Makefile.libcompat Wed Nov 1 21:22:05 2017 (r325288) @@ -70,7 +70,7 @@ LIBSOFTWMAKEFLAGS= -DCOMPAT_SOFTFP # Generic code for each type. # Set defaults based on type. libcompat= ${LIBCOMPAT:tl} -_LIBCOMPAT_MAKEVARS= _OBJTREE TMP CPUFLAGS CFLAGS CXXFLAGS WMAKEENV \ +_LIBCOMPAT_MAKEVARS= _OBJTOP TMP CPUFLAGS CFLAGS CXXFLAGS WMAKEENV \ WMAKEFLAGS WMAKE .for _var in ${_LIBCOMPAT_MAKEVARS} .if !empty(LIB${LIBCOMPAT}${_var}) @@ -79,8 +79,8 @@ LIBCOMPAT${_var}?= ${LIB${LIBCOMPAT}${_var}} .endfor # Shared flags -LIBCOMPAT_OBJTREE?= ${OBJTREE}${.CURDIR}/obj-lib${libcompat} -LIBCOMPATTMP?= ${LIBCOMPAT_OBJTREE}/tmp +LIBCOMPAT_OBJTOP?= ${OBJTOP}/obj-lib${libcompat} +LIBCOMPATTMP?= ${LIBCOMPAT_OBJTOP}/tmp LIBCOMPATCFLAGS+= ${LIBCOMPATCPUFLAGS} \ -L${LIBCOMPATTMP}/usr/lib${libcompat} \ @@ -107,7 +107,8 @@ LIBCOMPATCXXFLAGS+= -isystem ${LIBCOMPATTMP}/usr/inclu .endif # Yes, the flags are redundant. -LIBCOMPATWMAKEENV+= MAKEOBJDIRPREFIX=${LIBCOMPAT_OBJTREE} \ +LIBCOMPATWMAKEENV+= \ + MAKEOBJDIRPREFIX=${LIBCOMPAT_OBJTOP} \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${TMPPATH} \ SYSROOT=${LIBCOMPATTMP} \ @@ -183,7 +184,8 @@ build${libcompat}: .PHONY ${_+_}cd ${.CURDIR}/${_dir}; \ WORLDTMP=${WORLDTMP} \ MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \ - MAKEOBJDIRPREFIX=${LIBCOMPAT_OBJTREE} ${MAKE} SSP_CFLAGS= DESTDIR= \ + MAKEOBJDIRPREFIX=${LIBCOMPAT_OBJTOP} \ + ${MAKE} SSP_CFLAGS= DESTDIR= \ DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \ build-tools .endfor Modified: head/UPDATING ============================================================================== --- head/UPDATING Wed Nov 1 18:58:54 2017 (r325287) +++ head/UPDATING Wed Nov 1 21:22:05 2017 (r325288) @@ -51,6 +51,17 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW: ****************************** SPECIAL WARNING: ****************************** +20171101: + The default MAKEOBJDIR has changed from /usr/obj/ for native + builds, and /usr/obj// for cross-builds, to a unified + /usr/obj//. This behavior can be changed to the old + format by setting WITHOUT_UNIFIED_OBJDIR=yes in /etc/src-env.conf, + the environment, or with -DWITHOUT_UNIFIED_OBJDIR when building. + The UNIFIED_OBJDIR option is a transitional feature that will be + removed for 12.0 release; please migrate to the new format for any + tools by looking up the OBJDIR used by 'make -V .OBJDIR' means rather + than hardcoding paths. + 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 Modified: head/release/arm64/RPI3.conf ============================================================================== --- head/release/arm64/RPI3.conf Wed Nov 1 18:58:54 2017 (r325287) +++ head/release/arm64/RPI3.conf Wed Nov 1 21:22:05 2017 (r325288) @@ -42,13 +42,11 @@ arm_install_uboot() { "${DTB_REPO}/overlays/${_OL}?raw=true" done - _OBJDIR="$(chroot ${CHROOTDIR} make -C ${WORLDDIR} -V .OBJDIR)" - _OBJDIR="$(realpath ${_OBJDIR})" - if [ -d "${CHROOTDIR}/${_OBJDIR%%/usr/src}/${EMBEDDED_TARGET}.${EMBEDDED_TARGET_ARCH}" ]; then - BOOTFILES="/${_OBJDIR%%/usr/src}/${EMBEDDED_TARGET}.${EMBEDDED_TARGET_ARCH}/usr/src/sys/boot" - else - BOOTFILES="/${_OBJDIR}/sys/boot" - fi + BOOTFILES="$(chroot ${CHROOTDIR} \ + env TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \ + WITH_UNIFIED_OBJDIR=yes \ + make -C ${WORLDDIR}/sys/boot -V .OBJDIR)" + BOOTFILES="$(realpath ${BOOTFILES})" chroot ${CHROOTDIR} mkdir -p ${FATMOUNT}/EFI/BOOT chroot ${CHROOTDIR} cp -p ${BOOTFILES}/efi/boot1/boot1.efi \ Modified: head/release/tools/vmimage.subr ============================================================================== --- head/release/tools/vmimage.subr Wed Nov 1 18:58:54 2017 (r325287) +++ head/release/tools/vmimage.subr Wed Nov 1 21:22:05 2017 (r325288) @@ -14,13 +14,10 @@ write_partition_layout() { SWAPOPT="-p freebsd-swap/swapfs::${SWAPSIZE}" fi - _OBJDIR="$(make -C ${WORLDDIR} -V .OBJDIR)" - _OBJDIR="$(realpath ${_OBJDIR})" - if [ -d "${_OBJDIR%%/usr/src}/${TARGET}.${TARGET_ARCH}" ]; then - BOOTFILES="/${_OBJDIR%%/usr/src}/${TARGET}.${TARGET_ARCH}/usr/src/sys/boot" - else - BOOTFILES="/${_OBJDIR}/sys/boot" - fi + BOOTFILES="$(env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ + WITH_UNIFIED_OBJDIR=yes \ + make -C ${WORLDDIR}/sys/boot -V .OBJDIR)" + BOOTFILES="$(realpath ${BOOTFILES})" case "${TARGET}:${TARGET_ARCH}" in amd64:amd64 | i386:i386) Modified: head/share/man/man7/build.7 ============================================================================== --- head/share/man/man7/build.7 Wed Nov 1 18:58:54 2017 (r325287) +++ head/share/man/man7/build.7 Wed Nov 1 21:22:05 2017 (r325288) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 11, 2017 +.Dd October 26, 2017 .Dt BUILD 7 .Os .Sh NAME @@ -82,18 +82,7 @@ or under if variable .Va MAKEOBJDIRPREFIX is not set. -For a given source directory, its canonical object directory -would be -.Pa ${MAKEOBJDIRPREFIX}${.CURDIR} -if -.Xr make 1 -variable -.Va MAKEOBJDIRPREFIX -is set, or -.Pa /usr/obj${.CURDIR} -if this variable is not set. -Cross-builds set the object directory as described in the -documentation for the +The canonical object directory is described in the documentation for the .Cm buildworld target below. .Pp @@ -201,10 +190,18 @@ by setting the .Pa MAKEOBJDIRPREFIX .Xr make 1 variable. -The actual build location prefix used is +The actual build location prefix used +depends on the +.Va WITH_UNIFIED_OBJDIR +option from +.Xr src.conf 5 . +If enabled it is +.Pa ${MAKEOBJDIRPREFIX}${.CURDIR}/${TARGET}.${TARGET_ARCH} +for all builds. +If disabled it is .Pa ${MAKEOBJDIRPREFIX}${.CURDIR} for native builds, and -.Pa ${MAKEOBJDIRPREFIX}/${TARGET}${.CURDIR} +.Pa ${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH}${.CURDIR} for cross builds and native builds with variable .Va CROSS_BUILD_TESTING set. @@ -460,8 +457,12 @@ Defines the prefix for directory names in the tree of Defaults to .Pa /usr/obj if not defined. -This variable should only be set in the environment and not via +This variable should only be set in the environment or +.Pa /etc/src-env.conf +and not via .Pa /etc/make.conf +or +.Pa /etc/src.conf or the command line. .It Va NO_WERROR If defined, compiler warnings will not cause the build to halt, Modified: head/share/mk/bsd.obj.mk ============================================================================== --- head/share/mk/bsd.obj.mk Wed Nov 1 18:58:54 2017 (r325287) +++ head/share/mk/bsd.obj.mk Wed Nov 1 21:22:05 2017 (r325288) @@ -75,7 +75,7 @@ __objdir_made != umask ${OBJDIR_UMASK:U002}; ${Mkdirs} done .endif .endif # !empty(SRCS:M*/*) || !empty(DPSRCS:M*/*) -.elif defined(MAKEOBJDIRPREFIX) +.elif !empty(MAKEOBJDIRPREFIX) CANONICALOBJDIR:=${MAKEOBJDIRPREFIX}${.CURDIR} .elif defined(MAKEOBJDIR) && ${MAKEOBJDIR:M/*} != "" CANONICALOBJDIR:=${MAKEOBJDIR} Modified: head/share/mk/local.meta.sys.mk ============================================================================== --- head/share/mk/local.meta.sys.mk Wed Nov 1 18:58:54 2017 (r325287) +++ head/share/mk/local.meta.sys.mk Wed Nov 1 21:22:05 2017 (r325288) @@ -7,9 +7,6 @@ # we need this until there is an alternative MK_INSTALL_AS_USER= yes -# Default OBJROOT/MAKEOBJDIR handled in local.sys.obj.mk -.include - .if !defined(HOST_TARGET) # we need HOST_TARGET etc below. .include Modified: head/share/mk/src.sys.env.mk ============================================================================== --- head/share/mk/src.sys.env.mk Wed Nov 1 18:58:54 2017 (r325287) +++ head/share/mk/src.sys.env.mk Wed Nov 1 21:22:05 2017 (r325288) @@ -43,3 +43,5 @@ MAKESYSPATH:= ${MAKESYSPATH:S,.../share/mk,${.PARSEDIR MAKESYSPATH:= ${.PARSEDIR:tA} .export MAKESYSPATH .endif + +.include Modified: head/share/mk/src.sys.obj.mk ============================================================================== --- head/share/mk/src.sys.obj.mk Wed Nov 1 18:58:54 2017 (r325287) +++ head/share/mk/src.sys.obj.mk Wed Nov 1 21:22:05 2017 (r325288) @@ -1,9 +1,45 @@ # $FreeBSD$ +# +# Early setup of MAKEOBJDIR +# +# Default format is: /usr/obj/usr/src/[${TARGET}.${TARGET_ARCH}/]bin/sh +# MAKEOBJDIRPREFIX is /usr/obj +# OBJROOT is /usr/obj/usr/src/ +# OBJTOP is /usr/obj/usr/src/[${TARGET}.${TARGET_ARCH}/] +# MAKEOBJDIR is /usr/obj/usr/src/[${TARGET}.${TARGET_ARCH}/]bin/sh +# +# MAKEOBJDIRPREFIX will override the default pattern above and internally +# set MAKEOBJDIR. If OBJROOT is set then MAKEOBJDIRPREFIX is rooted inside +# of there. +# +# If MK_UNIFIED_OBJDIR is no then OBJROOT will always match OBJTOP. +# +# If .MAKE.LEVEL == 0 then the TARGET.TARGET_ARCH is potentially added on. +# If .MAKE.LEVEL > 0 and MAKEOBJDIRPREFIX is set then it will not get +# TARGET.TARGET_ARCH added in as it assumes that MAKEOBJDIRPREFIX is +# nested in the existing OBJTOP with TARGET.TARGET_ARCH in it. +# +_default_makeobjdirprefix?= /usr/obj _default_makeobjdir= $${.CURDIR:S,^$${SRCTOP},$${OBJTOP},} -.if empty(OBJROOT) || ${.MAKE.LEVEL} == 0 -.if defined(MAKEOBJDIRPREFIX) && !empty(MAKEOBJDIRPREFIX) +.include + +.if ${.MAKE.LEVEL} == 0 || empty(OBJROOT) +.if ${MK_UNIFIED_OBJDIR} == "no" +# Fall back to historical behavior. +# We always want to set a default MAKEOBJDIRPREFIX... +MAKEOBJDIRPREFIX?= ${_default_makeobjdirprefix} +# but don't enforce TARGET.TARGET_ARCH unless we're at the top-level directory. +.if ${.CURDIR} == ${SRCTOP} && \ + !(defined(TARGET) && defined(TARGET_ARCH) && \ + ${MACHINE} == ${TARGET} && ${MACHINE_ARCH} == ${TARGET_ARCH} && \ + !defined(CROSS_BUILD_TESTING)) +MAKEOBJDIRPREFIX:= ${MAKEOBJDIRPREFIX}${TARGET:D/${TARGET}.${TARGET_ARCH}} +.endif +.endif # ${MK_UNIFIED_OBJDIR} == "no" + +.if !empty(MAKEOBJDIRPREFIX) # put things approximately where they want OBJROOT:= ${MAKEOBJDIRPREFIX}${SRCTOP}/ MAKEOBJDIRPREFIX= @@ -17,24 +53,59 @@ MAKEOBJDIR= ${_default_makeobjdir} # Expand for our own use MAKEOBJDIR:= ${MAKEOBJDIR} .endif +# SB documented at http://www.crufty.net/sjg/docs/sb-tools.htm .if !empty(SB) SB_OBJROOT?= ${SB}/obj/ # this is what we use below OBJROOT?= ${SB_OBJROOT} .endif -OBJROOT?= /usr/obj${SRCTOP}/ +OBJROOT?= ${_default_makeobjdirprefix}${SRCTOP}/ .if ${OBJROOT:M*/} != "" OBJROOT:= ${OBJROOT:H:tA}/ .else OBJROOT:= ${OBJROOT:H:tA}/${OBJROOT:T} .endif +# Must export since OBJDIR will dynamically be based on it .export OBJROOT SRCTOP .endif -.if 0 +.if ${MK_UNIFIED_OBJDIR} == "yes" +OBJTOP:= ${OBJROOT}${TARGET:D${TARGET}.${TARGET_ARCH}:U${MACHINE}.${MACHINE_ARCH}} +.else +# TARGET.TARGET_ARCH handled in OBJROOT already. +OBJTOP:= ${OBJROOT:H} +.endif # ${MK_UNIFIED_OBJDIR} == "yes" + +# Wait to validate MAKEOBJDIR until OBJTOP is set. .if defined(MAKEOBJDIR) .if ${MAKEOBJDIR:M/*} == "" .error Cannot use MAKEOBJDIR=${MAKEOBJDIR}${.newline}Unset MAKEOBJDIR to get default: MAKEOBJDIR='${_default_makeobjdir}' .endif .endif + +# Fixup OBJROOT/OBJTOP if using MAKEOBJDIRPREFIX but leave it alone +# for DIRDEPS_BUILD which really wants to know the absolute top at +# all times. This intenionally comes after adding TARGET.TARGET_ARCH +# so that is truncated away for nested objdirs. This logic also +# will not trigger if the OBJROOT block above unsets MAKEOBJDIRPREFIX. +.if !empty(MAKEOBJDIRPREFIX) && ${MK_DIRDEPS_BUILD} == "no" +OBJTOP:= ${MAKEOBJDIRPREFIX}${SRCTOP} +OBJROOT:= ${OBJTOP}/ .endif + +# Assign this directory as .OBJDIR if possible +.if ${MK_AUTO_OBJ} == "no" +# The expected OBJDIR already exists, set it as .OBJDIR. +.if !empty(MAKEOBJDIRPREFIX) && exists(${MAKEOBJDIRPREFIX}${.CURDIR}) +.OBJDIR: ${MAKEOBJDIRPREFIX}${.CURDIR} +.elif exists(${MAKEOBJDIR}) +.OBJDIR: ${MAKEOBJDIR} +# Special case to work around bmake bug. If the top-level .OBJDIR does not yet +# exist and MAKEOBJDIR is passed into environment and yield a blank value, +# bmake will incorrectly set .OBJDIR=${SRCTOP}/ rather than the expected +# ${SRCTOP} to match ${.CURDIR}. +.elif ${MAKE_VERSION} <= 20170720 && \ + ${.CURDIR} == ${SRCTOP} && ${.OBJDIR} == ${SRCTOP}/ +.OBJDIR: ${.CURDIR} +.endif +.endif # ${MK_AUTO_OBJ} == "no" Modified: head/share/mk/sys.mk ============================================================================== --- head/share/mk/sys.mk Wed Nov 1 18:58:54 2017 (r325287) +++ head/share/mk/sys.mk Wed Nov 1 21:22:05 2017 (r325288) @@ -17,6 +17,8 @@ __TO_CPUARCH=C/mips(n32|64)?(el)?(hf)?/mips/:C/arm(v[6 MACHINE_CPUARCH=${MACHINE_ARCH:${__TO_CPUARCH}} .endif +__DEFAULT_YES_OPTIONS+= \ + UNIFIED_OBJDIR # Some options we need now __DEFAULT_NO_OPTIONS= \ Added: head/tools/build/options/WITHOUT_UNIFIED_OBJDIR ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITHOUT_UNIFIED_OBJDIR Wed Nov 1 21:22:05 2017 (r325288) @@ -0,0 +1,15 @@ +.\" $FreeBSD$ +Set to use the historical object directory format for +.Xr build 7 +targets. +For native-builds and builds done directly in sub-directories the format of +.Pa ${MAKEOBJDIRPREFIX}/${.CURDIR} +is used, +while for cross-builds +.Pa ${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH}/${.CURDIR} +is used. +.Pp +This option is transitional and will be removed before the 12.0 release, +at which time +.va WITH_UNIFIED_OBJDIR +will be enabled permanently. Added: head/tools/build/options/WITH_UNIFIED_OBJDIR ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITH_UNIFIED_OBJDIR Wed Nov 1 21:22:05 2017 (r325288) @@ -0,0 +1,12 @@ +.\" $FreeBSD$ +Set to use the unified object directory format for +.Xr build 7 +targets. +For cross-builds, native-builds, and sub-directory builds, the format of +.Pa ${MAKEOBJDIRPREFIX}/${.CURDIR}/${TARGET}.${TARGET_ARCH} +is used. +.Pp +This option is transitional and will be removed before the 12.0 release, +at which time +.va WITH_UNIFIED_OBJDIR +will be enabled permanently. Modified: head/tools/build/options/makeman ============================================================================== --- head/tools/build/options/makeman Wed Nov 1 18:58:54 2017 (r325287) +++ head/tools/build/options/makeman Wed Nov 1 21:22:05 2017 (r325288) @@ -217,12 +217,10 @@ variable, which defaults to Some examples that may only be set in this file are .Va WITH_DIRDEPS_BUILD , and -.Va WITH_META_MODE -as they are environment-only variables. -Note that +.Va WITH_META_MODE , +and .Va MAKEOBJDIRPREFIX -may be set here only when using -.Va WITH_DIRDEPS_BUILD . +as they are environment-only variables. .Pp The values of variables are ignored regardless of their setting; even if they would be set to From owner-svn-src-all@freebsd.org Wed Nov 1 21:22: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 C7D47E64629; Wed, 1 Nov 2017 21:22:11 +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 A4D7581CD1; Wed, 1 Nov 2017 21:22:11 +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 vA1LMAlZ025547; Wed, 1 Nov 2017 21:22:10 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA1LMAmV025544; Wed, 1 Nov 2017 21:22:10 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201711012122.vA1LMAmV025544@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Wed, 1 Nov 2017 21:22:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325289 - 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: 325289 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: Wed, 01 Nov 2017 21:22:11 -0000 Author: bdrewery Date: Wed Nov 1 21:22:10 2017 New Revision: 325289 URL: https://svnweb.freebsd.org/changeset/base/325289 Log: Add a 'make cleanuniverse'. This will remove all build files for the source directory when MK_UNIFIED_OBJDIR is enabled. Sponsored by: Dell EMC Isilon Modified: head/Makefile head/Makefile.inc1 head/share/man/man7/build.7 Modified: head/Makefile ============================================================================== --- head/Makefile Wed Nov 1 21:22:05 2017 (r325288) +++ head/Makefile Wed Nov 1 21:22:10 2017 (r325289) @@ -122,6 +122,7 @@ TGTS= all all-man buildenv buildenvvars buildkernel buildworld \ check check-old check-old-dirs check-old-files check-old-libs \ checkdpadd checkworld clean cleandepend cleandir cleanworld \ + cleanuniverse \ delete-old delete-old-dirs delete-old-files delete-old-libs \ depend distribute distributekernel distributekernel.debug \ distributeworld distrib-dirs distribution doxygen \ Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Wed Nov 1 21:22:05 2017 (r325288) +++ head/Makefile.inc1 Wed Nov 1 21:22:10 2017 (r325289) @@ -2751,14 +2751,21 @@ builddtb: .PHONY # in this makefile. We don't do a cleandir walk if MK_AUTO_OBJ is yes # since it is not possible for files to land in the wrong place. # -BW_CANONICALOBJDIR:=${OBJTOP} -cleanworld: .PHONY -.if exists(${BW_CANONICALOBJDIR}/) - -rm -rf ${BW_CANONICALOBJDIR}/* +.if make(cleanworld) +BW_CANONICALOBJDIR:=${OBJTOP}/ +.elif make(cleanuniverse) +BW_CANONICALOBJDIR:=${OBJROOT} +.if ${MK_UNIFIED_OBJDIR} == "no" +.error ${.TARGETS} only supported with WITH_UNIFIED_OBJDIR enabled. +.endif +.endif +cleanworld cleanuniverse: .PHONY +.if !empty(BW_CANONICALOBJDIR) && exists(${BW_CANONICALOBJDIR}) + -rm -rf ${BW_CANONICALOBJDIR}* -chflags -R 0 ${BW_CANONICALOBJDIR} - rm -rf ${BW_CANONICALOBJDIR}/* + rm -rf ${BW_CANONICALOBJDIR}* .endif -.if ${MK_AUTO_OBJ} == "no" +.if make(cleanworld) && ${MK_AUTO_OBJ} == "no" .if ${.CURDIR} == ${.OBJDIR} || ${.CURDIR}/obj == ${.OBJDIR} # To be safe in this case, fall back to a 'make cleandir' ${_+_}@cd ${.CURDIR}; ${MAKE} cleandir Modified: head/share/man/man7/build.7 ============================================================================== --- head/share/man/man7/build.7 Wed Nov 1 21:22:05 2017 (r325288) +++ head/share/man/man7/build.7 Wed Nov 1 21:22:10 2017 (r325289) @@ -207,8 +207,15 @@ for cross builds and native builds with variable set. .It Cm cleanworld Attempt to clean up targets built by a preceding -.Cm buildworld -step. +.Cm buildworld , +or similar step built from this source directory. +.It Cm cleanuniverse +When +.Va WITH_UNIFIED_OBJDIR +is enabled, attempt to clean up targets built by a preceding +.Cm buildworld , +.Cm universe , +or similar step, for any architecture built from this source directory. .It Cm distributeworld Distribute everything compiled by a preceding .Cm buildworld From owner-svn-src-all@freebsd.org Wed Nov 1 21:22:18 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 07756E6465A; Wed, 1 Nov 2017 21:22:18 +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 C1E2B81D30; Wed, 1 Nov 2017 21:22:17 +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 vA1LMGGB025639; Wed, 1 Nov 2017 21:22:16 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA1LMG7h025638; Wed, 1 Nov 2017 21:22:16 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201711012122.vA1LMG7h025638@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Wed, 1 Nov 2017 21:22:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325291 - head/share/mk X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/share/mk X-SVN-Commit-Revision: 325291 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: Wed, 01 Nov 2017 21:22:18 -0000 Author: bdrewery Date: Wed Nov 1 21:22:16 2017 New Revision: 325291 URL: https://svnweb.freebsd.org/changeset/base/325291 Log: make obj: Skip treewalk if AUTO_OBJ is enabled. Sponsored by: Dell EMC Isilon Modified: head/share/mk/bsd.subdir.mk Modified: head/share/mk/bsd.subdir.mk ============================================================================== --- head/share/mk/bsd.subdir.mk Wed Nov 1 21:22:13 2017 (r325290) +++ head/share/mk/bsd.subdir.mk Wed Nov 1 21:22:16 2017 (r325291) @@ -38,12 +38,16 @@ .if !target(____) ____: +.if ${MK_AUTO_OBJ} == "no" +_obj= obj +.endif + SUBDIR_TARGETS+= \ all all-man analyze buildconfig buildfiles buildincludes \ checkdpadd clean cleandepend cleandir cleanilinks \ cleanobj depend distribute files includes installconfig \ installfiles installincludes print-dir realinstall lint \ - maninstall manlint obj objlink tags \ + maninstall manlint ${_obj} objlink tags \ # Described above. STANDALONE_SUBDIR_TARGETS+= \ @@ -67,6 +71,10 @@ ECHODIR= : print-dir: .PHONY @echo ${RELDIR} .endif +.endif + +.if ${MK_AUTO_OBJ} == "yes" && !target(obj) +obj: .PHONY .endif .if !defined(NEED_SUBDIR) From owner-svn-src-all@freebsd.org Wed Nov 1 21:22:21 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 1D9C3E64673; Wed, 1 Nov 2017 21:22:21 +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 DB97781DA6; Wed, 1 Nov 2017 21:22: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 vA1LMJ8J026366; Wed, 1 Nov 2017 21:22:19 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA1LMJco026365; Wed, 1 Nov 2017 21:22:19 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201711012122.vA1LMJco026365@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Wed, 1 Nov 2017 21:22:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325292 - head/share/mk X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/share/mk X-SVN-Commit-Revision: 325292 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: Wed, 01 Nov 2017 21:22:21 -0000 Author: bdrewery Date: Wed Nov 1 21:22:19 2017 New Revision: 325292 URL: https://svnweb.freebsd.org/changeset/base/325292 Log: META_MODE: Respect make -s. MFC after: 2 weeks Sponsored by: Dell EMC Isilon Modified: head/share/mk/sys.mk Modified: head/share/mk/sys.mk ============================================================================== --- head/share/mk/sys.mk Wed Nov 1 21:22:16 2017 (r325291) +++ head/share/mk/sys.mk Wed Nov 1 21:22:19 2017 (r325292) @@ -53,8 +53,11 @@ MK_META_MODE= no .if ${MK_DIRDEPS_BUILD} == "yes" .sinclude .elif ${MK_META_MODE} == "yes" +META_MODE+= meta +.if empty(.MAKEFLAGS:M-s) # verbose will show .MAKE.META.PREFIX for each target. -META_MODE+= meta verbose +META_MODE+= verbose +.endif .if !defined(NO_META_MISSING) META_MODE+= missing-meta=yes .endif From owner-svn-src-all@freebsd.org Wed Nov 1 21:22:14 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 D0027E64641; Wed, 1 Nov 2017 21:22:14 +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 8242381CE5; Wed, 1 Nov 2017 21:22:14 +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 vA1LMDR0025592; Wed, 1 Nov 2017 21:22:13 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA1LMD9q025591; Wed, 1 Nov 2017 21:22:13 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201711012122.vA1LMD9q025591@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Wed, 1 Nov 2017 21:22:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325290 - head X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 325290 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: Wed, 01 Nov 2017 21:22:14 -0000 Author: bdrewery Date: Wed Nov 1 21:22:13 2017 New Revision: 325290 URL: https://svnweb.freebsd.org/changeset/base/325290 Log: native-xtools/xdev: Store these in a location including both MACHINE/TARGET. Given MACHINE/MACHINE_ARCH=amd64, TARGET=arm64 and TARGET_ARCH=aarch64, this change will build them in a location such as: /usr/obj/usr/src/amd64.amd64/nxb/arm64.aarch64/ and /usr/obj/usr/src/amd64.amd64/xdev/aarch64-freebsd/ Sponsored by: Dell EMC Isilon Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Wed Nov 1 21:22:10 2017 (r325289) +++ head/Makefile.inc1 Wed Nov 1 21:22:13 2017 (r325290) @@ -2093,7 +2093,7 @@ cross-tools: .MAKE .PHONY # already built. It then installs the static tools to NXBDESTDIR for Poudriere # to pickup. # -NXBOBJROOT= ${OBJROOT}nxb/ +NXBOBJROOT= ${OBJROOT}${MACHINE}.${MACHINE_ARCH}/nxb/ NXBOBJTOP= ${NXBOBJROOT}${TARGET}.${TARGET_ARCH} NXTP?= /nxb-bin .if ${NXTP:N/*} @@ -2790,10 +2790,16 @@ XDTP?=/usr/${XDDIR} .error XDTP variable should be an absolute path .endif -CDBENV=MAKEOBJDIRPREFIX=${OBJTOP}/${XDDIR} \ +CDBOBJROOT= ${OBJROOT}${MACHINE}.${MACHINE_ARCH}/xdev/ +CDBOBJTOP= ${CDBOBJROOT}${XDDIR} +CDBENV= \ INSTALL="sh ${.CURDIR}/tools/install.sh" CDENV= ${CDBENV} \ TOOLS_PREFIX=${XDTP} +CDMAKEARGS= \ + OBJTOP=${CDBOBJTOP:Q} \ + OBJROOT=${CDBOBJROOT:Q} +CD2MAKEARGS= ${CDMAKEARGS} .if ${WANT_COMPILER_TYPE} == gcc || \ (defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc) @@ -2816,8 +2822,9 @@ CD2ENV=${CDENV} CC="${CC} ${CD2CFLAGS}" CXX="${CXX} ${ MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH} CDTMP= ${OBJTOP}/${XDDIR}/tmp -CDMAKE=${CDENV} PATH=${CDTMP}/usr/bin:${PATH} ${MAKE} ${NOFUN} -CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDDESTDIR}/usr/bin:${PATH} ${MAKE} ${NOFUN} +CDMAKE=${CDENV} PATH=${CDTMP}/usr/bin:${PATH} ${MAKE} ${CDMAKEARGS} ${NOFUN} +CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDDESTDIR}/usr/bin:${PATH} \ + ${MAKE} ${CD2MAKEARGS} ${NOFUN} .if ${MK_META_MODE} != "no" # Don't rebuild build-tools targets during normal build. CD2MAKE+= BUILD_TOOLS_META=.NOMETA @@ -2849,7 +2856,7 @@ _xb-bootstrap-tools: .PHONY _xb-build-tools: .PHONY ${_+_}@cd ${.CURDIR}; \ - ${CDBENV} ${MAKE} -f Makefile.inc1 ${NOFUN} build-tools + ${CDBENV} ${MAKE} ${CDMAKEARGS} -f Makefile.inc1 ${NOFUN} build-tools XDEVDIRS= \ ${_clang_libs} \ From owner-svn-src-all@freebsd.org Wed Nov 1 21:22: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 4826AE646A9; Wed, 1 Nov 2017 21:22: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 124FD81E15; Wed, 1 Nov 2017 21:22:24 +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 vA1LMN4t026412; Wed, 1 Nov 2017 21:22:23 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA1LMNNv026411; Wed, 1 Nov 2017 21:22:23 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201711012122.vA1LMNNv026411@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Wed, 1 Nov 2017 21:22:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325293 - head/share/man/man5 X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/share/man/man5 X-SVN-Commit-Revision: 325293 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: Wed, 01 Nov 2017 21:22:24 -0000 Author: bdrewery Date: Wed Nov 1 21:22:23 2017 New Revision: 325293 URL: https://svnweb.freebsd.org/changeset/base/325293 Log: Regenerate for UNIFIED_OBJDIR. Sponsored by: Dell EMC Isilon Modified: head/share/man/man5/src.conf.5 Modified: head/share/man/man5/src.conf.5 ============================================================================== --- head/share/man/man5/src.conf.5 Wed Nov 1 21:22:19 2017 (r325292) +++ head/share/man/man5/src.conf.5 Wed Nov 1 21:22:23 2017 (r325293) @@ -1,6 +1,6 @@ .\" DO NOT EDIT-- this file is generated by tools/build/options/makeman. .\" $FreeBSD$ -.Dd October 30, 2017 +.Dd November 1, 2017 .Dt SRC.CONF 5 .Os .Sh NAME @@ -73,12 +73,10 @@ variable, which defaults to Some examples that may only be set in this file are .Va WITH_DIRDEPS_BUILD , and -.Va WITH_META_MODE -as they are environment-only variables. -Note that +.Va WITH_META_MODE , +and .Va MAKEOBJDIRPREFIX -may be set here only when using -.Va WITH_DIRDEPS_BUILD . +as they are environment-only variables. .Pp The values of variables are ignored regardless of their setting; even if they would be set to @@ -1499,6 +1497,26 @@ When set, it enforces these options: Set to not build .Xr unbound 8 and related programs. +.It Va WITHOUT_UNIFIED_OBJDIR +Set to use the historical object directory format for +.Xr build 7 +targets. +For native-builds and builds done directly in sub-directories the format of +.Pa ${MAKEOBJDIRPREFIX}/${.CURDIR} +is used, +while for cross-builds +.Pa ${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH}/${.CURDIR} +is used. +.Pp +This option is transitional and will be removed before the 12.0 release, +at which time +.va WITH_UNIFIED_OBJDIR +will be enabled permanently. +.Pp +This must be set in the environment, make command line, or +.Pa /etc/src-env.conf , +not +.Pa /etc/src.conf . .It Va WITHOUT_USB Set to not build USB-related programs and libraries. .It Va WITHOUT_USB_GADGET_EXAMPLES From owner-svn-src-all@freebsd.org Wed Nov 1 22:09: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 A32EBE6574E; Wed, 1 Nov 2017 22:09:11 +0000 (UTC) (envelope-from wulf@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 72D3483E1E; Wed, 1 Nov 2017 22:09:11 +0000 (UTC) (envelope-from wulf@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA1M9AKA044033; Wed, 1 Nov 2017 22:09:10 GMT (envelope-from wulf@FreeBSD.org) Received: (from wulf@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA1M9AXO044032; Wed, 1 Nov 2017 22:09:10 GMT (envelope-from wulf@FreeBSD.org) Message-Id: <201711012209.vA1M9AXO044032@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wulf set sender to wulf@FreeBSD.org using -f From: Vladimir Kondratyev Date: Wed, 1 Nov 2017 22:09:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325294 - head/sys/dev/evdev X-SVN-Group: head X-SVN-Commit-Author: wulf X-SVN-Commit-Paths: head/sys/dev/evdev X-SVN-Commit-Revision: 325294 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: Wed, 01 Nov 2017 22:09:11 -0000 Author: wulf Date: Wed Nov 1 22:09:10 2017 New Revision: 325294 URL: https://svnweb.freebsd.org/changeset/base/325294 Log: evdev: Hide "kern.evdev.rcpt_mask" sysctl if kernel is compiled w/o EVDEV_SUPPORT as it's value has no meaning in this case. Now presence of this sysctl can be used for discovery if evdev support for hybrid devices is compiled into kernel or not. Hide "kern.evdev.sysmouse_t_axis" sysctl for the same reason. Reviewed by: gonzo Approved by: gonzo (mentor) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D12676 Modified: head/sys/dev/evdev/evdev.c Modified: head/sys/dev/evdev/evdev.c ============================================================================== --- head/sys/dev/evdev/evdev.c Wed Nov 1 21:22:23 2017 (r325293) +++ head/sys/dev/evdev/evdev.c Wed Nov 1 22:09:10 2017 (r325294) @@ -64,12 +64,14 @@ MALLOC_DEFINE(M_EVDEV, "evdev", "evdev memory"); int evdev_rcpt_mask = EVDEV_RCPT_SYSMOUSE | EVDEV_RCPT_KBDMUX; int evdev_sysmouse_t_axis = 0; +#ifdef EVDEV_SUPPORT SYSCTL_NODE(_kern, OID_AUTO, evdev, CTLFLAG_RW, 0, "Evdev args"); SYSCTL_INT(_kern_evdev, OID_AUTO, rcpt_mask, CTLFLAG_RW, &evdev_rcpt_mask, 0, "Who is receiving events: bit0 - sysmouse, bit1 - kbdmux, " "bit2 - mouse hardware, bit3 - keyboard hardware"); SYSCTL_INT(_kern_evdev, OID_AUTO, sysmouse_t_axis, CTLFLAG_RW, &evdev_sysmouse_t_axis, 0, "Extract T-axis from 0-none, 1-ums, 2-psm"); +#endif static void evdev_start_repeat(struct evdev_dev *, uint16_t); static void evdev_stop_repeat(struct evdev_dev *); From owner-svn-src-all@freebsd.org Wed Nov 1 22:15: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 C1D91E65ACA; Wed, 1 Nov 2017 22:15:20 +0000 (UTC) (envelope-from wulf@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 8F5579D9; Wed, 1 Nov 2017 22:15:20 +0000 (UTC) (envelope-from wulf@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA1MFJ93048741; Wed, 1 Nov 2017 22:15:19 GMT (envelope-from wulf@FreeBSD.org) Received: (from wulf@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA1MFJhp048740; Wed, 1 Nov 2017 22:15:19 GMT (envelope-from wulf@FreeBSD.org) Message-Id: <201711012215.vA1MFJhp048740@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wulf set sender to wulf@FreeBSD.org using -f From: Vladimir Kondratyev Date: Wed, 1 Nov 2017 22:15:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325295 - head/sys/dev/evdev X-SVN-Group: head X-SVN-Commit-Author: wulf X-SVN-Commit-Paths: head/sys/dev/evdev X-SVN-Commit-Revision: 325295 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: Wed, 01 Nov 2017 22:15:20 -0000 Author: wulf Date: Wed Nov 1 22:15:19 2017 New Revision: 325295 URL: https://svnweb.freebsd.org/changeset/base/325295 Log: evdev: Lock Giant around keyboard ioctls This fixes turning ukbd(4) LEDs on/off with evdev interface as well Reviewed by: gonzo Approved by: gonzo (mentor) MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D12676 Modified: head/sys/dev/evdev/evdev_utils.c Modified: head/sys/dev/evdev/evdev_utils.c ============================================================================== --- head/sys/dev/evdev/evdev_utils.c Wed Nov 1 22:09:10 2017 (r325294) +++ head/sys/dev/evdev/evdev_utils.c Wed Nov 1 22:15:19 2017 (r325295) @@ -32,7 +32,9 @@ #include #include #include +#include #include +#include #include #include @@ -314,19 +316,26 @@ evdev_ev_kbd_event(struct evdev_dev *evdev, void *soft leds |= 1 << i; else leds &= ~(1 << i); - if (leds != oleds) + if (leds != oleds) { + mtx_lock(&Giant); kbdd_ioctl(kbd, KDSETLED, (caddr_t)&leds); + mtx_unlock(&Giant); + } break; } } } else if (type == EV_REP && code == REP_DELAY) { delay[0] = value; delay[1] = kbd->kb_delay2; + mtx_lock(&Giant); kbdd_ioctl(kbd, KDSETREPEAT, (caddr_t)delay); + mtx_unlock(&Giant); } else if (type == EV_REP && code == REP_PERIOD) { delay[0] = kbd->kb_delay1; delay[1] = value; + mtx_lock(&Giant); kbdd_ioctl(kbd, KDSETREPEAT, (caddr_t)delay); + mtx_unlock(&Giant); } } From owner-svn-src-all@freebsd.org Wed Nov 1 22:19: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 536A1E65B49; Wed, 1 Nov 2017 22:19:20 +0000 (UTC) (envelope-from wulf@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 1D4B6BBE; Wed, 1 Nov 2017 22:19:20 +0000 (UTC) (envelope-from wulf@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA1MJJ0f048940; Wed, 1 Nov 2017 22:19:19 GMT (envelope-from wulf@FreeBSD.org) Received: (from wulf@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA1MJJeo048939; Wed, 1 Nov 2017 22:19:19 GMT (envelope-from wulf@FreeBSD.org) Message-Id: <201711012219.vA1MJJeo048939@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wulf set sender to wulf@FreeBSD.org using -f From: Vladimir Kondratyev Date: Wed, 1 Nov 2017 22:19:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325296 - head/sys/dev/evdev X-SVN-Group: head X-SVN-Commit-Author: wulf X-SVN-Commit-Paths: head/sys/dev/evdev X-SVN-Commit-Revision: 325296 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: Wed, 01 Nov 2017 22:19:20 -0000 Author: wulf Date: Wed Nov 1 22:19:19 2017 New Revision: 325296 URL: https://svnweb.freebsd.org/changeset/base/325296 Log: evdev: Take driver's lock in cdev write handler if necessary Reviewed by: gonzo Approved by: gonzo (mentor) MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D12676 Modified: head/sys/dev/evdev/evdev.c Modified: head/sys/dev/evdev/evdev.c ============================================================================== --- head/sys/dev/evdev/evdev.c Wed Nov 1 22:15:19 2017 (r325295) +++ head/sys/dev/evdev/evdev.c Wed Nov 1 22:19:19 2017 (r325296) @@ -813,7 +813,11 @@ evdev_inject_event(struct evdev_dev *evdev, uint16_t t case EV_ABS: case EV_SW: push: + if (evdev->ev_lock_type != EV_LOCK_INTERNAL) + EVDEV_LOCK(evdev); ret = evdev_push_event(evdev, type, code, value); + if (evdev->ev_lock_type != EV_LOCK_INTERNAL) + EVDEV_UNLOCK(evdev); break; default: From owner-svn-src-all@freebsd.org Wed Nov 1 22:30: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 D5A19E65D9E; Wed, 1 Nov 2017 22:30:37 +0000 (UTC) (envelope-from wulf@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 A49FC117F; Wed, 1 Nov 2017 22:30:37 +0000 (UTC) (envelope-from wulf@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA1MUax7053880; Wed, 1 Nov 2017 22:30:36 GMT (envelope-from wulf@FreeBSD.org) Received: (from wulf@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA1MUaPh053878; Wed, 1 Nov 2017 22:30:36 GMT (envelope-from wulf@FreeBSD.org) Message-Id: <201711012230.vA1MUaPh053878@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wulf set sender to wulf@FreeBSD.org using -f From: Vladimir Kondratyev Date: Wed, 1 Nov 2017 22:30:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325297 - in head/sys/dev: syscons vt X-SVN-Group: head X-SVN-Commit-Author: wulf X-SVN-Commit-Paths: in head/sys/dev: syscons vt X-SVN-Commit-Revision: 325297 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: Wed, 01 Nov 2017 22:30:38 -0000 Author: wulf Date: Wed Nov 1 22:30:36 2017 New Revision: 325297 URL: https://svnweb.freebsd.org/changeset/base/325297 Log: sysmouse(4): Fix ums(4)-style T-axis reporting via evdev protocol - Do not report T-axis wheel events as button presses - Reverse T-axis to match Linux - Remove wrong comment. T-axis buttons state should be checked by level not by edge to allow continuous wheel tilt reporting Reviewed by: gonzo Approved by: gonzo (mentor) MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D12676 Modified: head/sys/dev/syscons/sysmouse.c head/sys/dev/vt/vt_sysmouse.c Modified: head/sys/dev/syscons/sysmouse.c ============================================================================== --- head/sys/dev/syscons/sysmouse.c Wed Nov 1 22:19:19 2017 (r325296) +++ head/sys/dev/syscons/sysmouse.c Wed Nov 1 22:30:36 2017 (r325297) @@ -107,11 +107,11 @@ smdev_evdev_write(int x, int y, int z, int buttons) } break; case EVDEV_SYSMOUSE_T_AXIS_UMS: - /* XXX: Edge triggering should be used here */ - if (buttons & (1 << 5)) + if (buttons & (1 << 6)) evdev_push_rel(sysmouse_evdev, REL_HWHEEL, 1); - else if (buttons & (1 << 6)) + else if (buttons & (1 << 5)) evdev_push_rel(sysmouse_evdev, REL_HWHEEL, -1); + buttons &= ~((1 << 5)|(1 << 6)); /* PASSTHROUGH */ case EVDEV_SYSMOUSE_T_AXIS_NONE: default: Modified: head/sys/dev/vt/vt_sysmouse.c ============================================================================== --- head/sys/dev/vt/vt_sysmouse.c Wed Nov 1 22:19:19 2017 (r325296) +++ head/sys/dev/vt/vt_sysmouse.c Wed Nov 1 22:30:36 2017 (r325297) @@ -139,11 +139,11 @@ sysmouse_evdev_store(int x, int y, int z, int buttons) } break; case EVDEV_SYSMOUSE_T_AXIS_UMS: - /* XXX: Edge triggering should be used here */ - if (buttons & (1 << 5)) + if (buttons & (1 << 6)) evdev_push_rel(sysmouse_evdev, REL_HWHEEL, 1); - else if (buttons & (1 << 6)) + else if (buttons & (1 << 5)) evdev_push_rel(sysmouse_evdev, REL_HWHEEL, -1); + buttons &= ~((1 << 5)|(1 << 6)); /* PASSTHROUGH */ case EVDEV_SYSMOUSE_T_AXIS_NONE: default: From owner-svn-src-all@freebsd.org Wed Nov 1 22:33: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 AA185E65F1D; Wed, 1 Nov 2017 22:33:45 +0000 (UTC) (envelope-from wulf@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 7483D15D9; Wed, 1 Nov 2017 22:33:45 +0000 (UTC) (envelope-from wulf@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA1MXi4e057148; Wed, 1 Nov 2017 22:33:44 GMT (envelope-from wulf@FreeBSD.org) Received: (from wulf@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA1MXiRV057146; Wed, 1 Nov 2017 22:33:44 GMT (envelope-from wulf@FreeBSD.org) Message-Id: <201711012233.vA1MXiRV057146@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wulf set sender to wulf@FreeBSD.org using -f From: Vladimir Kondratyev Date: Wed, 1 Nov 2017 22:33:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325298 - head/sys/dev/evdev X-SVN-Group: head X-SVN-Commit-Author: wulf X-SVN-Commit-Paths: head/sys/dev/evdev X-SVN-Commit-Revision: 325298 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: Wed, 01 Nov 2017 22:33:45 -0000 Author: wulf Date: Wed Nov 1 22:33:44 2017 New Revision: 325298 URL: https://svnweb.freebsd.org/changeset/base/325298 Log: evdev: Disable value normalization and state filtering for SND events. Some events can take sound pitch as a value so can not be represented as binary on/off events. Tracking for on/off state is left in place as it is a part of the evdev API. Reviewed by: gonzo Approved by: gonzo (mentor) MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D12676 Modified: head/sys/dev/evdev/evdev.c head/sys/dev/evdev/evdev.h Modified: head/sys/dev/evdev/evdev.c ============================================================================== --- head/sys/dev/evdev/evdev.c Wed Nov 1 22:30:36 2017 (r325297) +++ head/sys/dev/evdev/evdev.c Wed Nov 1 22:33:44 2017 (r325298) @@ -634,8 +634,6 @@ evdev_sparse_event(struct evdev_dev *evdev, uint16_t t break; case EV_SND: - if (bit_test(evdev->ev_snd_states, code) == value) - return (EV_SKIP_EVENT); bit_change(evdev->ev_snd_states, code, value); break; Modified: head/sys/dev/evdev/evdev.h ============================================================================== --- head/sys/dev/evdev/evdev.h Wed Nov 1 22:30:36 2017 (r325297) +++ head/sys/dev/evdev/evdev.h Wed Nov 1 22:33:44 2017 (r325298) @@ -197,7 +197,7 @@ static __inline int evdev_push_snd(struct evdev_dev *evdev, uint16_t code, int32_t value) { - return (evdev_push_event(evdev, EV_SND, code, value != 0)); + return (evdev_push_event(evdev, EV_SND, code, value)); } static __inline int From owner-svn-src-all@freebsd.org Wed Nov 1 22:37: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 5DE8AE65FBC; Wed, 1 Nov 2017 22:37:45 +0000 (UTC) (envelope-from wulf@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 1EE38177A; Wed, 1 Nov 2017 22:37:45 +0000 (UTC) (envelope-from wulf@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA1MbiOj057358; Wed, 1 Nov 2017 22:37:44 GMT (envelope-from wulf@FreeBSD.org) Received: (from wulf@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA1MbiPL057357; Wed, 1 Nov 2017 22:37:44 GMT (envelope-from wulf@FreeBSD.org) Message-Id: <201711012237.vA1MbiPL057357@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wulf set sender to wulf@FreeBSD.org using -f From: Vladimir Kondratyev Date: Wed, 1 Nov 2017 22:37:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325299 - head/sys/dev/evdev X-SVN-Group: head X-SVN-Commit-Author: wulf X-SVN-Commit-Paths: head/sys/dev/evdev X-SVN-Commit-Revision: 325299 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: Wed, 01 Nov 2017 22:37:45 -0000 Author: wulf Date: Wed Nov 1 22:37:43 2017 New Revision: 325299 URL: https://svnweb.freebsd.org/changeset/base/325299 Log: evdev: Do not start/stop softrepeat callout if no clients attached Reviewed by: gonzo Approved by: gonzo (mentor) MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D12676 Modified: head/sys/dev/evdev/evdev.c Modified: head/sys/dev/evdev/evdev.c ============================================================================== --- head/sys/dev/evdev/evdev.c Wed Nov 1 22:33:44 2017 (r325298) +++ head/sys/dev/evdev/evdev.c Wed Nov 1 22:37:43 2017 (r325299) @@ -579,7 +579,8 @@ evdev_modify_event(struct evdev_dev *evdev, uint16_t t *value = KEY_EVENT_REPEAT; } else { /* Start/stop callout for evdev repeats */ - if (bit_test(evdev->ev_key_states, code) == !*value) { + if (bit_test(evdev->ev_key_states, code) == !*value && + !LIST_EMPTY(&evdev->ev_clients)) { if (*value == KEY_EVENT_DOWN) evdev_start_repeat(evdev, code); else From owner-svn-src-all@freebsd.org Wed Nov 1 23:16: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 67D4BE669E9; Wed, 1 Nov 2017 23:16:35 +0000 (UTC) (envelope-from sjg@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 364722B24; Wed, 1 Nov 2017 23:16:35 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA1NGYAw074295; Wed, 1 Nov 2017 23:16:34 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA1NGWGP074270; Wed, 1 Nov 2017 23:16:32 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201711012316.vA1NGWGP074270@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Wed, 1 Nov 2017 23:16:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r325300 - in vendor/NetBSD/bmake/dist: . mk unit-tests X-SVN-Group: vendor X-SVN-Commit-Author: sjg X-SVN-Commit-Paths: in vendor/NetBSD/bmake/dist: . mk unit-tests X-SVN-Commit-Revision: 325300 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: Wed, 01 Nov 2017 23:16:35 -0000 Author: sjg Date: Wed Nov 1 23:16:32 2017 New Revision: 325300 URL: https://svnweb.freebsd.org/changeset/base/325300 Log: Import bmake-20171028 From ChangeLog 2017-10-28 Simon J. Gerraty * VERSION: 20171028 Merge with NetBSD make, pick up o main.c: ignore empty MAKEOBJDIR * Makefile.config.in: make @prefix@ @machine*@ and @default_sys_path@ defaults. 2017-10-05 Simon J. Gerraty * VERSION: 20171005 * unit-tests/dotwait.mk: redirect stderr through pipe for more consistent result on some platforms. 2017-08-13 Simon J. Gerraty * machine.sh: entry for AIX 2017-08-12 Simon J. Gerraty * VERSION (_MAKE_VERSION): Move the setting of _MAKE_VERSION to a file that can be included by configure as well as make. This allows configure to set set _MAKE_VERSION in make-bootstrap.sh 2017-08-10 Simon J. Gerraty * Makefile (_MAKE_VERSION): 20170810 Merge with NetBSD make, pick up o meta.c: if target is in subdir we only need subdir name in meta_name. Added: vendor/NetBSD/bmake/dist/VERSION Modified: vendor/NetBSD/bmake/dist/ChangeLog vendor/NetBSD/bmake/dist/FILES vendor/NetBSD/bmake/dist/Makefile vendor/NetBSD/bmake/dist/Makefile.config.in vendor/NetBSD/bmake/dist/bsd.after-import.mk vendor/NetBSD/bmake/dist/configure vendor/NetBSD/bmake/dist/configure.in vendor/NetBSD/bmake/dist/machine.sh vendor/NetBSD/bmake/dist/main.c vendor/NetBSD/bmake/dist/make-bootstrap.sh.in vendor/NetBSD/bmake/dist/meta.c vendor/NetBSD/bmake/dist/mk/ChangeLog vendor/NetBSD/bmake/dist/mk/autoconf.mk vendor/NetBSD/bmake/dist/mk/dirdeps.mk vendor/NetBSD/bmake/dist/mk/dpadd.mk vendor/NetBSD/bmake/dist/mk/gendirdeps.mk vendor/NetBSD/bmake/dist/mk/install-mk vendor/NetBSD/bmake/dist/mk/meta.autodep.mk vendor/NetBSD/bmake/dist/mk/meta.stage.mk vendor/NetBSD/bmake/dist/mk/sys.clean-env.mk vendor/NetBSD/bmake/dist/mk/whats.mk vendor/NetBSD/bmake/dist/os.sh vendor/NetBSD/bmake/dist/unit-tests/dotwait.exp vendor/NetBSD/bmake/dist/unit-tests/dotwait.mk Modified: vendor/NetBSD/bmake/dist/ChangeLog ============================================================================== --- vendor/NetBSD/bmake/dist/ChangeLog Wed Nov 1 22:37:43 2017 (r325299) +++ vendor/NetBSD/bmake/dist/ChangeLog Wed Nov 1 23:16:32 2017 (r325300) @@ -1,3 +1,36 @@ +2017-10-28 Simon J. Gerraty + + * VERSION: 20171028 + Merge with NetBSD make, pick up + o main.c: ignore empty MAKEOBJDIR + + * Makefile.config.in: + make @prefix@ @machine*@ and @default_sys_path@ defaults. + +2017-10-05 Simon J. Gerraty + + * VERSION: 20171005 + + * unit-tests/dotwait.mk: redirect stderr through pipe for more + consistent result on some platforms. + +2017-08-13 Simon J. Gerraty + + * machine.sh: entry for AIX + +2017-08-12 Simon J. Gerraty + + * VERSION (_MAKE_VERSION): Move the setting of _MAKE_VERSION + to a file that can be included by configure as well as make. + This allows configure to set set _MAKE_VERSION in make-bootstrap.sh + +2017-08-10 Simon J. Gerraty + + * Makefile (_MAKE_VERSION): 20170810 + Merge with NetBSD make, pick up + o meta.c: if target is in subdir we only need subdir name in + meta_name. + 2017-07-20 Simon J. Gerraty * Makefile (_MAKE_VERSION): 20170720 Modified: vendor/NetBSD/bmake/dist/FILES ============================================================================== --- vendor/NetBSD/bmake/dist/FILES Wed Nov 1 22:37:43 2017 (r325299) +++ vendor/NetBSD/bmake/dist/FILES Wed Nov 1 23:16:32 2017 (r325300) @@ -5,6 +5,7 @@ Makefile.config.in PSD.doc/Makefile PSD.doc/tutorial.ms README +VERSION aclocal.m4 arch.c bmake.1 Modified: vendor/NetBSD/bmake/dist/Makefile ============================================================================== --- vendor/NetBSD/bmake/dist/Makefile Wed Nov 1 22:37:43 2017 (r325299) +++ vendor/NetBSD/bmake/dist/Makefile Wed Nov 1 23:16:32 2017 (r325300) @@ -1,8 +1,5 @@ -# $Id: Makefile,v 1.95 2017/07/20 19:36:13 sjg Exp $ +# $Id: Makefile,v 1.99 2017/08/13 20:12:53 sjg Exp $ -# Base version on src date -_MAKE_VERSION= 20170720 - PROG= bmake SRCS= \ @@ -58,6 +55,8 @@ SRCS+= \ lstReplace.c \ lstSucc.c +.-include "VERSION" + # this file gets generated by configure .-include "Makefile.config" @@ -192,11 +191,13 @@ MANDIR= ${MANDIR.bmake:U${SHAREDIR}/man} ${OBJS}: config.h .endif +# start-delete2 for bsd.after-import.mk + # make sure that MAKE_VERSION gets updated. -main.o: ${SRCS} ${MAKEFILE} +main.o: ${SRCS} ${.CURDIR}/VERSION -# start-delete2 for bsd.after-import.mk .if ${MK_AUTOCONF_MK} == "yes" +CONFIGURE_DEPS += ${.CURDIR}/VERSION .include .endif SHARE_MK?=${SHAREDIR}/mk Modified: vendor/NetBSD/bmake/dist/Makefile.config.in ============================================================================== --- vendor/NetBSD/bmake/dist/Makefile.config.in Wed Nov 1 22:37:43 2017 (r325299) +++ vendor/NetBSD/bmake/dist/Makefile.config.in Wed Nov 1 23:16:32 2017 (r325300) @@ -1,11 +1,13 @@ # things set by configure -prefix= @prefix@ +_MAKE_VERSION=@_MAKE_VERSION@ + +prefix?= @prefix@ srcdir= @srcdir@ CC?= @CC@ -MACHINE= @machine@ -MACHINE_ARCH= @machine_arch@ -DEFAULT_SYS_PATH= @default_sys_path@ +MACHINE?= @machine@ +MACHINE_ARCH?= @machine_arch@ +DEFAULT_SYS_PATH?= @default_sys_path@ CPPFLAGS+= @CPPFLAGS@ CFLAGS+= ${CPPFLAGS} @DEFS@ @@ -17,4 +19,3 @@ FILEMON_H= @filemon_h@ BMAKE_PATH_MAX?= @bmake_path_max@ # used if MAXPATHLEN not defined CPPFLAGS+= -DBMAKE_PATH_MAX=${BMAKE_PATH_MAX} - Added: vendor/NetBSD/bmake/dist/VERSION ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/NetBSD/bmake/dist/VERSION Wed Nov 1 23:16:32 2017 (r325300) @@ -0,0 +1,2 @@ +# keep this compatible with sh and make +_MAKE_VERSION=20171028 Modified: vendor/NetBSD/bmake/dist/bsd.after-import.mk ============================================================================== --- vendor/NetBSD/bmake/dist/bsd.after-import.mk Wed Nov 1 22:37:43 2017 (r325299) +++ vendor/NetBSD/bmake/dist/bsd.after-import.mk Wed Nov 1 23:16:32 2017 (r325300) @@ -1,4 +1,4 @@ -# $Id: bsd.after-import.mk,v 1.12 2014/02/14 23:45:49 sjg Exp $ +# $Id: bsd.after-import.mk,v 1.13 2017/08/13 00:56:10 sjg Exp $ # This makefile is for use when integrating bmake into a BSD build # system. Use this makefile after importing bmake. @@ -56,6 +56,7 @@ bootstrap: ${BMAKE_SRC}/boot-strap ${MAKEFILE} # Makefiles need a little more tweaking than say config.h MAKEFILE_SED = sed -e '/^MACHINE/d' \ + -e '/include.*VERSION/d' \ -e '/^PROG/ { s,=,?=,;s,bmake,$${.CURDIR:T},; }' \ -e 's,^.-include,.sinclude,' \ -e '/^\..*include * #ifndef lint @@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 #if 0 static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: main.c,v 1.272 2017/06/19 19:58:24 christos Exp $"); +__RCSID("$NetBSD: main.c,v 1.273 2017/10/28 21:54:54 sjg Exp $"); #endif #endif /* not lint */ #endif @@ -792,7 +792,8 @@ Main_SetVarObjdir(const char *var, const char *suffix) { char *p, *path, *xpath; - if ((path = Var_Value(var, VAR_CMD, &p)) == NULL) + if ((path = Var_Value(var, VAR_CMD, &p)) == NULL || + *path == '\0') return FALSE; /* expand variable substitutions */ Modified: vendor/NetBSD/bmake/dist/make-bootstrap.sh.in ============================================================================== --- vendor/NetBSD/bmake/dist/make-bootstrap.sh.in Wed Nov 1 22:37:43 2017 (r325299) +++ vendor/NetBSD/bmake/dist/make-bootstrap.sh.in Wed Nov 1 23:16:32 2017 (r325300) @@ -13,7 +13,7 @@ esac CC="@CC@" CFLAGS="@CFLAGS@ -I. -I${srcdir} @DEFS@ @CPPFLAGS@ -DMAKE_NATIVE ${XDEFS} -DBMAKE_PATH_MAX=@bmake_path_max@" -MAKE_VERSION=`sed -n '/^_MAKE_VERSION=/s,.*=[^0-9]*,,p' $srcdir/Makefile` +MAKE_VERSION=@_MAKE_VERSION@ MDEFS="-DMAKE_VERSION=\"$MAKE_VERSION\" \ -D@force_machine@MACHINE=\"@machine@\" -DMACHINE_ARCH=\"@machine_arch@\" \ Modified: vendor/NetBSD/bmake/dist/meta.c ============================================================================== --- vendor/NetBSD/bmake/dist/meta.c Wed Nov 1 22:37:43 2017 (r325299) +++ vendor/NetBSD/bmake/dist/meta.c Wed Nov 1 23:16:32 2017 (r325300) @@ -1,4 +1,4 @@ -/* $NetBSD: meta.c,v 1.68 2017/07/09 04:54:00 sjg Exp $ */ +/* $NetBSD: meta.c,v 1.69 2017/08/10 21:07:48 sjg Exp $ */ /* * Implement 'meta' mode. @@ -250,6 +250,8 @@ meta_name(char *mname, size_t mnamelen, char *rp; char *cp; char *tp; + char *dtp; + size_t ldname; /* * Weed out relative paths from the target file name. @@ -286,10 +288,15 @@ meta_name(char *mname, size_t mnamelen, } /* on some systems dirname may modify its arg */ tp = bmake_strdup(tname); - if (strcmp(dname, dirname(tp)) == 0) + dtp = dirname(tp); + if (strcmp(dname, dtp) == 0) snprintf(mname, mnamelen, "%s.meta", tname); else { - snprintf(mname, mnamelen, "%s/%s.meta", dname, tname); + ldname = strlen(dname); + if (strncmp(dname, dtp, ldname) == 0 && dtp[ldname] == '/') + snprintf(mname, mnamelen, "%s/%s.meta", dname, &tname[ldname+1]); + else + snprintf(mname, mnamelen, "%s/%s.meta", dname, tname); /* * Replace path separators in the file name after the Modified: vendor/NetBSD/bmake/dist/mk/ChangeLog ============================================================================== --- vendor/NetBSD/bmake/dist/mk/ChangeLog Wed Nov 1 22:37:43 2017 (r325299) +++ vendor/NetBSD/bmake/dist/mk/ChangeLog Wed Nov 1 23:16:32 2017 (r325300) @@ -1,3 +1,21 @@ +2017-10-25 Simon J. Gerraty + + * Allow for host32 on rare occasions. + +2017-10-18 Simon J. Gerraty + + * install-mk (MK_VERSION): 20171018 + + * whats.mk: include what_thing in what_uuid to avoid problem + when building multiple apps in the same directory. + +2017-08-12 Simon J. Gerraty + + * install-mk (MK_VERSION): 20170812 + + * autoconf.mk: Use CONFIGURE_DEPS so Makefile can + add dependencies for config.recheck and config.gen + 2017-06-30 Simon J. Gerraty * install-mk (MK_VERSION): 20170630 Modified: vendor/NetBSD/bmake/dist/mk/autoconf.mk ============================================================================== --- vendor/NetBSD/bmake/dist/mk/autoconf.mk Wed Nov 1 22:37:43 2017 (r325299) +++ vendor/NetBSD/bmake/dist/mk/autoconf.mk Wed Nov 1 23:16:32 2017 (r325300) @@ -1,4 +1,4 @@ -# $Id: autoconf.mk,v 1.8 2012/11/19 05:37:48 sjg Exp $ +# $Id: autoconf.mk,v 1.9 2017/08/13 20:03:13 sjg Exp $ # # @(#) Copyright (c) 1996-2009, Simon J. Gerraty # @@ -15,8 +15,10 @@ .NOPATH: config.h config.status +CONFIGURE_DEPS += ${.CURDIR}/config.h.in ${.CURDIR}/configure + .if !target(config.h) -config.h: ${.CURDIR}/config.h.in config.status +config.h: ${CONFIGURE_DEPS} config.status ./config.status .endif @@ -28,11 +30,11 @@ config.status: config.recheck config.status: config.gen .endif -config.recheck: config.h.in ${.CURDIR}/configure +config.recheck: ${CONFIGURE_DEPS} ./config.status --recheck @touch $@ -config.gen: config.h.in ${.CURDIR}/configure +config.gen: ${CONFIGURE_DEPS} CC="${CC} ${CCMODE}" ${.CURDIR}/configure --no-create ${CONFIGURE_ARGS} @touch $@ config.recheck Modified: vendor/NetBSD/bmake/dist/mk/dirdeps.mk ============================================================================== --- vendor/NetBSD/bmake/dist/mk/dirdeps.mk Wed Nov 1 22:37:43 2017 (r325299) +++ vendor/NetBSD/bmake/dist/mk/dirdeps.mk Wed Nov 1 23:16:32 2017 (r325300) @@ -1,4 +1,4 @@ -# $Id: dirdeps.mk,v 1.89 2017/05/17 17:41:47 sjg Exp $ +# $Id: dirdeps.mk,v 1.90 2017/10/25 23:44:20 sjg Exp $ # Copyright (c) 2010-2013, Juniper Networks, Inc. # All rights reserved. @@ -536,9 +536,13 @@ _machines := ${DEP_MACHINE} # this is the machine list we actually use below _machines := ${_only_machines} -.if defined(HOSTPROG) || ${DEP_MACHINE} == "host" +.if defined(HOSTPROG) || ${DEP_MACHINE:Nhost*} == "" # we need to build this guy's dependencies for host as well. +.if ${DEP_MACHINE:Nhost*} == "" +_machines += ${DEP_MACHINE} +.else _machines += host +.endif .endif _machines := ${_machines:O:u} Modified: vendor/NetBSD/bmake/dist/mk/dpadd.mk ============================================================================== --- vendor/NetBSD/bmake/dist/mk/dpadd.mk Wed Nov 1 22:37:43 2017 (r325299) +++ vendor/NetBSD/bmake/dist/mk/dpadd.mk Wed Nov 1 23:16:32 2017 (r325300) @@ -1,4 +1,4 @@ -# $Id: dpadd.mk,v 1.23 2017/02/13 16:46:01 sjg Exp $ +# $Id: dpadd.mk,v 1.24 2017/10/25 23:44:20 sjg Exp $ # # @(#) Copyright (c) 2004, Simon J. Gerraty # @@ -195,7 +195,7 @@ __dpadd_incs += ${__dpadd_libs:O:u:@s@${SRC_LIBS_${s:T __dpadd_last_incs += ${__dpadd_libs:u:@x@${INCLUDES_LAST_${x:T:R}}@} __dpadd_last_incs += ${__dpadd_libs:O:u:@s@${SRC_LIBS_${s:T:R}:U}@:@x@${INCLUDES_LAST_${x:T:R}}@} -.if defined(HOSTPROG) || ${MACHINE} == "host" +.if defined(HOSTPROG) || ${MACHINE:Nhost*} == "" # we want any -I/usr/* last __dpadd_last_incs := \ ${__dpadd_last_incs:N-I/usr/*} \ Modified: vendor/NetBSD/bmake/dist/mk/gendirdeps.mk ============================================================================== --- vendor/NetBSD/bmake/dist/mk/gendirdeps.mk Wed Nov 1 22:37:43 2017 (r325299) +++ vendor/NetBSD/bmake/dist/mk/gendirdeps.mk Wed Nov 1 23:16:32 2017 (r325300) @@ -1,4 +1,4 @@ -# $Id: gendirdeps.mk,v 1.33 2016/10/11 22:37:28 sjg Exp $ +# $Id: gendirdeps.mk,v 1.34 2017/10/26 00:46:26 sjg Exp $ # Copyright (c) 2010-2013, Juniper Networks, Inc. # All rights reserved. @@ -194,7 +194,7 @@ dpadd_dir_list += ${f:H:tA} .endfor .if !empty(ddep_list) ddeps != cat ${ddep_list:O:u} | ${META2DEPS_FILTER} ${_skip_gendirdeps} \ - sed 's,//*$$,,;s,\.${HOST_TARGET}$$,.host,;s,\.${MACHINE}$$,,' + sed 's,//*$$,,;s,\.${HOST_TARGET:Uhost}$$,.host,;s,\.${HOST_TARGET32:Uhost32}$$,.host32,;s,\.${MACHINE}$$,,' .if ${DEBUG_GENDIRDEPS:Uno:@x@${RELDIR:M$x}@} != "" .info ${RELDIR}: raw_dir_list='${dir_list}' Modified: vendor/NetBSD/bmake/dist/mk/install-mk ============================================================================== --- vendor/NetBSD/bmake/dist/mk/install-mk Wed Nov 1 22:37:43 2017 (r325299) +++ vendor/NetBSD/bmake/dist/mk/install-mk Wed Nov 1 23:16:32 2017 (r325300) @@ -55,7 +55,7 @@ # Simon J. Gerraty # RCSid: -# $Id: install-mk,v 1.148 2017/06/30 23:46:15 sjg Exp $ +# $Id: install-mk,v 1.150 2017/10/19 03:50:51 sjg Exp $ # # @(#) Copyright (c) 1994 Simon J. Gerraty # @@ -70,7 +70,7 @@ # sjg@crufty.net # -MK_VERSION=20170630 +MK_VERSION=20171018 OWNER= GROUP= MODE=444 Modified: vendor/NetBSD/bmake/dist/mk/meta.autodep.mk ============================================================================== --- vendor/NetBSD/bmake/dist/mk/meta.autodep.mk Wed Nov 1 22:37:43 2017 (r325299) +++ vendor/NetBSD/bmake/dist/mk/meta.autodep.mk Wed Nov 1 23:16:32 2017 (r325300) @@ -1,4 +1,4 @@ -# $Id: meta.autodep.mk,v 1.45 2016/06/03 17:22:32 sjg Exp $ +# $Id: meta.autodep.mk,v 1.46 2017/10/25 23:44:20 sjg Exp $ # # @(#) Copyright (c) 2010, Simon J. Gerraty @@ -261,7 +261,7 @@ META_FILES = ${.MAKE.META.FILES:T:N.depend*:N*o.meta:O _makesyspath:= ${_PARSEDIR} ${_DEPENDFILE}: ${_depend} ${.PARSEDIR}/gendirdeps.mk ${META2DEPS} $${.MAKE.META.CREATED} @echo Checking $@: ${.OODATE:T:[1..8]} - @(cd . && \ + @(cd . && ${GENDIRDEPS_ENV} \ SKIP_GENDIRDEPS='${SKIP_GENDIRDEPS:O:u}' \ DPADD='${FORCE_DPADD:O:u}' ${_gendirdeps_mutex} \ MAKESYSPATH=${_makesyspath} \ Modified: vendor/NetBSD/bmake/dist/mk/meta.stage.mk ============================================================================== --- vendor/NetBSD/bmake/dist/mk/meta.stage.mk Wed Nov 1 22:37:43 2017 (r325299) +++ vendor/NetBSD/bmake/dist/mk/meta.stage.mk Wed Nov 1 23:16:32 2017 (r325300) @@ -1,4 +1,4 @@ -# $Id: meta.stage.mk,v 1.54 2017/07/06 23:20:33 sjg Exp $ +# $Id: meta.stage.mk,v 1.55 2017/10/27 01:17:09 sjg Exp $ # # @(#) Copyright (c) 2011-2017, Simon J. Gerraty # @@ -20,9 +20,9 @@ .if ${.MAKE.DEPENDFILE_PREFERENCE:U${.MAKE.DEPENDFILE}:M*.${MACHINE}} != "" # this is generally safer anyway -_dirdep = ${RELDIR}.${MACHINE} +_dirdep ?= ${RELDIR}.${MACHINE} .else -_dirdep = ${RELDIR} +_dirdep ?= ${RELDIR} .endif CLEANFILES+= .dirdep Modified: vendor/NetBSD/bmake/dist/mk/sys.clean-env.mk ============================================================================== --- vendor/NetBSD/bmake/dist/mk/sys.clean-env.mk Wed Nov 1 22:37:43 2017 (r325299) +++ vendor/NetBSD/bmake/dist/mk/sys.clean-env.mk Wed Nov 1 23:16:32 2017 (r325300) @@ -1,4 +1,4 @@ -# $Id: sys.clean-env.mk,v 1.21 2016/02/18 21:16:40 sjg Exp $ +# $Id: sys.clean-env.mk,v 1.22 2017/10/25 23:44:20 sjg Exp $ # # @(#) Copyright (c) 2009, Simon J. Gerraty # @@ -97,7 +97,7 @@ _objroot := ${OBJROOT:U${SB_OBJROOT:U${SB}/${SB_OBJPRE .if ${MAKE_VERSION} < 20160218 _objtop := ${OBJTOP:U${_objroot}${MACHINE}} # Take care of ${MACHINE} -.if ${MACHINE} == "host" || ${OBJTOP} == ${HOST_OBJTOP:Uno} +.if ${MACHINE:Nhost*} == "" || ${OBJTOP} == ${HOST_OBJTOP:Uno} OBJTOP = ${_objtop:S,${HOST_TARGET}$,\${MACHINE},} .else OBJTOP = ${_objtop:S,${MACHINE}$,\${MACHINE},} Modified: vendor/NetBSD/bmake/dist/mk/whats.mk ============================================================================== --- vendor/NetBSD/bmake/dist/mk/whats.mk Wed Nov 1 22:37:43 2017 (r325299) +++ vendor/NetBSD/bmake/dist/mk/whats.mk Wed Nov 1 23:16:32 2017 (r325300) @@ -1,4 +1,4 @@ -# $Id: whats.mk,v 1.1 2014/08/30 22:40:47 sjg Exp $ +# $Id: whats.mk,v 1.3 2017/10/19 06:09:14 sjg Exp $ # # @(#) Copyright (c) 2014, Simon J. Gerraty # @@ -36,7 +36,8 @@ what_build_thing?= ${KMOD}.ko .if !empty(what_thing) # a unique name that won't conflict with anything -what_uuid = what_${.CURDIR:T:hash} +what_uuid = what_${what_thing}_${.CURDIR:T:hash} +what_var = what_${.CURDIR:T:hash} .if !empty(what_build_thing) ${what_build_thing}: ${what_build_exts:@e@${what_uuid}.$e@} @@ -57,7 +58,7 @@ _what1:= @(\#)${what_thing:tu} built ${%Y%m%d:L:localt _what2:= @(\#)${what_location} ${what_uuid}.c: - echo '${_what_t} ${what_uuid}1[] = "${_what1}";' > $@ ${.OODATE:MNO_META_CMP} - echo '${_what_t} ${what_uuid}2[] = "${_what2}";' >> $@ + echo '${_what_t} ${what_var}1[] = "${_what1}";' > $@ ${.OODATE:MNO_META_CMP} + echo '${_what_t} ${what_var}2[] = "${_what2}";' >> $@ .endif .endif Modified: vendor/NetBSD/bmake/dist/os.sh ============================================================================== --- vendor/NetBSD/bmake/dist/os.sh Wed Nov 1 22:37:43 2017 (r325299) +++ vendor/NetBSD/bmake/dist/os.sh Wed Nov 1 23:16:32 2017 (r325300) @@ -17,7 +17,7 @@ # Simon J. Gerraty # RCSid: -# $Id: os.sh,v 1.53 2017/01/11 20:01:09 sjg Exp $ +# $Id: os.sh,v 1.54 2017/09/08 06:17:22 sjg Exp $ # # @(#) Copyright (c) 1994 Simon J. Gerraty # @@ -246,5 +246,7 @@ case /$0 in echo "$v='$vv'" done ;; +*/host_target32) echo $HOST_TARGET32;; +*/host_target) echo $HOST_TARGET;; esac Modified: vendor/NetBSD/bmake/dist/unit-tests/dotwait.exp ============================================================================== --- vendor/NetBSD/bmake/dist/unit-tests/dotwait.exp Wed Nov 1 22:37:43 2017 (r325299) +++ vendor/NetBSD/bmake/dist/unit-tests/dotwait.exp Wed Nov 1 23:16:32 2017 (r325300) @@ -22,9 +22,9 @@ shared.2.1 shared.2.1 shared.2.99 shared.2.99 +cycle.1.99 +cycle.1.99 make: Graph cycles through `cycle.2.99' make: Graph cycles through `cycle.2.98' make: Graph cycles through `cycle.2.97' -cycle.1.99 -cycle.1.99 exit status 0 Modified: vendor/NetBSD/bmake/dist/unit-tests/dotwait.mk ============================================================================== --- vendor/NetBSD/bmake/dist/unit-tests/dotwait.mk Wed Nov 1 22:37:43 2017 (r325299) +++ vendor/NetBSD/bmake/dist/unit-tests/dotwait.mk Wed Nov 1 23:16:32 2017 (r325300) @@ -1,4 +1,4 @@ -# $NetBSD: dotwait.mk,v 1.1 2014/08/21 13:44:51 apb Exp $ +# $NetBSD: dotwait.mk,v 1.2 2017/10/08 20:44:19 sjg Exp $ THISMAKEFILE:= ${.PARSEDIR}/${.PARSEFILE} @@ -11,7 +11,7 @@ PAUSE= sleep 1 # Ignore "--- target ---" lines printed by parallel make. all: .for t in ${TESTS} - @${.MAKE} -f ${THISMAKEFILE} -j4 $t | grep -v "^--- " + @${.MAKE} -f ${THISMAKEFILE} -j4 $t 2>&1 | grep -v "^--- " .endfor # From owner-svn-src-all@freebsd.org Wed Nov 1 23:17: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 B6E8FE66A6E; Wed, 1 Nov 2017 23:17:48 +0000 (UTC) (envelope-from sjg@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 6E24E2C88; Wed, 1 Nov 2017 23:17:48 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA1NHl08074390; Wed, 1 Nov 2017 23:17:47 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA1NHlDe074389; Wed, 1 Nov 2017 23:17:47 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201711012317.vA1NHlDe074389@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Wed, 1 Nov 2017 23:17:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r325301 - vendor/NetBSD/bmake/20171028 X-SVN-Group: vendor X-SVN-Commit-Author: sjg X-SVN-Commit-Paths: vendor/NetBSD/bmake/20171028 X-SVN-Commit-Revision: 325301 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: Wed, 01 Nov 2017 23:17:48 -0000 Author: sjg Date: Wed Nov 1 23:17:47 2017 New Revision: 325301 URL: https://svnweb.freebsd.org/changeset/base/325301 Log: tag bmake-20171028 Added: vendor/NetBSD/bmake/20171028/ - copied from r325300, vendor/NetBSD/bmake/dist/ From owner-svn-src-all@freebsd.org Wed Nov 1 23:20:05 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 CCE6BE66B12; Wed, 1 Nov 2017 23:20:05 +0000 (UTC) (envelope-from sjg@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 9A80B2E03; Wed, 1 Nov 2017 23:20:05 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA1NK4Nk074541; Wed, 1 Nov 2017 23:20:04 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA1NK4JF074540; Wed, 1 Nov 2017 23:20:04 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201711012320.vA1NK4JF074540@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Wed, 1 Nov 2017 23:20:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r325302 - vendor/NetBSD/bmake X-SVN-Group: vendor X-SVN-Commit-Author: sjg X-SVN-Commit-Paths: vendor/NetBSD/bmake X-SVN-Commit-Revision: 325302 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: Wed, 01 Nov 2017 23:20:05 -0000 Author: sjg Date: Wed Nov 1 23:20:04 2017 New Revision: 325302 URL: https://svnweb.freebsd.org/changeset/base/325302 Log: We get VERSION from bmake/VERSION now Modified: vendor/NetBSD/bmake/import.sh Modified: vendor/NetBSD/bmake/import.sh ============================================================================== --- vendor/NetBSD/bmake/import.sh Wed Nov 1 23:17:47 2017 (r325301) +++ vendor/NetBSD/bmake/import.sh Wed Nov 1 23:20:04 2017 (r325302) @@ -33,7 +33,7 @@ option_parsing() { -r) REVIEWER=$2; shift 2;; -u) url=$2; shift 2;; -h) echo "Usage:"; - echo " "$0 '[-ahnPr] [TARBALL=] [PR=] [REVIEWER=]' + echo " "$0 '[-ahnPr] [TARBALL=] [PR=] [REVIEWER=]' echo " "$0 '-a # (a)rchive' echo " "$0 '-h # print usage' echo " "$0 '-n # do not import, check only.' @@ -64,7 +64,7 @@ rm -rf $thing tar zxf $TARBALL # steps unique to bmake -VERSION=`grep '^_MAKE_VERSION' bmake/Makefile | sed 's,.*=[[:space:]]*,,'` +VERSION=`grep '^_MAKE_VERSION' bmake/VERSION | sed 's,.*=[[:space:]]*,,'` rm -rf bmake/missing # the rest should be common From owner-svn-src-all@freebsd.org Thu Nov 2 00:17: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 28B6CE67951; Thu, 2 Nov 2017 00:17:54 +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 0075C637EA; Thu, 2 Nov 2017 00:17:53 +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 vA20HrY6099255; Thu, 2 Nov 2017 00:17:53 GMT (envelope-from avos@FreeBSD.org) Received: (from avos@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA20HrNN099254; Thu, 2 Nov 2017 00:17:53 GMT (envelope-from avos@FreeBSD.org) Message-Id: <201711020017.vA20HrNN099254@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avos set sender to avos@FreeBSD.org using -f From: Andriy Voskoboinyk Date: Thu, 2 Nov 2017 00:17:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325303 - head/sys/dev/usb/wlan X-SVN-Group: head X-SVN-Commit-Author: avos X-SVN-Commit-Paths: head/sys/dev/usb/wlan X-SVN-Commit-Revision: 325303 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: Thu, 02 Nov 2017 00:17:54 -0000 Author: avos Date: Thu Nov 2 00:17:52 2017 New Revision: 325303 URL: https://svnweb.freebsd.org/changeset/base/325303 Log: rsu(4): trim code for Rx rate calculation. Include ridx <-> rate conversion functions from rtwn(4) + reuse already calculated value for ieee80211_radiotap(9). Tested with Asus USB-N10, STA mode. Modified: head/sys/dev/usb/wlan/if_rsu.c Modified: head/sys/dev/usb/wlan/if_rsu.c ============================================================================== --- head/sys/dev/usb/wlan/if_rsu.c Wed Nov 1 23:20:04 2017 (r325302) +++ head/sys/dev/usb/wlan/if_rsu.c Thu Nov 2 00:17:52 2017 (r325303) @@ -68,8 +68,11 @@ __FBSDID("$FreeBSD$"); #include #include "usbdevs.h" +#include /* XXX */ #include +#define RSU_RATE_IS_CCK RTWN_RATE_IS_CCK + #ifdef USB_DEBUG static int rsu_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, rsu, CTLFLAG_RW, 0, "USB rsu"); @@ -2382,44 +2385,6 @@ rsu_rx_frame(struct rsu_softc *sc, struct mbuf *m) rssi = rsu_hwrssi_to_rssi(sc, sc->sc_currssi); } - if (ieee80211_radiotap_active(ic)) { - struct rsu_rx_radiotap_header *tap = &sc->sc_rxtap; - - /* Map HW rate index to 802.11 rate. */ - tap->wr_flags = 0; /* TODO */ - tap->wr_tsft = rsu_get_tsf_high(sc); - if (le32toh(stat->tsf_low) > rsu_get_tsf_low(sc)) - tap->wr_tsft--; - tap->wr_tsft = (uint64_t)htole32(tap->wr_tsft) << 32; - tap->wr_tsft += stat->tsf_low; - - if (rate < 12) { - switch (rate) { - /* CCK. */ - case 0: tap->wr_rate = 2; break; - case 1: tap->wr_rate = 4; break; - case 2: tap->wr_rate = 11; break; - case 3: tap->wr_rate = 22; break; - /* OFDM. */ - case 4: tap->wr_rate = 12; break; - case 5: tap->wr_rate = 18; break; - case 6: tap->wr_rate = 24; break; - case 7: tap->wr_rate = 36; break; - case 8: tap->wr_rate = 48; break; - case 9: tap->wr_rate = 72; break; - case 10: tap->wr_rate = 96; break; - case 11: tap->wr_rate = 108; break; - } - } else { /* MCS0~15. */ - /* Bit 7 set means HT MCS instead of rate. */ - tap->wr_rate = 0x80 | (rate - 12); - } - - tap->wr_dbm_antsignal = rssi; - tap->wr_chan_freq = htole16(ic->ic_curchan->ic_freq); - tap->wr_chan_flags = htole16(ic->ic_curchan->ic_flags); - }; - /* Hardware does Rx TCP checksum offload. */ /* * This flag can be set for some other @@ -2465,64 +2430,33 @@ rsu_rx_frame(struct rsu_softc *sc, struct mbuf *m) rxs.c_nf = -96; /* Rate */ - if (!(rxdw3 & R92S_RXDW3_HTC)) { - switch (rate) { - /* CCK. */ - case 0: - rxs.c_rate = 2; + if (rate < 12) { + rxs.c_rate = ridx2rate[rate]; + if (RSU_RATE_IS_CCK(rate)) rxs.c_pktflags |= IEEE80211_RX_F_CCK; - break; - case 1: - rxs.c_rate = 4; - rxs.c_pktflags |= IEEE80211_RX_F_CCK; - break; - case 2: - rxs.c_rate = 11; - rxs.c_pktflags |= IEEE80211_RX_F_CCK; - break; - case 3: - rxs.c_rate = 22; - rxs.c_pktflags |= IEEE80211_RX_F_CCK; - break; - /* OFDM. */ - case 4: - rxs.c_rate = 12; + else rxs.c_pktflags |= IEEE80211_RX_F_OFDM; - break; - case 5: - rxs.c_rate = 18; - rxs.c_pktflags |= IEEE80211_RX_F_OFDM; - break; - case 6: - rxs.c_rate = 24; - rxs.c_pktflags |= IEEE80211_RX_F_OFDM; - break; - case 7: - rxs.c_rate = 36; - rxs.c_pktflags |= IEEE80211_RX_F_OFDM; - break; - case 8: - rxs.c_rate = 48; - rxs.c_pktflags |= IEEE80211_RX_F_OFDM; - break; - case 9: - rxs.c_rate = 72; - rxs.c_pktflags |= IEEE80211_RX_F_OFDM; - break; - case 10: - rxs.c_rate = 96; - rxs.c_pktflags |= IEEE80211_RX_F_OFDM; - break; - case 11: - rxs.c_rate = 108; - rxs.c_pktflags |= IEEE80211_RX_F_OFDM; - break; - } - } else if (rate >= 12) { /* MCS0~15. */ - /* Bit 7 set means HT MCS instead of rate. */ - rxs.c_rate = (rate - 12); + } else { + rxs.c_rate = IEEE80211_RATE_MCS | (rate - 12); rxs.c_pktflags |= IEEE80211_RX_F_HT; } + + if (ieee80211_radiotap_active(ic)) { + struct rsu_rx_radiotap_header *tap = &sc->sc_rxtap; + + /* Map HW rate index to 802.11 rate. */ + tap->wr_flags = 0; /* TODO */ + tap->wr_tsft = rsu_get_tsf_high(sc); + if (le32toh(stat->tsf_low) > rsu_get_tsf_low(sc)) + tap->wr_tsft--; + tap->wr_tsft = (uint64_t)htole32(tap->wr_tsft) << 32; + tap->wr_tsft += stat->tsf_low; + + tap->wr_rate = rxs.c_rate; + tap->wr_dbm_antsignal = rssi; + tap->wr_chan_freq = htole16(ic->ic_curchan->ic_freq); + tap->wr_chan_flags = htole16(ic->ic_curchan->ic_flags); + }; (void) ieee80211_add_rx_params(m, &rxs); From owner-svn-src-all@freebsd.org Thu Nov 2 04:05: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 D0280E4DF80; Thu, 2 Nov 2017 04:05: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 961AF6B908; Thu, 2 Nov 2017 04:05:04 +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 vA24539t095218; Thu, 2 Nov 2017 04:05:03 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA24533f095217; Thu, 2 Nov 2017 04:05:03 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201711020405.vA24533f095217@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Thu, 2 Nov 2017 04:05:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325304 - head/share/mk X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/share/mk X-SVN-Commit-Revision: 325304 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: Thu, 02 Nov 2017 04:05:04 -0000 Author: bdrewery Date: Thu Nov 2 04:05:03 2017 New Revision: 325304 URL: https://svnweb.freebsd.org/changeset/base/325304 Log: Don't propagate MAKEOBJDIRPREFIX changes to environment. A makefile may use this variable later for its own reasons, don't infect sub-makes with that value. Sponsored by: Dell EMC Isilon Modified: head/share/mk/src.sys.obj.mk Modified: head/share/mk/src.sys.obj.mk ============================================================================== --- head/share/mk/src.sys.obj.mk Thu Nov 2 00:17:52 2017 (r325303) +++ head/share/mk/src.sys.obj.mk Thu Nov 2 04:05:03 2017 (r325304) @@ -43,7 +43,8 @@ MAKEOBJDIRPREFIX:= ${MAKEOBJDIRPREFIX}${TARGET:D/${TAR # put things approximately where they want OBJROOT:= ${MAKEOBJDIRPREFIX}${SRCTOP}/ MAKEOBJDIRPREFIX= -.export MAKEOBJDIRPREFIX +# export but do not track +.export-env MAKEOBJDIRPREFIX .endif .if empty(MAKEOBJDIR) # OBJTOP set below From owner-svn-src-all@freebsd.org Thu Nov 2 04:07: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 DA584E4E095; Thu, 2 Nov 2017 04:07:42 +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 A45616BB5B; Thu, 2 Nov 2017 04:07:42 +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 vA247fTh095487; Thu, 2 Nov 2017 04:07:41 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA247fSi095484; Thu, 2 Nov 2017 04:07:41 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201711020407.vA247fSi095484@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Thu, 2 Nov 2017 04:07:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325305 - head/sys/dev/dpaa X-SVN-Group: head X-SVN-Commit-Author: jhibbits X-SVN-Commit-Paths: head/sys/dev/dpaa X-SVN-Commit-Revision: 325305 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: Thu, 02 Nov 2017 04:07:43 -0000 Author: jhibbits Date: Thu Nov 2 04:07:41 2017 New Revision: 325305 URL: https://svnweb.freebsd.org/changeset/base/325305 Log: Fix interrupt handling for dtsec The macId is the dTSEC unit within the FMan, so use the cell-index, not the unit number, which may not match the cell index. MFC after: 1 week Modified: head/sys/dev/dpaa/if_dtsec.c head/sys/dev/dpaa/if_dtsec.h head/sys/dev/dpaa/if_dtsec_fdt.c Modified: head/sys/dev/dpaa/if_dtsec.c ============================================================================== --- head/sys/dev/dpaa/if_dtsec.c Thu Nov 2 04:05:03 2017 (r325304) +++ head/sys/dev/dpaa/if_dtsec.c Thu Nov 2 04:07:41 2017 (r325305) @@ -578,8 +578,6 @@ dtsec_attach(device_t dev) parent = device_get_parent(dev); sc->sc_dev = dev; sc->sc_mac_mdio_irq = NO_IRQ; - sc->sc_eth_id = device_get_unit(dev); - /* Check if MallocSmart allocator is ready */ if (XX_MallocSmartInit() != E_OK) Modified: head/sys/dev/dpaa/if_dtsec.h ============================================================================== --- head/sys/dev/dpaa/if_dtsec.h Thu Nov 2 04:05:03 2017 (r325304) +++ head/sys/dev/dpaa/if_dtsec.h Thu Nov 2 04:07:41 2017 (r325305) @@ -66,7 +66,7 @@ struct dtsec_softc { /* dTSEC data */ enum eth_dev_type sc_eth_dev_type; - uint8_t sc_eth_id; + uint8_t sc_eth_id; /* Ethernet ID within its frame manager */ uintptr_t sc_mac_mem_offset; e_EnetMode sc_mac_enet_mode; int sc_mac_mdio_irq; Modified: head/sys/dev/dpaa/if_dtsec_fdt.c ============================================================================== --- head/sys/dev/dpaa/if_dtsec_fdt.c Thu Nov 2 04:05:03 2017 (r325304) +++ head/sys/dev/dpaa/if_dtsec_fdt.c Thu Nov 2 04:07:41 2017 (r325305) @@ -136,7 +136,7 @@ dtsec_fdt_attach(device_t dev) phandle_t enet_node, phy_node; phandle_t fman_rxtx_node[2]; char phy_type[6]; - pcell_t fman_tx_cell; + pcell_t fman_tx_cell, mac_id; int rid; sc = device_get_softc(dev); @@ -191,6 +191,11 @@ dtsec_fdt_attach(device_t dev) sc->sc_mac_enet_mode = e_ENET_MODE_XGMII_10000; else return (ENXIO); + + if (OF_getencprop(enet_node, "cell-index", + (void *)&mac_id, sizeof(mac_id)) <= 0) + return (ENXIO); + sc->sc_eth_id = mac_id; /* Get RX/TX port handles */ if (OF_getprop(enet_node, "fsl,fman-ports", (void *)fman_rxtx_node, From owner-svn-src-all@freebsd.org Thu Nov 2 04: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 A6069E4E60E; Thu, 2 Nov 2017 04:17:11 +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 753466C1B2; Thu, 2 Nov 2017 04:17:11 +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 vA24HAd3099921; Thu, 2 Nov 2017 04:17:10 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA24HAdA099920; Thu, 2 Nov 2017 04:17:10 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201711020417.vA24HAdA099920@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Thu, 2 Nov 2017 04:17:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325306 - head/share/man/man4/man4.powerpc X-SVN-Group: head X-SVN-Commit-Author: jhibbits X-SVN-Commit-Paths: head/share/man/man4/man4.powerpc X-SVN-Commit-Revision: 325306 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: Thu, 02 Nov 2017 04:17:11 -0000 Author: jhibbits Date: Thu Nov 2 04:17:10 2017 New Revision: 325306 URL: https://svnweb.freebsd.org/changeset/base/325306 Log: Actually add the dtsec(4) man page to the build Modified: head/share/man/man4/man4.powerpc/Makefile Modified: head/share/man/man4/man4.powerpc/Makefile ============================================================================== --- head/share/man/man4/man4.powerpc/Makefile Thu Nov 2 04:07:41 2017 (r325305) +++ head/share/man/man4/man4.powerpc/Makefile Thu Nov 2 04:17:10 2017 (r325306) @@ -8,6 +8,7 @@ MAN= adb.4 \ ams.4 \ bm.4 \ cuda.4 \ + dtsec.4 \ llan.4 \ pmu.4 \ powermac_nvram.4 \ From owner-svn-src-all@freebsd.org Thu Nov 2 07:08:15 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 ACBAAE51D10; Thu, 2 Nov 2017 07:08:15 +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 81E9A70378; Thu, 2 Nov 2017 07:08:15 +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 vA278Eex071801; Thu, 2 Nov 2017 07:08:14 GMT (envelope-from mmel@FreeBSD.org) Received: (from mmel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA278EKF071795; Thu, 2 Nov 2017 07:08:14 GMT (envelope-from mmel@FreeBSD.org) Message-Id: <201711020708.vA278EKF071795@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmel set sender to mmel@FreeBSD.org using -f From: Michal Meloun Date: Thu, 2 Nov 2017 07:08:14 +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: r325307 - in stable/11: lib/libc/arm/gen sys/arm/arm sys/arm/include X-SVN-Group: stable-11 X-SVN-Commit-Author: mmel X-SVN-Commit-Paths: in stable/11: lib/libc/arm/gen sys/arm/arm sys/arm/include X-SVN-Commit-Revision: 325307 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: Thu, 02 Nov 2017 07:08:15 -0000 Author: mmel Date: Thu Nov 2 07:08:13 2017 New Revision: 325307 URL: https://svnweb.freebsd.org/changeset/base/325307 Log: MFC r324660: Save VFP state in getcontext(3) on ARM. This is a last followup of r315974, which fixes userland part of VFP save/restore problems described in PR 217611. Added: stable/11/lib/libc/arm/gen/getcontextx.c - copied unchanged from r324660, head/lib/libc/arm/gen/getcontextx.c Modified: stable/11/lib/libc/arm/gen/Makefile.inc stable/11/sys/arm/arm/machdep.c stable/11/sys/arm/arm/sys_machdep.c stable/11/sys/arm/include/machdep.h stable/11/sys/arm/include/sysarch.h Directory Properties: stable/11/ (props changed) Modified: stable/11/lib/libc/arm/gen/Makefile.inc ============================================================================== --- stable/11/lib/libc/arm/gen/Makefile.inc Thu Nov 2 04:17:10 2017 (r325306) +++ stable/11/lib/libc/arm/gen/Makefile.inc Thu Nov 2 07:08:13 2017 (r325307) @@ -5,7 +5,7 @@ SRCS+= _ctx_start.S _setjmp.S _set_tp.c alloca.S fabs. infinity.c ldexp.c makecontext.c \ __aeabi_read_tp.S setjmp.S signalcontext.c sigsetjmp.S flt_rounds.c \ arm_initfini.c \ - trivial-getcontextx.c + getcontextx.c .if ${MACHINE_ARCH:Marmv6*} && (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "") SRCS+= fpgetmask_vfp.c fpgetround_vfp.c fpgetsticky_vfp.c fpsetmask_vfp.c \ Copied: stable/11/lib/libc/arm/gen/getcontextx.c (from r324660, head/lib/libc/arm/gen/getcontextx.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/11/lib/libc/arm/gen/getcontextx.c Thu Nov 2 07:08:13 2017 (r325307, copy of r324660, head/lib/libc/arm/gen/getcontextx.c) @@ -0,0 +1,99 @@ +/* + * Copyright (c) 2017 Michal Meloun + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include + +struct ucontextx { + ucontext_t ucontext; + mcontext_vfp_t mcontext_vfp; +}; + +int +__getcontextx_size(void) +{ + + return (sizeof(struct ucontextx)); +} + +int +__fillcontextx2(char *ctx) +{ + struct ucontextx *ucxp; + ucontext_t *ucp; + mcontext_vfp_t *mvp; + struct arm_get_vfpstate_args vfp_arg; + + ucxp = (struct ucontextx *)ctx; + ucp = &ucxp->ucontext; + mvp = &ucxp->mcontext_vfp; + + vfp_arg.mc_vfp_size = sizeof(mcontext_vfp_t); + vfp_arg.mc_vfp = mvp; + if (sysarch(ARM_GET_VFPSTATE, &vfp_arg) == -1) + return (-1); + ucp->uc_mcontext.mc_vfp_size = sizeof(mcontext_vfp_t); + ucp->uc_mcontext.mc_vfp_ptr = mvp; + return (0); +} + +int +__fillcontextx(char *ctx) +{ + struct ucontextx *ucxp; + + ucxp = (struct ucontextx *)ctx; + if (getcontext(&ucxp->ucontext) == -1) + return (-1); + __fillcontextx2(ctx); + return (0); +} + +__weak_reference(__getcontextx, getcontextx); + +ucontext_t * +__getcontextx(void) +{ + char *ctx; + int error; + + ctx = malloc(__getcontextx_size()); + if (ctx == NULL) + return (NULL); + if (__fillcontextx(ctx) == -1) { + error = errno; + free(ctx); + errno = error; + return (NULL); + } + return ((ucontext_t *)ctx); +} Modified: stable/11/sys/arm/arm/machdep.c ============================================================================== --- stable/11/sys/arm/arm/machdep.c Thu Nov 2 04:17:10 2017 (r325306) +++ stable/11/sys/arm/arm/machdep.c Thu Nov 2 07:08:13 2017 (r325307) @@ -430,6 +430,30 @@ set_vfpcontext(struct thread *td, mcontext_vfp_t *vfp) } #endif +int +arm_get_vfpstate(struct thread *td, void *args) +{ + int rv; + struct arm_get_vfpstate_args ua; + mcontext_vfp_t mcontext_vfp; + + rv = copyin(args, &ua, sizeof(ua)); + if (rv != 0) + return (rv); + if (ua.mc_vfp_size != sizeof(mcontext_vfp_t)) + return (EINVAL); +#ifdef VFP + get_vfpcontext(td, &mcontext_vfp); +#else + bzero(&mcontext_vfp, sizeof(mcontext_vfp)); +#endif + + rv = copyout(&mcontext_vfp, ua.mc_vfp, sizeof(mcontext_vfp)); + if (rv != 0) + return (rv); + return (0); +} + /* * Get machine context. */ Modified: stable/11/sys/arm/arm/sys_machdep.c ============================================================================== --- stable/11/sys/arm/arm/sys_machdep.c Thu Nov 2 04:17:10 2017 (r325306) +++ stable/11/sys/arm/arm/sys_machdep.c Thu Nov 2 07:08:13 2017 (r325307) @@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #ifndef _SYS_SYSPROTO_H_ @@ -206,6 +207,7 @@ sysarch(td, uap) case ARM_DRAIN_WRITEBUF: case ARM_SET_TP: case ARM_GET_TP: + case ARM_GET_VFPSTATE: break; default: @@ -230,6 +232,9 @@ sysarch(td, uap) break; case ARM_GET_TP: error = arm32_get_tp(td, uap->parms); + break; + case ARM_GET_VFPSTATE: + error = arm_get_vfpstate(td, uap->parms); break; default: error = EINVAL; Modified: stable/11/sys/arm/include/machdep.h ============================================================================== --- stable/11/sys/arm/include/machdep.h Thu Nov 2 04:17:10 2017 (r325306) +++ stable/11/sys/arm/include/machdep.h Thu Nov 2 07:08:13 2017 (r325307) @@ -40,6 +40,7 @@ void arm_parse_fdt_bootargs(void); void arm_print_kenv(void); void arm_generic_initclocks(void); +int arm_get_vfpstate(struct thread *td, void *args); /* Board-specific attributes */ void board_set_serial(uint64_t); Modified: stable/11/sys/arm/include/sysarch.h ============================================================================== --- stable/11/sys/arm/include/sysarch.h Thu Nov 2 04:17:10 2017 (r325306) +++ stable/11/sys/arm/include/sysarch.h Thu Nov 2 07:08:13 2017 (r325307) @@ -78,10 +78,16 @@ #define ARM_DRAIN_WRITEBUF 1 #define ARM_SET_TP 2 #define ARM_GET_TP 3 +#define ARM_GET_VFPSTATE 4 struct arm_sync_icache_args { uintptr_t addr; /* Virtual start address */ size_t len; /* Region size */ +}; + +struct arm_get_vfpstate_args { + size_t mc_vfp_size; + void *mc_vfp; }; #ifndef _KERNEL From owner-svn-src-all@freebsd.org Thu Nov 2 07:09:39 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 68940E51D8A; Thu, 2 Nov 2017 07:09:39 +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 370EC704AC; Thu, 2 Nov 2017 07:09:39 +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 vA279co2071942; Thu, 2 Nov 2017 07:09:38 GMT (envelope-from mmel@FreeBSD.org) Received: (from mmel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA279cZ8071941; Thu, 2 Nov 2017 07:09:38 GMT (envelope-from mmel@FreeBSD.org) Message-Id: <201711020709.vA279cZ8071941@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmel set sender to mmel@FreeBSD.org using -f From: Michal Meloun Date: Thu, 2 Nov 2017 07:09:38 +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: r325308 - stable/11/lib/libthr/arch/arm/include X-SVN-Group: stable-11 X-SVN-Commit-Author: mmel X-SVN-Commit-Paths: stable/11/lib/libthr/arch/arm/include X-SVN-Commit-Revision: 325308 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: Thu, 02 Nov 2017 07:09:39 -0000 Author: mmel Date: Thu Nov 2 07:09:38 2017 New Revision: 325308 URL: https://svnweb.freebsd.org/changeset/base/325308 Log: MFC r325103: Fix misleading comment. Not a functional change. Modified: stable/11/lib/libthr/arch/arm/include/pthread_md.h Directory Properties: stable/11/ (props changed) Modified: stable/11/lib/libthr/arch/arm/include/pthread_md.h ============================================================================== --- stable/11/lib/libthr/arch/arm/include/pthread_md.h Thu Nov 2 07:08:13 2017 (r325307) +++ stable/11/lib/libthr/arch/arm/include/pthread_md.h Thu Nov 2 07:09:38 2017 (r325308) @@ -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 Thu Nov 2 08:47: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 8D089E54014; Thu, 2 Nov 2017 08:47:04 +0000 (UTC) (envelope-from tsoome@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 5913072BD6; Thu, 2 Nov 2017 08:47:04 +0000 (UTC) (envelope-from tsoome@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA28l3LF015416; Thu, 2 Nov 2017 08:47:03 GMT (envelope-from tsoome@FreeBSD.org) Received: (from tsoome@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA28l3o6015415; Thu, 2 Nov 2017 08:47:03 GMT (envelope-from tsoome@FreeBSD.org) Message-Id: <201711020847.vA28l3o6015415@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tsoome set sender to tsoome@FreeBSD.org using -f From: Toomas Soome Date: Thu, 2 Nov 2017 08:47:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325310 - head/sys/boot/zfs X-SVN-Group: head X-SVN-Commit-Author: tsoome X-SVN-Commit-Paths: head/sys/boot/zfs X-SVN-Commit-Revision: 325310 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: Thu, 02 Nov 2017 08:47:04 -0000 Author: tsoome Date: Thu Nov 2 08:47:03 2017 New Revision: 325310 URL: https://svnweb.freebsd.org/changeset/base/325310 Log: zfs.c:vdev_read() needs to be careful about large sectors Using the same implementation as done in efi/boot1. We must handle smaller than sector size IO etc. Differential Revision: https://reviews.freebsd.org/D12850 Modified: head/sys/boot/zfs/zfs.c Modified: head/sys/boot/zfs/zfs.c ============================================================================== --- head/sys/boot/zfs/zfs.c Thu Nov 2 07:25:59 2017 (r325309) +++ head/sys/boot/zfs/zfs.c Thu Nov 2 08:47:03 2017 (r325310) @@ -368,17 +368,61 @@ zfs_readdir(struct open_file *f, struct dirent *d) } static int -vdev_read(vdev_t *vdev, void *priv, off_t offset, void *buf, size_t size) +vdev_read(vdev_t *vdev, void *priv, off_t offset, void *buf, size_t bytes) { - int fd; + int fd, ret; + size_t res, size, remainder, rb_size, blksz; + unsigned secsz; + off_t off; + char *bouncebuf, *rb_buf; fd = (uintptr_t) priv; - lseek(fd, offset, SEEK_SET); - if (read(fd, buf, size) == size) { - return 0; - } else { - return (EIO); + bouncebuf = NULL; + + ret = ioctl(fd, DIOCGSECTORSIZE, &secsz); + if (ret != 0) + return (ret); + + off = offset / secsz; + remainder = offset % secsz; + if (lseek(fd, off * secsz, SEEK_SET) == -1) + return (errno); + + rb_buf = buf; + rb_size = bytes; + size = roundup2(bytes + remainder, secsz); + blksz = size; + if (remainder != 0 || size != bytes) { + bouncebuf = zfs_alloc(secsz); + if (bouncebuf == NULL) { + printf("vdev_read: out of memory\n"); + return (ENOMEM); + } + rb_buf = bouncebuf; + blksz = rb_size - remainder; } + + while (bytes > 0) { + res = read(fd, rb_buf, rb_size); + if (res != rb_size) { + ret = EIO; + goto error; + } + if (bytes < blksz) + blksz = bytes; + if (bouncebuf != NULL) + memcpy(buf, rb_buf + remainder, blksz); + buf = (void *)((uintptr_t)buf + blksz); + bytes -= blksz; + remainder = 0; + blksz = rb_size; + } + + ret = 0; +error: + if (bouncebuf != NULL) + zfs_free(bouncebuf, secsz); + return (ret); } static int From owner-svn-src-all@freebsd.org Thu Nov 2 10:38: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 4E508E55DB3; Thu, 2 Nov 2017 10:38:10 +0000 (UTC) (envelope-from mav@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 27FC17541D; Thu, 2 Nov 2017 10:38:10 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA2Ac9YX061803; Thu, 2 Nov 2017 10:38:09 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA2Ac9ER061802; Thu, 2 Nov 2017 10:38:09 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201711021038.vA2Ac9ER061802@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Thu, 2 Nov 2017 10:38:09 +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: r325311 - stable/11/sys/netinet X-SVN-Group: stable-11 X-SVN-Commit-Author: mav X-SVN-Commit-Paths: stable/11/sys/netinet X-SVN-Commit-Revision: 325311 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: Thu, 02 Nov 2017 10:38:10 -0000 Author: mav Date: Thu Nov 2 10:38:09 2017 New Revision: 325311 URL: https://svnweb.freebsd.org/changeset/base/325311 Log: MFC r324752: Relax per-ifnet cif_vrs list double locking in carp(4). In all cases where cif_vrs list is modified, two locks are held: per-ifnet CIF_LOCK and global carp_sx. It means to read that list only one of them is enough to be held, so we can skip CIF_LOCK when we already have carp_sx. This fixes kernel panic, caused by attempts of copyout() to sleep while holding non-sleepable CIF_LOCK mutex. Modified: stable/11/sys/netinet/ip_carp.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/netinet/ip_carp.c ============================================================================== --- stable/11/sys/netinet/ip_carp.c Thu Nov 2 08:47:03 2017 (r325310) +++ stable/11/sys/netinet/ip_carp.c Thu Nov 2 10:38:09 2017 (r325311) @@ -175,8 +175,8 @@ static int proto_reg[] = {-1, -1}; * Each softc has a lock sc_mtx. It is used to synchronise carp_input_c(), * callout-driven events and ioctl()s. * - * To traverse the list of softcs on an ifnet we use CIF_LOCK(), to - * traverse the global list we use the mutex carp_mtx. + * To traverse the list of softcs on an ifnet we use CIF_LOCK() or carp_sx. + * To traverse the global list we use the mutex carp_mtx. * * Known issues with locking: * @@ -286,7 +286,8 @@ SYSCTL_VNET_PCPUSTAT(_net_inet_carp, OID_AUTO, stats, ++_i) #define IFNET_FOREACH_CARP(ifp, sc) \ - CIF_LOCK_ASSERT(ifp->if_carp); \ + KASSERT(mtx_owned(&ifp->if_carp->cif_mtx) || \ + sx_xlocked(&carp_sx), ("cif_vrs not locked")); \ TAILQ_FOREACH((sc), &(ifp)->if_carp->cif_vrs, sc_list) #define DEMOTE_ADVSKEW(sc) \ @@ -1468,6 +1469,8 @@ carp_alloc(struct ifnet *ifp) struct carp_softc *sc; struct carp_if *cif; + sx_assert(&carp_sx, SA_XLOCKED); + if ((cif = ifp->if_carp) == NULL) cif = carp_alloc_if(ifp); @@ -1657,11 +1660,9 @@ carp_ioctl(struct ifreq *ifr, u_long cmd, struct threa } if (ifp->if_carp) { - CIF_LOCK(ifp->if_carp); IFNET_FOREACH_CARP(ifp, sc) if (sc->sc_vhid == carpr.carpr_vhid) break; - CIF_UNLOCK(ifp->if_carp); } if (sc == NULL) { sc = carp_alloc(ifp); @@ -1732,11 +1733,9 @@ carp_ioctl(struct ifreq *ifr, u_long cmd, struct threa priveleged = (priv_check(td, PRIV_NETINET_CARP) == 0); if (carpr.carpr_vhid != 0) { - CIF_LOCK(ifp->if_carp); IFNET_FOREACH_CARP(ifp, sc) if (sc->sc_vhid == carpr.carpr_vhid) break; - CIF_UNLOCK(ifp->if_carp); if (sc == NULL) { error = ENOENT; break; @@ -1747,7 +1746,6 @@ carp_ioctl(struct ifreq *ifr, u_long cmd, struct threa int i, count; count = 0; - CIF_LOCK(ifp->if_carp); IFNET_FOREACH_CARP(ifp, sc) count++; @@ -1769,7 +1767,6 @@ carp_ioctl(struct ifreq *ifr, u_long cmd, struct threa } i++; } - CIF_UNLOCK(ifp->if_carp); } break; } @@ -1824,11 +1821,9 @@ carp_attach(struct ifaddr *ifa, int vhid) return (ENOPROTOOPT); } - CIF_LOCK(cif); IFNET_FOREACH_CARP(ifp, sc) if (sc->sc_vhid == vhid) break; - CIF_UNLOCK(cif); if (sc == NULL) { sx_xunlock(&carp_sx); return (ENOENT); From owner-svn-src-all@freebsd.org Thu Nov 2 12:09:19 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 C3596E57EEB; Thu, 2 Nov 2017 12:09:19 +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 9D59477B9B; Thu, 2 Nov 2017 12:09:19 +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 vA2C9IFj021734; Thu, 2 Nov 2017 12:09:18 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA2C9IPs021733; Thu, 2 Nov 2017 12:09:18 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201711021209.vA2C9IPs021733@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Thu, 2 Nov 2017 12:09:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325312 - head/tools/tools/fetchbench X-SVN-Group: head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: head/tools/tools/fetchbench X-SVN-Commit-Revision: 325312 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: Thu, 02 Nov 2017 12:09:19 -0000 Author: trasz Date: Thu Nov 2 12:09:18 2017 New Revision: 325312 URL: https://svnweb.freebsd.org/changeset/base/325312 Log: Add fetchbench, a trivial HTTP benchmark based on fetch(1). Obtained from: CheriBSD MFC after: 2 weeks Sponsored by: DARPA, AFRL Added: head/tools/tools/fetchbench/ head/tools/tools/fetchbench/fetchbench (contents, props changed) Added: head/tools/tools/fetchbench/fetchbench ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/tools/fetchbench/fetchbench Thu Nov 2 12:09:18 2017 (r325312) @@ -0,0 +1,76 @@ +#!/bin/sh +#- +# Copyright (c) 2017 Edward Tomasz Napierala +# All rights reserved. +# +# This software was developed by SRI International and the University of +# Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237) +# ("CTSRD"), as part of the DARPA CRASH research programme. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# +# $FreeBSD$ + +# This is a simple HTTP benchmark. It works by running a number of fetch(1) +# instances in parallel, 10 by default, each performing a number of fetches, +# 100 by default, and then printing out the time it took. +# +# Example usage: ./fetchbench -i 2 -n 5 http://freebsd.org + +usage() +{ + cat <&2 +usage: fetchbench [-i number-of-instances] [-n fetches-per-instance] url +EOF + exit 1 +} + +NPROC=10 +NFETCH=100 + +while getopts "i:n:X" opt; do + case "$opt" in + i) NPROC="${OPTARG}" ;; + n) NFETCH="${OPTARG}" ;; + X) MEASURE_PLEASE=1 ;; + *) usage ;; + esac +done +shift $(($OPTIND - 1)) + +if [ $# -ne 1 ]; then + usage +fi + +URL="${1}" + +if [ -n "${MEASURE_PLEASE}" ]; then + for p in `/usr/bin/jot ${NPROC}`; do + ( + for f in `/usr/bin/jot ${NFETCH}`; do echo "${URL}"; done | /usr/bin/xargs /usr/bin/fetch -qo /dev/null + ) & + done + wait + echo -n "${0}: $((${NFETCH} * ${NPROC})) requests for ${URL}, spread among ${NPROC} parallel processes, in " +else + ( /usr/bin/time -h "${0}" -i "${NPROC}" -n "${NFETCH}" -X "${URL}" ) 2>&1 | sed -E 's/ //;s/ +/, /g' +fi From owner-svn-src-all@freebsd.org Thu Nov 2 12:11: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 30FA8E57F7D; Thu, 2 Nov 2017 12:11:22 +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 00EF177D87; Thu, 2 Nov 2017 12:11:21 +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 vA2CBLKh024789; Thu, 2 Nov 2017 12:11:21 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA2CBLKK024788; Thu, 2 Nov 2017 12:11:21 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201711021211.vA2CBLKK024788@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Thu, 2 Nov 2017 12:11:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325313 - head/tools/tools/syscall_timing X-SVN-Group: head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: head/tools/tools/syscall_timing X-SVN-Commit-Revision: 325313 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: Thu, 02 Nov 2017 12:11:22 -0000 Author: trasz Date: Thu Nov 2 12:11:20 2017 New Revision: 325313 URL: https://svnweb.freebsd.org/changeset/base/325313 Log: Make syscall_timing(1) default to a temporary file when run without -p. Obtained from: CheriBSD MFC after: 2 weeks Sponsored by: DARPA, AFRL Modified: head/tools/tools/syscall_timing/syscall_timing.c Modified: head/tools/tools/syscall_timing/syscall_timing.c ============================================================================== --- head/tools/tools/syscall_timing/syscall_timing.c Thu Nov 2 12:09:18 2017 (r325312) +++ head/tools/tools/syscall_timing/syscall_timing.c Thu Nov 2 12:11:20 2017 (r325313) @@ -38,6 +38,7 @@ #include #include +#include #include #include #include @@ -693,15 +694,17 @@ main(int argc, char *argv[]) struct timespec ts_res; const struct test *the_test; const char *path; + char *tmp_dir, *tmp_path; long long ll; char *endp; - int ch, error, i, j, k; + int ch, fd, error, i, j, k, rv; uintmax_t iterations, loops; alarm_timeout = 1; iterations = 0; loops = 10; path = NULL; + tmp_path = NULL; while ((ch = getopt(argc, argv, "i:l:p:s:")) != -1) { switch (ch) { case 'i': @@ -760,7 +763,15 @@ main(int argc, char *argv[]) if (the_test == NULL) usage(); if ((the_test->t_flags & FLAG_PATH) && (path == NULL)) { - errx(-1, "%s requires -p", the_test->t_name); + tmp_dir = strdup("/tmp/syscall_timing.XXXXXXXX"); + if (tmp_dir == NULL) + err(1, "strdup"); + tmp_dir = mkdtemp(tmp_dir); + if (tmp_dir == NULL) + err(1, "mkdtemp"); + rv = asprintf(&tmp_path, "%s/testfile", tmp_dir); + if (rv <= 0) + err(1, "asprintf"); } } @@ -779,6 +790,19 @@ main(int argc, char *argv[]) the_test = &tests[i]; } + if (tmp_path != NULL) { + fd = open(tmp_path, O_WRONLY | O_CREAT, 0700); + if (fd < 0) + err(1, "cannot open %s", tmp_path); + error = ftruncate(fd, 1000000); + if (error != 0) + err(1, "ftruncate"); + error = close(fd); + if (error != 0) + err(1, "close"); + path = tmp_path; + } + /* * Run one warmup, then do the real thing (loops) times. */ @@ -804,5 +828,15 @@ main(int argc, char *argv[]) printf("0.%09ju\n", (uintmax_t)nsecsperit); } } + + if (tmp_path != NULL) { + error = unlink(tmp_path); + if (error != 0 && errno != ENOENT) + warn("cannot unlink %s", tmp_path); + error = rmdir(tmp_dir); + if (error != 0) + warn("cannot rmdir %s", tmp_dir); + } + return (0); } From owner-svn-src-all@freebsd.org Thu Nov 2 12:12:19 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 73DD8E57FF3; Thu, 2 Nov 2017 12:12:19 +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 416FE7C129; Thu, 2 Nov 2017 12:12:19 +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 vA2CCITN025761; Thu, 2 Nov 2017 12:12:18 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA2CCIUU025760; Thu, 2 Nov 2017 12:12:18 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201711021212.vA2CCIUU025760@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Thu, 2 Nov 2017 12:12:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325314 - head/tools/tools/syscall_timing X-SVN-Group: head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: head/tools/tools/syscall_timing X-SVN-Commit-Revision: 325314 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: Thu, 02 Nov 2017 12:12:19 -0000 Author: trasz Date: Thu Nov 2 12:12:18 2017 New Revision: 325314 URL: https://svnweb.freebsd.org/changeset/base/325314 Log: Add getpriority(2) benchmark; it's a lightweight syscall which does pretty much nothing - just like getuid(2) - but takes arguments. Obtained from: CheriBSD MFC after: 2 weeks Sponsored by: DARPA, AFRL Modified: head/tools/tools/syscall_timing/syscall_timing.c Modified: head/tools/tools/syscall_timing/syscall_timing.c ============================================================================== --- head/tools/tools/syscall_timing/syscall_timing.c Thu Nov 2 12:11:20 2017 (r325313) +++ head/tools/tools/syscall_timing/syscall_timing.c Thu Nov 2 12:12:18 2017 (r325314) @@ -31,6 +31,7 @@ #include #include +#include #include #include #include @@ -163,6 +164,22 @@ test_gettimeofday(uintmax_t num, uintmax_t int_arg, co } uintmax_t +test_getpriority(uintmax_t num, uintmax_t int_arg, const char *path) +{ + uintmax_t i; + + benchmark_start(); + for (i = 0; i < num; i++) { + if (alarm_fired) + break; + (void)getpriority(PRIO_PROCESS, 0); + } + benchmark_stop(); + return (i); +} + + +uintmax_t test_pipe(uintmax_t num, uintmax_t int_arg, const char *path) { int fd[2], i; @@ -634,6 +651,7 @@ static const struct test tests[] = { { "getppid", test_getppid }, { "clock_gettime", test_clock_gettime }, { "gettimeofday", test_gettimeofday }, + { "getpriority", test_getpriority }, { "pipe", test_pipe }, { "socket_local_stream", test_socket_stream, .t_int = PF_LOCAL }, { "socket_local_dgram", test_socket_dgram, .t_int = PF_LOCAL }, From owner-svn-src-all@freebsd.org Thu Nov 2 12:13:03 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 59789E5817E; Thu, 2 Nov 2017 12:13:03 +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 264107C39C; Thu, 2 Nov 2017 12:13:03 +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 vA2CD2BR025833; Thu, 2 Nov 2017 12:13:02 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA2CD23H025832; Thu, 2 Nov 2017 12:13:02 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201711021213.vA2CD23H025832@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Thu, 2 Nov 2017 12:13:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325315 - head/tools/tools/syscall_timing X-SVN-Group: head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: head/tools/tools/syscall_timing X-SVN-Commit-Revision: 325315 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: Thu, 02 Nov 2017 12:13:03 -0000 Author: trasz Date: Thu Nov 2 12:13:02 2017 New Revision: 325315 URL: https://svnweb.freebsd.org/changeset/base/325315 Log: Add select(2) benchmark. It takes four pointers; unfortunately it's somewhat heavy. Obtained from: CheriBSD MFC after: 2 weeks Sponsored by: DARPA, AFRL Modified: head/tools/tools/syscall_timing/syscall_timing.c Modified: head/tools/tools/syscall_timing/syscall_timing.c ============================================================================== --- head/tools/tools/syscall_timing/syscall_timing.c Thu Nov 2 12:12:18 2017 (r325314) +++ head/tools/tools/syscall_timing/syscall_timing.c Thu Nov 2 12:13:02 2017 (r325315) @@ -178,7 +178,6 @@ test_getpriority(uintmax_t num, uintmax_t int_arg, con return (i); } - uintmax_t test_pipe(uintmax_t num, uintmax_t int_arg, const char *path) { @@ -208,6 +207,31 @@ test_pipe(uintmax_t num, uintmax_t int_arg, const char } uintmax_t +test_select(uintmax_t num, uintmax_t int_arg, const char *path) +{ + fd_set readfds, writefds, exceptfds; + struct timeval tv; + uintmax_t i; + int error; + + FD_ZERO(&readfds); + FD_ZERO(&writefds); + FD_ZERO(&exceptfds); + + tv.tv_sec = 0; + tv.tv_usec = 0; + + benchmark_start(); + for (i = 0; i < num; i++) { + if (alarm_fired) + break; + (void)select(0, &readfds, &writefds, &exceptfds, &tv); + } + benchmark_stop(); + return (i); +} + +uintmax_t test_socket_stream(uintmax_t num, uintmax_t int_arg, const char *path) { uintmax_t i; @@ -653,6 +677,7 @@ static const struct test tests[] = { { "gettimeofday", test_gettimeofday }, { "getpriority", test_getpriority }, { "pipe", test_pipe }, + { "select", test_select }, { "socket_local_stream", test_socket_stream, .t_int = PF_LOCAL }, { "socket_local_dgram", test_socket_dgram, .t_int = PF_LOCAL }, { "socketpair_stream", test_socketpair_stream }, From owner-svn-src-all@freebsd.org Thu Nov 2 12:14: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 34C51E582C0; Thu, 2 Nov 2017 12:14:44 +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 039977C60B; Thu, 2 Nov 2017 12:14:43 +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 vA2CEhGm025932; Thu, 2 Nov 2017 12:14:43 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA2CEhAT025931; Thu, 2 Nov 2017 12:14:43 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201711021214.vA2CEhAT025931@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Thu, 2 Nov 2017 12:14:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325316 - head/tools/tools/syscall_timing X-SVN-Group: head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: head/tools/tools/syscall_timing X-SVN-Commit-Revision: 325316 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: Thu, 02 Nov 2017 12:14:44 -0000 Author: trasz Date: Thu Nov 2 12:14:42 2017 New Revision: 325316 URL: https://svnweb.freebsd.org/changeset/base/325316 Log: Add benchmark for getresuid(2) - three pointers, although only "output" ones, and quite lightwait. The purpose of this commit, and the previous one, is to be able to measure overhead of pointer arguments - in case you're running a strange architecture where pointers and integers are quite different things at the hardware level. Obtained from: CheriBSD MFC after: 2 weeks Sponsored by: DARPA, AFRL Modified: head/tools/tools/syscall_timing/syscall_timing.c Modified: head/tools/tools/syscall_timing/syscall_timing.c ============================================================================== --- head/tools/tools/syscall_timing/syscall_timing.c Thu Nov 2 12:13:02 2017 (r325315) +++ head/tools/tools/syscall_timing/syscall_timing.c Thu Nov 2 12:14:42 2017 (r325316) @@ -132,6 +132,22 @@ test_getppid(uintmax_t num, uintmax_t int_arg, const c } uintmax_t +test_getresuid(uintmax_t num, uintmax_t int_arg, const char *path) +{ + uid_t ruid, euid, suid; + uintmax_t i; + + benchmark_start(); + for (i = 0; i < num; i++) { + if (alarm_fired) + break; + (void)getresuid(&ruid, &euid, &suid); + } + benchmark_stop(); + return (i); +} + +uintmax_t test_clock_gettime(uintmax_t num, uintmax_t int_arg, const char *path) { struct timespec ts; @@ -673,6 +689,7 @@ struct test { static const struct test tests[] = { { "getuid", test_getuid }, { "getppid", test_getppid }, + { "getresuid", test_getresuid }, { "clock_gettime", test_clock_gettime }, { "gettimeofday", test_gettimeofday }, { "getpriority", test_getpriority }, From owner-svn-src-all@freebsd.org Thu Nov 2 12:15: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 BC52CE5835C; Thu, 2 Nov 2017 12:15:40 +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 897747C776; Thu, 2 Nov 2017 12:15:40 +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 vA2CFdaU026013; Thu, 2 Nov 2017 12:15:39 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA2CFd37026012; Thu, 2 Nov 2017 12:15:39 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201711021215.vA2CFd37026012@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Thu, 2 Nov 2017 12:15:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325317 - head/tools/tools/syscall_timing X-SVN-Group: head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: head/tools/tools/syscall_timing X-SVN-Commit-Revision: 325317 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: Thu, 02 Nov 2017 12:15:40 -0000 Author: trasz Date: Thu Nov 2 12:15:39 2017 New Revision: 325317 URL: https://svnweb.freebsd.org/changeset/base/325317 Log: Add bad_open benchmark, which measures failed opens by calling open("", O_RDONLY);. Obtained from: CheriBSD MFC after: 2 weeks Sponsored by: DARPA, AFRL Modified: head/tools/tools/syscall_timing/syscall_timing.c Modified: head/tools/tools/syscall_timing/syscall_timing.c ============================================================================== --- head/tools/tools/syscall_timing/syscall_timing.c Thu Nov 2 12:14:42 2017 (r325316) +++ head/tools/tools/syscall_timing/syscall_timing.c Thu Nov 2 12:15:39 2017 (r325317) @@ -392,6 +392,21 @@ test_open_close(uintmax_t num, uintmax_t int_arg, cons } uintmax_t +test_bad_open(uintmax_t num, uintmax_t int_arg, const char *path) +{ + uintmax_t i; + + benchmark_start(); + for (i = 0; i < num; i++) { + if (alarm_fired) + break; + open("", O_RDONLY); + } + benchmark_stop(); + return (i); +} + +uintmax_t test_read(uintmax_t num, uintmax_t int_arg, const char *path) { char buf[int_arg]; @@ -702,6 +717,7 @@ static const struct test tests[] = { { "socket_tcp", test_socket_stream, .t_int = PF_INET }, { "socket_udp", test_socket_dgram, .t_int = PF_INET }, { "create_unlink", test_create_unlink, .t_flags = FLAG_PATH }, + { "bad_open", test_bad_open }, { "open_close", test_open_close, .t_flags = FLAG_PATH }, { "open_read_close_1", test_open_read_close, .t_flags = FLAG_PATH, .t_int = 1 }, From owner-svn-src-all@freebsd.org Thu Nov 2 12:16:12 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 4371FE583D0; Thu, 2 Nov 2017 12:16:12 +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 12D287C8C6; Thu, 2 Nov 2017 12:16:12 +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 vA2CGBVx026076; Thu, 2 Nov 2017 12:16:11 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA2CGBVo026075; Thu, 2 Nov 2017 12:16:11 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201711021216.vA2CGBVo026075@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Thu, 2 Nov 2017 12:16:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325318 - head/tools/tools/syscall_timing X-SVN-Group: head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: head/tools/tools/syscall_timing X-SVN-Commit-Revision: 325318 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: Thu, 02 Nov 2017 12:16:12 -0000 Author: trasz Date: Thu Nov 2 12:16:11 2017 New Revision: 325318 URL: https://svnweb.freebsd.org/changeset/base/325318 Log: Add benchmark for access(2). Obtained from: CheriBSD MFC after: 2 weeks Sponsored by: DARPA, AFRL Modified: head/tools/tools/syscall_timing/syscall_timing.c Modified: head/tools/tools/syscall_timing/syscall_timing.c ============================================================================== --- head/tools/tools/syscall_timing/syscall_timing.c Thu Nov 2 12:15:39 2017 (r325317) +++ head/tools/tools/syscall_timing/syscall_timing.c Thu Nov 2 12:16:11 2017 (r325318) @@ -340,6 +340,28 @@ test_socketpair_dgram(uintmax_t num, uintmax_t int_arg } uintmax_t +test_access(uintmax_t num, uintmax_t int_arg, const char *path) +{ + uintmax_t i; + int fd; + + fd = access(path, O_RDONLY); + if (fd < 0) + err(-1, "test_access: %s", path); + close(fd); + + benchmark_start(); + for (i = 0; i < num; i++) { + if (alarm_fired) + break; + access(path, O_RDONLY); + close(fd); + } + benchmark_stop(); + return (i); +} + +uintmax_t test_create_unlink(uintmax_t num, uintmax_t int_arg, const char *path) { uintmax_t i; @@ -716,6 +738,7 @@ static const struct test tests[] = { { "socketpair_dgram", test_socketpair_dgram }, { "socket_tcp", test_socket_stream, .t_int = PF_INET }, { "socket_udp", test_socket_dgram, .t_int = PF_INET }, + { "access", test_access, .t_flags = FLAG_PATH }, { "create_unlink", test_create_unlink, .t_flags = FLAG_PATH }, { "bad_open", test_bad_open }, { "open_close", test_open_close, .t_flags = FLAG_PATH }, From owner-svn-src-all@freebsd.org Thu Nov 2 12:16: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 E19A8E58474; Thu, 2 Nov 2017 12:16:51 +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 B0E1C7CA30; Thu, 2 Nov 2017 12:16:51 +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 vA2CGoSw026140; Thu, 2 Nov 2017 12:16:50 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA2CGori026139; Thu, 2 Nov 2017 12:16:50 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201711021216.vA2CGori026139@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Thu, 2 Nov 2017 12:16:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325319 - head/tools/tools/syscall_timing X-SVN-Group: head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: head/tools/tools/syscall_timing X-SVN-Commit-Revision: 325319 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: Thu, 02 Nov 2017 12:16:52 -0000 Author: trasz Date: Thu Nov 2 12:16:50 2017 New Revision: 325319 URL: https://svnweb.freebsd.org/changeset/base/325319 Log: Remove artificial limit for -i. Obtained from: CheriBSD MFC after: 2 weeks Sponsored by: DARPA, AFRL Modified: head/tools/tools/syscall_timing/syscall_timing.c Modified: head/tools/tools/syscall_timing/syscall_timing.c ============================================================================== --- head/tools/tools/syscall_timing/syscall_timing.c Thu Nov 2 12:16:11 2017 (r325318) +++ head/tools/tools/syscall_timing/syscall_timing.c Thu Nov 2 12:16:50 2017 (r325319) @@ -808,7 +808,7 @@ main(int argc, char *argv[]) switch (ch) { case 'i': ll = strtol(optarg, &endp, 10); - if (*endp != 0 || ll < 1 || ll > 100000) + if (*endp != 0 || ll < 1) usage(); iterations = ll; break; From owner-svn-src-all@freebsd.org Thu Nov 2 13:49: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 D6ADDE5A238; Thu, 2 Nov 2017 13:49:09 +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 A52FB7F220; Thu, 2 Nov 2017 13:49:09 +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 vA2Dn82K063560; Thu, 2 Nov 2017 13:49:08 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA2Dn8Yg063559; Thu, 2 Nov 2017 13:49:08 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201711021349.vA2Dn8Yg063559@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Thu, 2 Nov 2017 13:49:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325320 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Group: head X-SVN-Commit-Author: avg X-SVN-Commit-Paths: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Commit-Revision: 325320 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: Thu, 02 Nov 2017 13:49:10 -0000 Author: avg Date: Thu Nov 2 13:49:08 2017 New Revision: 325320 URL: https://svnweb.freebsd.org/changeset/base/325320 Log: Disable posix_fallocate(2) for ZFS The generic (naive) implementation of posix_fallocate cannot provide the standard mandated guarantee that overwrites would never fail due to the lack of free space. The fundamental reason is the copy-on-write architecture of ZFS. Other features like compression and deduplication can also increase the size difference between the (pre-)allocated dummy content and the future content. So, until ZFS can properly implement the feature it's better to report that it is unsupported rather than providing an ersatz implementation. Please note that EINVAL is used to report that the underlying file system does not support the operation (POSIX.1-2008). illumos and ZoL seem to do the same. MFC after: 3 weeks Sponsored by: Panzura Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Thu Nov 2 12:16:50 2017 (r325319) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Thu Nov 2 13:49:08 2017 (r325320) @@ -6009,6 +6009,7 @@ struct vop_vector zfs_vnodeops = { .vop_inactive = zfs_freebsd_inactive, .vop_reclaim = zfs_freebsd_reclaim, .vop_access = zfs_freebsd_access, + .vop_allocate = VOP_EINVAL, .vop_lookup = zfs_cache_lookup, .vop_cachedlookup = zfs_freebsd_lookup, .vop_getattr = zfs_freebsd_getattr, From owner-svn-src-all@freebsd.org Thu Nov 2 14:08:39 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 CCA67E5AA49; Thu, 2 Nov 2017 14:08:39 +0000 (UTC) (envelope-from skra@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 A4EDA7FD35; Thu, 2 Nov 2017 14:08:39 +0000 (UTC) (envelope-from skra@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA2E8c5W071659; Thu, 2 Nov 2017 14:08:38 GMT (envelope-from skra@FreeBSD.org) Received: (from skra@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA2E8caf071658; Thu, 2 Nov 2017 14:08:38 GMT (envelope-from skra@FreeBSD.org) Message-Id: <201711021408.vA2E8caf071658@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: skra set sender to skra@FreeBSD.org using -f From: Svatopluk Kraus Date: Thu, 2 Nov 2017 14:08:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325321 - head/sys/arm/arm X-SVN-Group: head X-SVN-Commit-Author: skra X-SVN-Commit-Paths: head/sys/arm/arm X-SVN-Commit-Revision: 325321 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: Thu, 02 Nov 2017 14:08:39 -0000 Author: skra Date: Thu Nov 2 14:08:38 2017 New Revision: 325321 URL: https://svnweb.freebsd.org/changeset/base/325321 Log: Take into account race conditions in case of accessed or modified bit emulation in fast path of data/prefetch abort common routine. Process these bits only if related page table entries are consistent with provided abort info. In case of inconsistency, do nothing and let processor to signal new abort if still needed. The mapping related to an abort may be a subject of change concurrently. The situation is more evident on multicore machines. Mapping may be removed on one core while being used on another one before TLB flush happened. Memory swapping process may be an example. Or, two or more aborts may be signaled for the same page on more cores concurrently. While an abort on one core may cause a promotion of related mapping, an abort on another core may be inconsistent then as related mapping was promoted. A question is how much real the issue may be on single core machine. However, it's better to play safe even for these machines. This change may solve some "PT2MAP abort" panics reported rarely. The revision of pmap_fault() was initiated thanks to stack backtrace provided by Bob Prohaska (fbsd at www.zefox.net). While here, INVARIANTS block was changed. The previous check had iffy value as only one entry from many was checked from L2 page table. Reviewed by: mmel MFC after: 3 weeks Modified: head/sys/arm/arm/pmap-v6.c Modified: head/sys/arm/arm/pmap-v6.c ============================================================================== --- head/sys/arm/arm/pmap-v6.c Thu Nov 2 13:49:08 2017 (r325320) +++ head/sys/arm/arm/pmap-v6.c Thu Nov 2 14:08:38 2017 (r325321) @@ -6404,6 +6404,22 @@ pmap_fault(pmap_t pmap, vm_offset_t far, uint32_t fsr, */ PMAP_LOCK(pmap); +#ifdef INVARIANTS + pte1 = pte1_load(pmap_pte1(pmap, far)); + if (pte1_is_link(pte1)) { + /* + * Check in advance that associated L2 page table is mapped into + * PT2MAP space. Note that faulty access to not mapped L2 page + * table is caught in more general check above where "far" is + * checked that it does not lay in PT2MAP space. Note also that + * L1 page table and PT2TAB always exist and are mapped. + */ + pte2 = pt2tab_load(pmap_pt2tab_entry(pmap, far)); + if (!pte2_is_valid(pte2)) + panic("%s: missing L2 page table (%p, %#x)", + __func__, pmap, far); + } +#endif #ifdef SMP /* * Special treatment is due to break-before-make approach done when @@ -6424,10 +6440,23 @@ pmap_fault(pmap_t pmap, vm_offset_t far, uint32_t fsr, * for aborts from user mode. */ if (idx == FAULT_ACCESS_L2) { - pte2p = pt2map_entry(far); - pte2 = pte2_load(pte2p); - if (pte2_is_valid(pte2)) { - pte2_store(pte2p, pte2 | PTE2_A); + pte1 = pte1_load(pmap_pte1(pmap, far)); + if (pte1_is_link(pte1)) { + /* L2 page table should exist and be mapped. */ + pte2p = pt2map_entry(far); + pte2 = pte2_load(pte2p); + if (pte2_is_valid(pte2)) { + pte2_store(pte2p, pte2 | PTE2_A); + PMAP_UNLOCK(pmap); + return (KERN_SUCCESS); + } + } else { + /* + * We got L2 access fault but PTE1 is not a link. + * Probably some race happened, do nothing. + */ + CTR3(KTR_PMAP, "%s: FAULT_ACCESS_L2 - pmap %#x far %#x", + __func__, pmap, far); PMAP_UNLOCK(pmap); return (KERN_SUCCESS); } @@ -6439,6 +6468,15 @@ pmap_fault(pmap_t pmap, vm_offset_t far, uint32_t fsr, pte1_store(pte1p, pte1 | PTE1_A); PMAP_UNLOCK(pmap); return (KERN_SUCCESS); + } else { + /* + * We got L1 access fault but PTE1 is not section + * mapping. Probably some race happened, do nothing. + */ + CTR3(KTR_PMAP, "%s: FAULT_ACCESS_L1 - pmap %#x far %#x", + __func__, pmap, far); + PMAP_UNLOCK(pmap); + return (KERN_SUCCESS); } } @@ -6451,12 +6489,25 @@ pmap_fault(pmap_t pmap, vm_offset_t far, uint32_t fsr, * for aborts from user mode. */ if ((fsr & FSR_WNR) && (idx == FAULT_PERM_L2)) { - pte2p = pt2map_entry(far); - pte2 = pte2_load(pte2p); - if (pte2_is_valid(pte2) && !(pte2 & PTE2_RO) && - (pte2 & PTE2_NM)) { - pte2_store(pte2p, pte2 & ~PTE2_NM); - tlb_flush(trunc_page(far)); + pte1 = pte1_load(pmap_pte1(pmap, far)); + if (pte1_is_link(pte1)) { + /* L2 page table should exist and be mapped. */ + pte2p = pt2map_entry(far); + pte2 = pte2_load(pte2p); + if (pte2_is_valid(pte2) && !(pte2 & PTE2_RO) && + (pte2 & PTE2_NM)) { + pte2_store(pte2p, pte2 & ~PTE2_NM); + tlb_flush(trunc_page(far)); + PMAP_UNLOCK(pmap); + return (KERN_SUCCESS); + } + } else { + /* + * We got L2 permission fault but PTE1 is not a link. + * Probably some race happened, do nothing. + */ + CTR3(KTR_PMAP, "%s: FAULT_PERM_L2 - pmap %#x far %#x", + __func__, pmap, far); PMAP_UNLOCK(pmap); return (KERN_SUCCESS); } @@ -6464,10 +6515,20 @@ pmap_fault(pmap_t pmap, vm_offset_t far, uint32_t fsr, if ((fsr & FSR_WNR) && (idx == FAULT_PERM_L1)) { pte1p = pmap_pte1(pmap, far); pte1 = pte1_load(pte1p); - if (pte1_is_section(pte1) && !(pte1 & PTE1_RO) && - (pte1 & PTE1_NM)) { - pte1_store(pte1p, pte1 & ~PTE1_NM); - tlb_flush(pte1_trunc(far)); + if (pte1_is_section(pte1)) { + if (!(pte1 & PTE1_RO) && (pte1 & PTE1_NM)) { + pte1_store(pte1p, pte1 & ~PTE1_NM); + tlb_flush(pte1_trunc(far)); + PMAP_UNLOCK(pmap); + return (KERN_SUCCESS); + } + } else { + /* + * We got L1 permission fault but PTE1 is not section + * mapping. Probably some race happened, do nothing. + */ + CTR3(KTR_PMAP, "%s: FAULT_PERM_L1 - pmap %#x far %#x", + __func__, pmap, far); PMAP_UNLOCK(pmap); return (KERN_SUCCESS); } @@ -6478,33 +6539,6 @@ pmap_fault(pmap_t pmap, vm_offset_t far, uint32_t fsr, * modify bits aborts, could be moved to ASM. Now we are * starting to deal with not fast aborts. */ - -#ifdef INVARIANTS - /* - * Read an entry in PT2TAB associated with both pmap and far. - * It's safe because PT2TAB is always mapped. - */ - pte2 = pt2tab_load(pmap_pt2tab_entry(pmap, far)); - if (pte2_is_valid(pte2)) { - /* - * Now, when we know that L2 page table is allocated, - * we can use PT2MAP to get L2 page table entry. - */ - pte2 = pte2_load(pt2map_entry(far)); - if (pte2_is_valid(pte2)) { - /* - * If L2 page table entry is valid, make sure that - * L1 page table entry is valid too. Note that we - * leave L2 page entries untouched when promoted. - */ - pte1 = pte1_load(pmap_pte1(pmap, far)); - if (!pte1_is_valid(pte1)) { - panic("%s: missing L1 page entry (%p, %#x)", - __func__, pmap, far); - } - } - } -#endif PMAP_UNLOCK(pmap); return (KERN_FAILURE); } From owner-svn-src-all@freebsd.org Thu Nov 2 15:38:26 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 A2745E5CCEB; Thu, 2 Nov 2017 15:38:26 +0000 (UTC) (envelope-from gordon@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 4B12F82D51; Thu, 2 Nov 2017 15:38:26 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA2FcPwM008822; Thu, 2 Nov 2017 15:38:25 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA2FcOBN008815; Thu, 2 Nov 2017 15:38:24 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <201711021538.vA2FcOBN008815@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Thu, 2 Nov 2017 15:38:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r325322 - in releng/10.3: . contrib/tzdata sys/conf X-SVN-Group: releng X-SVN-Commit-Author: gordon X-SVN-Commit-Paths: in releng/10.3: . contrib/tzdata sys/conf X-SVN-Commit-Revision: 325322 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: Thu, 02 Nov 2017 15:38:26 -0000 Author: gordon Date: Thu Nov 2 15:38:24 2017 New Revision: 325322 URL: https://svnweb.freebsd.org/changeset/base/325322 Log: Update timezone database information. [EN-17:09] Approved by: so Added: releng/10.3/contrib/tzdata/calendars releng/10.3/contrib/tzdata/theory.html (contents, props changed) releng/10.3/contrib/tzdata/zishrink.awk (contents, props changed) Deleted: releng/10.3/contrib/tzdata/Theory Modified: releng/10.3/UPDATING releng/10.3/contrib/tzdata/CONTRIBUTING releng/10.3/contrib/tzdata/LICENSE releng/10.3/contrib/tzdata/Makefile releng/10.3/contrib/tzdata/NEWS releng/10.3/contrib/tzdata/README releng/10.3/contrib/tzdata/africa releng/10.3/contrib/tzdata/antarctica releng/10.3/contrib/tzdata/asia releng/10.3/contrib/tzdata/australasia releng/10.3/contrib/tzdata/backward releng/10.3/contrib/tzdata/backzone releng/10.3/contrib/tzdata/checklinks.awk releng/10.3/contrib/tzdata/europe releng/10.3/contrib/tzdata/leap-seconds.list releng/10.3/contrib/tzdata/leapseconds releng/10.3/contrib/tzdata/leapseconds.awk releng/10.3/contrib/tzdata/northamerica releng/10.3/contrib/tzdata/southamerica releng/10.3/contrib/tzdata/version releng/10.3/contrib/tzdata/zone.tab releng/10.3/contrib/tzdata/zone1970.tab releng/10.3/sys/conf/newvers.sh Modified: releng/10.3/UPDATING ============================================================================== --- releng/10.3/UPDATING Thu Nov 2 14:08:38 2017 (r325321) +++ releng/10.3/UPDATING Thu Nov 2 15:38:24 2017 (r325322) @@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITHOUT_CLANG to b stable/10, and then rebuild without this option. The bootstrap process from older version of current is a bit fragile. +20171102 p23 FreeBSD-EN-17:09.tzdata + + Update timezone database information. [EN-17:09] + 20171017 p22 FreeBSD-SA-17:07.wpa Fix WPA2 protocol vulnerability. [SA-17:07] Modified: releng/10.3/contrib/tzdata/CONTRIBUTING ============================================================================== --- releng/10.3/contrib/tzdata/CONTRIBUTING Thu Nov 2 14:08:38 2017 (r325321) +++ releng/10.3/contrib/tzdata/CONTRIBUTING Thu Nov 2 15:38:24 2017 (r325322) @@ -5,23 +5,29 @@ change timekeeping rules erratically and sometimes wit warning, the data entries do not cover all of civil time before 1970, and undoubtedly errors remain in the code and data. Feel free to fill gaps or fix mistakes, and please email improvements -to tz@iana.org for use in the future. +to tz@iana.org for use in the future. In your email, please give +reliable sources that reviewers can check. +----- + +Developers can contribute technical changes to the source code and +data as follows. + To email small changes, please run a POSIX shell command like 'diff -u old/europe new/europe >myfix.patch', and attach myfix.patch to the email. -For more-elaborate changes, please read the Theory file and browse -the mailing list archives for -examples of patches that tend to work well. Ideally, additions to +For more-elaborate changes, please read the theory.html file and browse +the mailing list archives for +examples of patches that tend to work well. Additions to data should contain commentary citing reliable sources as -justification. +justification. Citations should use https: URLs if available. Please submit changes against either the latest release in - or the master branch of the experimental -Git repository. If you use Git the following workflow may be helpful: + or the master branch of the development +repository. If you use Git the following workflow may be helpful: - * Copy the experimental repository. + * Copy the development repository. git clone https://github.com/eggert/tz.git cd tz Modified: releng/10.3/contrib/tzdata/LICENSE ============================================================================== --- releng/10.3/contrib/tzdata/LICENSE Thu Nov 2 14:08:38 2017 (r325321) +++ releng/10.3/contrib/tzdata/LICENSE Thu Nov 2 15:38:24 2017 (r325322) @@ -1,4 +1,5 @@ -With a few exceptions, all files in the tz code and data (including -this one) are in the public domain. The exceptions are date.c, -newstrftime.3, and strftime.c, which contain material derived from BSD -and which use the BSD 3-clause license. +Unless specified below, all files in the tz code and data (including +this LICENSE file) are in the public domain. + +If the files date.c, newstrftime.3, and strftime.c are present, they +contain material derived from BSD and use the BSD 3-clause license. Modified: releng/10.3/contrib/tzdata/Makefile ============================================================================== --- releng/10.3/contrib/tzdata/Makefile Thu Nov 2 14:08:38 2017 (r325321) +++ releng/10.3/contrib/tzdata/Makefile Thu Nov 2 15:38:24 2017 (r325322) @@ -49,6 +49,7 @@ TOPDIR= /usr/local # "Compiled" time zone information is placed in the "TZDIR" directory # (and subdirectories). # Use an absolute path name for TZDIR unless you're just testing the software. +# TZDIR_BASENAME should not contain "/" and should not be ".", ".." or empty. TZDIR_BASENAME= zoneinfo TZDIR= $(TOPDIR)/etc/$(TZDIR_BASENAME) @@ -72,11 +73,11 @@ MANDIR= $(TOPDIR)/man LIBDIR= $(TOPDIR)/lib -# If you always want time values interpreted as "seconds since the epoch -# (not counting leap seconds)", use +# If you want only POSIX time, with time values interpreted as +# seconds since the epoch (not counting leap seconds), use # REDO= posix_only -# below. If you always want right time values interpreted as "seconds since -# the epoch" (counting leap seconds)", use +# below. If you want only "right" time, with values interpreted +# as seconds since the epoch (counting leap seconds), use # REDO= right_only # below. If you want both sets of data available, with leap seconds not # counted normally, use @@ -85,10 +86,31 @@ LIBDIR= $(TOPDIR)/lib # normally, use # REDO= right_posix # below. POSIX mandates that leap seconds not be counted; for compatibility -# with it, use "posix_only" or "posix_right". +# with it, use "posix_only" or "posix_right". Use POSIX time on systems with +# leap smearing; this can work better than unsmeared "right" time with +# applications that are not leap second aware, and is closer to unsmeared +# "right" time than unsmeared POSIX time is (e.g., 0.5 vs 1.0 s max error). REDO= posix_right +# To install data in text form that has all the information of the binary data, +# (optionally incorporating leap second information), use +# TZDATA_TEXT= tzdata.zi leapseconds +# To install text data without leap second information (e.g., because +# REDO='posix_only'), use +# TZDATA_TEXT= tzdata.zi +# To avoid installing text data, use +# TZDATA_TEXT= + +TZDATA_TEXT= leapseconds tzdata.zi + +# For backward-compatibility links for old zone names, use +# BACKWARD= backward pacificnew +# To omit these links, use +# BACKWARD= + +BACKWARD= backward pacificnew + # If you want out-of-scope and often-wrong data from the file 'backzone', use # PACKRATDATA= backzone # To omit this data, use @@ -96,6 +118,11 @@ REDO= posix_right PACKRATDATA= +# The name of a locale using the UTF-8 encoding, used during self-tests. +# The tests are skipped if the name does not appear to work on this system. + +UTF8_LOCALE= en_US.utf8 + # Since "." may not be in PATH... YEARISTYPE= ./yearistype @@ -103,50 +130,53 @@ YEARISTYPE= ./yearistype # Non-default libraries needed to link. LDLIBS= -# Add the following to the end of the "CFLAGS=" line as needed. +# Add the following to the end of the "CFLAGS=" line as needed to override +# defaults specified in the source code. "-DFOO" is equivalent to "-DFOO=1". # -DBIG_BANG=-9999999LL if the Big Bang occurred at time -9999999 (see zic.c) +# -DDEPRECATE_TWO_DIGIT_YEARS for optional runtime warnings about strftime +# formats that generate only the last two digits of year numbers +# -DEPOCH_LOCAL if the 'time' function returns local time not UT +# -DEPOCH_OFFSET=N if the 'time' function returns a value N greater +# than what POSIX specifies, assuming local time is UT. +# For example, N is 252460800 on AmigaOS. # -DHAVE_DECL_ASCTIME_R=0 if does not declare asctime_r +# -DHAVE_DECL_ENVIRON if declares 'environ' # -DHAVE_DIRECT_H if mkdir needs (MS-Windows) -# -DHAVE_DOS_FILE_NAMES if file names have drive specifiers etc. (MS-DOS) -# -DHAVE_GETTEXT=1 if 'gettext' works (e.g., GNU/Linux, FreeBSD, Solaris) -# -DHAVE_INCOMPATIBLE_CTIME_R=1 if your system's time.h declares +# -DHAVE_GENERIC=0 if _Generic does not work +# -DHAVE_GETTEXT if 'gettext' works (e.g., GNU/Linux, FreeBSD, Solaris) +# -DHAVE_INCOMPATIBLE_CTIME_R if your system's time.h declares # ctime_r and asctime_r incompatibly with the POSIX standard # (Solaris when _POSIX_PTHREAD_SEMANTICS is not defined). -# -DHAVE_INTTYPES_H=1 if you have a pre-C99 compiler with "inttypes.h" +# -DHAVE_INTTYPES_H if you have a non-C99 compiler with # -DHAVE_LINK=0 if your system lacks a link function # -DHAVE_LOCALTIME_R=0 if your system lacks a localtime_r function # -DHAVE_LOCALTIME_RZ=0 if you do not want zdump to use localtime_rz -# This defaults to 1 if a working localtime_rz seems to be available. # localtime_rz can make zdump significantly faster, but is nonstandard. # -DHAVE_POSIX_DECLS=0 if your system's include files do not declare # functions like 'link' or variables like 'tzname' required by POSIX -# -DHAVE_STDINT_H=1 if you have a pre-C99 compiler with "stdint.h" -# -DHAVE_STRFTIME_L=1 if declares locale_t and strftime_l -# This defaults to 0 if _POSIX_VERSION < 200809, 1 otherwise. +# -DHAVE_SNPRINTF=0 if your system lacks the snprintf function +# -DHAVE_STDBOOL_H if you have a non-C99 compiler with +# -DHAVE_STDINT_H if you have a non-C99 compiler with +# -DHAVE_STRFTIME_L if declares locale_t and strftime_l # -DHAVE_STRDUP=0 if your system lacks the strdup function # -DHAVE_SYMLINK=0 if your system lacks the symlink function -# -DHAVE_SYS_STAT_H=0 if your compiler lacks a "sys/stat.h" -# -DHAVE_SYS_WAIT_H=0 if your compiler lacks a "sys/wait.h" +# -DHAVE_SYS_STAT_H=0 if your compiler lacks a +# -DHAVE_SYS_WAIT_H=0 if your compiler lacks a # -DHAVE_TZSET=0 if your system lacks a tzset function -# -DHAVE_UNISTD_H=0 if your compiler lacks a "unistd.h" (Microsoft C++ 7?) -# -DEPOCH_LOCAL=1 if the 'time' function returns local time not UT -# -DEPOCH_OFFSET=N if the 'time' function returns a value N greater -# than what POSIX specifies, assuming local time is UT. -# For example, N is 252460800 on AmigaOS. -# -DNO_RUN_TIME_WARNINGS_ABOUT_YEAR_2000_PROBLEMS_THANK_YOU=1 -# if you do not want run time warnings about formats that may cause -# year 2000 grief -# -Dssize_t=long on ancient hosts that lack ssize_t -# -DTHREAD_SAFE=1 to make localtime.c thread-safe, as POSIX requires; +# -DHAVE_UNISTD_H=0 if your compiler lacks a +# -Dlocale_t=XXX if your system uses XXX instead of locale_t +# -Dssize_t=long on hosts like MS-Windows that lack ssize_t +# -DTHREAD_SAFE to make localtime.c thread-safe, as POSIX requires; # not needed by the main-program tz code, which is single-threaded. # Append other compiler flags as needed, e.g., -pthread on GNU/Linux. # -Dtime_tz=\"T\" to use T as the time_t type, rather than the system time_t +# This is intended for internal use only; it mangles external names. # -DTZ_DOMAIN=\"foo\" to use "foo" for gettext domain name; default is "tz" # -DTZ_DOMAINDIR=\"/path\" to use "/path" for gettext directory; # the default is system-supplied, typically "/usr/lib/locale" # -DTZDEFRULESTRING=\",date/time,date/time\" to default to the specified # DST transitions if the time zone files cannot be accessed -# -DUNINIT_TRAP=1 if reading uninitialized storage can cause problems +# -DUNINIT_TRAP if reading uninitialized storage can cause problems # other than simply getting garbage data # -DUSE_LTZ=0 to build zdump with the system time zone library # Also set TZDOBJS=zdump.o and CHECK_TIME_T_ALTERNATIVES= below. @@ -154,27 +184,28 @@ LDLIBS= # (or some other number) to set the maximum time zone abbreviation length # that zic will accept without a warning (the default is 6) # $(GCC_DEBUG_FLAGS) if you are using recent GCC and want lots of checking -GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-common -fstrict-aliasing \ - -Wall -Wextra \ - -Wbad-function-cast -Wcast-align -Wdate-time \ - -Wdeclaration-after-statement \ - -Wdouble-promotion \ - -Wformat=2 -Winit-self -Wjump-misses-init \ - -Wlogical-op -Wmissing-prototypes -Wnested-externs \ - -Wold-style-definition -Woverlength-strings -Wpointer-arith \ - -Wshadow -Wstrict-prototypes -Wsuggest-attribute=const \ - -Wsuggest-attribute=format -Wsuggest-attribute=noreturn \ - -Wsuggest-attribute=pure -Wtrampolines \ - -Wunused -Wwrite-strings \ - -Wno-address -Wno-format-nonliteral -Wno-sign-compare \ - -Wno-type-limits -Wno-unused-parameter +# Select instrumentation via "make GCC_INSTRUMENT='whatever'". +GCC_INSTRUMENT = \ + -fsanitize=undefined -fsanitize-address-use-after-scope \ + -fsanitize-undefined-trap-on-error -fstack-protector +GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \ + $(GCC_INSTRUMENT) \ + -Wall -Wextra \ + -Walloc-size-larger-than=100000 -Warray-bounds=2 \ + -Wbad-function-cast -Wcast-align -Wdate-time \ + -Wdeclaration-after-statement -Wdouble-promotion \ + -Wformat=2 -Wformat-overflow=2 -Wformat-signedness -Wformat-truncation \ + -Winit-self -Wjump-misses-init -Wlogical-op \ + -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ + -Wold-style-definition -Woverlength-strings -Wpointer-arith \ + -Wshadow -Wshift-overflow=2 -Wstrict-prototypes -Wstringop-overflow=5 \ + -Wsuggest-attribute=const -Wsuggest-attribute=format \ + -Wsuggest-attribute=noreturn -Wsuggest-attribute=pure \ + -Wtrampolines -Wundef -Wuninitialized -Wunused \ + -Wvariadic-macros -Wvla -Wwrite-strings \ + -Wno-address -Wno-format-nonliteral -Wno-sign-compare \ + -Wno-type-limits -Wno-unused-parameter # -# If you want to use System V compatibility code, add -# -DUSG_COMPAT -# to the end of the "CFLAGS=" line. This arrange for "timezone" and "daylight" -# variables to be kept up-to-date by the time conversion functions. Neither -# "timezone" nor "daylight" is described in X3J11's work. -# # If your system has a "GMT offset" field in its "struct tm"s # (or if you decide to add such a field in your system's "time.h" file), # add the name to a define such as @@ -186,6 +217,31 @@ GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-common -fstrict- # and define NO_TM_ZONE to suppress any guessing. These two fields are not # required by POSIX, but are widely available on GNU/Linux and BSD systems. # +# The next batch of options control support for external variables +# exported by tzcode. In practice these variables are less useful +# than TM_GMTOFF and TM_ZONE. However, most of them are standardized. +# # +# # To omit or support the external variable "tzname", add one of: +# # -DHAVE_TZNAME=0 +# # -DHAVE_TZNAME=1 +# # to the "CFLAGS=" line. "tzname" is required by POSIX 1988 and later. +# # If not defined, the code attempts to guess HAVE_TZNAME from other macros. +# # Warning: unless time_tz is also defined, HAVE_TZNAME=1 can cause +# # crashes when combined with some platforms' standard libraries, +# # presumably due to memory allocation issues. +# # +# # To omit or support the external variables "timezone" and "daylight", add +# # -DUSG_COMPAT=0 +# # -DUSG_COMPAT=1 +# # to the "CFLAGS=" line; "timezone" and "daylight" are inspired by +# # Unix Systems Group code and are required by POSIX 2008 (with XSI) and later. +# # If not defined, the code attempts to guess USG_COMPAT from other macros. +# # +# # To support the external variable "altzone", add +# # -DALTZONE +# # to the end of the "CFLAGS=" line; although "altzone" appeared in +# # System V Release 3.1 it has not been standardized. +# # If you want functions that were inspired by early versions of X3J11's work, # add # -DSTD_INSPIRED @@ -223,11 +279,6 @@ GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-common -fstrict- # -DALL_STATE # to the end of the "CFLAGS=" line. Storage is obtained by calling malloc. # -# If you want an "altzone" variable (a la System V Release 3.1), add -# -DALTZONE -# to the end of the "CFLAGS=" line. -# This variable is not described in X3J11's work. -# # NIST-PCTS:151-2, Version 1.4, (1993-12-03) is a test suite put # out by the National Institute of Standards and Technology # which claims to test C and Posix conformance. If you want to pass PCTS, add @@ -237,8 +288,8 @@ GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-common -fstrict- # If you want strict compliance with XPG4 as of 1994-04-09, add # -DXPG4_1994_04_09 # to the end of the "CFLAGS=" line. This causes "strftime" to always return -# 53 as a week number (rather than 52 or 53) for those days in January that -# before the first Monday in January when a "%V" format is used and January 1 +# 53 as a week number (rather than 52 or 53) for January days before +# January's first Monday when a "%V" format is used and January 1 # falls on a Friday, Saturday, or Sunday. CFLAGS= @@ -262,7 +313,7 @@ ZFLAGS= # How to use zic to install tz binary files. -ZIC_INSTALL= $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) $(LEAPSECONDS) +ZIC_INSTALL= $(ZIC) -d $(DESTDIR)$(TZDIR) $(LEAPSECONDS) # The name of a Posix-compliant 'awk' on your system. AWK= awk @@ -286,6 +337,7 @@ SGML_CATALOG_FILES= \ # The name, arguments and environment of a program to validate your web pages. # See for a validator, and # for a validation library. +# Set VALIDATE=':' if you do not have such a program. VALIDATE = nsgmls VALIDATE_FLAGS = -s -B -wall -wno-unused-param VALIDATE_ENV = \ @@ -352,7 +404,7 @@ AR= ar RANLIB= : TZCOBJS= zic.o -TZDOBJS= zdump.o localtime.o asctime.o +TZDOBJS= zdump.o localtime.o asctime.o strftime.o DATEOBJS= date.o localtime.o strftime.o asctime.o LIBSRCS= localtime.c asctime.c difftime.c LIBOBJS= localtime.o asctime.o difftime.o @@ -367,33 +419,35 @@ MANTXTS= newctime.3.txt newstrftime.3.txt newtzset.3.t time2posix.3.txt \ tzfile.5.txt tzselect.8.txt zic.8.txt zdump.8.txt \ date.1.txt -COMMON= CONTRIBUTING LICENSE Makefile NEWS README Theory version +COMMON= calendars CONTRIBUTING LICENSE Makefile \ + NEWS README theory.html version WEB_PAGES= tz-art.htm tz-how-to.html tz-link.htm DOCS= $(MANS) date.1 $(MANTXTS) $(WEB_PAGES) PRIMARY_YDATA= africa antarctica asia australasia \ europe northamerica southamerica -YDATA= $(PRIMARY_YDATA) pacificnew etcetera backward +YDATA= $(PRIMARY_YDATA) etcetera $(BACKWARD) NDATA= systemv factory TDATA= $(YDATA) $(NDATA) ZONETABLES= zone1970.tab zone.tab -TABDATA= iso3166.tab leapseconds $(ZONETABLES) +TABDATA= iso3166.tab $(TZDATA_TEXT) $(ZONETABLES) LEAP_DEPS= leapseconds.awk leap-seconds.list -DATA= $(YDATA) $(NDATA) backzone $(TABDATA) \ - leap-seconds.list yearistype.sh -AWK_SCRIPTS= checklinks.awk checktab.awk leapseconds.awk +TZDATA_ZI_DEPS= zishrink.awk $(TDATA) $(PACKRATDATA) +DATA= $(YDATA) $(NDATA) backzone iso3166.tab leap-seconds.list \ + leapseconds yearistype.sh $(ZONETABLES) +AWK_SCRIPTS= checklinks.awk checktab.awk leapseconds.awk zishrink.awk MISC= $(AWK_SCRIPTS) zoneinfo2tdf.pl TZS_YEAR= 2050 TZS= to$(TZS_YEAR).tzs TZS_NEW= to$(TZS_YEAR)new.tzs TZS_DEPS= $(PRIMARY_YDATA) asctime.c localtime.c \ private.h tzfile.h zdump.c zic.c -ENCHILADA= $(COMMON) $(DOCS) $(SOURCES) $(DATA) $(MISC) $(TZS) +ENCHILADA= $(COMMON) $(DOCS) $(SOURCES) $(DATA) $(MISC) $(TZS) tzdata.zi # Consult these files when deciding whether to rebuild the 'version' file. # This list is not the same as the output of 'git ls-files', since # .gitignore is not distributed. VERSION_DEPS= \ - CONTRIBUTING LICENSE Makefile NEWS README Theory \ + calendars CONTRIBUTING LICENSE Makefile NEWS README \ africa antarctica asctime.c asia australasia \ backward backzone \ checklinks.awk checktab.awk \ @@ -402,7 +456,7 @@ VERSION_DEPS= \ leap-seconds.list leapseconds.awk localtime.c \ newctime.3 newstrftime.3 newtzset.3 northamerica \ pacificnew private.h \ - southamerica strftime.c systemv \ + southamerica strftime.c systemv theory.html \ time2posix.3 tz-art.htm tz-how-to.html tz-link.htm \ tzfile.5 tzfile.h tzselect.8 tzselect.ksh \ workman.sh yearistype.sh \ @@ -424,7 +478,7 @@ install: all $(DATA) $(REDO) $(MANS) $(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \ $(DESTDIR)$(MANDIR)/man8 $(ZIC_INSTALL) -l $(LOCALTIME) -p $(POSIXRULES) - cp -f iso3166.tab $(ZONETABLES) $(DESTDIR)$(TZDIR)/. + cp -f $(TABDATA) $(DESTDIR)$(TZDIR)/. cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/. cp libtz.a $(DESTDIR)$(LIBDIR)/. $(RANLIB) $(DESTDIR)$(LIBDIR)/libtz.a @@ -445,6 +499,11 @@ version: $(VERSION_DEPS) printf '%s\n' "$$V" >$@.out mv $@.out $@ +# This file can be tailored by setting BACKWARD, PACKRATDATA, etc. +tzdata.zi: $(TZDATA_ZI_DEPS) + LC_ALL=C $(AWK) -f zishrink.awk $(TDATA) $(PACKRATDATA) >$@.out + mv $@.out $@ + version.h: version VERSION=`cat version` && printf '%s\n' \ 'static char const PKGVERSION[]="($(PACKAGE)) ";' \ @@ -470,6 +529,7 @@ leapseconds: $(LEAP_DEPS) # Arguments to pass to submakes of install_data. # They can be overridden by later submake arguments. INSTALLARGS = \ + BACKWARD=$(BACKWARD) \ DESTDIR=$(DESTDIR) \ LEAPSECONDS='$(LEAPSECONDS)' \ PACKRATDATA='$(PACKRATDATA)' \ @@ -478,10 +538,8 @@ INSTALLARGS = \ ZIC='$(ZIC)' # 'make install_data' installs one set of tz binary files. -# It can be tailored by setting LEAPSECONDS, PACKRATDATA, etc. -install_data: zic leapseconds yearistype $(PACKRATDATA) $(TDATA) - $(ZIC_INSTALL) $(TDATA) - $(AWK) '/^Rule/' $(TDATA) | $(ZIC_INSTALL) - $(PACKRATDATA) +install_data: zic leapseconds yearistype tzdata.zi + $(ZIC_INSTALL) tzdata.zi posix_only: $(MAKE) $(INSTALLARGS) LEAPSECONDS= install_data @@ -518,14 +576,14 @@ posix_packrat: zones: $(REDO) -$(TZS_NEW): $(TDATA) zdump zic +$(TZS_NEW): tzdata.zi zdump zic mkdir -p tzs.dir - $(zic) -d tzs.dir $(TDATA) - $(AWK) '/^Link/{print $$1 "\t" $$2 "\t" $$3}' \ - $(TDATA) | LC_ALL=C sort >$@.out + $(zic) -d tzs.dir tzdata.zi + $(AWK) '/^L/{print "Link\t" $$2 "\t" $$3}' \ + tzdata.zi | LC_ALL=C sort >$@.out wd=`pwd` && \ zones=`$(AWK) -v wd="$$wd" \ - '/^Zone/{print wd "/tzs.dir/" $$2}' $(TDATA) \ + '/^Z/{print wd "/tzs.dir/" $$2}' tzdata.zi \ | LC_ALL=C sort` && \ ./zdump -i -c $(TZS_YEAR) $$zones >>$@.out sed 's,^TZ=".*tzs\.dir/,TZ=",' $@.out >$@.sed.out @@ -542,7 +600,8 @@ force_tzs: $(TZS_NEW) cp $(TZS_NEW) $(TZS) libtz.a: $(LIBOBJS) - $(AR) ru $@ $(LIBOBJS) + rm -f $@ + $(AR) -rc $@ $(LIBOBJS) $(RANLIB) $@ date: $(DATEOBJS) @@ -560,24 +619,37 @@ tzselect: tzselect.ksh version chmod +x $@.out mv $@.out $@ -check: check_character_set check_white_space check_links check_sorted \ - check_tables check_tzs check_web +check: check_character_set check_white_space check_links \ + check_name_lengths check_sorted \ + check_tables check_web check_zishrink check_tzs check_character_set: $(ENCHILADA) - LC_ALL=en_US.utf8 && export LC_ALL && \ + test ! '$(UTF8_LOCALE)' || \ + ! printf 'A\304\200B\n' | \ + LC_ALL='$(UTF8_LOCALE)' grep -q '^A.B$$' >/dev/null 2>&1 || { \ + LC_ALL='$(UTF8_LOCALE)' && export LC_ALL && \ sharp='#' && \ ! grep -Env $(SAFE_LINE) $(MANS) date.1 $(MANTXTS) \ $(MISC) $(SOURCES) $(WEB_PAGES) \ - CONTRIBUTING LICENSE Makefile README version && \ + CONTRIBUTING LICENSE Makefile README \ + version tzdata.zi && \ ! grep -Env $(SAFE_SHARP_LINE) $(TDATA) backzone \ leapseconds yearistype.sh zone.tab && \ - ! grep -Env $(OK_LINE) $(ENCHILADA) + ! grep -Env $(OK_LINE) $(ENCHILADA); \ + } check_white_space: $(ENCHILADA) patfmt=' \t|[\f\r\v]' && pat=`printf "$$patfmt\\n"` && \ ! grep -En "$$pat" $(ENCHILADA) ! grep -n '[[:space:]]$$' $(ENCHILADA) +PRECEDES_FILE_NAME = ^(Zone|Link[[:space:]]+[^[:space:]]+)[[:space:]]+ +FILE_NAME_COMPONENT_TOO_LONG = \ + $(PRECEDES_FILE_NAME)[^[:space:]]*[^/[:space:]]{15} + +check_name_lengths: $(TDATA) backzone + ! grep -En '$(FILE_NAME_COMPONENT_TOO_LONG)' $(TDATA) backzone + CHECK_CC_LIST = { n = split($$1,a,/,/); for (i=2; i<=n; i++) print a[1], a[i]; } check_sorted: backward backzone iso3166.tab zone.tab zone1970.tab @@ -592,6 +664,7 @@ check_sorted: backward backzone iso3166.tab zone.tab z check_links: checklinks.awk $(TDATA) $(AWK) -f checklinks.awk $(TDATA) + $(AWK) -f checklinks.awk tzdata.zi check_tables: checktab.awk $(PRIMARY_YDATA) $(ZONETABLES) for tab in $(ZONETABLES); do \ @@ -602,14 +675,32 @@ check_tables: checktab.awk $(PRIMARY_YDATA) $(ZONETABL check_tzs: $(TZS) $(TZS_NEW) diff -u $(TZS) $(TZS_NEW) -check_web: $(WEB_PAGES) - $(VALIDATE_ENV) $(VALIDATE) $(VALIDATE_FLAGS) $(WEB_PAGES) +# This checks only the HTML 4.01 strict page. +# To check the the other pages, use . +check_web: tz-how-to.html + $(VALIDATE_ENV) $(VALIDATE) $(VALIDATE_FLAGS) tz-how-to.html +# Check that tzdata.zi generates the same binary data that its sources do. +check_zishrink: tzdata.zi zic leapseconds $(PACKRATDATA) $(TDATA) + for type in posix right; do \ + mkdir -p time_t.dir/$$type time_t.dir/$$type-shrunk && \ + case $$type in \ + right) leap='-L leapseconds';; \ + *) leap=;; \ + esac && \ + $(ZIC) $$leap -d time_t.dir/$$type $(TDATA) && \ + $(AWK) '/^Rule/' $(TDATA) | \ + $(ZIC) $$leap -d time_t.dir/$$type - $(PACKRATDATA) && \ + $(ZIC) $$leap -d time_t.dir/$$type-shrunk tzdata.zi && \ + diff -r time_t.dir/$$type time_t.dir/$$type-shrunk || exit; \ + done + rm -fr time_t.dir + clean_misc: rm -f core *.o *.out \ date tzselect version.h zdump zic yearistype libtz.a clean: clean_misc - rm -fr *.dir tzdb-*/ $(TZS_NEW) + rm -fr *.dir tzdata.zi tzdb-*/ $(TZS_NEW) maintainer-clean: clean @echo 'This command is intended for maintainers to use; it' @@ -663,6 +754,7 @@ set-timestamps.out: $(ENCHILADA) touch -cmr `ls -t $$file workman.sh | sed 1q` $$file.txt || \ exit; \ done + touch -cmr `ls -t $(TZDATA_ZI_DEPS) | sed 1q` tzdata.zi touch -cmr `ls -t $(TZS_DEPS) | sed 1q` $(TZS) touch -cmr `ls -t $(VERSION_DEPS) | sed 1q` version touch $@ @@ -674,7 +766,7 @@ check_public: $(MAKE) maintainer-clean $(MAKE) "CFLAGS=$(GCC_DEBUG_FLAGS)" ALL mkdir -p public.dir - for i in $(TDATA) ; do \ + for i in $(TDATA) tzdata.zi; do \ $(zic) -v -d public.dir $$i 2>&1 || exit; \ done $(zic) -v -d public.dir $(TDATA) @@ -768,8 +860,8 @@ typecheck: $(MAKE) clean ; \ done -zonenames: $(TDATA) - @$(AWK) '/^Zone/ { print $$2 } /^Link/ { print $$3 }' $(TDATA) +zonenames: tzdata.zi + @$(AWK) '/^Z/ { print $$2 } /^L/ { print $$3 }' tzdata.zi asctime.o: private.h tzfile.h date.o: private.h @@ -785,6 +877,7 @@ zic.o: private.h tzfile.h version.h .PHONY: check check_character_set check_links .PHONY: check_public check_sorted check_tables .PHONY: check_time_t_alternatives check_tzs check_web check_white_space +.PHONY: check_zishrink .PHONY: clean clean_misc force_tzs .PHONY: install install_data maintainer-clean names .PHONY: posix_only posix_packrat posix_right Modified: releng/10.3/contrib/tzdata/NEWS ============================================================================== --- releng/10.3/contrib/tzdata/NEWS Thu Nov 2 14:08:38 2017 (r325321) +++ releng/10.3/contrib/tzdata/NEWS Thu Nov 2 15:38:24 2017 (r325322) @@ -1,5 +1,344 @@ News for the tz database +Release 2017c - 2017-10-20 14:49:34 -0700 + + Briefly: + Northern Cyprus switches from +03 to +02/+03 on 2017-10-29. + Fiji ends DST 2018-01-14, not 2018-01-21. + Namibia switches from +01/+02 to +02 on 2018-04-01. + Sudan switches from +03 to +02 on 2017-11-01. + Tonga likely switches from +13/+14 to +13 on 2017-11-05. + Turks & Caicos switches from -04 to -05/-04 on 2018-11-04. + A new file tzdata.zi now holds a small text copy of all data. + The zic input format has been regularized slightly. + + Changes to future time stamps + + Northern Cyprus has decided to resume EU rules starting + 2017-10-29, thus reinstituting winter time. + + Fiji ends DST 2018-01-14 instead of the 2018-01-21 previously + predicted. (Thanks to Dominic Fok.) Adjust future predictions + accordingly. + + Namibia will switch from +01 with DST to +02 all year on + 2017-09-03 at 02:00. This affects UT offsets starting 2018-04-01 + at 02:00. (Thanks to Steffen Thorsen.) + + Sudan will switch from +03 to +02 on 2017-11-01. (Thanks to Ahmed + Atyya and Yahia Abdalla.) South Sudan is not switching, so + Africa/Juba is no longer a link to Africa/Khartoum. + + Tonga has likely ended its experiment with DST, and will not + adjust its clocks on 2017-11-05. Although Tonga has not announced + whether it will continue to observe DST, the IATA is assuming that + it will not. (Thanks to David Wade.) + + Turks & Caicos will switch from -04 all year to -05 with US DST on + 2018-03-11 at 03:00. This affects UT offsets starting 2018-11-04 + at 02:00. (Thanks to Steffen Thorsen.) + + Changes to past time stamps + + Namibia switched from +02 to +01 on 1994-03-21, not 1994-04-03. + (Thanks to Arthur David Olson.) + + Detroit did not observe DST in 1967. + + Use railway time for Asia/Kolkata before 1941, by switching to + Madras local time (UT +052110) in 1870, then to IST (UT +0530) in + 1906. Also, treat 1941-2's +0630 as DST, like 1942-5. + + Europe/Dublin's 1946 and 1947 fallback transitions occurred at + 02:00 standard time, not 02:00 DST. (Thanks to Michael Deckers.) + + Pacific/Apia and Pacific/Pago_Pago switched from Antipodean to + American time in 1892, not 1879. (Thanks to Michael Deckers.) + + Adjust the 1867 transition in Alaska to better reflect the + historical record, by changing it to occur on 1867-10-18 at 15:30 + Sitka time rather than at the start of 1867-10-17 local time. + Although strictly speaking this is accurate only for Sitka, + the rest of Alaska's blanks need to be filled in somehow. + + Fix off-by-one errors in UT offsets for Adak and Nome before 1867. + (Thanks to Michael Deckers.) + + Add 7 s to the UT offset in Asia/Yangon before 1920. + + Changes to zone names + + Remove Canada/East-Saskatchewan from the 'backward' file, as it + exceeded the 14-character limit and was an unused misnomer anyway. + + Changes to build procedure + + To support applications that prefer to read time zone data in text + form, two zic input files tzdata.zi and leapseconds are now + installed by default. The commands 'zic tzdata.zi' and 'zic -L + leapseconds tzdata.zi' can reproduce the tzdata binary files + without and with leap seconds, respectively. To prevent these two + new files from being installed, use 'make TZDATA_TEXT=', and to + suppress leap seconds from the tzdata text installation, use 'make + TZDATA_TEXT=tzdata.zi'. + + 'make BACKWARD=' now suppresses backward-compatibility names + like 'US/Pacific' that are defined in the 'backward' and + 'pacificnew' files. + + 'make check' now works on systems that lack a UTF-8 locale, + or that lack the nsgmls program. Set UTF8_LOCALE to configure + the name of a UTF-8 locale, if you have one. + + Y2K runtime checks are no longer enabled by default. Add + -DDEPRECATE_TWO_DIGIT_YEARS to CFLAGS to enable them, instead of + adding -DNO_RUN_TIME_WARNINGS_ABOUT_YEAR_2000_PROBLEMS_THANK_YOU + to disable them. (New name suggested by Brian Inglis.) + + The build procedure for zdump now works on AIX 7.1. + (Problem reported by Kees Dekker.) + + Changes to code + + zic and the reference runtime now reject multiple leap seconds + within 28 days of each other, or leap seconds before the Epoch. + As a result, support for double leap seconds, which was + obsolescent and undocumented, has been removed. Double leap + seconds were an error in the C89 standard; they have never existed + in civil timekeeping. (Thanks to Robert Elz and Bradley White for + noticing glitches in the code that uncovered this problem.) + + zic now warns about use of the obsolescent and undocumented -y + option, and about use of the obsolescent TYPE field of Rule lines. + + zic now allows unambiguous abbreviations like "Sa" and "Su" for + weekdays; formerly it rejected them due to a bug. Conversely, zic + no longer considers non-prefixes to be abbreviations; for example, + it no longer accepts "lF" as an abbreviation for "lastFriday". + Also, zic warns about the undocumented usage with a "last-" + prefix, e.g., "last-Fri". + + Similarly, zic now accepts the unambiguous abbreviation "L" for + "Link" in ordinary context and for "Leap" in leap-second context. + Conversely, zic no longer accepts non-prefixes such as "La" as + abbreviations for words like "Leap". + + zic no longer accepts leap second lines in ordinary input, or + ordinary lines in leap second input. Formerly, zic sometimes + warned about this undocumented usage and handled it incorrectly. + + The new macro HAVE_TZNAME governs whether the tzname external + variable is exported, instead of USG_COMPAT. USG_COMPAT now + governs only the external variables "timezone" and "daylight". + This change is needed because the three variables are not in the + same category: although POSIX requires tzname, it specifies the + other two variables as optional. Also, USG_COMPAT is now 1 or 0: + if not defined, the code attempts to guess it from other macros. + + localtime.c and difftime.c no longer require stdio.h, and .c files + other than zic.c no longer require sys/wait.h. + + zdump.c no longer assumes snprintf. (Reported by Jonathan Leffler.) + + Calculation of time_t extrema works around a bug in GCC 4.8.4 + (Reported by Stan Shebs and Joseph Myers.) + + zic.c no longer mistranslates formats of line numbers in non-English + locales. (Problem reported by Benno Schulenberg.) + + Several minor changes have been made to the code to make it a + bit easier to port to MS-Windows and Solaris. (Thanks to Kees + Dekker for reporting the problems.) + + Changes to documentation and commentary + + The two new files 'theory.html' and 'calendars' contain the + contents of the removed file 'Theory'. The goal is to document + tzdb theory more accessibly. + + The zic man page now documents abbreviation rules. + + tz-link.htm now covers how to apply tzdata changes to clients. + (Thanks to Jorge Fábregas for the AIX link.) It also mentions MySQL. + + The leap-seconds.list URL has been updated to something that is + more reliable for tzdb. (Thanks to Tim Parenti and Brian Inglis.) + +Release 2017b - 2017-03-17 07:30:38 -0700 + + Briefly: Haiti has resumed DST. + + Changes to past and future time stamps + + Haiti resumed observance of DST in 2017. (Thanks to Steffen Thorsen.) + + Changes to past time stamps + + Liberia changed from -004430 to +00 on 1972-01-07, not 1972-05-01. + + Use "MMT" to abbreviate Liberia's time zone before 1972, as "-004430" + is one byte over the POSIX limit. (Problem reported by Derick Rethans.) + + Changes to code + + The reference localtime implementation now falls back on the + current US daylight-saving transition rules rather than the + 1987-2006 rules. This fallback occurs only when (1) the TZ + environment variable's value has a name like "AST4ADT" that asks + for daylight saving time but does not specify the rules, (2) there + is no file by that name, and (3) the TZDEFRULES file cannot be + loaded. (Thanks to Tom Lane.) + + +Release 2017a - 2017-02-28 00:05:36 -0800 + + Briefly: Southern Chile moves from -04/-03 to -03, and Mongolia + discontinues DST. + + Changes to future time stamps + + Mongolia no longer observes DST. (Thanks to Ganbold Tsagaankhuu.) + + Chile's Region of Magallanes moves from -04/-03 to -03 year-round. + Its clocks diverge from America/Santiago starting 2017-05-13 at + 23:00, hiving off a new zone America/Punta_Arenas. Although the + Chilean government says this change expires in May 2019, for now + assume it's permanent. (Thanks to Juan Correa and Deborah + Goldsmith.) This also affects Antarctica/Palmer. + + Changes to past time stamps + + Fix many entries for historical time stamps for Europe/Madrid + before 1979, to agree with tables compiled by Pere Planesas of the + National Astronomical Observatory of Spain. As a side effect, + this changes some time stamps for Africa/Ceuta before 1929, which + are probably guesswork anyway. (Thanks to Steve Allen and + Pierpaolo Bernardi for the heads-ups, and to Michael Deckers for + correcting the 1901 transition.) + + Ecuador observed DST from 1992-11-28 to 1993-02-05. + (Thanks to Alois Treindl.) + + Asia/Atyrau and Asia/Oral were at +03 (not +04) before 1930-06-21. + (Thanks to Stepan Golosunov.) + + Changes to past and future time zone abbreviations + + Switch to numeric time zone abbreviations for South America, as + part of the ongoing project of removing invented abbreviations. + This avoids the need to invent an abbreviation for the new Chilean + new zone. Similarly, switch from invented to numeric time zone + abbreviations for Afghanistan, American Samoa, the Azores, + Bangladesh, Bhutan, the British Indian Ocean Territory, Brunei, + Cape Verde, Chatham Is, Christmas I, Cocos (Keeling) Is, Cook Is, + Dubai, East Timor, Eucla, Fiji, French Polynesia, Greenland, + Indochina, Iran, Iraq, Kiribati, Lord Howe, Macquarie, Malaysia, + the Maldives, Marshall Is, Mauritius, Micronesia, Mongolia, + Myanmar, Nauru, Nepal, New Caledonia, Niue, Norfolk I, Palau, + Papua New Guinea, the Philippines, Pitcairn, Qatar, Réunion, St + Pierre & Miquelon, Samoa, Saudi Arabia, Seychelles, Singapore, + Solomon Is, Tokelau, Tuvalu, Wake, Vanuatu, Wallis & Futuna, and + Xinjiang; for 20-minute daylight saving time in Ghana before 1943; + for half-hour daylight saving time in Belize before 1944 and in + the Dominican Republic before 1975; and for Canary Islands before + 1946, for Guinea-Bissau before 1975, for Iceland before 1969, for + Indian Summer Time before 1942, for Indonesia before around 1964, + for Kenya before 1960, for Liberia before 1973, for Madeira before + 1967, for Namibia before 1943, for the Netherlands in 1937-9, for + Pakistan before 1971, for Western Sahara before 1977, and for + Zaporozhye in 1880-1924. + + For Alaska time from 1900 through 1967, instead of "CAT" use the + abbreviation "AST", the abbreviation commonly used at the time + (Atlantic Standard Time had not been standardized yet). Use "AWT" + and "APT" instead of the invented abbreviations "CAWT" and "CAPT". + + Use "CST" and "CDT" instead of invented abbreviations for Macau + before 1999 and Taiwan before 1938, and use "JST" instead of the + invented abbreviation "JCST" for Japan and Korea before 1938. + + Change to database entry category + + Move the Pacific/Johnston link from 'australasia' to 'backward', + since Johnston is now uninhabited. + + Changes to code + + zic no longer mishandles some transitions in January 2038 when it + attempts to work around Qt bug 53071. This fixes a bug affecting + Pacific/Tongatapu that was introduced in zic 2016e. localtime.c + now contains a workaround, useful when loading a file generated by + a buggy zic. (Problem and localtime.c fix reported by Bradley + White.) + + zdump -i now outputs non-hour numeric time zone abbreviations + without a colon, e.g., "+0530" rather than "+05:30". This agrees + with zic %z and with common practice, and simplifies auditing of + zdump output. + + zdump is now buildable again with -DUSE_LTZ=0. + (Problem reported by Joseph Myers.) + + zdump.c now always includes private.h, to avoid code duplication + with private.h. (Problem reported by Kees Dekker.) + + localtime.c no longer mishandles early or late timestamps + when TZ is set to a POSIX-style string that specifies DST. + (Problem reported by Kees Dekker.) + + date and strftime now cause %z to generate "-0000" instead of + "+0000" when the UT offset is zero and the time zone abbreviation + begins with "-". + + Changes to documentation and commentary + + The 'Theory' file now better documents choice of historical time + zone abbreviations. (Problems reported by Michael Deckers.) + + tz-link.htm now covers leap smearing, which is popular in clouds. + + +Release 2016j - 2016-11-22 23:17:13 -0800 + + Briefly: Saratov, Russia moves from +03 to +04 on 2016-12-04. + + Changes to future time stamps + + Saratov, Russia switches from +03 to +04 on 2016-12-04 at 02:00. + This hives off a new zone Europe/Saratov from Europe/Volgograd. + (Thanks to Yuri Konotopov and Stepan Golosunov.) + + Changes to past time stamps + + The new zone Asia/Atyrau for AtyraÅ« Region, Kazakhstan, is like + Asia/Aqtau except it switched from +05/+06 to +04/+05 in spring + 1999, not fall 1994. (Thanks to Stepan Golosunov.) + + Changes to past time zone abbreviations + + Asia/Gaza and Asia/Hebron now use "EEST", not "EET", to denote + summer time before 1948. The old use of "EET" was a typo. + + Changes to code + + zic no longer mishandles file systems that lack hard links, fixing + bugs introduced in 2016g. (Problems reported by Tom Lane.) + Also, when the destination already contains symbolic links, zic + should now work better on systems where the 'link' system call + does not follow symbolic links. + + Changes to documentation and commentary + + tz-link.htm now documents the relationship between release version + numbers and development-repository commit tags. (Suggested by + Paul Koning.) + + The 'Theory' file now documents UT. + + iso3166.tab now accents "Curaçao", and commentary now mentions + the names "Cabo Verde" and "Czechia". (Thanks to Jiří BoháÄ.) + + Release 2016i - 2016-11-01 23:19:52 -0700 Briefly: Cyprus split into two time zones on 2016-10-30, and Tonga @@ -212,7 +551,7 @@ Release 2016g - 2016-09-13 08:56:38 -0700 23 commits and some working-file changes have been made since release 2016g, the version number is now something like '2016g-23-g50556e3-dirty' instead of the misleading '2016g'. - Official releases uses the same version number format as before, + Tagged releases use the same version number format as before, e.g., '2016g'. To support the more-accurate version number, its specification has moved from a line in the Makefile to a new source file 'version'. @@ -870,16 +1209,16 @@ Release 2014i - 2014-10-21 22:04:57 -0700 been fixed. (Thanks to Christos Zoulas for reporting most of these problems and for suggesting fixes.) - If USG_COMPAT is defined and the requested time stamp is standard time, + If USG_COMPAT is defined and the requested timestamp is standard time, the tz library's localtime and mktime functions now set the extern - variable timezone to a value appropriate for that time stamp; and + variable timezone to a value appropriate for that timestamp; and similarly for ALTZONE, daylight saving time, and the altzone variable. This change is a companion to the tzname change in 2014h, and is designed to make timezone and altzone more compatible with tzname. The tz library's functions now set errno to EOVERFLOW if they fail because the result cannot be represented. ctime and ctime_r now - return NULL and set errno when a time stamp is out of range, rather + return NULL and set errno when a timestamp is out of range, rather than having undefined behavior. Some bugs associated with the new 2014g functions have been fixed. @@ -896,7 +1235,7 @@ Release 2014i - 2014-10-21 22:04:57 -0700 Release 2014h - 2014-09-25 18:59:03 -0700 - Changes affecting past time stamps + Changes affecting past timestamps America/Jamaica's 1974 spring-forward transition was Jan. 6, not Apr. 28. @@ -904,8 +1243,8 @@ Release 2014h - 2014-09-25 18:59:03 -0700 not 1920-01-06. The old entry was based on a misinterpretation of Shanks. Some more zones have been turned into links, when they differed - from existing zones only for older time stamps. As usual, - these changes affect UTC offsets in pre-1970 time stamps only. + from existing zones only for older timestamps. As usual, + these changes affect UTC offsets in pre-1970 timestamps only. Their old contents have been moved to the 'backzone' file. The affected zones are: Africa/Blantyre, Africa/Bujumbura, Africa/Gaborone, Africa/Harare, Africa/Kigali, Africa/Lubumbashi, @@ -917,7 +1256,7 @@ Release 2014h - 2014-09-25 18:59:03 -0700 not merely on platforms defining TM_GMTOFF. The tz library's localtime and mktime functions now set tzname to a value - appropriate for the requested time stamp, and zdump now uses this + appropriate for the requested timestamp, and zdump now uses this on platforms not defining TM_ZONE, fixing a 2014g regression. (Thanks to Tim Parenti for reporting the problem.) @@ -957,13 +1296,13 @@ Release 2014h - 2014-09-25 18:59:03 -0700 Release 2014g - 2014-08-28 12:31:23 -0700 - Changes affecting future time stamps *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Thu Nov 2 15:38: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 E7D52E5CD52; Thu, 2 Nov 2017 15:38:55 +0000 (UTC) (envelope-from gordon@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 8CB7482E85; Thu, 2 Nov 2017 15:38:55 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA2FcswL008885; Thu, 2 Nov 2017 15:38:54 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA2Fcssc008878; Thu, 2 Nov 2017 15:38:54 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <201711021538.vA2Fcssc008878@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Thu, 2 Nov 2017 15:38:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r325323 - in releng/10.4: . contrib/tzdata sys/conf X-SVN-Group: releng X-SVN-Commit-Author: gordon X-SVN-Commit-Paths: in releng/10.4: . contrib/tzdata sys/conf X-SVN-Commit-Revision: 325323 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: Thu, 02 Nov 2017 15:38:56 -0000 Author: gordon Date: Thu Nov 2 15:38:54 2017 New Revision: 325323 URL: https://svnweb.freebsd.org/changeset/base/325323 Log: Update timezone database information. [EN-17:09] Approved by: so Added: releng/10.4/contrib/tzdata/calendars releng/10.4/contrib/tzdata/theory.html releng/10.4/contrib/tzdata/zishrink.awk Deleted: releng/10.4/contrib/tzdata/Theory Modified: releng/10.4/UPDATING releng/10.4/contrib/tzdata/CONTRIBUTING releng/10.4/contrib/tzdata/LICENSE releng/10.4/contrib/tzdata/Makefile releng/10.4/contrib/tzdata/NEWS releng/10.4/contrib/tzdata/africa releng/10.4/contrib/tzdata/antarctica releng/10.4/contrib/tzdata/asia releng/10.4/contrib/tzdata/australasia releng/10.4/contrib/tzdata/backward releng/10.4/contrib/tzdata/backzone releng/10.4/contrib/tzdata/checklinks.awk releng/10.4/contrib/tzdata/europe releng/10.4/contrib/tzdata/leap-seconds.list releng/10.4/contrib/tzdata/leapseconds releng/10.4/contrib/tzdata/leapseconds.awk releng/10.4/contrib/tzdata/northamerica releng/10.4/contrib/tzdata/southamerica releng/10.4/contrib/tzdata/version releng/10.4/contrib/tzdata/zone.tab releng/10.4/contrib/tzdata/zone1970.tab releng/10.4/sys/conf/newvers.sh Modified: releng/10.4/UPDATING ============================================================================== --- releng/10.4/UPDATING Thu Nov 2 15:38:24 2017 (r325322) +++ releng/10.4/UPDATING Thu Nov 2 15:38:54 2017 (r325323) @@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITHOUT_CLANG to b stable/10, and then rebuild without this option. The bootstrap process from older version of current is a bit fragile. +20171102: p2 FreeBSD-EN-17:09.tzdata + + Update timezone database information. [EN-17:09] + 20171017: p1 FreeBSD-SA-17:07.wpa Fix WPA2 protocol vulnerability. [SA-17:07] Modified: releng/10.4/contrib/tzdata/CONTRIBUTING ============================================================================== --- releng/10.4/contrib/tzdata/CONTRIBUTING Thu Nov 2 15:38:24 2017 (r325322) +++ releng/10.4/contrib/tzdata/CONTRIBUTING Thu Nov 2 15:38:54 2017 (r325323) @@ -5,20 +5,26 @@ change timekeeping rules erratically and sometimes wit warning, the data entries do not cover all of civil time before 1970, and undoubtedly errors remain in the code and data. Feel free to fill gaps or fix mistakes, and please email improvements -to tz@iana.org for use in the future. +to tz@iana.org for use in the future. In your email, please give +reliable sources that reviewers can check. +----- + +Developers can contribute technical changes to the source code and +data as follows. + To email small changes, please run a POSIX shell command like 'diff -u old/europe new/europe >myfix.patch', and attach myfix.patch to the email. -For more-elaborate changes, please read the Theory file and browse -the mailing list archives for -examples of patches that tend to work well. Ideally, additions to +For more-elaborate changes, please read the theory.html file and browse +the mailing list archives for +examples of patches that tend to work well. Additions to data should contain commentary citing reliable sources as -justification. +justification. Citations should use https: URLs if available. Please submit changes against either the latest release in - or the master branch of the development + or the master branch of the development repository. If you use Git the following workflow may be helpful: * Copy the development repository. Modified: releng/10.4/contrib/tzdata/LICENSE ============================================================================== --- releng/10.4/contrib/tzdata/LICENSE Thu Nov 2 15:38:24 2017 (r325322) +++ releng/10.4/contrib/tzdata/LICENSE Thu Nov 2 15:38:54 2017 (r325323) @@ -1,4 +1,5 @@ -With a few exceptions, all files in the tz code and data (including -this one) are in the public domain. The exceptions are date.c, -newstrftime.3, and strftime.c, which contain material derived from BSD -and which use the BSD 3-clause license. +Unless specified below, all files in the tz code and data (including +this LICENSE file) are in the public domain. + +If the files date.c, newstrftime.3, and strftime.c are present, they +contain material derived from BSD and use the BSD 3-clause license. Modified: releng/10.4/contrib/tzdata/Makefile ============================================================================== --- releng/10.4/contrib/tzdata/Makefile Thu Nov 2 15:38:24 2017 (r325322) +++ releng/10.4/contrib/tzdata/Makefile Thu Nov 2 15:38:54 2017 (r325323) @@ -49,6 +49,7 @@ TOPDIR= /usr/local # "Compiled" time zone information is placed in the "TZDIR" directory # (and subdirectories). # Use an absolute path name for TZDIR unless you're just testing the software. +# TZDIR_BASENAME should not contain "/" and should not be ".", ".." or empty. TZDIR_BASENAME= zoneinfo TZDIR= $(TOPDIR)/etc/$(TZDIR_BASENAME) @@ -75,7 +76,7 @@ LIBDIR= $(TOPDIR)/lib # If you want only POSIX time, with time values interpreted as # seconds since the epoch (not counting leap seconds), use # REDO= posix_only -# below. If you want want only "right" time, with values interpreted +# below. If you want only "right" time, with values interpreted # as seconds since the epoch (counting leap seconds), use # REDO= right_only # below. If you want both sets of data available, with leap seconds not @@ -92,6 +93,24 @@ LIBDIR= $(TOPDIR)/lib REDO= posix_right +# To install data in text form that has all the information of the binary data, +# (optionally incorporating leap second information), use +# TZDATA_TEXT= tzdata.zi leapseconds +# To install text data without leap second information (e.g., because +# REDO='posix_only'), use +# TZDATA_TEXT= tzdata.zi +# To avoid installing text data, use +# TZDATA_TEXT= + +TZDATA_TEXT= leapseconds tzdata.zi + +# For backward-compatibility links for old zone names, use +# BACKWARD= backward pacificnew +# To omit these links, use +# BACKWARD= + +BACKWARD= backward pacificnew + # If you want out-of-scope and often-wrong data from the file 'backzone', use # PACKRATDATA= backzone # To omit this data, use @@ -99,6 +118,11 @@ REDO= posix_right PACKRATDATA= +# The name of a locale using the UTF-8 encoding, used during self-tests. +# The tests are skipped if the name does not appear to work on this system. + +UTF8_LOCALE= en_US.utf8 + # Since "." may not be in PATH... YEARISTYPE= ./yearistype @@ -106,50 +130,53 @@ YEARISTYPE= ./yearistype # Non-default libraries needed to link. LDLIBS= -# Add the following to the end of the "CFLAGS=" line as needed. +# Add the following to the end of the "CFLAGS=" line as needed to override +# defaults specified in the source code. "-DFOO" is equivalent to "-DFOO=1". # -DBIG_BANG=-9999999LL if the Big Bang occurred at time -9999999 (see zic.c) +# -DDEPRECATE_TWO_DIGIT_YEARS for optional runtime warnings about strftime +# formats that generate only the last two digits of year numbers +# -DEPOCH_LOCAL if the 'time' function returns local time not UT +# -DEPOCH_OFFSET=N if the 'time' function returns a value N greater +# than what POSIX specifies, assuming local time is UT. +# For example, N is 252460800 on AmigaOS. # -DHAVE_DECL_ASCTIME_R=0 if does not declare asctime_r +# -DHAVE_DECL_ENVIRON if declares 'environ' # -DHAVE_DIRECT_H if mkdir needs (MS-Windows) -# -DHAVE_DOS_FILE_NAMES if file names have drive specifiers etc. (MS-DOS) -# -DHAVE_GETTEXT=1 if 'gettext' works (e.g., GNU/Linux, FreeBSD, Solaris) -# -DHAVE_INCOMPATIBLE_CTIME_R=1 if your system's time.h declares +# -DHAVE_GENERIC=0 if _Generic does not work +# -DHAVE_GETTEXT if 'gettext' works (e.g., GNU/Linux, FreeBSD, Solaris) +# -DHAVE_INCOMPATIBLE_CTIME_R if your system's time.h declares # ctime_r and asctime_r incompatibly with the POSIX standard # (Solaris when _POSIX_PTHREAD_SEMANTICS is not defined). -# -DHAVE_INTTYPES_H=1 if you have a pre-C99 compiler with "inttypes.h" +# -DHAVE_INTTYPES_H if you have a non-C99 compiler with # -DHAVE_LINK=0 if your system lacks a link function # -DHAVE_LOCALTIME_R=0 if your system lacks a localtime_r function # -DHAVE_LOCALTIME_RZ=0 if you do not want zdump to use localtime_rz -# This defaults to 1 if a working localtime_rz seems to be available. # localtime_rz can make zdump significantly faster, but is nonstandard. # -DHAVE_POSIX_DECLS=0 if your system's include files do not declare # functions like 'link' or variables like 'tzname' required by POSIX -# -DHAVE_STDINT_H=1 if you have a pre-C99 compiler with "stdint.h" -# -DHAVE_STRFTIME_L=1 if declares locale_t and strftime_l -# This defaults to 0 if _POSIX_VERSION < 200809, 1 otherwise. +# -DHAVE_SNPRINTF=0 if your system lacks the snprintf function +# -DHAVE_STDBOOL_H if you have a non-C99 compiler with +# -DHAVE_STDINT_H if you have a non-C99 compiler with +# -DHAVE_STRFTIME_L if declares locale_t and strftime_l # -DHAVE_STRDUP=0 if your system lacks the strdup function # -DHAVE_SYMLINK=0 if your system lacks the symlink function -# -DHAVE_SYS_STAT_H=0 if your compiler lacks a "sys/stat.h" -# -DHAVE_SYS_WAIT_H=0 if your compiler lacks a "sys/wait.h" +# -DHAVE_SYS_STAT_H=0 if your compiler lacks a +# -DHAVE_SYS_WAIT_H=0 if your compiler lacks a # -DHAVE_TZSET=0 if your system lacks a tzset function -# -DHAVE_UNISTD_H=0 if your compiler lacks a "unistd.h" (Microsoft C++ 7?) -# -DEPOCH_LOCAL=1 if the 'time' function returns local time not UT -# -DEPOCH_OFFSET=N if the 'time' function returns a value N greater -# than what POSIX specifies, assuming local time is UT. -# For example, N is 252460800 on AmigaOS. -# -DNO_RUN_TIME_WARNINGS_ABOUT_YEAR_2000_PROBLEMS_THANK_YOU=1 -# if you do not want run time warnings about formats that may cause -# year 2000 grief -# -Dssize_t=long on ancient hosts that lack ssize_t -# -DTHREAD_SAFE=1 to make localtime.c thread-safe, as POSIX requires; +# -DHAVE_UNISTD_H=0 if your compiler lacks a +# -Dlocale_t=XXX if your system uses XXX instead of locale_t +# -Dssize_t=long on hosts like MS-Windows that lack ssize_t +# -DTHREAD_SAFE to make localtime.c thread-safe, as POSIX requires; # not needed by the main-program tz code, which is single-threaded. # Append other compiler flags as needed, e.g., -pthread on GNU/Linux. # -Dtime_tz=\"T\" to use T as the time_t type, rather than the system time_t +# This is intended for internal use only; it mangles external names. # -DTZ_DOMAIN=\"foo\" to use "foo" for gettext domain name; default is "tz" # -DTZ_DOMAINDIR=\"/path\" to use "/path" for gettext directory; # the default is system-supplied, typically "/usr/lib/locale" # -DTZDEFRULESTRING=\",date/time,date/time\" to default to the specified # DST transitions if the time zone files cannot be accessed -# -DUNINIT_TRAP=1 if reading uninitialized storage can cause problems +# -DUNINIT_TRAP if reading uninitialized storage can cause problems # other than simply getting garbage data # -DUSE_LTZ=0 to build zdump with the system time zone library # Also set TZDOBJS=zdump.o and CHECK_TIME_T_ALTERNATIVES= below. @@ -157,27 +184,28 @@ LDLIBS= # (or some other number) to set the maximum time zone abbreviation length # that zic will accept without a warning (the default is 6) # $(GCC_DEBUG_FLAGS) if you are using recent GCC and want lots of checking -GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-common -fstrict-aliasing \ - -Wall -Wextra \ - -Wbad-function-cast -Wcast-align -Wdate-time \ - -Wdeclaration-after-statement \ - -Wdouble-promotion \ - -Wformat=2 -Winit-self -Wjump-misses-init \ - -Wlogical-op -Wmissing-prototypes -Wnested-externs \ - -Wold-style-definition -Woverlength-strings -Wpointer-arith \ - -Wshadow -Wstrict-prototypes -Wsuggest-attribute=const \ - -Wsuggest-attribute=format -Wsuggest-attribute=noreturn \ - -Wsuggest-attribute=pure -Wtrampolines \ - -Wundef -Wunused -Wwrite-strings \ - -Wno-address -Wno-format-nonliteral -Wno-sign-compare \ - -Wno-type-limits -Wno-unused-parameter +# Select instrumentation via "make GCC_INSTRUMENT='whatever'". +GCC_INSTRUMENT = \ + -fsanitize=undefined -fsanitize-address-use-after-scope \ + -fsanitize-undefined-trap-on-error -fstack-protector +GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \ + $(GCC_INSTRUMENT) \ + -Wall -Wextra \ + -Walloc-size-larger-than=100000 -Warray-bounds=2 \ + -Wbad-function-cast -Wcast-align -Wdate-time \ + -Wdeclaration-after-statement -Wdouble-promotion \ + -Wformat=2 -Wformat-overflow=2 -Wformat-signedness -Wformat-truncation \ + -Winit-self -Wjump-misses-init -Wlogical-op \ + -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ + -Wold-style-definition -Woverlength-strings -Wpointer-arith \ + -Wshadow -Wshift-overflow=2 -Wstrict-prototypes -Wstringop-overflow=5 \ + -Wsuggest-attribute=const -Wsuggest-attribute=format \ + -Wsuggest-attribute=noreturn -Wsuggest-attribute=pure \ + -Wtrampolines -Wundef -Wuninitialized -Wunused \ + -Wvariadic-macros -Wvla -Wwrite-strings \ + -Wno-address -Wno-format-nonliteral -Wno-sign-compare \ + -Wno-type-limits -Wno-unused-parameter # -# If you want to use System V compatibility code, add -# -DUSG_COMPAT -# to the end of the "CFLAGS=" line. This arrange for "timezone" and "daylight" -# variables to be kept up-to-date by the time conversion functions. Neither -# "timezone" nor "daylight" is described in X3J11's work. -# # If your system has a "GMT offset" field in its "struct tm"s # (or if you decide to add such a field in your system's "time.h" file), # add the name to a define such as @@ -189,6 +217,31 @@ GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-common -fstrict- # and define NO_TM_ZONE to suppress any guessing. These two fields are not # required by POSIX, but are widely available on GNU/Linux and BSD systems. # +# The next batch of options control support for external variables +# exported by tzcode. In practice these variables are less useful +# than TM_GMTOFF and TM_ZONE. However, most of them are standardized. +# # +# # To omit or support the external variable "tzname", add one of: +# # -DHAVE_TZNAME=0 +# # -DHAVE_TZNAME=1 +# # to the "CFLAGS=" line. "tzname" is required by POSIX 1988 and later. +# # If not defined, the code attempts to guess HAVE_TZNAME from other macros. +# # Warning: unless time_tz is also defined, HAVE_TZNAME=1 can cause +# # crashes when combined with some platforms' standard libraries, +# # presumably due to memory allocation issues. +# # +# # To omit or support the external variables "timezone" and "daylight", add +# # -DUSG_COMPAT=0 +# # -DUSG_COMPAT=1 +# # to the "CFLAGS=" line; "timezone" and "daylight" are inspired by +# # Unix Systems Group code and are required by POSIX 2008 (with XSI) and later. +# # If not defined, the code attempts to guess USG_COMPAT from other macros. +# # +# # To support the external variable "altzone", add +# # -DALTZONE +# # to the end of the "CFLAGS=" line; although "altzone" appeared in +# # System V Release 3.1 it has not been standardized. +# # If you want functions that were inspired by early versions of X3J11's work, # add # -DSTD_INSPIRED @@ -226,11 +279,6 @@ GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-common -fstrict- # -DALL_STATE # to the end of the "CFLAGS=" line. Storage is obtained by calling malloc. # -# If you want an "altzone" variable (a la System V Release 3.1), add -# -DALTZONE -# to the end of the "CFLAGS=" line. -# This variable is not described in X3J11's work. -# # NIST-PCTS:151-2, Version 1.4, (1993-12-03) is a test suite put # out by the National Institute of Standards and Technology # which claims to test C and Posix conformance. If you want to pass PCTS, add @@ -240,8 +288,8 @@ GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-common -fstrict- # If you want strict compliance with XPG4 as of 1994-04-09, add # -DXPG4_1994_04_09 # to the end of the "CFLAGS=" line. This causes "strftime" to always return -# 53 as a week number (rather than 52 or 53) for those days in January that -# before the first Monday in January when a "%V" format is used and January 1 +# 53 as a week number (rather than 52 or 53) for January days before +# January's first Monday when a "%V" format is used and January 1 # falls on a Friday, Saturday, or Sunday. CFLAGS= @@ -265,7 +313,7 @@ ZFLAGS= # How to use zic to install tz binary files. -ZIC_INSTALL= $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) $(LEAPSECONDS) +ZIC_INSTALL= $(ZIC) -d $(DESTDIR)$(TZDIR) $(LEAPSECONDS) # The name of a Posix-compliant 'awk' on your system. AWK= awk @@ -289,6 +337,7 @@ SGML_CATALOG_FILES= \ # The name, arguments and environment of a program to validate your web pages. # See for a validator, and # for a validation library. +# Set VALIDATE=':' if you do not have such a program. VALIDATE = nsgmls VALIDATE_FLAGS = -s -B -wall -wno-unused-param VALIDATE_ENV = \ @@ -355,7 +404,7 @@ AR= ar RANLIB= : TZCOBJS= zic.o -TZDOBJS= zdump.o localtime.o asctime.o +TZDOBJS= zdump.o localtime.o asctime.o strftime.o DATEOBJS= date.o localtime.o strftime.o asctime.o LIBSRCS= localtime.c asctime.c difftime.c LIBOBJS= localtime.o asctime.o difftime.o @@ -370,33 +419,35 @@ MANTXTS= newctime.3.txt newstrftime.3.txt newtzset.3.t time2posix.3.txt \ tzfile.5.txt tzselect.8.txt zic.8.txt zdump.8.txt \ date.1.txt -COMMON= CONTRIBUTING LICENSE Makefile NEWS README Theory version +COMMON= calendars CONTRIBUTING LICENSE Makefile \ + NEWS README theory.html version WEB_PAGES= tz-art.htm tz-how-to.html tz-link.htm DOCS= $(MANS) date.1 $(MANTXTS) $(WEB_PAGES) PRIMARY_YDATA= africa antarctica asia australasia \ europe northamerica southamerica -YDATA= $(PRIMARY_YDATA) pacificnew etcetera backward +YDATA= $(PRIMARY_YDATA) etcetera $(BACKWARD) NDATA= systemv factory TDATA= $(YDATA) $(NDATA) ZONETABLES= zone1970.tab zone.tab -TABDATA= iso3166.tab leapseconds $(ZONETABLES) +TABDATA= iso3166.tab $(TZDATA_TEXT) $(ZONETABLES) LEAP_DEPS= leapseconds.awk leap-seconds.list -DATA= $(YDATA) $(NDATA) backzone $(TABDATA) \ - leap-seconds.list yearistype.sh -AWK_SCRIPTS= checklinks.awk checktab.awk leapseconds.awk +TZDATA_ZI_DEPS= zishrink.awk $(TDATA) $(PACKRATDATA) +DATA= $(YDATA) $(NDATA) backzone iso3166.tab leap-seconds.list \ + leapseconds yearistype.sh $(ZONETABLES) +AWK_SCRIPTS= checklinks.awk checktab.awk leapseconds.awk zishrink.awk MISC= $(AWK_SCRIPTS) zoneinfo2tdf.pl TZS_YEAR= 2050 TZS= to$(TZS_YEAR).tzs TZS_NEW= to$(TZS_YEAR)new.tzs TZS_DEPS= $(PRIMARY_YDATA) asctime.c localtime.c \ private.h tzfile.h zdump.c zic.c -ENCHILADA= $(COMMON) $(DOCS) $(SOURCES) $(DATA) $(MISC) $(TZS) +ENCHILADA= $(COMMON) $(DOCS) $(SOURCES) $(DATA) $(MISC) $(TZS) tzdata.zi # Consult these files when deciding whether to rebuild the 'version' file. # This list is not the same as the output of 'git ls-files', since # .gitignore is not distributed. VERSION_DEPS= \ - CONTRIBUTING LICENSE Makefile NEWS README Theory \ + calendars CONTRIBUTING LICENSE Makefile NEWS README \ africa antarctica asctime.c asia australasia \ backward backzone \ checklinks.awk checktab.awk \ @@ -405,7 +456,7 @@ VERSION_DEPS= \ leap-seconds.list leapseconds.awk localtime.c \ newctime.3 newstrftime.3 newtzset.3 northamerica \ pacificnew private.h \ - southamerica strftime.c systemv \ + southamerica strftime.c systemv theory.html \ time2posix.3 tz-art.htm tz-how-to.html tz-link.htm \ tzfile.5 tzfile.h tzselect.8 tzselect.ksh \ workman.sh yearistype.sh \ @@ -427,7 +478,7 @@ install: all $(DATA) $(REDO) $(MANS) $(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \ $(DESTDIR)$(MANDIR)/man8 $(ZIC_INSTALL) -l $(LOCALTIME) -p $(POSIXRULES) - cp -f iso3166.tab $(ZONETABLES) $(DESTDIR)$(TZDIR)/. + cp -f $(TABDATA) $(DESTDIR)$(TZDIR)/. cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/. cp libtz.a $(DESTDIR)$(LIBDIR)/. $(RANLIB) $(DESTDIR)$(LIBDIR)/libtz.a @@ -448,6 +499,11 @@ version: $(VERSION_DEPS) printf '%s\n' "$$V" >$@.out mv $@.out $@ +# This file can be tailored by setting BACKWARD, PACKRATDATA, etc. +tzdata.zi: $(TZDATA_ZI_DEPS) + LC_ALL=C $(AWK) -f zishrink.awk $(TDATA) $(PACKRATDATA) >$@.out + mv $@.out $@ + version.h: version VERSION=`cat version` && printf '%s\n' \ 'static char const PKGVERSION[]="($(PACKAGE)) ";' \ @@ -473,6 +529,7 @@ leapseconds: $(LEAP_DEPS) # Arguments to pass to submakes of install_data. # They can be overridden by later submake arguments. INSTALLARGS = \ + BACKWARD=$(BACKWARD) \ DESTDIR=$(DESTDIR) \ LEAPSECONDS='$(LEAPSECONDS)' \ PACKRATDATA='$(PACKRATDATA)' \ @@ -481,10 +538,8 @@ INSTALLARGS = \ ZIC='$(ZIC)' # 'make install_data' installs one set of tz binary files. -# It can be tailored by setting LEAPSECONDS, PACKRATDATA, etc. -install_data: zic leapseconds yearistype $(PACKRATDATA) $(TDATA) - $(ZIC_INSTALL) $(TDATA) - $(AWK) '/^Rule/' $(TDATA) | $(ZIC_INSTALL) - $(PACKRATDATA) +install_data: zic leapseconds yearistype tzdata.zi + $(ZIC_INSTALL) tzdata.zi posix_only: $(MAKE) $(INSTALLARGS) LEAPSECONDS= install_data @@ -521,14 +576,14 @@ posix_packrat: zones: $(REDO) -$(TZS_NEW): $(TDATA) zdump zic +$(TZS_NEW): tzdata.zi zdump zic mkdir -p tzs.dir - $(zic) -d tzs.dir $(TDATA) - $(AWK) '/^Link/{print $$1 "\t" $$2 "\t" $$3}' \ - $(TDATA) | LC_ALL=C sort >$@.out + $(zic) -d tzs.dir tzdata.zi + $(AWK) '/^L/{print "Link\t" $$2 "\t" $$3}' \ + tzdata.zi | LC_ALL=C sort >$@.out wd=`pwd` && \ zones=`$(AWK) -v wd="$$wd" \ - '/^Zone/{print wd "/tzs.dir/" $$2}' $(TDATA) \ + '/^Z/{print wd "/tzs.dir/" $$2}' tzdata.zi \ | LC_ALL=C sort` && \ ./zdump -i -c $(TZS_YEAR) $$zones >>$@.out sed 's,^TZ=".*tzs\.dir/,TZ=",' $@.out >$@.sed.out @@ -564,24 +619,37 @@ tzselect: tzselect.ksh version chmod +x $@.out mv $@.out $@ -check: check_character_set check_white_space check_links check_sorted \ - check_tables check_tzs check_web +check: check_character_set check_white_space check_links \ + check_name_lengths check_sorted \ + check_tables check_web check_zishrink check_tzs check_character_set: $(ENCHILADA) - LC_ALL=en_US.utf8 && export LC_ALL && \ + test ! '$(UTF8_LOCALE)' || \ + ! printf 'A\304\200B\n' | \ + LC_ALL='$(UTF8_LOCALE)' grep -q '^A.B$$' >/dev/null 2>&1 || { \ + LC_ALL='$(UTF8_LOCALE)' && export LC_ALL && \ sharp='#' && \ ! grep -Env $(SAFE_LINE) $(MANS) date.1 $(MANTXTS) \ $(MISC) $(SOURCES) $(WEB_PAGES) \ - CONTRIBUTING LICENSE Makefile README version && \ + CONTRIBUTING LICENSE Makefile README \ + version tzdata.zi && \ ! grep -Env $(SAFE_SHARP_LINE) $(TDATA) backzone \ leapseconds yearistype.sh zone.tab && \ - ! grep -Env $(OK_LINE) $(ENCHILADA) + ! grep -Env $(OK_LINE) $(ENCHILADA); \ + } check_white_space: $(ENCHILADA) patfmt=' \t|[\f\r\v]' && pat=`printf "$$patfmt\\n"` && \ ! grep -En "$$pat" $(ENCHILADA) ! grep -n '[[:space:]]$$' $(ENCHILADA) +PRECEDES_FILE_NAME = ^(Zone|Link[[:space:]]+[^[:space:]]+)[[:space:]]+ +FILE_NAME_COMPONENT_TOO_LONG = \ + $(PRECEDES_FILE_NAME)[^[:space:]]*[^/[:space:]]{15} + +check_name_lengths: $(TDATA) backzone + ! grep -En '$(FILE_NAME_COMPONENT_TOO_LONG)' $(TDATA) backzone + CHECK_CC_LIST = { n = split($$1,a,/,/); for (i=2; i<=n; i++) print a[1], a[i]; } check_sorted: backward backzone iso3166.tab zone.tab zone1970.tab @@ -596,6 +664,7 @@ check_sorted: backward backzone iso3166.tab zone.tab z check_links: checklinks.awk $(TDATA) $(AWK) -f checklinks.awk $(TDATA) + $(AWK) -f checklinks.awk tzdata.zi check_tables: checktab.awk $(PRIMARY_YDATA) $(ZONETABLES) for tab in $(ZONETABLES); do \ @@ -606,14 +675,32 @@ check_tables: checktab.awk $(PRIMARY_YDATA) $(ZONETABL check_tzs: $(TZS) $(TZS_NEW) diff -u $(TZS) $(TZS_NEW) -check_web: $(WEB_PAGES) - $(VALIDATE_ENV) $(VALIDATE) $(VALIDATE_FLAGS) $(WEB_PAGES) +# This checks only the HTML 4.01 strict page. +# To check the the other pages, use . +check_web: tz-how-to.html + $(VALIDATE_ENV) $(VALIDATE) $(VALIDATE_FLAGS) tz-how-to.html +# Check that tzdata.zi generates the same binary data that its sources do. +check_zishrink: tzdata.zi zic leapseconds $(PACKRATDATA) $(TDATA) + for type in posix right; do \ + mkdir -p time_t.dir/$$type time_t.dir/$$type-shrunk && \ + case $$type in \ + right) leap='-L leapseconds';; \ + *) leap=;; \ + esac && \ + $(ZIC) $$leap -d time_t.dir/$$type $(TDATA) && \ + $(AWK) '/^Rule/' $(TDATA) | \ + $(ZIC) $$leap -d time_t.dir/$$type - $(PACKRATDATA) && \ + $(ZIC) $$leap -d time_t.dir/$$type-shrunk tzdata.zi && \ + diff -r time_t.dir/$$type time_t.dir/$$type-shrunk || exit; \ + done + rm -fr time_t.dir + clean_misc: rm -f core *.o *.out \ date tzselect version.h zdump zic yearistype libtz.a clean: clean_misc - rm -fr *.dir tzdb-*/ $(TZS_NEW) + rm -fr *.dir tzdata.zi tzdb-*/ $(TZS_NEW) maintainer-clean: clean @echo 'This command is intended for maintainers to use; it' @@ -667,6 +754,7 @@ set-timestamps.out: $(ENCHILADA) touch -cmr `ls -t $$file workman.sh | sed 1q` $$file.txt || \ exit; \ done + touch -cmr `ls -t $(TZDATA_ZI_DEPS) | sed 1q` tzdata.zi touch -cmr `ls -t $(TZS_DEPS) | sed 1q` $(TZS) touch -cmr `ls -t $(VERSION_DEPS) | sed 1q` version touch $@ @@ -678,7 +766,7 @@ check_public: $(MAKE) maintainer-clean $(MAKE) "CFLAGS=$(GCC_DEBUG_FLAGS)" ALL mkdir -p public.dir - for i in $(TDATA) ; do \ + for i in $(TDATA) tzdata.zi; do \ $(zic) -v -d public.dir $$i 2>&1 || exit; \ done $(zic) -v -d public.dir $(TDATA) @@ -772,8 +860,8 @@ typecheck: $(MAKE) clean ; \ done -zonenames: $(TDATA) - @$(AWK) '/^Zone/ { print $$2 } /^Link/ { print $$3 }' $(TDATA) +zonenames: tzdata.zi + @$(AWK) '/^Z/ { print $$2 } /^L/ { print $$3 }' tzdata.zi asctime.o: private.h tzfile.h date.o: private.h @@ -789,6 +877,7 @@ zic.o: private.h tzfile.h version.h .PHONY: check check_character_set check_links .PHONY: check_public check_sorted check_tables .PHONY: check_time_t_alternatives check_tzs check_web check_white_space +.PHONY: check_zishrink .PHONY: clean clean_misc force_tzs .PHONY: install install_data maintainer-clean names .PHONY: posix_only posix_packrat posix_right Modified: releng/10.4/contrib/tzdata/NEWS ============================================================================== --- releng/10.4/contrib/tzdata/NEWS Thu Nov 2 15:38:24 2017 (r325322) +++ releng/10.4/contrib/tzdata/NEWS Thu Nov 2 15:38:54 2017 (r325323) @@ -1,5 +1,169 @@ News for the tz database +Release 2017c - 2017-10-20 14:49:34 -0700 + + Briefly: + Northern Cyprus switches from +03 to +02/+03 on 2017-10-29. + Fiji ends DST 2018-01-14, not 2018-01-21. + Namibia switches from +01/+02 to +02 on 2018-04-01. + Sudan switches from +03 to +02 on 2017-11-01. + Tonga likely switches from +13/+14 to +13 on 2017-11-05. + Turks & Caicos switches from -04 to -05/-04 on 2018-11-04. + A new file tzdata.zi now holds a small text copy of all data. + The zic input format has been regularized slightly. + + Changes to future time stamps + + Northern Cyprus has decided to resume EU rules starting + 2017-10-29, thus reinstituting winter time. + + Fiji ends DST 2018-01-14 instead of the 2018-01-21 previously + predicted. (Thanks to Dominic Fok.) Adjust future predictions + accordingly. + + Namibia will switch from +01 with DST to +02 all year on + 2017-09-03 at 02:00. This affects UT offsets starting 2018-04-01 + at 02:00. (Thanks to Steffen Thorsen.) + + Sudan will switch from +03 to +02 on 2017-11-01. (Thanks to Ahmed + Atyya and Yahia Abdalla.) South Sudan is not switching, so + Africa/Juba is no longer a link to Africa/Khartoum. + + Tonga has likely ended its experiment with DST, and will not + adjust its clocks on 2017-11-05. Although Tonga has not announced + whether it will continue to observe DST, the IATA is assuming that + it will not. (Thanks to David Wade.) + + Turks & Caicos will switch from -04 all year to -05 with US DST on + 2018-03-11 at 03:00. This affects UT offsets starting 2018-11-04 + at 02:00. (Thanks to Steffen Thorsen.) + + Changes to past time stamps + + Namibia switched from +02 to +01 on 1994-03-21, not 1994-04-03. + (Thanks to Arthur David Olson.) + + Detroit did not observe DST in 1967. + + Use railway time for Asia/Kolkata before 1941, by switching to + Madras local time (UT +052110) in 1870, then to IST (UT +0530) in + 1906. Also, treat 1941-2's +0630 as DST, like 1942-5. + + Europe/Dublin's 1946 and 1947 fallback transitions occurred at + 02:00 standard time, not 02:00 DST. (Thanks to Michael Deckers.) + + Pacific/Apia and Pacific/Pago_Pago switched from Antipodean to + American time in 1892, not 1879. (Thanks to Michael Deckers.) + + Adjust the 1867 transition in Alaska to better reflect the + historical record, by changing it to occur on 1867-10-18 at 15:30 + Sitka time rather than at the start of 1867-10-17 local time. + Although strictly speaking this is accurate only for Sitka, + the rest of Alaska's blanks need to be filled in somehow. + + Fix off-by-one errors in UT offsets for Adak and Nome before 1867. + (Thanks to Michael Deckers.) + + Add 7 s to the UT offset in Asia/Yangon before 1920. + + Changes to zone names + + Remove Canada/East-Saskatchewan from the 'backward' file, as it + exceeded the 14-character limit and was an unused misnomer anyway. + + Changes to build procedure + + To support applications that prefer to read time zone data in text + form, two zic input files tzdata.zi and leapseconds are now + installed by default. The commands 'zic tzdata.zi' and 'zic -L + leapseconds tzdata.zi' can reproduce the tzdata binary files + without and with leap seconds, respectively. To prevent these two + new files from being installed, use 'make TZDATA_TEXT=', and to + suppress leap seconds from the tzdata text installation, use 'make + TZDATA_TEXT=tzdata.zi'. + + 'make BACKWARD=' now suppresses backward-compatibility names + like 'US/Pacific' that are defined in the 'backward' and + 'pacificnew' files. + + 'make check' now works on systems that lack a UTF-8 locale, + or that lack the nsgmls program. Set UTF8_LOCALE to configure + the name of a UTF-8 locale, if you have one. + + Y2K runtime checks are no longer enabled by default. Add + -DDEPRECATE_TWO_DIGIT_YEARS to CFLAGS to enable them, instead of + adding -DNO_RUN_TIME_WARNINGS_ABOUT_YEAR_2000_PROBLEMS_THANK_YOU + to disable them. (New name suggested by Brian Inglis.) + + The build procedure for zdump now works on AIX 7.1. + (Problem reported by Kees Dekker.) + + Changes to code + + zic and the reference runtime now reject multiple leap seconds + within 28 days of each other, or leap seconds before the Epoch. + As a result, support for double leap seconds, which was + obsolescent and undocumented, has been removed. Double leap + seconds were an error in the C89 standard; they have never existed + in civil timekeeping. (Thanks to Robert Elz and Bradley White for + noticing glitches in the code that uncovered this problem.) + + zic now warns about use of the obsolescent and undocumented -y + option, and about use of the obsolescent TYPE field of Rule lines. + + zic now allows unambiguous abbreviations like "Sa" and "Su" for + weekdays; formerly it rejected them due to a bug. Conversely, zic + no longer considers non-prefixes to be abbreviations; for example, + it no longer accepts "lF" as an abbreviation for "lastFriday". + Also, zic warns about the undocumented usage with a "last-" + prefix, e.g., "last-Fri". + + Similarly, zic now accepts the unambiguous abbreviation "L" for + "Link" in ordinary context and for "Leap" in leap-second context. + Conversely, zic no longer accepts non-prefixes such as "La" as + abbreviations for words like "Leap". + + zic no longer accepts leap second lines in ordinary input, or + ordinary lines in leap second input. Formerly, zic sometimes + warned about this undocumented usage and handled it incorrectly. + + The new macro HAVE_TZNAME governs whether the tzname external + variable is exported, instead of USG_COMPAT. USG_COMPAT now + governs only the external variables "timezone" and "daylight". + This change is needed because the three variables are not in the + same category: although POSIX requires tzname, it specifies the + other two variables as optional. Also, USG_COMPAT is now 1 or 0: + if not defined, the code attempts to guess it from other macros. + + localtime.c and difftime.c no longer require stdio.h, and .c files + other than zic.c no longer require sys/wait.h. + + zdump.c no longer assumes snprintf. (Reported by Jonathan Leffler.) + + Calculation of time_t extrema works around a bug in GCC 4.8.4 + (Reported by Stan Shebs and Joseph Myers.) + + zic.c no longer mistranslates formats of line numbers in non-English + locales. (Problem reported by Benno Schulenberg.) + + Several minor changes have been made to the code to make it a + bit easier to port to MS-Windows and Solaris. (Thanks to Kees + Dekker for reporting the problems.) + + Changes to documentation and commentary + + The two new files 'theory.html' and 'calendars' contain the + contents of the removed file 'Theory'. The goal is to document + tzdb theory more accessibly. + + The zic man page now documents abbreviation rules. + + tz-link.htm now covers how to apply tzdata changes to clients. + (Thanks to Jorge Fábregas for the AIX link.) It also mentions MySQL. + + The leap-seconds.list URL has been updated to something that is + more reliable for tzdb. (Thanks to Tim Parenti and Brian Inglis.) + Release 2017b - 2017-03-17 07:30:38 -0700 Briefly: Haiti has resumed DST. @@ -15,7 +179,17 @@ Release 2017b - 2017-03-17 07:30:38 -0700 Use "MMT" to abbreviate Liberia's time zone before 1972, as "-004430" is one byte over the POSIX limit. (Problem reported by Derick Rethans.) + Changes to code + The reference localtime implementation now falls back on the + current US daylight-saving transition rules rather than the + 1987-2006 rules. This fallback occurs only when (1) the TZ + environment variable's value has a name like "AST4ADT" that asks + for daylight saving time but does not specify the rules, (2) there + is no file by that name, and (3) the TZDEFRULES file cannot be + loaded. (Thanks to Tom Lane.) + + Release 2017a - 2017-02-28 00:05:36 -0800 Briefly: Southern Chile moves from -04/-03 to -03, and Mongolia @@ -1981,7 +2155,7 @@ Release 2013e - 2013-09-19 23:50:04 -0700 The 'leapseconds' file is now generated automatically from a new file 'leap-seconds.list', which is a copy of - . + A new source file 'leapseconds.awk' implements this. The goal is simplification of the future maintenance of 'leapseconds'. @@ -2187,7 +2361,7 @@ Release 2013a - 2013-02-27 09:20:35 -0800 Many changes affect historical timestamps before 1940. These were deduced from: Milne J. Civil time. Geogr J. 1899 - Feb;13(2):173-94 . + Feb;13(2):173-94 . Changes affecting the code: Modified: releng/10.4/contrib/tzdata/africa ============================================================================== --- releng/10.4/contrib/tzdata/africa Thu Nov 2 15:38:24 2017 (r325322) +++ releng/10.4/contrib/tzdata/africa Thu Nov 2 15:38:54 2017 (r325323) @@ -26,7 +26,7 @@ # # For data circa 1899, a common source is: # Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94. -# http://www.jstor.org/stable/1774359 +# https://www.jstor.org/stable/1774359 # # A reliable and entertaining source about time zones is # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997). @@ -218,7 +218,7 @@ Rule Egypt 2006 only - Sep 21 24:00 0 - # saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07. # From Jesper Nørgaard Welen (2007-08-15): [The following agree:] # http://www.nentjes.info/Bill/bill5.htm -# http://www.timeanddate.com/worldclock/city.html?n=53 +# https://www.timeanddate.com/worldclock/city.html?n=53 # From Steffen Thorsen (2007-09-04): The official information...: # http://www.sis.gov.eg/En/EgyptOnline/Miscellaneous/000002/0207000000000000001580.htm Rule Egypt 2007 only - Sep Thu>=1 24:00 0 - @@ -256,8 +256,8 @@ Rule Egypt 2007 only - Sep Thu>=1 24:00 0 - # timeanddate[2] and another site I've found[3] also support that. # # [1] https://bugzilla.redhat.com/show_bug.cgi?id=492263 -# [2] http://www.timeanddate.com/worldclock/clockchange.html?n=53 -# [3] http://wwp.greenwichmeantime.com/time-zone/africa/egypt/ +# [2] https://www.timeanddate.com/worldclock/clockchange.html?n=53 +# [3] https://wwp.greenwichmeantime.com/time-zone/africa/egypt/ # From Arthur David Olson (2009-04-20): # In 2009 (and for the next several years), Ramadan ends before the fourth @@ -267,10 +267,10 @@ Rule Egypt 2007 only - Sep Thu>=1 24:00 0 - # From Steffen Thorsen (2009-08-11): # We have been able to confirm the August change with the Egyptian Cabinet # Information and Decision Support Center: -# http://www.timeanddate.com/news/time/egypt-dst-ends-2009.html +# https://www.timeanddate.com/news/time/egypt-dst-ends-2009.html # # The Middle East News Agency -# http://www.mena.org.eg/index.aspx +# https://www.mena.org.eg/index.aspx # also reports "Egypt starts winter time on August 21" # today in article numbered "71, 11/08/2009 12:25 GMT." # Only the title above is available without a subscription to their service, @@ -320,7 +320,7 @@ Rule Egypt 2007 only - Sep Thu>=1 24:00 0 - # Thursday of April.... Clocks will still be turned back for Ramadan, but # dates not yet announced.... # http://almogaz.com/news/weird-news/2015/04/05/1947105 ... -# http://www.timeanddate.com/news/time/egypt-starts-dst-2015.html +# https://www.timeanddate.com/news/time/egypt-starts-dst-2015.html # From Ahmed Nazmy (2015-04-20): # Egypt's ministers cabinet just announced ... that it will cancel DST at @@ -447,11 +447,11 @@ Zone Africa/Monrovia -0:43:08 - LMT 1882 # From Even Scharning (2012-11-10): # Libya set their time one hour back at 02:00 on Saturday November 10. -# http://www.libyaherald.com/2012/11/04/clocks-to-go-back-an-hour-on-saturday/ +# https://www.libyaherald.com/2012/11/04/clocks-to-go-back-an-hour-on-saturday/ # Here is an official source [in Arabic]: http://ls.ly/fb6Yc # # Steffen Thorsen forwarded a translation (2012-11-10) in -# http://mm.icann.org/pipermail/tz/2012-November/018451.html +# https://mm.icann.org/pipermail/tz/2012-November/018451.html # # From Tim Parenti (2012-11-11): # Treat the 2012-11-10 change as a zone change from UTC+2 to UTC+1. @@ -462,7 +462,7 @@ Zone Africa/Monrovia -0:43:08 - LMT 1882 # From Even Scharning (2013-10-25): # The scheduled end of DST in Libya on Friday, October 25, 2013 was # cancelled yesterday.... -# http://www.libyaherald.com/2013/10/24/correction-no-time-change-tomorrow/ +# https://www.libyaherald.com/2013/10/24/correction-no-time-change-tomorrow/ # # From Paul Eggert (2013-10-25): # For now, assume they're reverting to the pre-2012 rules of permanent UT +02. @@ -515,7 +515,7 @@ Zone Africa/Tripoli 0:52:44 - LMT 1920 # basis.... # It seems that Mauritius observed daylight saving time from 1982-10-10 to # 1983-03-20 as well, but that was not successful.... -# http://www.timeanddate.com/news/time/mauritius-daylight-saving-time.html +# https://www.timeanddate.com/news/time/mauritius-daylight-saving-time.html # From Alex Krivenyshev (2008-06-25): # http://economicdevelopment.gov.mu/portal/site/Mainhomepage/menuitem.a42b24128104d9845dabddd154508a0c/?content_id=0a7cee8b5d69a110VgnVCM1000000a04a8c0RCRD @@ -583,7 +583,7 @@ Zone Africa/Tripoli 0:52:44 - LMT 1920 # http://lexpress.mu/Story/3398~Beebeejaun---Les-objectifs-d-%C3%A9conomie-d-%C3%A9nergie-de-l-heure-d-%C3%A9t%C3%A9-ont-%C3%A9t%C3%A9-atteints- # # Our wrap-up: -# http://www.timeanddate.com/news/time/mauritius-dst-will-not-repeat.html +# https://www.timeanddate.com/news/time/mauritius-dst-will-not-repeat.html # From Arthur David Olson (2009-07-11): # The "mauritius-dst-will-not-repeat" wrapup includes this: @@ -615,7 +615,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # be one hour ahead of GMT between 1 June and 27 September, according to # Communication Minister and Government Spokesman, Khalid Naciri...." # -# http://www.worldtimezone.net/dst_news/dst_news_morocco01.html +# http://www.worldtimezone.com/dst_news/dst_news_morocco01.html # http://en.afrik.com/news11892.html # From Alex Krivenyshev (2008-05-09): @@ -628,7 +628,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # From Patrice Scattolin (2008-05-09): # According to this article: -# http://www.avmaroc.com/actualite/heure-dete-comment-a127896.html +# https://www.avmaroc.com/actualite/heure-dete-comment-a127896.html # (and republished here: ) # the changes occur at midnight: # @@ -650,7 +650,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # posted in English). # # The following Google query will generate many relevant hits: -# http://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search +# https://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search # From Steffen Thorsen (2008-08-27): # Morocco will change the clocks back on the midnight between August 31 @@ -661,7 +661,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # http://www.menara.ma/fr/Actualites/Maroc/Societe/ci.retour_a_l_heure_gmt_a_partir_du_dimanche_31_aout_a_minuit_officiel_.default # # We have some further details posted here: -# http://www.timeanddate.com/news/time/morocco-ends-dst-early-2008.html +# https://www.timeanddate.com/news/time/morocco-ends-dst-early-2008.html # From Steffen Thorsen (2009-03-17): # Morocco will observe DST from 2009-06-01 00:00 to 2009-08-21 00:00 according @@ -671,7 +671,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # (French) # # Our summary: -# http://www.timeanddate.com/news/time/morocco-starts-dst-2009.html +# https://www.timeanddate.com/news/time/morocco-starts-dst-2009.html # From Alexander Krivenyshev (2009-03-17): # Here is a link to official document from Royaume du Maroc Premier Ministre, @@ -694,7 +694,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # http://www.lavieeco.com/actualites/4099-le-maroc-passera-a-l-heure-d-ete-gmt1-le-2-mai.html # (French) # Our page: -# http://www.timeanddate.com/news/time/morocco-starts-dst-2010.html +# https://www.timeanddate.com/news/time/morocco-starts-dst-2010.html # From Dan Abitol (2011-03-30): # ...Rules for Africa/Casablanca are the following (24h format) @@ -711,7 +711,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # They said that the decision was already taken. # # More articles in the press -# http://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-leve.html +# https://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-leve.html # http://www.lematin.ma/Actualite/Express/Article.asp?id=148923 # http://www.lavieeco.com/actualite/Le-Maroc-passe-sur-GMT%2B1-a-partir-de-dim @@ -803,7 +803,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # 1433 (18 April 2012) and the decision of the Head of Government of # 16 N. 3-29-15 Chaaban 1435 (4 June 2015). # Source (french): -# http://lnt.ma/le-maroc-reculera-dune-heure-le-dimanche-14-juin/ +# https://lnt.ma/le-maroc-reculera-dune-heure-le-dimanche-14-juin/ # # From Milamber (2015-06-09): # http://www.mmsp.gov.ma/fr/actualites.aspx?id=863 @@ -812,7 +812,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # [The gov.ma announcement] would (probably) make the switch on 2015-07-19 go # from 03:00 to 04:00 rather than from 02:00 to 03:00, as in the patch.... # I think the patch is correct and the quoted text is wrong; the text in -# agrees +# agrees # with the patch. # From Paul Eggert (2015-06-08): @@ -937,10 +937,18 @@ Link Africa/Maputo Africa/Kigali # Rwanda Link Africa/Maputo Africa/Lubumbashi # E Dem. Rep. of Congo Link Africa/Maputo Africa/Lusaka # Zambia + # Namibia -# The 1994-04-03 transition is from Shanks & Pottenger. -# Shanks & Pottenger report no DST after 1998-04; go with IATA. +# From Arthur David Olson (2017-08-09): +# The text of the "Namibia Time Act, 1994" is available online at +# www.lac.org.na/laws/1994/811.pdf +# and includes this nugget: +# Notwithstanding the provisions of subsection (2) of section 1, the +# first winter period after the commencement of this Act shall +# commence at OOhOO on Monday 21 March 1994 and shall end at 02h00 on +# Sunday 4 September 1994. + # From Petronella Sibeene (2007-03-30): # http://allafrica.com/stories/200703300178.html # While the entire country changes its time, Katima Mulilo and other @@ -955,19 +963,30 @@ Link Africa/Maputo Africa/Lusaka # Zambia # observes Botswana time, we have no details about historical practice. # In the meantime people there can use Africa/Gaborone. # See: Immanuel S. The Namibian. 2017-02-23. -# http://www.namibian.com.na/51480/read/Time-change-divides-lawmakers +# https://www.namibian.com.na/51480/read/Time-change-divides-lawmakers +# From Steffen Thorsen (2017-08-09): +# Namibia is going to change their time zone to what is now their DST: +# https://www.newera.com.na/2017/02/23/namibias-winter-time-might-be-repealed/ +# This video is from the government decision: +# https://www.nbc.na/news/na-passes-namibia-time-bill-repealing-1994-namibia-time-act.8665 +# We have made the assumption so far that they will change their time zone at +# the same time they would normally start DST, the first Sunday in September: +# https://www.timeanddate.com/news/time/namibia-new-time-zone.html + # RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S -Rule Namibia 1994 max - Sep Sun>=1 2:00 1:00 S -Rule Namibia 1995 max - Apr Sun>=1 2:00 0 - +Rule Namibia 1994 only - Mar 21 0:00 0 - +Rule Namibia 1994 2016 - Sep Sun>=1 2:00 1:00 S +Rule Namibia 1995 2017 - Apr Sun>=1 2:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Windhoek 1:08:24 - LMT 1892 Feb 8 1:30 - +0130 1903 Mar 2:00 - SAST 1942 Sep 20 2:00 2:00 1:00 SAST 1943 Mar 21 2:00 2:00 - SAST 1990 Mar 21 # independence - 2:00 - CAT 1994 Apr 3 - 1:00 Namibia WA%sT + 2:00 - CAT 1994 Mar 21 0:00 + 1:00 Namibia WA%sT 2017 Sep 3 2:00 + 2:00 - CAT # Niger # See Africa/Lagos. *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Thu Nov 2 15:39: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 9B92FE5CDEE; Thu, 2 Nov 2017 15:39:51 +0000 (UTC) (envelope-from gordon@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 4094482FEE; Thu, 2 Nov 2017 15:39:51 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA2FdowH008974; Thu, 2 Nov 2017 15:39:50 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA2Fdoqk008968; Thu, 2 Nov 2017 15:39:50 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <201711021539.vA2Fdoqk008968@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Thu, 2 Nov 2017 15:39:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r325324 - in releng/11.0: . contrib/tzdata sys/conf X-SVN-Group: releng X-SVN-Commit-Author: gordon X-SVN-Commit-Paths: in releng/11.0: . contrib/tzdata sys/conf X-SVN-Commit-Revision: 325324 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: Thu, 02 Nov 2017 15:39:51 -0000 Author: gordon Date: Thu Nov 2 15:39:49 2017 New Revision: 325324 URL: https://svnweb.freebsd.org/changeset/base/325324 Log: Update timezone database information. [EN-17:09] Approved by: so Added: releng/11.0/contrib/tzdata/calendars releng/11.0/contrib/tzdata/theory.html (contents, props changed) releng/11.0/contrib/tzdata/zishrink.awk (contents, props changed) Deleted: releng/11.0/contrib/tzdata/Theory Modified: releng/11.0/UPDATING releng/11.0/contrib/tzdata/CONTRIBUTING releng/11.0/contrib/tzdata/LICENSE releng/11.0/contrib/tzdata/Makefile releng/11.0/contrib/tzdata/NEWS releng/11.0/contrib/tzdata/README releng/11.0/contrib/tzdata/africa releng/11.0/contrib/tzdata/antarctica releng/11.0/contrib/tzdata/asia releng/11.0/contrib/tzdata/australasia releng/11.0/contrib/tzdata/backward releng/11.0/contrib/tzdata/backzone releng/11.0/contrib/tzdata/checklinks.awk releng/11.0/contrib/tzdata/europe releng/11.0/contrib/tzdata/leap-seconds.list releng/11.0/contrib/tzdata/leapseconds releng/11.0/contrib/tzdata/leapseconds.awk releng/11.0/contrib/tzdata/northamerica releng/11.0/contrib/tzdata/southamerica releng/11.0/contrib/tzdata/version releng/11.0/contrib/tzdata/zone.tab releng/11.0/contrib/tzdata/zone1970.tab releng/11.0/sys/conf/newvers.sh Modified: releng/11.0/UPDATING ============================================================================== --- releng/11.0/UPDATING Thu Nov 2 15:38:54 2017 (r325323) +++ releng/11.0/UPDATING Thu Nov 2 15:39:49 2017 (r325324) @@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITHOUT_CLANG and the tip of head, and then rebuild without this option. The bootstrap process from older version of current across the gcc/clang cutover is a bit fragile. +20171102 p14 FreeBSD-EN-17:09.tzdata + + Update timezone database information. [EN-17:09] + 20171017 p13 FreeBSD-SA-17:07.wpa Fix WPA2 protocol vulnerability. [SA-17:07] Modified: releng/11.0/contrib/tzdata/CONTRIBUTING ============================================================================== --- releng/11.0/contrib/tzdata/CONTRIBUTING Thu Nov 2 15:38:54 2017 (r325323) +++ releng/11.0/contrib/tzdata/CONTRIBUTING Thu Nov 2 15:39:49 2017 (r325324) @@ -5,23 +5,29 @@ change timekeeping rules erratically and sometimes wit warning, the data entries do not cover all of civil time before 1970, and undoubtedly errors remain in the code and data. Feel free to fill gaps or fix mistakes, and please email improvements -to tz@iana.org for use in the future. +to tz@iana.org for use in the future. In your email, please give +reliable sources that reviewers can check. +----- + +Developers can contribute technical changes to the source code and +data as follows. + To email small changes, please run a POSIX shell command like 'diff -u old/europe new/europe >myfix.patch', and attach myfix.patch to the email. -For more-elaborate changes, please read the Theory file and browse -the mailing list archives for -examples of patches that tend to work well. Ideally, additions to +For more-elaborate changes, please read the theory.html file and browse +the mailing list archives for +examples of patches that tend to work well. Additions to data should contain commentary citing reliable sources as -justification. +justification. Citations should use https: URLs if available. Please submit changes against either the latest release in - or the master branch of the experimental -Git repository. If you use Git the following workflow may be helpful: + or the master branch of the development +repository. If you use Git the following workflow may be helpful: - * Copy the experimental repository. + * Copy the development repository. git clone https://github.com/eggert/tz.git cd tz Modified: releng/11.0/contrib/tzdata/LICENSE ============================================================================== --- releng/11.0/contrib/tzdata/LICENSE Thu Nov 2 15:38:54 2017 (r325323) +++ releng/11.0/contrib/tzdata/LICENSE Thu Nov 2 15:39:49 2017 (r325324) @@ -1,4 +1,5 @@ -With a few exceptions, all files in the tz code and data (including -this one) are in the public domain. The exceptions are date.c, -newstrftime.3, and strftime.c, which contain material derived from BSD -and which use the BSD 3-clause license. +Unless specified below, all files in the tz code and data (including +this LICENSE file) are in the public domain. + +If the files date.c, newstrftime.3, and strftime.c are present, they +contain material derived from BSD and use the BSD 3-clause license. Modified: releng/11.0/contrib/tzdata/Makefile ============================================================================== --- releng/11.0/contrib/tzdata/Makefile Thu Nov 2 15:38:54 2017 (r325323) +++ releng/11.0/contrib/tzdata/Makefile Thu Nov 2 15:39:49 2017 (r325324) @@ -49,6 +49,7 @@ TOPDIR= /usr/local # "Compiled" time zone information is placed in the "TZDIR" directory # (and subdirectories). # Use an absolute path name for TZDIR unless you're just testing the software. +# TZDIR_BASENAME should not contain "/" and should not be ".", ".." or empty. TZDIR_BASENAME= zoneinfo TZDIR= $(TOPDIR)/etc/$(TZDIR_BASENAME) @@ -72,11 +73,11 @@ MANDIR= $(TOPDIR)/man LIBDIR= $(TOPDIR)/lib -# If you always want time values interpreted as "seconds since the epoch -# (not counting leap seconds)", use +# If you want only POSIX time, with time values interpreted as +# seconds since the epoch (not counting leap seconds), use # REDO= posix_only -# below. If you always want right time values interpreted as "seconds since -# the epoch" (counting leap seconds)", use +# below. If you want only "right" time, with values interpreted +# as seconds since the epoch (counting leap seconds), use # REDO= right_only # below. If you want both sets of data available, with leap seconds not # counted normally, use @@ -85,10 +86,31 @@ LIBDIR= $(TOPDIR)/lib # normally, use # REDO= right_posix # below. POSIX mandates that leap seconds not be counted; for compatibility -# with it, use "posix_only" or "posix_right". +# with it, use "posix_only" or "posix_right". Use POSIX time on systems with +# leap smearing; this can work better than unsmeared "right" time with +# applications that are not leap second aware, and is closer to unsmeared +# "right" time than unsmeared POSIX time is (e.g., 0.5 vs 1.0 s max error). REDO= posix_right +# To install data in text form that has all the information of the binary data, +# (optionally incorporating leap second information), use +# TZDATA_TEXT= tzdata.zi leapseconds +# To install text data without leap second information (e.g., because +# REDO='posix_only'), use +# TZDATA_TEXT= tzdata.zi +# To avoid installing text data, use +# TZDATA_TEXT= + +TZDATA_TEXT= leapseconds tzdata.zi + +# For backward-compatibility links for old zone names, use +# BACKWARD= backward pacificnew +# To omit these links, use +# BACKWARD= + +BACKWARD= backward pacificnew + # If you want out-of-scope and often-wrong data from the file 'backzone', use # PACKRATDATA= backzone # To omit this data, use @@ -96,6 +118,11 @@ REDO= posix_right PACKRATDATA= +# The name of a locale using the UTF-8 encoding, used during self-tests. +# The tests are skipped if the name does not appear to work on this system. + +UTF8_LOCALE= en_US.utf8 + # Since "." may not be in PATH... YEARISTYPE= ./yearistype @@ -103,50 +130,53 @@ YEARISTYPE= ./yearistype # Non-default libraries needed to link. LDLIBS= -# Add the following to the end of the "CFLAGS=" line as needed. +# Add the following to the end of the "CFLAGS=" line as needed to override +# defaults specified in the source code. "-DFOO" is equivalent to "-DFOO=1". # -DBIG_BANG=-9999999LL if the Big Bang occurred at time -9999999 (see zic.c) +# -DDEPRECATE_TWO_DIGIT_YEARS for optional runtime warnings about strftime +# formats that generate only the last two digits of year numbers +# -DEPOCH_LOCAL if the 'time' function returns local time not UT +# -DEPOCH_OFFSET=N if the 'time' function returns a value N greater +# than what POSIX specifies, assuming local time is UT. +# For example, N is 252460800 on AmigaOS. # -DHAVE_DECL_ASCTIME_R=0 if does not declare asctime_r +# -DHAVE_DECL_ENVIRON if declares 'environ' # -DHAVE_DIRECT_H if mkdir needs (MS-Windows) -# -DHAVE_DOS_FILE_NAMES if file names have drive specifiers etc. (MS-DOS) -# -DHAVE_GETTEXT=1 if 'gettext' works (e.g., GNU/Linux, FreeBSD, Solaris) -# -DHAVE_INCOMPATIBLE_CTIME_R=1 if your system's time.h declares +# -DHAVE_GENERIC=0 if _Generic does not work +# -DHAVE_GETTEXT if 'gettext' works (e.g., GNU/Linux, FreeBSD, Solaris) +# -DHAVE_INCOMPATIBLE_CTIME_R if your system's time.h declares # ctime_r and asctime_r incompatibly with the POSIX standard # (Solaris when _POSIX_PTHREAD_SEMANTICS is not defined). -# -DHAVE_INTTYPES_H=1 if you have a pre-C99 compiler with "inttypes.h" +# -DHAVE_INTTYPES_H if you have a non-C99 compiler with # -DHAVE_LINK=0 if your system lacks a link function # -DHAVE_LOCALTIME_R=0 if your system lacks a localtime_r function # -DHAVE_LOCALTIME_RZ=0 if you do not want zdump to use localtime_rz -# This defaults to 1 if a working localtime_rz seems to be available. # localtime_rz can make zdump significantly faster, but is nonstandard. # -DHAVE_POSIX_DECLS=0 if your system's include files do not declare # functions like 'link' or variables like 'tzname' required by POSIX -# -DHAVE_STDINT_H=1 if you have a pre-C99 compiler with "stdint.h" -# -DHAVE_STRFTIME_L=1 if declares locale_t and strftime_l -# This defaults to 0 if _POSIX_VERSION < 200809, 1 otherwise. +# -DHAVE_SNPRINTF=0 if your system lacks the snprintf function +# -DHAVE_STDBOOL_H if you have a non-C99 compiler with +# -DHAVE_STDINT_H if you have a non-C99 compiler with +# -DHAVE_STRFTIME_L if declares locale_t and strftime_l # -DHAVE_STRDUP=0 if your system lacks the strdup function # -DHAVE_SYMLINK=0 if your system lacks the symlink function -# -DHAVE_SYS_STAT_H=0 if your compiler lacks a "sys/stat.h" -# -DHAVE_SYS_WAIT_H=0 if your compiler lacks a "sys/wait.h" +# -DHAVE_SYS_STAT_H=0 if your compiler lacks a +# -DHAVE_SYS_WAIT_H=0 if your compiler lacks a # -DHAVE_TZSET=0 if your system lacks a tzset function -# -DHAVE_UNISTD_H=0 if your compiler lacks a "unistd.h" (Microsoft C++ 7?) -# -DEPOCH_LOCAL=1 if the 'time' function returns local time not UT -# -DEPOCH_OFFSET=N if the 'time' function returns a value N greater -# than what POSIX specifies, assuming local time is UT. -# For example, N is 252460800 on AmigaOS. -# -DNO_RUN_TIME_WARNINGS_ABOUT_YEAR_2000_PROBLEMS_THANK_YOU=1 -# if you do not want run time warnings about formats that may cause -# year 2000 grief -# -Dssize_t=long on ancient hosts that lack ssize_t -# -DTHREAD_SAFE=1 to make localtime.c thread-safe, as POSIX requires; +# -DHAVE_UNISTD_H=0 if your compiler lacks a +# -Dlocale_t=XXX if your system uses XXX instead of locale_t +# -Dssize_t=long on hosts like MS-Windows that lack ssize_t +# -DTHREAD_SAFE to make localtime.c thread-safe, as POSIX requires; # not needed by the main-program tz code, which is single-threaded. # Append other compiler flags as needed, e.g., -pthread on GNU/Linux. # -Dtime_tz=\"T\" to use T as the time_t type, rather than the system time_t +# This is intended for internal use only; it mangles external names. # -DTZ_DOMAIN=\"foo\" to use "foo" for gettext domain name; default is "tz" # -DTZ_DOMAINDIR=\"/path\" to use "/path" for gettext directory; # the default is system-supplied, typically "/usr/lib/locale" # -DTZDEFRULESTRING=\",date/time,date/time\" to default to the specified # DST transitions if the time zone files cannot be accessed -# -DUNINIT_TRAP=1 if reading uninitialized storage can cause problems +# -DUNINIT_TRAP if reading uninitialized storage can cause problems # other than simply getting garbage data # -DUSE_LTZ=0 to build zdump with the system time zone library # Also set TZDOBJS=zdump.o and CHECK_TIME_T_ALTERNATIVES= below. @@ -154,27 +184,28 @@ LDLIBS= # (or some other number) to set the maximum time zone abbreviation length # that zic will accept without a warning (the default is 6) # $(GCC_DEBUG_FLAGS) if you are using recent GCC and want lots of checking -GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-common -fstrict-aliasing \ - -Wall -Wextra \ - -Wbad-function-cast -Wcast-align -Wdate-time \ - -Wdeclaration-after-statement \ - -Wdouble-promotion \ - -Wformat=2 -Winit-self -Wjump-misses-init \ - -Wlogical-op -Wmissing-prototypes -Wnested-externs \ - -Wold-style-definition -Woverlength-strings -Wpointer-arith \ - -Wshadow -Wstrict-prototypes -Wsuggest-attribute=const \ - -Wsuggest-attribute=format -Wsuggest-attribute=noreturn \ - -Wsuggest-attribute=pure -Wtrampolines \ - -Wunused -Wwrite-strings \ - -Wno-address -Wno-format-nonliteral -Wno-sign-compare \ - -Wno-type-limits -Wno-unused-parameter +# Select instrumentation via "make GCC_INSTRUMENT='whatever'". +GCC_INSTRUMENT = \ + -fsanitize=undefined -fsanitize-address-use-after-scope \ + -fsanitize-undefined-trap-on-error -fstack-protector +GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \ + $(GCC_INSTRUMENT) \ + -Wall -Wextra \ + -Walloc-size-larger-than=100000 -Warray-bounds=2 \ + -Wbad-function-cast -Wcast-align -Wdate-time \ + -Wdeclaration-after-statement -Wdouble-promotion \ + -Wformat=2 -Wformat-overflow=2 -Wformat-signedness -Wformat-truncation \ + -Winit-self -Wjump-misses-init -Wlogical-op \ + -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ + -Wold-style-definition -Woverlength-strings -Wpointer-arith \ + -Wshadow -Wshift-overflow=2 -Wstrict-prototypes -Wstringop-overflow=5 \ + -Wsuggest-attribute=const -Wsuggest-attribute=format \ + -Wsuggest-attribute=noreturn -Wsuggest-attribute=pure \ + -Wtrampolines -Wundef -Wuninitialized -Wunused \ + -Wvariadic-macros -Wvla -Wwrite-strings \ + -Wno-address -Wno-format-nonliteral -Wno-sign-compare \ + -Wno-type-limits -Wno-unused-parameter # -# If you want to use System V compatibility code, add -# -DUSG_COMPAT -# to the end of the "CFLAGS=" line. This arrange for "timezone" and "daylight" -# variables to be kept up-to-date by the time conversion functions. Neither -# "timezone" nor "daylight" is described in X3J11's work. -# # If your system has a "GMT offset" field in its "struct tm"s # (or if you decide to add such a field in your system's "time.h" file), # add the name to a define such as @@ -186,6 +217,31 @@ GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-common -fstrict- # and define NO_TM_ZONE to suppress any guessing. These two fields are not # required by POSIX, but are widely available on GNU/Linux and BSD systems. # +# The next batch of options control support for external variables +# exported by tzcode. In practice these variables are less useful +# than TM_GMTOFF and TM_ZONE. However, most of them are standardized. +# # +# # To omit or support the external variable "tzname", add one of: +# # -DHAVE_TZNAME=0 +# # -DHAVE_TZNAME=1 +# # to the "CFLAGS=" line. "tzname" is required by POSIX 1988 and later. +# # If not defined, the code attempts to guess HAVE_TZNAME from other macros. +# # Warning: unless time_tz is also defined, HAVE_TZNAME=1 can cause +# # crashes when combined with some platforms' standard libraries, +# # presumably due to memory allocation issues. +# # +# # To omit or support the external variables "timezone" and "daylight", add +# # -DUSG_COMPAT=0 +# # -DUSG_COMPAT=1 +# # to the "CFLAGS=" line; "timezone" and "daylight" are inspired by +# # Unix Systems Group code and are required by POSIX 2008 (with XSI) and later. +# # If not defined, the code attempts to guess USG_COMPAT from other macros. +# # +# # To support the external variable "altzone", add +# # -DALTZONE +# # to the end of the "CFLAGS=" line; although "altzone" appeared in +# # System V Release 3.1 it has not been standardized. +# # If you want functions that were inspired by early versions of X3J11's work, # add # -DSTD_INSPIRED @@ -223,11 +279,6 @@ GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-common -fstrict- # -DALL_STATE # to the end of the "CFLAGS=" line. Storage is obtained by calling malloc. # -# If you want an "altzone" variable (a la System V Release 3.1), add -# -DALTZONE -# to the end of the "CFLAGS=" line. -# This variable is not described in X3J11's work. -# # NIST-PCTS:151-2, Version 1.4, (1993-12-03) is a test suite put # out by the National Institute of Standards and Technology # which claims to test C and Posix conformance. If you want to pass PCTS, add @@ -237,8 +288,8 @@ GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-common -fstrict- # If you want strict compliance with XPG4 as of 1994-04-09, add # -DXPG4_1994_04_09 # to the end of the "CFLAGS=" line. This causes "strftime" to always return -# 53 as a week number (rather than 52 or 53) for those days in January that -# before the first Monday in January when a "%V" format is used and January 1 +# 53 as a week number (rather than 52 or 53) for January days before +# January's first Monday when a "%V" format is used and January 1 # falls on a Friday, Saturday, or Sunday. CFLAGS= @@ -262,7 +313,7 @@ ZFLAGS= # How to use zic to install tz binary files. -ZIC_INSTALL= $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) $(LEAPSECONDS) +ZIC_INSTALL= $(ZIC) -d $(DESTDIR)$(TZDIR) $(LEAPSECONDS) # The name of a Posix-compliant 'awk' on your system. AWK= awk @@ -286,6 +337,7 @@ SGML_CATALOG_FILES= \ # The name, arguments and environment of a program to validate your web pages. # See for a validator, and # for a validation library. +# Set VALIDATE=':' if you do not have such a program. VALIDATE = nsgmls VALIDATE_FLAGS = -s -B -wall -wno-unused-param VALIDATE_ENV = \ @@ -352,7 +404,7 @@ AR= ar RANLIB= : TZCOBJS= zic.o -TZDOBJS= zdump.o localtime.o asctime.o +TZDOBJS= zdump.o localtime.o asctime.o strftime.o DATEOBJS= date.o localtime.o strftime.o asctime.o LIBSRCS= localtime.c asctime.c difftime.c LIBOBJS= localtime.o asctime.o difftime.o @@ -367,33 +419,35 @@ MANTXTS= newctime.3.txt newstrftime.3.txt newtzset.3.t time2posix.3.txt \ tzfile.5.txt tzselect.8.txt zic.8.txt zdump.8.txt \ date.1.txt -COMMON= CONTRIBUTING LICENSE Makefile NEWS README Theory version +COMMON= calendars CONTRIBUTING LICENSE Makefile \ + NEWS README theory.html version WEB_PAGES= tz-art.htm tz-how-to.html tz-link.htm DOCS= $(MANS) date.1 $(MANTXTS) $(WEB_PAGES) PRIMARY_YDATA= africa antarctica asia australasia \ europe northamerica southamerica -YDATA= $(PRIMARY_YDATA) pacificnew etcetera backward +YDATA= $(PRIMARY_YDATA) etcetera $(BACKWARD) NDATA= systemv factory TDATA= $(YDATA) $(NDATA) ZONETABLES= zone1970.tab zone.tab -TABDATA= iso3166.tab leapseconds $(ZONETABLES) +TABDATA= iso3166.tab $(TZDATA_TEXT) $(ZONETABLES) LEAP_DEPS= leapseconds.awk leap-seconds.list -DATA= $(YDATA) $(NDATA) backzone $(TABDATA) \ - leap-seconds.list yearistype.sh -AWK_SCRIPTS= checklinks.awk checktab.awk leapseconds.awk +TZDATA_ZI_DEPS= zishrink.awk $(TDATA) $(PACKRATDATA) +DATA= $(YDATA) $(NDATA) backzone iso3166.tab leap-seconds.list \ + leapseconds yearistype.sh $(ZONETABLES) +AWK_SCRIPTS= checklinks.awk checktab.awk leapseconds.awk zishrink.awk MISC= $(AWK_SCRIPTS) zoneinfo2tdf.pl TZS_YEAR= 2050 TZS= to$(TZS_YEAR).tzs TZS_NEW= to$(TZS_YEAR)new.tzs TZS_DEPS= $(PRIMARY_YDATA) asctime.c localtime.c \ private.h tzfile.h zdump.c zic.c -ENCHILADA= $(COMMON) $(DOCS) $(SOURCES) $(DATA) $(MISC) $(TZS) +ENCHILADA= $(COMMON) $(DOCS) $(SOURCES) $(DATA) $(MISC) $(TZS) tzdata.zi # Consult these files when deciding whether to rebuild the 'version' file. # This list is not the same as the output of 'git ls-files', since # .gitignore is not distributed. VERSION_DEPS= \ - CONTRIBUTING LICENSE Makefile NEWS README Theory \ + calendars CONTRIBUTING LICENSE Makefile NEWS README \ africa antarctica asctime.c asia australasia \ backward backzone \ checklinks.awk checktab.awk \ @@ -402,7 +456,7 @@ VERSION_DEPS= \ leap-seconds.list leapseconds.awk localtime.c \ newctime.3 newstrftime.3 newtzset.3 northamerica \ pacificnew private.h \ - southamerica strftime.c systemv \ + southamerica strftime.c systemv theory.html \ time2posix.3 tz-art.htm tz-how-to.html tz-link.htm \ tzfile.5 tzfile.h tzselect.8 tzselect.ksh \ workman.sh yearistype.sh \ @@ -424,7 +478,7 @@ install: all $(DATA) $(REDO) $(MANS) $(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \ $(DESTDIR)$(MANDIR)/man8 $(ZIC_INSTALL) -l $(LOCALTIME) -p $(POSIXRULES) - cp -f iso3166.tab $(ZONETABLES) $(DESTDIR)$(TZDIR)/. + cp -f $(TABDATA) $(DESTDIR)$(TZDIR)/. cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/. cp libtz.a $(DESTDIR)$(LIBDIR)/. $(RANLIB) $(DESTDIR)$(LIBDIR)/libtz.a @@ -445,6 +499,11 @@ version: $(VERSION_DEPS) printf '%s\n' "$$V" >$@.out mv $@.out $@ +# This file can be tailored by setting BACKWARD, PACKRATDATA, etc. +tzdata.zi: $(TZDATA_ZI_DEPS) + LC_ALL=C $(AWK) -f zishrink.awk $(TDATA) $(PACKRATDATA) >$@.out + mv $@.out $@ + version.h: version VERSION=`cat version` && printf '%s\n' \ 'static char const PKGVERSION[]="($(PACKAGE)) ";' \ @@ -470,6 +529,7 @@ leapseconds: $(LEAP_DEPS) # Arguments to pass to submakes of install_data. # They can be overridden by later submake arguments. INSTALLARGS = \ + BACKWARD=$(BACKWARD) \ DESTDIR=$(DESTDIR) \ LEAPSECONDS='$(LEAPSECONDS)' \ PACKRATDATA='$(PACKRATDATA)' \ @@ -478,10 +538,8 @@ INSTALLARGS = \ ZIC='$(ZIC)' # 'make install_data' installs one set of tz binary files. -# It can be tailored by setting LEAPSECONDS, PACKRATDATA, etc. -install_data: zic leapseconds yearistype $(PACKRATDATA) $(TDATA) - $(ZIC_INSTALL) $(TDATA) - $(AWK) '/^Rule/' $(TDATA) | $(ZIC_INSTALL) - $(PACKRATDATA) +install_data: zic leapseconds yearistype tzdata.zi + $(ZIC_INSTALL) tzdata.zi posix_only: $(MAKE) $(INSTALLARGS) LEAPSECONDS= install_data @@ -518,14 +576,14 @@ posix_packrat: zones: $(REDO) -$(TZS_NEW): $(TDATA) zdump zic +$(TZS_NEW): tzdata.zi zdump zic mkdir -p tzs.dir - $(zic) -d tzs.dir $(TDATA) - $(AWK) '/^Link/{print $$1 "\t" $$2 "\t" $$3}' \ - $(TDATA) | LC_ALL=C sort >$@.out + $(zic) -d tzs.dir tzdata.zi + $(AWK) '/^L/{print "Link\t" $$2 "\t" $$3}' \ + tzdata.zi | LC_ALL=C sort >$@.out wd=`pwd` && \ zones=`$(AWK) -v wd="$$wd" \ - '/^Zone/{print wd "/tzs.dir/" $$2}' $(TDATA) \ + '/^Z/{print wd "/tzs.dir/" $$2}' tzdata.zi \ | LC_ALL=C sort` && \ ./zdump -i -c $(TZS_YEAR) $$zones >>$@.out sed 's,^TZ=".*tzs\.dir/,TZ=",' $@.out >$@.sed.out @@ -542,7 +600,8 @@ force_tzs: $(TZS_NEW) cp $(TZS_NEW) $(TZS) libtz.a: $(LIBOBJS) - $(AR) ru $@ $(LIBOBJS) + rm -f $@ + $(AR) -rc $@ $(LIBOBJS) $(RANLIB) $@ date: $(DATEOBJS) @@ -560,24 +619,37 @@ tzselect: tzselect.ksh version chmod +x $@.out mv $@.out $@ -check: check_character_set check_white_space check_links check_sorted \ - check_tables check_tzs check_web +check: check_character_set check_white_space check_links \ + check_name_lengths check_sorted \ + check_tables check_web check_zishrink check_tzs check_character_set: $(ENCHILADA) - LC_ALL=en_US.utf8 && export LC_ALL && \ + test ! '$(UTF8_LOCALE)' || \ + ! printf 'A\304\200B\n' | \ + LC_ALL='$(UTF8_LOCALE)' grep -q '^A.B$$' >/dev/null 2>&1 || { \ + LC_ALL='$(UTF8_LOCALE)' && export LC_ALL && \ sharp='#' && \ ! grep -Env $(SAFE_LINE) $(MANS) date.1 $(MANTXTS) \ $(MISC) $(SOURCES) $(WEB_PAGES) \ - CONTRIBUTING LICENSE Makefile README version && \ + CONTRIBUTING LICENSE Makefile README \ + version tzdata.zi && \ ! grep -Env $(SAFE_SHARP_LINE) $(TDATA) backzone \ leapseconds yearistype.sh zone.tab && \ - ! grep -Env $(OK_LINE) $(ENCHILADA) + ! grep -Env $(OK_LINE) $(ENCHILADA); \ + } check_white_space: $(ENCHILADA) patfmt=' \t|[\f\r\v]' && pat=`printf "$$patfmt\\n"` && \ ! grep -En "$$pat" $(ENCHILADA) ! grep -n '[[:space:]]$$' $(ENCHILADA) +PRECEDES_FILE_NAME = ^(Zone|Link[[:space:]]+[^[:space:]]+)[[:space:]]+ +FILE_NAME_COMPONENT_TOO_LONG = \ + $(PRECEDES_FILE_NAME)[^[:space:]]*[^/[:space:]]{15} + +check_name_lengths: $(TDATA) backzone + ! grep -En '$(FILE_NAME_COMPONENT_TOO_LONG)' $(TDATA) backzone + CHECK_CC_LIST = { n = split($$1,a,/,/); for (i=2; i<=n; i++) print a[1], a[i]; } check_sorted: backward backzone iso3166.tab zone.tab zone1970.tab @@ -592,6 +664,7 @@ check_sorted: backward backzone iso3166.tab zone.tab z check_links: checklinks.awk $(TDATA) $(AWK) -f checklinks.awk $(TDATA) + $(AWK) -f checklinks.awk tzdata.zi check_tables: checktab.awk $(PRIMARY_YDATA) $(ZONETABLES) for tab in $(ZONETABLES); do \ @@ -602,14 +675,32 @@ check_tables: checktab.awk $(PRIMARY_YDATA) $(ZONETABL check_tzs: $(TZS) $(TZS_NEW) diff -u $(TZS) $(TZS_NEW) -check_web: $(WEB_PAGES) - $(VALIDATE_ENV) $(VALIDATE) $(VALIDATE_FLAGS) $(WEB_PAGES) +# This checks only the HTML 4.01 strict page. +# To check the the other pages, use . +check_web: tz-how-to.html + $(VALIDATE_ENV) $(VALIDATE) $(VALIDATE_FLAGS) tz-how-to.html +# Check that tzdata.zi generates the same binary data that its sources do. +check_zishrink: tzdata.zi zic leapseconds $(PACKRATDATA) $(TDATA) + for type in posix right; do \ + mkdir -p time_t.dir/$$type time_t.dir/$$type-shrunk && \ + case $$type in \ + right) leap='-L leapseconds';; \ + *) leap=;; \ + esac && \ + $(ZIC) $$leap -d time_t.dir/$$type $(TDATA) && \ + $(AWK) '/^Rule/' $(TDATA) | \ + $(ZIC) $$leap -d time_t.dir/$$type - $(PACKRATDATA) && \ + $(ZIC) $$leap -d time_t.dir/$$type-shrunk tzdata.zi && \ + diff -r time_t.dir/$$type time_t.dir/$$type-shrunk || exit; \ + done + rm -fr time_t.dir + clean_misc: rm -f core *.o *.out \ date tzselect version.h zdump zic yearistype libtz.a clean: clean_misc - rm -fr *.dir tzdb-*/ $(TZS_NEW) + rm -fr *.dir tzdata.zi tzdb-*/ $(TZS_NEW) maintainer-clean: clean @echo 'This command is intended for maintainers to use; it' @@ -663,6 +754,7 @@ set-timestamps.out: $(ENCHILADA) touch -cmr `ls -t $$file workman.sh | sed 1q` $$file.txt || \ exit; \ done + touch -cmr `ls -t $(TZDATA_ZI_DEPS) | sed 1q` tzdata.zi touch -cmr `ls -t $(TZS_DEPS) | sed 1q` $(TZS) touch -cmr `ls -t $(VERSION_DEPS) | sed 1q` version touch $@ @@ -674,7 +766,7 @@ check_public: $(MAKE) maintainer-clean $(MAKE) "CFLAGS=$(GCC_DEBUG_FLAGS)" ALL mkdir -p public.dir - for i in $(TDATA) ; do \ + for i in $(TDATA) tzdata.zi; do \ $(zic) -v -d public.dir $$i 2>&1 || exit; \ done $(zic) -v -d public.dir $(TDATA) @@ -768,8 +860,8 @@ typecheck: $(MAKE) clean ; \ done -zonenames: $(TDATA) - @$(AWK) '/^Zone/ { print $$2 } /^Link/ { print $$3 }' $(TDATA) +zonenames: tzdata.zi + @$(AWK) '/^Z/ { print $$2 } /^L/ { print $$3 }' tzdata.zi asctime.o: private.h tzfile.h date.o: private.h @@ -785,6 +877,7 @@ zic.o: private.h tzfile.h version.h .PHONY: check check_character_set check_links .PHONY: check_public check_sorted check_tables .PHONY: check_time_t_alternatives check_tzs check_web check_white_space +.PHONY: check_zishrink .PHONY: clean clean_misc force_tzs .PHONY: install install_data maintainer-clean names .PHONY: posix_only posix_packrat posix_right Modified: releng/11.0/contrib/tzdata/NEWS ============================================================================== --- releng/11.0/contrib/tzdata/NEWS Thu Nov 2 15:38:54 2017 (r325323) +++ releng/11.0/contrib/tzdata/NEWS Thu Nov 2 15:39:49 2017 (r325324) @@ -1,5 +1,344 @@ News for the tz database +Release 2017c - 2017-10-20 14:49:34 -0700 + + Briefly: + Northern Cyprus switches from +03 to +02/+03 on 2017-10-29. + Fiji ends DST 2018-01-14, not 2018-01-21. + Namibia switches from +01/+02 to +02 on 2018-04-01. + Sudan switches from +03 to +02 on 2017-11-01. + Tonga likely switches from +13/+14 to +13 on 2017-11-05. + Turks & Caicos switches from -04 to -05/-04 on 2018-11-04. + A new file tzdata.zi now holds a small text copy of all data. + The zic input format has been regularized slightly. + + Changes to future time stamps + + Northern Cyprus has decided to resume EU rules starting + 2017-10-29, thus reinstituting winter time. + + Fiji ends DST 2018-01-14 instead of the 2018-01-21 previously + predicted. (Thanks to Dominic Fok.) Adjust future predictions + accordingly. + + Namibia will switch from +01 with DST to +02 all year on + 2017-09-03 at 02:00. This affects UT offsets starting 2018-04-01 + at 02:00. (Thanks to Steffen Thorsen.) + + Sudan will switch from +03 to +02 on 2017-11-01. (Thanks to Ahmed + Atyya and Yahia Abdalla.) South Sudan is not switching, so + Africa/Juba is no longer a link to Africa/Khartoum. + + Tonga has likely ended its experiment with DST, and will not + adjust its clocks on 2017-11-05. Although Tonga has not announced + whether it will continue to observe DST, the IATA is assuming that + it will not. (Thanks to David Wade.) + + Turks & Caicos will switch from -04 all year to -05 with US DST on + 2018-03-11 at 03:00. This affects UT offsets starting 2018-11-04 + at 02:00. (Thanks to Steffen Thorsen.) + + Changes to past time stamps + + Namibia switched from +02 to +01 on 1994-03-21, not 1994-04-03. + (Thanks to Arthur David Olson.) + + Detroit did not observe DST in 1967. + + Use railway time for Asia/Kolkata before 1941, by switching to + Madras local time (UT +052110) in 1870, then to IST (UT +0530) in + 1906. Also, treat 1941-2's +0630 as DST, like 1942-5. + + Europe/Dublin's 1946 and 1947 fallback transitions occurred at + 02:00 standard time, not 02:00 DST. (Thanks to Michael Deckers.) + + Pacific/Apia and Pacific/Pago_Pago switched from Antipodean to + American time in 1892, not 1879. (Thanks to Michael Deckers.) + + Adjust the 1867 transition in Alaska to better reflect the + historical record, by changing it to occur on 1867-10-18 at 15:30 + Sitka time rather than at the start of 1867-10-17 local time. + Although strictly speaking this is accurate only for Sitka, + the rest of Alaska's blanks need to be filled in somehow. + + Fix off-by-one errors in UT offsets for Adak and Nome before 1867. + (Thanks to Michael Deckers.) + + Add 7 s to the UT offset in Asia/Yangon before 1920. + + Changes to zone names + + Remove Canada/East-Saskatchewan from the 'backward' file, as it + exceeded the 14-character limit and was an unused misnomer anyway. + + Changes to build procedure + + To support applications that prefer to read time zone data in text + form, two zic input files tzdata.zi and leapseconds are now + installed by default. The commands 'zic tzdata.zi' and 'zic -L + leapseconds tzdata.zi' can reproduce the tzdata binary files + without and with leap seconds, respectively. To prevent these two + new files from being installed, use 'make TZDATA_TEXT=', and to + suppress leap seconds from the tzdata text installation, use 'make + TZDATA_TEXT=tzdata.zi'. + + 'make BACKWARD=' now suppresses backward-compatibility names + like 'US/Pacific' that are defined in the 'backward' and + 'pacificnew' files. + + 'make check' now works on systems that lack a UTF-8 locale, + or that lack the nsgmls program. Set UTF8_LOCALE to configure + the name of a UTF-8 locale, if you have one. + + Y2K runtime checks are no longer enabled by default. Add + -DDEPRECATE_TWO_DIGIT_YEARS to CFLAGS to enable them, instead of + adding -DNO_RUN_TIME_WARNINGS_ABOUT_YEAR_2000_PROBLEMS_THANK_YOU + to disable them. (New name suggested by Brian Inglis.) + + The build procedure for zdump now works on AIX 7.1. + (Problem reported by Kees Dekker.) + + Changes to code + + zic and the reference runtime now reject multiple leap seconds + within 28 days of each other, or leap seconds before the Epoch. + As a result, support for double leap seconds, which was + obsolescent and undocumented, has been removed. Double leap + seconds were an error in the C89 standard; they have never existed + in civil timekeeping. (Thanks to Robert Elz and Bradley White for + noticing glitches in the code that uncovered this problem.) + + zic now warns about use of the obsolescent and undocumented -y + option, and about use of the obsolescent TYPE field of Rule lines. + + zic now allows unambiguous abbreviations like "Sa" and "Su" for + weekdays; formerly it rejected them due to a bug. Conversely, zic + no longer considers non-prefixes to be abbreviations; for example, + it no longer accepts "lF" as an abbreviation for "lastFriday". + Also, zic warns about the undocumented usage with a "last-" + prefix, e.g., "last-Fri". + + Similarly, zic now accepts the unambiguous abbreviation "L" for + "Link" in ordinary context and for "Leap" in leap-second context. + Conversely, zic no longer accepts non-prefixes such as "La" as + abbreviations for words like "Leap". + + zic no longer accepts leap second lines in ordinary input, or + ordinary lines in leap second input. Formerly, zic sometimes + warned about this undocumented usage and handled it incorrectly. + + The new macro HAVE_TZNAME governs whether the tzname external + variable is exported, instead of USG_COMPAT. USG_COMPAT now + governs only the external variables "timezone" and "daylight". + This change is needed because the three variables are not in the + same category: although POSIX requires tzname, it specifies the + other two variables as optional. Also, USG_COMPAT is now 1 or 0: + if not defined, the code attempts to guess it from other macros. + + localtime.c and difftime.c no longer require stdio.h, and .c files + other than zic.c no longer require sys/wait.h. + + zdump.c no longer assumes snprintf. (Reported by Jonathan Leffler.) + + Calculation of time_t extrema works around a bug in GCC 4.8.4 + (Reported by Stan Shebs and Joseph Myers.) + + zic.c no longer mistranslates formats of line numbers in non-English + locales. (Problem reported by Benno Schulenberg.) + + Several minor changes have been made to the code to make it a + bit easier to port to MS-Windows and Solaris. (Thanks to Kees + Dekker for reporting the problems.) + + Changes to documentation and commentary + + The two new files 'theory.html' and 'calendars' contain the + contents of the removed file 'Theory'. The goal is to document + tzdb theory more accessibly. + + The zic man page now documents abbreviation rules. + + tz-link.htm now covers how to apply tzdata changes to clients. + (Thanks to Jorge Fábregas for the AIX link.) It also mentions MySQL. + + The leap-seconds.list URL has been updated to something that is + more reliable for tzdb. (Thanks to Tim Parenti and Brian Inglis.) + +Release 2017b - 2017-03-17 07:30:38 -0700 + + Briefly: Haiti has resumed DST. + + Changes to past and future time stamps + + Haiti resumed observance of DST in 2017. (Thanks to Steffen Thorsen.) + + Changes to past time stamps + + Liberia changed from -004430 to +00 on 1972-01-07, not 1972-05-01. + + Use "MMT" to abbreviate Liberia's time zone before 1972, as "-004430" + is one byte over the POSIX limit. (Problem reported by Derick Rethans.) + + Changes to code + + The reference localtime implementation now falls back on the + current US daylight-saving transition rules rather than the + 1987-2006 rules. This fallback occurs only when (1) the TZ + environment variable's value has a name like "AST4ADT" that asks + for daylight saving time but does not specify the rules, (2) there + is no file by that name, and (3) the TZDEFRULES file cannot be + loaded. (Thanks to Tom Lane.) + + +Release 2017a - 2017-02-28 00:05:36 -0800 + + Briefly: Southern Chile moves from -04/-03 to -03, and Mongolia + discontinues DST. + + Changes to future time stamps + + Mongolia no longer observes DST. (Thanks to Ganbold Tsagaankhuu.) + + Chile's Region of Magallanes moves from -04/-03 to -03 year-round. + Its clocks diverge from America/Santiago starting 2017-05-13 at + 23:00, hiving off a new zone America/Punta_Arenas. Although the + Chilean government says this change expires in May 2019, for now + assume it's permanent. (Thanks to Juan Correa and Deborah + Goldsmith.) This also affects Antarctica/Palmer. + + Changes to past time stamps + + Fix many entries for historical time stamps for Europe/Madrid + before 1979, to agree with tables compiled by Pere Planesas of the + National Astronomical Observatory of Spain. As a side effect, + this changes some time stamps for Africa/Ceuta before 1929, which + are probably guesswork anyway. (Thanks to Steve Allen and + Pierpaolo Bernardi for the heads-ups, and to Michael Deckers for + correcting the 1901 transition.) + + Ecuador observed DST from 1992-11-28 to 1993-02-05. + (Thanks to Alois Treindl.) + + Asia/Atyrau and Asia/Oral were at +03 (not +04) before 1930-06-21. + (Thanks to Stepan Golosunov.) + + Changes to past and future time zone abbreviations + + Switch to numeric time zone abbreviations for South America, as + part of the ongoing project of removing invented abbreviations. + This avoids the need to invent an abbreviation for the new Chilean + new zone. Similarly, switch from invented to numeric time zone + abbreviations for Afghanistan, American Samoa, the Azores, + Bangladesh, Bhutan, the British Indian Ocean Territory, Brunei, + Cape Verde, Chatham Is, Christmas I, Cocos (Keeling) Is, Cook Is, + Dubai, East Timor, Eucla, Fiji, French Polynesia, Greenland, + Indochina, Iran, Iraq, Kiribati, Lord Howe, Macquarie, Malaysia, + the Maldives, Marshall Is, Mauritius, Micronesia, Mongolia, + Myanmar, Nauru, Nepal, New Caledonia, Niue, Norfolk I, Palau, + Papua New Guinea, the Philippines, Pitcairn, Qatar, Réunion, St + Pierre & Miquelon, Samoa, Saudi Arabia, Seychelles, Singapore, + Solomon Is, Tokelau, Tuvalu, Wake, Vanuatu, Wallis & Futuna, and + Xinjiang; for 20-minute daylight saving time in Ghana before 1943; + for half-hour daylight saving time in Belize before 1944 and in + the Dominican Republic before 1975; and for Canary Islands before + 1946, for Guinea-Bissau before 1975, for Iceland before 1969, for + Indian Summer Time before 1942, for Indonesia before around 1964, + for Kenya before 1960, for Liberia before 1973, for Madeira before + 1967, for Namibia before 1943, for the Netherlands in 1937-9, for + Pakistan before 1971, for Western Sahara before 1977, and for + Zaporozhye in 1880-1924. + + For Alaska time from 1900 through 1967, instead of "CAT" use the + abbreviation "AST", the abbreviation commonly used at the time + (Atlantic Standard Time had not been standardized yet). Use "AWT" + and "APT" instead of the invented abbreviations "CAWT" and "CAPT". + + Use "CST" and "CDT" instead of invented abbreviations for Macau + before 1999 and Taiwan before 1938, and use "JST" instead of the + invented abbreviation "JCST" for Japan and Korea before 1938. + + Change to database entry category + + Move the Pacific/Johnston link from 'australasia' to 'backward', + since Johnston is now uninhabited. + + Changes to code + + zic no longer mishandles some transitions in January 2038 when it + attempts to work around Qt bug 53071. This fixes a bug affecting + Pacific/Tongatapu that was introduced in zic 2016e. localtime.c + now contains a workaround, useful when loading a file generated by + a buggy zic. (Problem and localtime.c fix reported by Bradley + White.) + + zdump -i now outputs non-hour numeric time zone abbreviations + without a colon, e.g., "+0530" rather than "+05:30". This agrees + with zic %z and with common practice, and simplifies auditing of + zdump output. + + zdump is now buildable again with -DUSE_LTZ=0. + (Problem reported by Joseph Myers.) + + zdump.c now always includes private.h, to avoid code duplication + with private.h. (Problem reported by Kees Dekker.) + + localtime.c no longer mishandles early or late timestamps + when TZ is set to a POSIX-style string that specifies DST. + (Problem reported by Kees Dekker.) + + date and strftime now cause %z to generate "-0000" instead of + "+0000" when the UT offset is zero and the time zone abbreviation + begins with "-". + + Changes to documentation and commentary + + The 'Theory' file now better documents choice of historical time + zone abbreviations. (Problems reported by Michael Deckers.) + + tz-link.htm now covers leap smearing, which is popular in clouds. + + +Release 2016j - 2016-11-22 23:17:13 -0800 + + Briefly: Saratov, Russia moves from +03 to +04 on 2016-12-04. + + Changes to future time stamps + + Saratov, Russia switches from +03 to +04 on 2016-12-04 at 02:00. + This hives off a new zone Europe/Saratov from Europe/Volgograd. + (Thanks to Yuri Konotopov and Stepan Golosunov.) + + Changes to past time stamps + + The new zone Asia/Atyrau for AtyraÅ« Region, Kazakhstan, is like + Asia/Aqtau except it switched from +05/+06 to +04/+05 in spring + 1999, not fall 1994. (Thanks to Stepan Golosunov.) + + Changes to past time zone abbreviations + + Asia/Gaza and Asia/Hebron now use "EEST", not "EET", to denote + summer time before 1948. The old use of "EET" was a typo. + + Changes to code + + zic no longer mishandles file systems that lack hard links, fixing + bugs introduced in 2016g. (Problems reported by Tom Lane.) + Also, when the destination already contains symbolic links, zic + should now work better on systems where the 'link' system call + does not follow symbolic links. + + Changes to documentation and commentary + + tz-link.htm now documents the relationship between release version + numbers and development-repository commit tags. (Suggested by + Paul Koning.) + + The 'Theory' file now documents UT. + + iso3166.tab now accents "Curaçao", and commentary now mentions + the names "Cabo Verde" and "Czechia". (Thanks to Jiří BoháÄ.) + + Release 2016i - 2016-11-01 23:19:52 -0700 Briefly: Cyprus split into two time zones on 2016-10-30, and Tonga @@ -212,7 +551,7 @@ Release 2016g - 2016-09-13 08:56:38 -0700 23 commits and some working-file changes have been made since release 2016g, the version number is now something like '2016g-23-g50556e3-dirty' instead of the misleading '2016g'. - Official releases uses the same version number format as before, + Tagged releases use the same version number format as before, e.g., '2016g'. To support the more-accurate version number, its specification has moved from a line in the Makefile to a new source file 'version'. @@ -870,16 +1209,16 @@ Release 2014i - 2014-10-21 22:04:57 -0700 been fixed. (Thanks to Christos Zoulas for reporting most of these problems and for suggesting fixes.) - If USG_COMPAT is defined and the requested time stamp is standard time, + If USG_COMPAT is defined and the requested timestamp is standard time, the tz library's localtime and mktime functions now set the extern - variable timezone to a value appropriate for that time stamp; and + variable timezone to a value appropriate for that timestamp; and similarly for ALTZONE, daylight saving time, and the altzone variable. This change is a companion to the tzname change in 2014h, and is designed to make timezone and altzone more compatible with tzname. The tz library's functions now set errno to EOVERFLOW if they fail because the result cannot be represented. ctime and ctime_r now - return NULL and set errno when a time stamp is out of range, rather + return NULL and set errno when a timestamp is out of range, rather than having undefined behavior. Some bugs associated with the new 2014g functions have been fixed. @@ -896,7 +1235,7 @@ Release 2014i - 2014-10-21 22:04:57 -0700 Release 2014h - 2014-09-25 18:59:03 -0700 - Changes affecting past time stamps + Changes affecting past timestamps America/Jamaica's 1974 spring-forward transition was Jan. 6, not Apr. 28. @@ -904,8 +1243,8 @@ Release 2014h - 2014-09-25 18:59:03 -0700 not 1920-01-06. The old entry was based on a misinterpretation of Shanks. Some more zones have been turned into links, when they differed - from existing zones only for older time stamps. As usual, - these changes affect UTC offsets in pre-1970 time stamps only. + from existing zones only for older timestamps. As usual, + these changes affect UTC offsets in pre-1970 timestamps only. Their old contents have been moved to the 'backzone' file. The affected zones are: Africa/Blantyre, Africa/Bujumbura, Africa/Gaborone, Africa/Harare, Africa/Kigali, Africa/Lubumbashi, @@ -917,7 +1256,7 @@ Release 2014h - 2014-09-25 18:59:03 -0700 not merely on platforms defining TM_GMTOFF. The tz library's localtime and mktime functions now set tzname to a value - appropriate for the requested time stamp, and zdump now uses this + appropriate for the requested timestamp, and zdump now uses this on platforms not defining TM_ZONE, fixing a 2014g regression. (Thanks to Tim Parenti for reporting the problem.) @@ -957,13 +1296,13 @@ Release 2014h - 2014-09-25 18:59:03 -0700 Release 2014g - 2014-08-28 12:31:23 -0700 - Changes affecting future time stamps *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Thu Nov 2 15:40:21 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 D4256E5CE64; Thu, 2 Nov 2017 15:40:21 +0000 (UTC) (envelope-from gordon@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 63E0383133; Thu, 2 Nov 2017 15:40:21 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA2FeKGO009066; Thu, 2 Nov 2017 15:40:20 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA2FeKrI009059; Thu, 2 Nov 2017 15:40:20 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <201711021540.vA2FeKrI009059@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Thu, 2 Nov 2017 15:40:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r325325 - in releng/11.1: . contrib/tzdata sys/conf X-SVN-Group: releng X-SVN-Commit-Author: gordon X-SVN-Commit-Paths: in releng/11.1: . contrib/tzdata sys/conf X-SVN-Commit-Revision: 325325 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: Thu, 02 Nov 2017 15:40:21 -0000 Author: gordon Date: Thu Nov 2 15:40:19 2017 New Revision: 325325 URL: https://svnweb.freebsd.org/changeset/base/325325 Log: Update timezone database information. [EN-17:09] Approved by: so Added: releng/11.1/contrib/tzdata/calendars releng/11.1/contrib/tzdata/theory.html releng/11.1/contrib/tzdata/zishrink.awk Deleted: releng/11.1/contrib/tzdata/Theory Modified: releng/11.1/UPDATING releng/11.1/contrib/tzdata/CONTRIBUTING releng/11.1/contrib/tzdata/LICENSE releng/11.1/contrib/tzdata/Makefile releng/11.1/contrib/tzdata/NEWS releng/11.1/contrib/tzdata/africa releng/11.1/contrib/tzdata/antarctica releng/11.1/contrib/tzdata/asia releng/11.1/contrib/tzdata/australasia releng/11.1/contrib/tzdata/backward releng/11.1/contrib/tzdata/backzone releng/11.1/contrib/tzdata/checklinks.awk releng/11.1/contrib/tzdata/europe releng/11.1/contrib/tzdata/leap-seconds.list releng/11.1/contrib/tzdata/leapseconds releng/11.1/contrib/tzdata/leapseconds.awk releng/11.1/contrib/tzdata/northamerica releng/11.1/contrib/tzdata/southamerica releng/11.1/contrib/tzdata/version releng/11.1/contrib/tzdata/zone.tab releng/11.1/contrib/tzdata/zone1970.tab releng/11.1/sys/conf/newvers.sh Modified: releng/11.1/UPDATING ============================================================================== --- releng/11.1/UPDATING Thu Nov 2 15:39:49 2017 (r325324) +++ releng/11.1/UPDATING Thu Nov 2 15:40:19 2017 (r325325) @@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITHOUT_CLANG and the tip of head, and then rebuild without this option. The bootstrap process from older version of current across the gcc/clang cutover is a bit fragile. +20171102 p3 FreeBSD-EN-17:09.tzdata + + Update timezone database information. [EN-17:09] + 20171017 p2 FreeBSD-SA-17:07.wpa Fix WPA2 protocol vulnerability. [SA-17:07] Modified: releng/11.1/contrib/tzdata/CONTRIBUTING ============================================================================== --- releng/11.1/contrib/tzdata/CONTRIBUTING Thu Nov 2 15:39:49 2017 (r325324) +++ releng/11.1/contrib/tzdata/CONTRIBUTING Thu Nov 2 15:40:19 2017 (r325325) @@ -5,20 +5,26 @@ change timekeeping rules erratically and sometimes wit warning, the data entries do not cover all of civil time before 1970, and undoubtedly errors remain in the code and data. Feel free to fill gaps or fix mistakes, and please email improvements -to tz@iana.org for use in the future. +to tz@iana.org for use in the future. In your email, please give +reliable sources that reviewers can check. +----- + +Developers can contribute technical changes to the source code and +data as follows. + To email small changes, please run a POSIX shell command like 'diff -u old/europe new/europe >myfix.patch', and attach myfix.patch to the email. -For more-elaborate changes, please read the Theory file and browse -the mailing list archives for -examples of patches that tend to work well. Ideally, additions to +For more-elaborate changes, please read the theory.html file and browse +the mailing list archives for +examples of patches that tend to work well. Additions to data should contain commentary citing reliable sources as -justification. +justification. Citations should use https: URLs if available. Please submit changes against either the latest release in - or the master branch of the development + or the master branch of the development repository. If you use Git the following workflow may be helpful: * Copy the development repository. Modified: releng/11.1/contrib/tzdata/LICENSE ============================================================================== --- releng/11.1/contrib/tzdata/LICENSE Thu Nov 2 15:39:49 2017 (r325324) +++ releng/11.1/contrib/tzdata/LICENSE Thu Nov 2 15:40:19 2017 (r325325) @@ -1,4 +1,5 @@ -With a few exceptions, all files in the tz code and data (including -this one) are in the public domain. The exceptions are date.c, -newstrftime.3, and strftime.c, which contain material derived from BSD -and which use the BSD 3-clause license. +Unless specified below, all files in the tz code and data (including +this LICENSE file) are in the public domain. + +If the files date.c, newstrftime.3, and strftime.c are present, they +contain material derived from BSD and use the BSD 3-clause license. Modified: releng/11.1/contrib/tzdata/Makefile ============================================================================== --- releng/11.1/contrib/tzdata/Makefile Thu Nov 2 15:39:49 2017 (r325324) +++ releng/11.1/contrib/tzdata/Makefile Thu Nov 2 15:40:19 2017 (r325325) @@ -49,6 +49,7 @@ TOPDIR= /usr/local # "Compiled" time zone information is placed in the "TZDIR" directory # (and subdirectories). # Use an absolute path name for TZDIR unless you're just testing the software. +# TZDIR_BASENAME should not contain "/" and should not be ".", ".." or empty. TZDIR_BASENAME= zoneinfo TZDIR= $(TOPDIR)/etc/$(TZDIR_BASENAME) @@ -75,7 +76,7 @@ LIBDIR= $(TOPDIR)/lib # If you want only POSIX time, with time values interpreted as # seconds since the epoch (not counting leap seconds), use # REDO= posix_only -# below. If you want want only "right" time, with values interpreted +# below. If you want only "right" time, with values interpreted # as seconds since the epoch (counting leap seconds), use # REDO= right_only # below. If you want both sets of data available, with leap seconds not @@ -92,6 +93,24 @@ LIBDIR= $(TOPDIR)/lib REDO= posix_right +# To install data in text form that has all the information of the binary data, +# (optionally incorporating leap second information), use +# TZDATA_TEXT= tzdata.zi leapseconds +# To install text data without leap second information (e.g., because +# REDO='posix_only'), use +# TZDATA_TEXT= tzdata.zi +# To avoid installing text data, use +# TZDATA_TEXT= + +TZDATA_TEXT= leapseconds tzdata.zi + +# For backward-compatibility links for old zone names, use +# BACKWARD= backward pacificnew +# To omit these links, use +# BACKWARD= + +BACKWARD= backward pacificnew + # If you want out-of-scope and often-wrong data from the file 'backzone', use # PACKRATDATA= backzone # To omit this data, use @@ -99,6 +118,11 @@ REDO= posix_right PACKRATDATA= +# The name of a locale using the UTF-8 encoding, used during self-tests. +# The tests are skipped if the name does not appear to work on this system. + +UTF8_LOCALE= en_US.utf8 + # Since "." may not be in PATH... YEARISTYPE= ./yearistype @@ -106,50 +130,53 @@ YEARISTYPE= ./yearistype # Non-default libraries needed to link. LDLIBS= -# Add the following to the end of the "CFLAGS=" line as needed. +# Add the following to the end of the "CFLAGS=" line as needed to override +# defaults specified in the source code. "-DFOO" is equivalent to "-DFOO=1". # -DBIG_BANG=-9999999LL if the Big Bang occurred at time -9999999 (see zic.c) +# -DDEPRECATE_TWO_DIGIT_YEARS for optional runtime warnings about strftime +# formats that generate only the last two digits of year numbers +# -DEPOCH_LOCAL if the 'time' function returns local time not UT +# -DEPOCH_OFFSET=N if the 'time' function returns a value N greater +# than what POSIX specifies, assuming local time is UT. +# For example, N is 252460800 on AmigaOS. # -DHAVE_DECL_ASCTIME_R=0 if does not declare asctime_r +# -DHAVE_DECL_ENVIRON if declares 'environ' # -DHAVE_DIRECT_H if mkdir needs (MS-Windows) -# -DHAVE_DOS_FILE_NAMES if file names have drive specifiers etc. (MS-DOS) -# -DHAVE_GETTEXT=1 if 'gettext' works (e.g., GNU/Linux, FreeBSD, Solaris) -# -DHAVE_INCOMPATIBLE_CTIME_R=1 if your system's time.h declares +# -DHAVE_GENERIC=0 if _Generic does not work +# -DHAVE_GETTEXT if 'gettext' works (e.g., GNU/Linux, FreeBSD, Solaris) +# -DHAVE_INCOMPATIBLE_CTIME_R if your system's time.h declares # ctime_r and asctime_r incompatibly with the POSIX standard # (Solaris when _POSIX_PTHREAD_SEMANTICS is not defined). -# -DHAVE_INTTYPES_H=1 if you have a pre-C99 compiler with "inttypes.h" +# -DHAVE_INTTYPES_H if you have a non-C99 compiler with # -DHAVE_LINK=0 if your system lacks a link function # -DHAVE_LOCALTIME_R=0 if your system lacks a localtime_r function # -DHAVE_LOCALTIME_RZ=0 if you do not want zdump to use localtime_rz -# This defaults to 1 if a working localtime_rz seems to be available. # localtime_rz can make zdump significantly faster, but is nonstandard. # -DHAVE_POSIX_DECLS=0 if your system's include files do not declare # functions like 'link' or variables like 'tzname' required by POSIX -# -DHAVE_STDINT_H=1 if you have a pre-C99 compiler with "stdint.h" -# -DHAVE_STRFTIME_L=1 if declares locale_t and strftime_l -# This defaults to 0 if _POSIX_VERSION < 200809, 1 otherwise. +# -DHAVE_SNPRINTF=0 if your system lacks the snprintf function +# -DHAVE_STDBOOL_H if you have a non-C99 compiler with +# -DHAVE_STDINT_H if you have a non-C99 compiler with +# -DHAVE_STRFTIME_L if declares locale_t and strftime_l # -DHAVE_STRDUP=0 if your system lacks the strdup function # -DHAVE_SYMLINK=0 if your system lacks the symlink function -# -DHAVE_SYS_STAT_H=0 if your compiler lacks a "sys/stat.h" -# -DHAVE_SYS_WAIT_H=0 if your compiler lacks a "sys/wait.h" +# -DHAVE_SYS_STAT_H=0 if your compiler lacks a +# -DHAVE_SYS_WAIT_H=0 if your compiler lacks a # -DHAVE_TZSET=0 if your system lacks a tzset function -# -DHAVE_UNISTD_H=0 if your compiler lacks a "unistd.h" (Microsoft C++ 7?) -# -DEPOCH_LOCAL=1 if the 'time' function returns local time not UT -# -DEPOCH_OFFSET=N if the 'time' function returns a value N greater -# than what POSIX specifies, assuming local time is UT. -# For example, N is 252460800 on AmigaOS. -# -DNO_RUN_TIME_WARNINGS_ABOUT_YEAR_2000_PROBLEMS_THANK_YOU=1 -# if you do not want run time warnings about formats that may cause -# year 2000 grief -# -Dssize_t=long on ancient hosts that lack ssize_t -# -DTHREAD_SAFE=1 to make localtime.c thread-safe, as POSIX requires; +# -DHAVE_UNISTD_H=0 if your compiler lacks a +# -Dlocale_t=XXX if your system uses XXX instead of locale_t +# -Dssize_t=long on hosts like MS-Windows that lack ssize_t +# -DTHREAD_SAFE to make localtime.c thread-safe, as POSIX requires; # not needed by the main-program tz code, which is single-threaded. # Append other compiler flags as needed, e.g., -pthread on GNU/Linux. # -Dtime_tz=\"T\" to use T as the time_t type, rather than the system time_t +# This is intended for internal use only; it mangles external names. # -DTZ_DOMAIN=\"foo\" to use "foo" for gettext domain name; default is "tz" # -DTZ_DOMAINDIR=\"/path\" to use "/path" for gettext directory; # the default is system-supplied, typically "/usr/lib/locale" # -DTZDEFRULESTRING=\",date/time,date/time\" to default to the specified # DST transitions if the time zone files cannot be accessed -# -DUNINIT_TRAP=1 if reading uninitialized storage can cause problems +# -DUNINIT_TRAP if reading uninitialized storage can cause problems # other than simply getting garbage data # -DUSE_LTZ=0 to build zdump with the system time zone library # Also set TZDOBJS=zdump.o and CHECK_TIME_T_ALTERNATIVES= below. @@ -157,27 +184,28 @@ LDLIBS= # (or some other number) to set the maximum time zone abbreviation length # that zic will accept without a warning (the default is 6) # $(GCC_DEBUG_FLAGS) if you are using recent GCC and want lots of checking -GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-common -fstrict-aliasing \ - -Wall -Wextra \ - -Wbad-function-cast -Wcast-align -Wdate-time \ - -Wdeclaration-after-statement \ - -Wdouble-promotion \ - -Wformat=2 -Winit-self -Wjump-misses-init \ - -Wlogical-op -Wmissing-prototypes -Wnested-externs \ - -Wold-style-definition -Woverlength-strings -Wpointer-arith \ - -Wshadow -Wstrict-prototypes -Wsuggest-attribute=const \ - -Wsuggest-attribute=format -Wsuggest-attribute=noreturn \ - -Wsuggest-attribute=pure -Wtrampolines \ - -Wundef -Wunused -Wwrite-strings \ - -Wno-address -Wno-format-nonliteral -Wno-sign-compare \ - -Wno-type-limits -Wno-unused-parameter +# Select instrumentation via "make GCC_INSTRUMENT='whatever'". +GCC_INSTRUMENT = \ + -fsanitize=undefined -fsanitize-address-use-after-scope \ + -fsanitize-undefined-trap-on-error -fstack-protector +GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \ + $(GCC_INSTRUMENT) \ + -Wall -Wextra \ + -Walloc-size-larger-than=100000 -Warray-bounds=2 \ + -Wbad-function-cast -Wcast-align -Wdate-time \ + -Wdeclaration-after-statement -Wdouble-promotion \ + -Wformat=2 -Wformat-overflow=2 -Wformat-signedness -Wformat-truncation \ + -Winit-self -Wjump-misses-init -Wlogical-op \ + -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ + -Wold-style-definition -Woverlength-strings -Wpointer-arith \ + -Wshadow -Wshift-overflow=2 -Wstrict-prototypes -Wstringop-overflow=5 \ + -Wsuggest-attribute=const -Wsuggest-attribute=format \ + -Wsuggest-attribute=noreturn -Wsuggest-attribute=pure \ + -Wtrampolines -Wundef -Wuninitialized -Wunused \ + -Wvariadic-macros -Wvla -Wwrite-strings \ + -Wno-address -Wno-format-nonliteral -Wno-sign-compare \ + -Wno-type-limits -Wno-unused-parameter # -# If you want to use System V compatibility code, add -# -DUSG_COMPAT -# to the end of the "CFLAGS=" line. This arrange for "timezone" and "daylight" -# variables to be kept up-to-date by the time conversion functions. Neither -# "timezone" nor "daylight" is described in X3J11's work. -# # If your system has a "GMT offset" field in its "struct tm"s # (or if you decide to add such a field in your system's "time.h" file), # add the name to a define such as @@ -189,6 +217,31 @@ GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-common -fstrict- # and define NO_TM_ZONE to suppress any guessing. These two fields are not # required by POSIX, but are widely available on GNU/Linux and BSD systems. # +# The next batch of options control support for external variables +# exported by tzcode. In practice these variables are less useful +# than TM_GMTOFF and TM_ZONE. However, most of them are standardized. +# # +# # To omit or support the external variable "tzname", add one of: +# # -DHAVE_TZNAME=0 +# # -DHAVE_TZNAME=1 +# # to the "CFLAGS=" line. "tzname" is required by POSIX 1988 and later. +# # If not defined, the code attempts to guess HAVE_TZNAME from other macros. +# # Warning: unless time_tz is also defined, HAVE_TZNAME=1 can cause +# # crashes when combined with some platforms' standard libraries, +# # presumably due to memory allocation issues. +# # +# # To omit or support the external variables "timezone" and "daylight", add +# # -DUSG_COMPAT=0 +# # -DUSG_COMPAT=1 +# # to the "CFLAGS=" line; "timezone" and "daylight" are inspired by +# # Unix Systems Group code and are required by POSIX 2008 (with XSI) and later. +# # If not defined, the code attempts to guess USG_COMPAT from other macros. +# # +# # To support the external variable "altzone", add +# # -DALTZONE +# # to the end of the "CFLAGS=" line; although "altzone" appeared in +# # System V Release 3.1 it has not been standardized. +# # If you want functions that were inspired by early versions of X3J11's work, # add # -DSTD_INSPIRED @@ -226,11 +279,6 @@ GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-common -fstrict- # -DALL_STATE # to the end of the "CFLAGS=" line. Storage is obtained by calling malloc. # -# If you want an "altzone" variable (a la System V Release 3.1), add -# -DALTZONE -# to the end of the "CFLAGS=" line. -# This variable is not described in X3J11's work. -# # NIST-PCTS:151-2, Version 1.4, (1993-12-03) is a test suite put # out by the National Institute of Standards and Technology # which claims to test C and Posix conformance. If you want to pass PCTS, add @@ -240,8 +288,8 @@ GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-common -fstrict- # If you want strict compliance with XPG4 as of 1994-04-09, add # -DXPG4_1994_04_09 # to the end of the "CFLAGS=" line. This causes "strftime" to always return -# 53 as a week number (rather than 52 or 53) for those days in January that -# before the first Monday in January when a "%V" format is used and January 1 +# 53 as a week number (rather than 52 or 53) for January days before +# January's first Monday when a "%V" format is used and January 1 # falls on a Friday, Saturday, or Sunday. CFLAGS= @@ -265,7 +313,7 @@ ZFLAGS= # How to use zic to install tz binary files. -ZIC_INSTALL= $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) $(LEAPSECONDS) +ZIC_INSTALL= $(ZIC) -d $(DESTDIR)$(TZDIR) $(LEAPSECONDS) # The name of a Posix-compliant 'awk' on your system. AWK= awk @@ -289,6 +337,7 @@ SGML_CATALOG_FILES= \ # The name, arguments and environment of a program to validate your web pages. # See for a validator, and # for a validation library. +# Set VALIDATE=':' if you do not have such a program. VALIDATE = nsgmls VALIDATE_FLAGS = -s -B -wall -wno-unused-param VALIDATE_ENV = \ @@ -355,7 +404,7 @@ AR= ar RANLIB= : TZCOBJS= zic.o -TZDOBJS= zdump.o localtime.o asctime.o +TZDOBJS= zdump.o localtime.o asctime.o strftime.o DATEOBJS= date.o localtime.o strftime.o asctime.o LIBSRCS= localtime.c asctime.c difftime.c LIBOBJS= localtime.o asctime.o difftime.o @@ -370,33 +419,35 @@ MANTXTS= newctime.3.txt newstrftime.3.txt newtzset.3.t time2posix.3.txt \ tzfile.5.txt tzselect.8.txt zic.8.txt zdump.8.txt \ date.1.txt -COMMON= CONTRIBUTING LICENSE Makefile NEWS README Theory version +COMMON= calendars CONTRIBUTING LICENSE Makefile \ + NEWS README theory.html version WEB_PAGES= tz-art.htm tz-how-to.html tz-link.htm DOCS= $(MANS) date.1 $(MANTXTS) $(WEB_PAGES) PRIMARY_YDATA= africa antarctica asia australasia \ europe northamerica southamerica -YDATA= $(PRIMARY_YDATA) pacificnew etcetera backward +YDATA= $(PRIMARY_YDATA) etcetera $(BACKWARD) NDATA= systemv factory TDATA= $(YDATA) $(NDATA) ZONETABLES= zone1970.tab zone.tab -TABDATA= iso3166.tab leapseconds $(ZONETABLES) +TABDATA= iso3166.tab $(TZDATA_TEXT) $(ZONETABLES) LEAP_DEPS= leapseconds.awk leap-seconds.list -DATA= $(YDATA) $(NDATA) backzone $(TABDATA) \ - leap-seconds.list yearistype.sh -AWK_SCRIPTS= checklinks.awk checktab.awk leapseconds.awk +TZDATA_ZI_DEPS= zishrink.awk $(TDATA) $(PACKRATDATA) +DATA= $(YDATA) $(NDATA) backzone iso3166.tab leap-seconds.list \ + leapseconds yearistype.sh $(ZONETABLES) +AWK_SCRIPTS= checklinks.awk checktab.awk leapseconds.awk zishrink.awk MISC= $(AWK_SCRIPTS) zoneinfo2tdf.pl TZS_YEAR= 2050 TZS= to$(TZS_YEAR).tzs TZS_NEW= to$(TZS_YEAR)new.tzs TZS_DEPS= $(PRIMARY_YDATA) asctime.c localtime.c \ private.h tzfile.h zdump.c zic.c -ENCHILADA= $(COMMON) $(DOCS) $(SOURCES) $(DATA) $(MISC) $(TZS) +ENCHILADA= $(COMMON) $(DOCS) $(SOURCES) $(DATA) $(MISC) $(TZS) tzdata.zi # Consult these files when deciding whether to rebuild the 'version' file. # This list is not the same as the output of 'git ls-files', since # .gitignore is not distributed. VERSION_DEPS= \ - CONTRIBUTING LICENSE Makefile NEWS README Theory \ + calendars CONTRIBUTING LICENSE Makefile NEWS README \ africa antarctica asctime.c asia australasia \ backward backzone \ checklinks.awk checktab.awk \ @@ -405,7 +456,7 @@ VERSION_DEPS= \ leap-seconds.list leapseconds.awk localtime.c \ newctime.3 newstrftime.3 newtzset.3 northamerica \ pacificnew private.h \ - southamerica strftime.c systemv \ + southamerica strftime.c systemv theory.html \ time2posix.3 tz-art.htm tz-how-to.html tz-link.htm \ tzfile.5 tzfile.h tzselect.8 tzselect.ksh \ workman.sh yearistype.sh \ @@ -427,7 +478,7 @@ install: all $(DATA) $(REDO) $(MANS) $(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \ $(DESTDIR)$(MANDIR)/man8 $(ZIC_INSTALL) -l $(LOCALTIME) -p $(POSIXRULES) - cp -f iso3166.tab $(ZONETABLES) $(DESTDIR)$(TZDIR)/. + cp -f $(TABDATA) $(DESTDIR)$(TZDIR)/. cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/. cp libtz.a $(DESTDIR)$(LIBDIR)/. $(RANLIB) $(DESTDIR)$(LIBDIR)/libtz.a @@ -448,6 +499,11 @@ version: $(VERSION_DEPS) printf '%s\n' "$$V" >$@.out mv $@.out $@ +# This file can be tailored by setting BACKWARD, PACKRATDATA, etc. +tzdata.zi: $(TZDATA_ZI_DEPS) + LC_ALL=C $(AWK) -f zishrink.awk $(TDATA) $(PACKRATDATA) >$@.out + mv $@.out $@ + version.h: version VERSION=`cat version` && printf '%s\n' \ 'static char const PKGVERSION[]="($(PACKAGE)) ";' \ @@ -473,6 +529,7 @@ leapseconds: $(LEAP_DEPS) # Arguments to pass to submakes of install_data. # They can be overridden by later submake arguments. INSTALLARGS = \ + BACKWARD=$(BACKWARD) \ DESTDIR=$(DESTDIR) \ LEAPSECONDS='$(LEAPSECONDS)' \ PACKRATDATA='$(PACKRATDATA)' \ @@ -481,10 +538,8 @@ INSTALLARGS = \ ZIC='$(ZIC)' # 'make install_data' installs one set of tz binary files. -# It can be tailored by setting LEAPSECONDS, PACKRATDATA, etc. -install_data: zic leapseconds yearistype $(PACKRATDATA) $(TDATA) - $(ZIC_INSTALL) $(TDATA) - $(AWK) '/^Rule/' $(TDATA) | $(ZIC_INSTALL) - $(PACKRATDATA) +install_data: zic leapseconds yearistype tzdata.zi + $(ZIC_INSTALL) tzdata.zi posix_only: $(MAKE) $(INSTALLARGS) LEAPSECONDS= install_data @@ -521,14 +576,14 @@ posix_packrat: zones: $(REDO) -$(TZS_NEW): $(TDATA) zdump zic +$(TZS_NEW): tzdata.zi zdump zic mkdir -p tzs.dir - $(zic) -d tzs.dir $(TDATA) - $(AWK) '/^Link/{print $$1 "\t" $$2 "\t" $$3}' \ - $(TDATA) | LC_ALL=C sort >$@.out + $(zic) -d tzs.dir tzdata.zi + $(AWK) '/^L/{print "Link\t" $$2 "\t" $$3}' \ + tzdata.zi | LC_ALL=C sort >$@.out wd=`pwd` && \ zones=`$(AWK) -v wd="$$wd" \ - '/^Zone/{print wd "/tzs.dir/" $$2}' $(TDATA) \ + '/^Z/{print wd "/tzs.dir/" $$2}' tzdata.zi \ | LC_ALL=C sort` && \ ./zdump -i -c $(TZS_YEAR) $$zones >>$@.out sed 's,^TZ=".*tzs\.dir/,TZ=",' $@.out >$@.sed.out @@ -564,24 +619,37 @@ tzselect: tzselect.ksh version chmod +x $@.out mv $@.out $@ -check: check_character_set check_white_space check_links check_sorted \ - check_tables check_tzs check_web +check: check_character_set check_white_space check_links \ + check_name_lengths check_sorted \ + check_tables check_web check_zishrink check_tzs check_character_set: $(ENCHILADA) - LC_ALL=en_US.utf8 && export LC_ALL && \ + test ! '$(UTF8_LOCALE)' || \ + ! printf 'A\304\200B\n' | \ + LC_ALL='$(UTF8_LOCALE)' grep -q '^A.B$$' >/dev/null 2>&1 || { \ + LC_ALL='$(UTF8_LOCALE)' && export LC_ALL && \ sharp='#' && \ ! grep -Env $(SAFE_LINE) $(MANS) date.1 $(MANTXTS) \ $(MISC) $(SOURCES) $(WEB_PAGES) \ - CONTRIBUTING LICENSE Makefile README version && \ + CONTRIBUTING LICENSE Makefile README \ + version tzdata.zi && \ ! grep -Env $(SAFE_SHARP_LINE) $(TDATA) backzone \ leapseconds yearistype.sh zone.tab && \ - ! grep -Env $(OK_LINE) $(ENCHILADA) + ! grep -Env $(OK_LINE) $(ENCHILADA); \ + } check_white_space: $(ENCHILADA) patfmt=' \t|[\f\r\v]' && pat=`printf "$$patfmt\\n"` && \ ! grep -En "$$pat" $(ENCHILADA) ! grep -n '[[:space:]]$$' $(ENCHILADA) +PRECEDES_FILE_NAME = ^(Zone|Link[[:space:]]+[^[:space:]]+)[[:space:]]+ +FILE_NAME_COMPONENT_TOO_LONG = \ + $(PRECEDES_FILE_NAME)[^[:space:]]*[^/[:space:]]{15} + +check_name_lengths: $(TDATA) backzone + ! grep -En '$(FILE_NAME_COMPONENT_TOO_LONG)' $(TDATA) backzone + CHECK_CC_LIST = { n = split($$1,a,/,/); for (i=2; i<=n; i++) print a[1], a[i]; } check_sorted: backward backzone iso3166.tab zone.tab zone1970.tab @@ -596,6 +664,7 @@ check_sorted: backward backzone iso3166.tab zone.tab z check_links: checklinks.awk $(TDATA) $(AWK) -f checklinks.awk $(TDATA) + $(AWK) -f checklinks.awk tzdata.zi check_tables: checktab.awk $(PRIMARY_YDATA) $(ZONETABLES) for tab in $(ZONETABLES); do \ @@ -606,14 +675,32 @@ check_tables: checktab.awk $(PRIMARY_YDATA) $(ZONETABL check_tzs: $(TZS) $(TZS_NEW) diff -u $(TZS) $(TZS_NEW) -check_web: $(WEB_PAGES) - $(VALIDATE_ENV) $(VALIDATE) $(VALIDATE_FLAGS) $(WEB_PAGES) +# This checks only the HTML 4.01 strict page. +# To check the the other pages, use . +check_web: tz-how-to.html + $(VALIDATE_ENV) $(VALIDATE) $(VALIDATE_FLAGS) tz-how-to.html +# Check that tzdata.zi generates the same binary data that its sources do. +check_zishrink: tzdata.zi zic leapseconds $(PACKRATDATA) $(TDATA) + for type in posix right; do \ + mkdir -p time_t.dir/$$type time_t.dir/$$type-shrunk && \ + case $$type in \ + right) leap='-L leapseconds';; \ + *) leap=;; \ + esac && \ + $(ZIC) $$leap -d time_t.dir/$$type $(TDATA) && \ + $(AWK) '/^Rule/' $(TDATA) | \ + $(ZIC) $$leap -d time_t.dir/$$type - $(PACKRATDATA) && \ + $(ZIC) $$leap -d time_t.dir/$$type-shrunk tzdata.zi && \ + diff -r time_t.dir/$$type time_t.dir/$$type-shrunk || exit; \ + done + rm -fr time_t.dir + clean_misc: rm -f core *.o *.out \ date tzselect version.h zdump zic yearistype libtz.a clean: clean_misc - rm -fr *.dir tzdb-*/ $(TZS_NEW) + rm -fr *.dir tzdata.zi tzdb-*/ $(TZS_NEW) maintainer-clean: clean @echo 'This command is intended for maintainers to use; it' @@ -667,6 +754,7 @@ set-timestamps.out: $(ENCHILADA) touch -cmr `ls -t $$file workman.sh | sed 1q` $$file.txt || \ exit; \ done + touch -cmr `ls -t $(TZDATA_ZI_DEPS) | sed 1q` tzdata.zi touch -cmr `ls -t $(TZS_DEPS) | sed 1q` $(TZS) touch -cmr `ls -t $(VERSION_DEPS) | sed 1q` version touch $@ @@ -678,7 +766,7 @@ check_public: $(MAKE) maintainer-clean $(MAKE) "CFLAGS=$(GCC_DEBUG_FLAGS)" ALL mkdir -p public.dir - for i in $(TDATA) ; do \ + for i in $(TDATA) tzdata.zi; do \ $(zic) -v -d public.dir $$i 2>&1 || exit; \ done $(zic) -v -d public.dir $(TDATA) @@ -772,8 +860,8 @@ typecheck: $(MAKE) clean ; \ done -zonenames: $(TDATA) - @$(AWK) '/^Zone/ { print $$2 } /^Link/ { print $$3 }' $(TDATA) +zonenames: tzdata.zi + @$(AWK) '/^Z/ { print $$2 } /^L/ { print $$3 }' tzdata.zi asctime.o: private.h tzfile.h date.o: private.h @@ -789,6 +877,7 @@ zic.o: private.h tzfile.h version.h .PHONY: check check_character_set check_links .PHONY: check_public check_sorted check_tables .PHONY: check_time_t_alternatives check_tzs check_web check_white_space +.PHONY: check_zishrink .PHONY: clean clean_misc force_tzs .PHONY: install install_data maintainer-clean names .PHONY: posix_only posix_packrat posix_right Modified: releng/11.1/contrib/tzdata/NEWS ============================================================================== --- releng/11.1/contrib/tzdata/NEWS Thu Nov 2 15:39:49 2017 (r325324) +++ releng/11.1/contrib/tzdata/NEWS Thu Nov 2 15:40:19 2017 (r325325) @@ -1,5 +1,169 @@ News for the tz database +Release 2017c - 2017-10-20 14:49:34 -0700 + + Briefly: + Northern Cyprus switches from +03 to +02/+03 on 2017-10-29. + Fiji ends DST 2018-01-14, not 2018-01-21. + Namibia switches from +01/+02 to +02 on 2018-04-01. + Sudan switches from +03 to +02 on 2017-11-01. + Tonga likely switches from +13/+14 to +13 on 2017-11-05. + Turks & Caicos switches from -04 to -05/-04 on 2018-11-04. + A new file tzdata.zi now holds a small text copy of all data. + The zic input format has been regularized slightly. + + Changes to future time stamps + + Northern Cyprus has decided to resume EU rules starting + 2017-10-29, thus reinstituting winter time. + + Fiji ends DST 2018-01-14 instead of the 2018-01-21 previously + predicted. (Thanks to Dominic Fok.) Adjust future predictions + accordingly. + + Namibia will switch from +01 with DST to +02 all year on + 2017-09-03 at 02:00. This affects UT offsets starting 2018-04-01 + at 02:00. (Thanks to Steffen Thorsen.) + + Sudan will switch from +03 to +02 on 2017-11-01. (Thanks to Ahmed + Atyya and Yahia Abdalla.) South Sudan is not switching, so + Africa/Juba is no longer a link to Africa/Khartoum. + + Tonga has likely ended its experiment with DST, and will not + adjust its clocks on 2017-11-05. Although Tonga has not announced + whether it will continue to observe DST, the IATA is assuming that + it will not. (Thanks to David Wade.) + + Turks & Caicos will switch from -04 all year to -05 with US DST on + 2018-03-11 at 03:00. This affects UT offsets starting 2018-11-04 + at 02:00. (Thanks to Steffen Thorsen.) + + Changes to past time stamps + + Namibia switched from +02 to +01 on 1994-03-21, not 1994-04-03. + (Thanks to Arthur David Olson.) + + Detroit did not observe DST in 1967. + + Use railway time for Asia/Kolkata before 1941, by switching to + Madras local time (UT +052110) in 1870, then to IST (UT +0530) in + 1906. Also, treat 1941-2's +0630 as DST, like 1942-5. + + Europe/Dublin's 1946 and 1947 fallback transitions occurred at + 02:00 standard time, not 02:00 DST. (Thanks to Michael Deckers.) + + Pacific/Apia and Pacific/Pago_Pago switched from Antipodean to + American time in 1892, not 1879. (Thanks to Michael Deckers.) + + Adjust the 1867 transition in Alaska to better reflect the + historical record, by changing it to occur on 1867-10-18 at 15:30 + Sitka time rather than at the start of 1867-10-17 local time. + Although strictly speaking this is accurate only for Sitka, + the rest of Alaska's blanks need to be filled in somehow. + + Fix off-by-one errors in UT offsets for Adak and Nome before 1867. + (Thanks to Michael Deckers.) + + Add 7 s to the UT offset in Asia/Yangon before 1920. + + Changes to zone names + + Remove Canada/East-Saskatchewan from the 'backward' file, as it + exceeded the 14-character limit and was an unused misnomer anyway. + + Changes to build procedure + + To support applications that prefer to read time zone data in text + form, two zic input files tzdata.zi and leapseconds are now + installed by default. The commands 'zic tzdata.zi' and 'zic -L + leapseconds tzdata.zi' can reproduce the tzdata binary files + without and with leap seconds, respectively. To prevent these two + new files from being installed, use 'make TZDATA_TEXT=', and to + suppress leap seconds from the tzdata text installation, use 'make + TZDATA_TEXT=tzdata.zi'. + + 'make BACKWARD=' now suppresses backward-compatibility names + like 'US/Pacific' that are defined in the 'backward' and + 'pacificnew' files. + + 'make check' now works on systems that lack a UTF-8 locale, + or that lack the nsgmls program. Set UTF8_LOCALE to configure + the name of a UTF-8 locale, if you have one. + + Y2K runtime checks are no longer enabled by default. Add + -DDEPRECATE_TWO_DIGIT_YEARS to CFLAGS to enable them, instead of + adding -DNO_RUN_TIME_WARNINGS_ABOUT_YEAR_2000_PROBLEMS_THANK_YOU + to disable them. (New name suggested by Brian Inglis.) + + The build procedure for zdump now works on AIX 7.1. + (Problem reported by Kees Dekker.) + + Changes to code + + zic and the reference runtime now reject multiple leap seconds + within 28 days of each other, or leap seconds before the Epoch. + As a result, support for double leap seconds, which was + obsolescent and undocumented, has been removed. Double leap + seconds were an error in the C89 standard; they have never existed + in civil timekeeping. (Thanks to Robert Elz and Bradley White for + noticing glitches in the code that uncovered this problem.) + + zic now warns about use of the obsolescent and undocumented -y + option, and about use of the obsolescent TYPE field of Rule lines. + + zic now allows unambiguous abbreviations like "Sa" and "Su" for + weekdays; formerly it rejected them due to a bug. Conversely, zic + no longer considers non-prefixes to be abbreviations; for example, + it no longer accepts "lF" as an abbreviation for "lastFriday". + Also, zic warns about the undocumented usage with a "last-" + prefix, e.g., "last-Fri". + + Similarly, zic now accepts the unambiguous abbreviation "L" for + "Link" in ordinary context and for "Leap" in leap-second context. + Conversely, zic no longer accepts non-prefixes such as "La" as + abbreviations for words like "Leap". + + zic no longer accepts leap second lines in ordinary input, or + ordinary lines in leap second input. Formerly, zic sometimes + warned about this undocumented usage and handled it incorrectly. + + The new macro HAVE_TZNAME governs whether the tzname external + variable is exported, instead of USG_COMPAT. USG_COMPAT now + governs only the external variables "timezone" and "daylight". + This change is needed because the three variables are not in the + same category: although POSIX requires tzname, it specifies the + other two variables as optional. Also, USG_COMPAT is now 1 or 0: + if not defined, the code attempts to guess it from other macros. + + localtime.c and difftime.c no longer require stdio.h, and .c files + other than zic.c no longer require sys/wait.h. + + zdump.c no longer assumes snprintf. (Reported by Jonathan Leffler.) + + Calculation of time_t extrema works around a bug in GCC 4.8.4 + (Reported by Stan Shebs and Joseph Myers.) + + zic.c no longer mistranslates formats of line numbers in non-English + locales. (Problem reported by Benno Schulenberg.) + + Several minor changes have been made to the code to make it a + bit easier to port to MS-Windows and Solaris. (Thanks to Kees + Dekker for reporting the problems.) + + Changes to documentation and commentary + + The two new files 'theory.html' and 'calendars' contain the + contents of the removed file 'Theory'. The goal is to document + tzdb theory more accessibly. + + The zic man page now documents abbreviation rules. + + tz-link.htm now covers how to apply tzdata changes to clients. + (Thanks to Jorge Fábregas for the AIX link.) It also mentions MySQL. + + The leap-seconds.list URL has been updated to something that is + more reliable for tzdb. (Thanks to Tim Parenti and Brian Inglis.) + Release 2017b - 2017-03-17 07:30:38 -0700 Briefly: Haiti has resumed DST. @@ -15,7 +179,17 @@ Release 2017b - 2017-03-17 07:30:38 -0700 Use "MMT" to abbreviate Liberia's time zone before 1972, as "-004430" is one byte over the POSIX limit. (Problem reported by Derick Rethans.) + Changes to code + The reference localtime implementation now falls back on the + current US daylight-saving transition rules rather than the + 1987-2006 rules. This fallback occurs only when (1) the TZ + environment variable's value has a name like "AST4ADT" that asks + for daylight saving time but does not specify the rules, (2) there + is no file by that name, and (3) the TZDEFRULES file cannot be + loaded. (Thanks to Tom Lane.) + + Release 2017a - 2017-02-28 00:05:36 -0800 Briefly: Southern Chile moves from -04/-03 to -03, and Mongolia @@ -1981,7 +2155,7 @@ Release 2013e - 2013-09-19 23:50:04 -0700 The 'leapseconds' file is now generated automatically from a new file 'leap-seconds.list', which is a copy of - . + A new source file 'leapseconds.awk' implements this. The goal is simplification of the future maintenance of 'leapseconds'. @@ -2187,7 +2361,7 @@ Release 2013a - 2013-02-27 09:20:35 -0800 Many changes affect historical timestamps before 1940. These were deduced from: Milne J. Civil time. Geogr J. 1899 - Feb;13(2):173-94 . + Feb;13(2):173-94 . Changes affecting the code: Modified: releng/11.1/contrib/tzdata/africa ============================================================================== --- releng/11.1/contrib/tzdata/africa Thu Nov 2 15:39:49 2017 (r325324) +++ releng/11.1/contrib/tzdata/africa Thu Nov 2 15:40:19 2017 (r325325) @@ -26,7 +26,7 @@ # # For data circa 1899, a common source is: # Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94. -# http://www.jstor.org/stable/1774359 +# https://www.jstor.org/stable/1774359 # # A reliable and entertaining source about time zones is # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997). @@ -218,7 +218,7 @@ Rule Egypt 2006 only - Sep 21 24:00 0 - # saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07. # From Jesper Nørgaard Welen (2007-08-15): [The following agree:] # http://www.nentjes.info/Bill/bill5.htm -# http://www.timeanddate.com/worldclock/city.html?n=53 +# https://www.timeanddate.com/worldclock/city.html?n=53 # From Steffen Thorsen (2007-09-04): The official information...: # http://www.sis.gov.eg/En/EgyptOnline/Miscellaneous/000002/0207000000000000001580.htm Rule Egypt 2007 only - Sep Thu>=1 24:00 0 - @@ -256,8 +256,8 @@ Rule Egypt 2007 only - Sep Thu>=1 24:00 0 - # timeanddate[2] and another site I've found[3] also support that. # # [1] https://bugzilla.redhat.com/show_bug.cgi?id=492263 -# [2] http://www.timeanddate.com/worldclock/clockchange.html?n=53 -# [3] http://wwp.greenwichmeantime.com/time-zone/africa/egypt/ +# [2] https://www.timeanddate.com/worldclock/clockchange.html?n=53 +# [3] https://wwp.greenwichmeantime.com/time-zone/africa/egypt/ # From Arthur David Olson (2009-04-20): # In 2009 (and for the next several years), Ramadan ends before the fourth @@ -267,10 +267,10 @@ Rule Egypt 2007 only - Sep Thu>=1 24:00 0 - # From Steffen Thorsen (2009-08-11): # We have been able to confirm the August change with the Egyptian Cabinet # Information and Decision Support Center: -# http://www.timeanddate.com/news/time/egypt-dst-ends-2009.html +# https://www.timeanddate.com/news/time/egypt-dst-ends-2009.html # # The Middle East News Agency -# http://www.mena.org.eg/index.aspx +# https://www.mena.org.eg/index.aspx # also reports "Egypt starts winter time on August 21" # today in article numbered "71, 11/08/2009 12:25 GMT." # Only the title above is available without a subscription to their service, @@ -320,7 +320,7 @@ Rule Egypt 2007 only - Sep Thu>=1 24:00 0 - # Thursday of April.... Clocks will still be turned back for Ramadan, but # dates not yet announced.... # http://almogaz.com/news/weird-news/2015/04/05/1947105 ... -# http://www.timeanddate.com/news/time/egypt-starts-dst-2015.html +# https://www.timeanddate.com/news/time/egypt-starts-dst-2015.html # From Ahmed Nazmy (2015-04-20): # Egypt's ministers cabinet just announced ... that it will cancel DST at @@ -447,11 +447,11 @@ Zone Africa/Monrovia -0:43:08 - LMT 1882 # From Even Scharning (2012-11-10): # Libya set their time one hour back at 02:00 on Saturday November 10. -# http://www.libyaherald.com/2012/11/04/clocks-to-go-back-an-hour-on-saturday/ +# https://www.libyaherald.com/2012/11/04/clocks-to-go-back-an-hour-on-saturday/ # Here is an official source [in Arabic]: http://ls.ly/fb6Yc # # Steffen Thorsen forwarded a translation (2012-11-10) in -# http://mm.icann.org/pipermail/tz/2012-November/018451.html +# https://mm.icann.org/pipermail/tz/2012-November/018451.html # # From Tim Parenti (2012-11-11): # Treat the 2012-11-10 change as a zone change from UTC+2 to UTC+1. @@ -462,7 +462,7 @@ Zone Africa/Monrovia -0:43:08 - LMT 1882 # From Even Scharning (2013-10-25): # The scheduled end of DST in Libya on Friday, October 25, 2013 was # cancelled yesterday.... -# http://www.libyaherald.com/2013/10/24/correction-no-time-change-tomorrow/ +# https://www.libyaherald.com/2013/10/24/correction-no-time-change-tomorrow/ # # From Paul Eggert (2013-10-25): # For now, assume they're reverting to the pre-2012 rules of permanent UT +02. @@ -515,7 +515,7 @@ Zone Africa/Tripoli 0:52:44 - LMT 1920 # basis.... # It seems that Mauritius observed daylight saving time from 1982-10-10 to # 1983-03-20 as well, but that was not successful.... -# http://www.timeanddate.com/news/time/mauritius-daylight-saving-time.html +# https://www.timeanddate.com/news/time/mauritius-daylight-saving-time.html # From Alex Krivenyshev (2008-06-25): # http://economicdevelopment.gov.mu/portal/site/Mainhomepage/menuitem.a42b24128104d9845dabddd154508a0c/?content_id=0a7cee8b5d69a110VgnVCM1000000a04a8c0RCRD @@ -583,7 +583,7 @@ Zone Africa/Tripoli 0:52:44 - LMT 1920 # http://lexpress.mu/Story/3398~Beebeejaun---Les-objectifs-d-%C3%A9conomie-d-%C3%A9nergie-de-l-heure-d-%C3%A9t%C3%A9-ont-%C3%A9t%C3%A9-atteints- # # Our wrap-up: -# http://www.timeanddate.com/news/time/mauritius-dst-will-not-repeat.html +# https://www.timeanddate.com/news/time/mauritius-dst-will-not-repeat.html # From Arthur David Olson (2009-07-11): # The "mauritius-dst-will-not-repeat" wrapup includes this: @@ -615,7 +615,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # be one hour ahead of GMT between 1 June and 27 September, according to # Communication Minister and Government Spokesman, Khalid Naciri...." # -# http://www.worldtimezone.net/dst_news/dst_news_morocco01.html +# http://www.worldtimezone.com/dst_news/dst_news_morocco01.html # http://en.afrik.com/news11892.html # From Alex Krivenyshev (2008-05-09): @@ -628,7 +628,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # From Patrice Scattolin (2008-05-09): # According to this article: -# http://www.avmaroc.com/actualite/heure-dete-comment-a127896.html +# https://www.avmaroc.com/actualite/heure-dete-comment-a127896.html # (and republished here: ) # the changes occur at midnight: # @@ -650,7 +650,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # posted in English). # # The following Google query will generate many relevant hits: -# http://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search +# https://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search # From Steffen Thorsen (2008-08-27): # Morocco will change the clocks back on the midnight between August 31 @@ -661,7 +661,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # http://www.menara.ma/fr/Actualites/Maroc/Societe/ci.retour_a_l_heure_gmt_a_partir_du_dimanche_31_aout_a_minuit_officiel_.default # # We have some further details posted here: -# http://www.timeanddate.com/news/time/morocco-ends-dst-early-2008.html +# https://www.timeanddate.com/news/time/morocco-ends-dst-early-2008.html # From Steffen Thorsen (2009-03-17): # Morocco will observe DST from 2009-06-01 00:00 to 2009-08-21 00:00 according @@ -671,7 +671,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # (French) # # Our summary: -# http://www.timeanddate.com/news/time/morocco-starts-dst-2009.html +# https://www.timeanddate.com/news/time/morocco-starts-dst-2009.html # From Alexander Krivenyshev (2009-03-17): # Here is a link to official document from Royaume du Maroc Premier Ministre, @@ -694,7 +694,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # http://www.lavieeco.com/actualites/4099-le-maroc-passera-a-l-heure-d-ete-gmt1-le-2-mai.html # (French) # Our page: -# http://www.timeanddate.com/news/time/morocco-starts-dst-2010.html +# https://www.timeanddate.com/news/time/morocco-starts-dst-2010.html # From Dan Abitol (2011-03-30): # ...Rules for Africa/Casablanca are the following (24h format) @@ -711,7 +711,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # They said that the decision was already taken. # # More articles in the press -# http://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-leve.html +# https://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-leve.html # http://www.lematin.ma/Actualite/Express/Article.asp?id=148923 # http://www.lavieeco.com/actualite/Le-Maroc-passe-sur-GMT%2B1-a-partir-de-dim @@ -803,7 +803,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # 1433 (18 April 2012) and the decision of the Head of Government of # 16 N. 3-29-15 Chaaban 1435 (4 June 2015). # Source (french): -# http://lnt.ma/le-maroc-reculera-dune-heure-le-dimanche-14-juin/ +# https://lnt.ma/le-maroc-reculera-dune-heure-le-dimanche-14-juin/ # # From Milamber (2015-06-09): # http://www.mmsp.gov.ma/fr/actualites.aspx?id=863 @@ -812,7 +812,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # [The gov.ma announcement] would (probably) make the switch on 2015-07-19 go # from 03:00 to 04:00 rather than from 02:00 to 03:00, as in the patch.... # I think the patch is correct and the quoted text is wrong; the text in -# agrees +# agrees # with the patch. # From Paul Eggert (2015-06-08): @@ -937,10 +937,18 @@ Link Africa/Maputo Africa/Kigali # Rwanda Link Africa/Maputo Africa/Lubumbashi # E Dem. Rep. of Congo Link Africa/Maputo Africa/Lusaka # Zambia + # Namibia -# The 1994-04-03 transition is from Shanks & Pottenger. -# Shanks & Pottenger report no DST after 1998-04; go with IATA. +# From Arthur David Olson (2017-08-09): +# The text of the "Namibia Time Act, 1994" is available online at +# www.lac.org.na/laws/1994/811.pdf +# and includes this nugget: +# Notwithstanding the provisions of subsection (2) of section 1, the +# first winter period after the commencement of this Act shall +# commence at OOhOO on Monday 21 March 1994 and shall end at 02h00 on +# Sunday 4 September 1994. + # From Petronella Sibeene (2007-03-30): # http://allafrica.com/stories/200703300178.html # While the entire country changes its time, Katima Mulilo and other @@ -955,19 +963,30 @@ Link Africa/Maputo Africa/Lusaka # Zambia # observes Botswana time, we have no details about historical practice. # In the meantime people there can use Africa/Gaborone. # See: Immanuel S. The Namibian. 2017-02-23. -# http://www.namibian.com.na/51480/read/Time-change-divides-lawmakers +# https://www.namibian.com.na/51480/read/Time-change-divides-lawmakers +# From Steffen Thorsen (2017-08-09): +# Namibia is going to change their time zone to what is now their DST: +# https://www.newera.com.na/2017/02/23/namibias-winter-time-might-be-repealed/ +# This video is from the government decision: +# https://www.nbc.na/news/na-passes-namibia-time-bill-repealing-1994-namibia-time-act.8665 +# We have made the assumption so far that they will change their time zone at +# the same time they would normally start DST, the first Sunday in September: +# https://www.timeanddate.com/news/time/namibia-new-time-zone.html + # RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S -Rule Namibia 1994 max - Sep Sun>=1 2:00 1:00 S -Rule Namibia 1995 max - Apr Sun>=1 2:00 0 - +Rule Namibia 1994 only - Mar 21 0:00 0 - +Rule Namibia 1994 2016 - Sep Sun>=1 2:00 1:00 S +Rule Namibia 1995 2017 - Apr Sun>=1 2:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Windhoek 1:08:24 - LMT 1892 Feb 8 1:30 - +0130 1903 Mar 2:00 - SAST 1942 Sep 20 2:00 2:00 1:00 SAST 1943 Mar 21 2:00 2:00 - SAST 1990 Mar 21 # independence - 2:00 - CAT 1994 Apr 3 - 1:00 Namibia WA%sT + 2:00 - CAT 1994 Mar 21 0:00 + 1:00 Namibia WA%sT 2017 Sep 3 2:00 + 2:00 - CAT # Niger # See Africa/Lagos. *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Thu Nov 2 17:35: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 65D95E5F369; Thu, 2 Nov 2017 17:35:24 +0000 (UTC) (envelope-from jkim@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 0F0F22506; Thu, 2 Nov 2017 17:35:23 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA2HZN9o058945; Thu, 2 Nov 2017 17:35:23 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA2HZJ6k058910; Thu, 2 Nov 2017 17:35:19 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201711021735.vA2HZJ6k058910@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Thu, 2 Nov 2017 17:35:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r325326 - in vendor-crypto/openssl/dist: . apps crypto crypto/asn1 crypto/bn crypto/bn/asm crypto/dh crypto/dsa crypto/ec crypto/ec/asm crypto/ecdh crypto/ecdsa crypto/err crypto/evp cr... X-SVN-Group: vendor-crypto X-SVN-Commit-Author: jkim X-SVN-Commit-Paths: in vendor-crypto/openssl/dist: . apps crypto crypto/asn1 crypto/bn crypto/bn/asm crypto/dh crypto/dsa crypto/ec crypto/ec/asm crypto/ecdh crypto/ecdsa crypto/err crypto/evp crypto/lhash crypto/ocsp cr... X-SVN-Commit-Revision: 325326 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: Thu, 02 Nov 2017 17:35:24 -0000 Author: jkim Date: Thu Nov 2 17:35:19 2017 New Revision: 325326 URL: https://svnweb.freebsd.org/changeset/base/325326 Log: Import OpenSSL 1.0.2m. Added: vendor-crypto/openssl/dist/crypto/asn1/asn1_int.h (contents, props changed) vendor-crypto/openssl/dist/doc/crypto/EVP_PKEY_meth_new.pod vendor-crypto/openssl/dist/doc/crypto/X509_check_private_key.pod vendor-crypto/openssl/dist/doc/ssl/SSL_CTX_set_tlsext_servername_callback.pod vendor-crypto/openssl/dist/doc/ssl/SSL_export_keying_material.pod Deleted: vendor-crypto/openssl/dist/doc/man3/SSL_CTX_set_tlsext_servername_callback.pod Modified: vendor-crypto/openssl/dist/CHANGES vendor-crypto/openssl/dist/FREEBSD-upgrade vendor-crypto/openssl/dist/INSTALL vendor-crypto/openssl/dist/Makefile vendor-crypto/openssl/dist/NEWS vendor-crypto/openssl/dist/README vendor-crypto/openssl/dist/apps/ca.c vendor-crypto/openssl/dist/apps/s_client.c vendor-crypto/openssl/dist/apps/s_server.c vendor-crypto/openssl/dist/apps/speed.c vendor-crypto/openssl/dist/apps/spkac.c vendor-crypto/openssl/dist/apps/srp.c vendor-crypto/openssl/dist/apps/tsget vendor-crypto/openssl/dist/crypto/asn1/Makefile vendor-crypto/openssl/dist/crypto/asn1/a_bitstr.c vendor-crypto/openssl/dist/crypto/asn1/tasn_fre.c vendor-crypto/openssl/dist/crypto/asn1/tasn_new.c vendor-crypto/openssl/dist/crypto/asn1/x_name.c vendor-crypto/openssl/dist/crypto/asn1/x_pkey.c vendor-crypto/openssl/dist/crypto/bn/asm/x86_64-mont5.pl vendor-crypto/openssl/dist/crypto/bn/bn_exp.c vendor-crypto/openssl/dist/crypto/bn/bn_lib.c vendor-crypto/openssl/dist/crypto/bn/bn_mont.c vendor-crypto/openssl/dist/crypto/bn/bn_mul.c vendor-crypto/openssl/dist/crypto/bn/bn_x931p.c vendor-crypto/openssl/dist/crypto/cryptlib.c vendor-crypto/openssl/dist/crypto/dh/Makefile vendor-crypto/openssl/dist/crypto/dh/dh.h vendor-crypto/openssl/dist/crypto/dh/dh_kdf.c vendor-crypto/openssl/dist/crypto/dh/dh_pmeth.c vendor-crypto/openssl/dist/crypto/dsa/dsa_ameth.c vendor-crypto/openssl/dist/crypto/dsa/dsa_gen.c vendor-crypto/openssl/dist/crypto/dsa/dsa_ossl.c vendor-crypto/openssl/dist/crypto/ec/asm/ecp_nistz256-x86_64.pl vendor-crypto/openssl/dist/crypto/ec/ecp_mont.c vendor-crypto/openssl/dist/crypto/ec/ecp_nistp224.c vendor-crypto/openssl/dist/crypto/ec/ecp_nistp256.c vendor-crypto/openssl/dist/crypto/ec/ecp_nistp521.c vendor-crypto/openssl/dist/crypto/ecdh/ech_lib.c vendor-crypto/openssl/dist/crypto/ecdsa/ecs_lib.c vendor-crypto/openssl/dist/crypto/ecdsa/ecs_ossl.c vendor-crypto/openssl/dist/crypto/err/err.c vendor-crypto/openssl/dist/crypto/evp/e_aes_cbc_hmac_sha1.c vendor-crypto/openssl/dist/crypto/evp/e_aes_cbc_hmac_sha256.c vendor-crypto/openssl/dist/crypto/evp/evp.h vendor-crypto/openssl/dist/crypto/evp/evp_key.c vendor-crypto/openssl/dist/crypto/evp/pmeth_lib.c vendor-crypto/openssl/dist/crypto/ex_data.c vendor-crypto/openssl/dist/crypto/lhash/lhash.c vendor-crypto/openssl/dist/crypto/ocsp/ocsp_vfy.c vendor-crypto/openssl/dist/crypto/opensslv.h vendor-crypto/openssl/dist/crypto/pem/pem_lib.c vendor-crypto/openssl/dist/crypto/pem/pem_pk8.c vendor-crypto/openssl/dist/crypto/pem/pem_pkey.c vendor-crypto/openssl/dist/crypto/pkcs12/p12_kiss.c vendor-crypto/openssl/dist/crypto/rsa/rsa_ameth.c vendor-crypto/openssl/dist/crypto/rsa/rsa_oaep.c vendor-crypto/openssl/dist/crypto/rsa/rsa_pk1.c vendor-crypto/openssl/dist/crypto/rsa/rsa_pmeth.c vendor-crypto/openssl/dist/crypto/ui/ui_lib.c vendor-crypto/openssl/dist/crypto/whrlpool/wp_dgst.c vendor-crypto/openssl/dist/crypto/x509/by_dir.c vendor-crypto/openssl/dist/crypto/x509/by_file.c vendor-crypto/openssl/dist/crypto/x509v3/pcy_tree.c vendor-crypto/openssl/dist/crypto/x509v3/v3_addr.c vendor-crypto/openssl/dist/crypto/x509v3/v3_genn.c vendor-crypto/openssl/dist/crypto/x509v3/v3_ncons.c vendor-crypto/openssl/dist/crypto/x86_64cpuid.pl vendor-crypto/openssl/dist/doc/apps/asn1parse.pod vendor-crypto/openssl/dist/doc/apps/ca.pod vendor-crypto/openssl/dist/doc/apps/ciphers.pod vendor-crypto/openssl/dist/doc/apps/cms.pod vendor-crypto/openssl/dist/doc/apps/crl.pod vendor-crypto/openssl/dist/doc/apps/crl2pkcs7.pod vendor-crypto/openssl/dist/doc/apps/dgst.pod vendor-crypto/openssl/dist/doc/apps/dhparam.pod vendor-crypto/openssl/dist/doc/apps/dsa.pod vendor-crypto/openssl/dist/doc/apps/dsaparam.pod vendor-crypto/openssl/dist/doc/apps/ec.pod vendor-crypto/openssl/dist/doc/apps/ecparam.pod vendor-crypto/openssl/dist/doc/apps/enc.pod vendor-crypto/openssl/dist/doc/apps/errstr.pod vendor-crypto/openssl/dist/doc/apps/gendsa.pod vendor-crypto/openssl/dist/doc/apps/genpkey.pod vendor-crypto/openssl/dist/doc/apps/genrsa.pod vendor-crypto/openssl/dist/doc/apps/nseq.pod vendor-crypto/openssl/dist/doc/apps/ocsp.pod vendor-crypto/openssl/dist/doc/apps/passwd.pod vendor-crypto/openssl/dist/doc/apps/pkcs12.pod vendor-crypto/openssl/dist/doc/apps/pkcs7.pod vendor-crypto/openssl/dist/doc/apps/pkcs8.pod vendor-crypto/openssl/dist/doc/apps/pkey.pod vendor-crypto/openssl/dist/doc/apps/pkeyparam.pod vendor-crypto/openssl/dist/doc/apps/pkeyutl.pod vendor-crypto/openssl/dist/doc/apps/rand.pod vendor-crypto/openssl/dist/doc/apps/req.pod vendor-crypto/openssl/dist/doc/apps/rsa.pod vendor-crypto/openssl/dist/doc/apps/rsautl.pod vendor-crypto/openssl/dist/doc/apps/s_client.pod vendor-crypto/openssl/dist/doc/apps/s_server.pod vendor-crypto/openssl/dist/doc/apps/s_time.pod vendor-crypto/openssl/dist/doc/apps/sess_id.pod vendor-crypto/openssl/dist/doc/apps/smime.pod vendor-crypto/openssl/dist/doc/apps/speed.pod vendor-crypto/openssl/dist/doc/apps/spkac.pod vendor-crypto/openssl/dist/doc/apps/ts.pod vendor-crypto/openssl/dist/doc/apps/tsget.pod vendor-crypto/openssl/dist/doc/apps/verify.pod vendor-crypto/openssl/dist/doc/apps/version.pod vendor-crypto/openssl/dist/doc/apps/x509.pod vendor-crypto/openssl/dist/doc/crypto/BN_bn2bin.pod vendor-crypto/openssl/dist/doc/crypto/BN_new.pod vendor-crypto/openssl/dist/doc/crypto/EVP_EncryptInit.pod vendor-crypto/openssl/dist/doc/crypto/RSA_padding_add_PKCS1_type_1.pod vendor-crypto/openssl/dist/doc/crypto/RSA_public_encrypt.pod vendor-crypto/openssl/dist/doc/crypto/hmac.pod vendor-crypto/openssl/dist/doc/ssl/SSL_set_connect_state.pod vendor-crypto/openssl/dist/ssl/s23_clnt.c vendor-crypto/openssl/dist/ssl/s3_pkt.c vendor-crypto/openssl/dist/ssl/s3_srvr.c vendor-crypto/openssl/dist/ssl/ssl_ciph.c vendor-crypto/openssl/dist/ssl/ssl_lib.c vendor-crypto/openssl/dist/ssl/ssl_sess.c vendor-crypto/openssl/dist/ssl/ssltest.c vendor-crypto/openssl/dist/ssl/tls1.h vendor-crypto/openssl/dist/util/copy-if-different.pl vendor-crypto/openssl/dist/util/copy.pl vendor-crypto/openssl/dist/util/libeay.num vendor-crypto/openssl/dist/util/mk1mf.pl Modified: vendor-crypto/openssl/dist/CHANGES ============================================================================== --- vendor-crypto/openssl/dist/CHANGES Thu Nov 2 15:40:19 2017 (r325325) +++ vendor-crypto/openssl/dist/CHANGES Thu Nov 2 17:35:19 2017 (r325326) @@ -2,6 +2,44 @@ OpenSSL CHANGES _______________ + This is a high-level summary of the most important changes. + For a full list of changes, see the git commit log; for example, + https://github.com/openssl/openssl/commits/ and pick the appropriate + release branch. + + Changes between 1.0.2l and 1.0.2m [2 Nov 2017] + + *) bn_sqrx8x_internal carry bug on x86_64 + + There is a carry propagating bug in the x86_64 Montgomery squaring + procedure. No EC algorithms are affected. Analysis suggests that attacks + against RSA and DSA as a result of this defect would be very difficult to + perform and are not believed likely. Attacks against DH are considered just + feasible (although very difficult) because most of the work necessary to + deduce information about a private key may be performed offline. The amount + of resources required for such an attack would be very significant and + likely only accessible to a limited number of attackers. An attacker would + additionally need online access to an unpatched system using the target + private key in a scenario with persistent DH parameters and a private + key that is shared between multiple clients. + + This only affects processors that support the BMI1, BMI2 and ADX extensions + like Intel Broadwell (5th generation) and later or AMD Ryzen. + + This issue was reported to OpenSSL by the OSS-Fuzz project. + (CVE-2017-3736) + [Andy Polyakov] + + *) Malformed X.509 IPAddressFamily could cause OOB read + + If an X.509 certificate has a malformed IPAddressFamily extension, + OpenSSL could do a one-byte buffer overread. The most likely result + would be an erroneous display of the certificate in text format. + + This issue was reported to OpenSSL by the OSS-Fuzz project. + (CVE-2017-3735) + [Rich Salz] + Changes between 1.0.2k and 1.0.2l [25 May 2017] *) Have 'config' recognise 64-bit mingw and choose 'mingw64' as the target Modified: vendor-crypto/openssl/dist/FREEBSD-upgrade ============================================================================== --- vendor-crypto/openssl/dist/FREEBSD-upgrade Thu Nov 2 15:40:19 2017 (r325325) +++ vendor-crypto/openssl/dist/FREEBSD-upgrade Thu Nov 2 17:35:19 2017 (r325326) @@ -11,8 +11,8 @@ First, read http://wiki.freebsd.org/SubversionPrimer/V # Xlist setenv XLIST /FreeBSD/work/openssl/svn-FREEBSD-files/FREEBSD-Xlist setenv FSVN "svn+ssh://repo.freebsd.org/base" -setenv OSSLVER 1.0.2l -# OSSLTAG format: v1_0_2l +setenv OSSLVER 1.0.2m +# OSSLTAG format: v1_0_2m ###setenv OSSLTAG v`echo ${OSSLVER} | tr . _` Modified: vendor-crypto/openssl/dist/INSTALL ============================================================================== --- vendor-crypto/openssl/dist/INSTALL Thu Nov 2 15:40:19 2017 (r325325) +++ vendor-crypto/openssl/dist/INSTALL Thu Nov 2 17:35:19 2017 (r325326) @@ -190,10 +190,8 @@ the failure that isn't a problem in OpenSSL itself (like a missing or malfunctioning bc). If it is a problem with OpenSSL itself, try removing any compiler optimization flags from the CFLAG line - in Makefile.ssl and run "make clean; make". Please send a bug - report to , including the output of - "make report" in order to be added to the request tracker at - http://www.openssl.org/support/rt.html. + in Makefile.ssl and run "make clean; make". To report a bug please open an + issue on GitHub, at https://github.com/openssl/openssl/issues. 4. If everything tests ok, install OpenSSL with Modified: vendor-crypto/openssl/dist/Makefile ============================================================================== --- vendor-crypto/openssl/dist/Makefile Thu Nov 2 15:40:19 2017 (r325325) +++ vendor-crypto/openssl/dist/Makefile Thu Nov 2 17:35:19 2017 (r325326) @@ -4,7 +4,7 @@ ## Makefile for OpenSSL ## -VERSION=1.0.2l +VERSION=1.0.2m MAJOR=1 MINOR=0.2 SHLIB_VERSION_NUMBER=1.0.0 Modified: vendor-crypto/openssl/dist/NEWS ============================================================================== --- vendor-crypto/openssl/dist/NEWS Thu Nov 2 15:40:19 2017 (r325325) +++ vendor-crypto/openssl/dist/NEWS Thu Nov 2 17:35:19 2017 (r325326) @@ -5,6 +5,11 @@ This file gives a brief overview of the major changes between each OpenSSL release. For more details please read the CHANGES file. + Major changes between OpenSSL 1.0.2l and OpenSSL 1.0.2m [2 Nov 2017] + + o bn_sqrx8x_internal carry bug on x86_64 (CVE-2017-3736) + o Malformed X.509 IPAddressFamily could cause OOB read (CVE-2017-3735) + Major changes between OpenSSL 1.0.2k and OpenSSL 1.0.2l [25 May 2017] o config now recognises 64-bit mingw and chooses mingw64 instead of mingw Modified: vendor-crypto/openssl/dist/README ============================================================================== --- vendor-crypto/openssl/dist/README Thu Nov 2 15:40:19 2017 (r325325) +++ vendor-crypto/openssl/dist/README Thu Nov 2 17:35:19 2017 (r325326) @@ -1,5 +1,5 @@ - OpenSSL 1.0.2l 25 May 2017 + OpenSSL 1.0.2m 2 Nov 2017 Copyright (c) 1998-2015 The OpenSSL Project Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson Modified: vendor-crypto/openssl/dist/apps/ca.c ============================================================================== --- vendor-crypto/openssl/dist/apps/ca.c Thu Nov 2 15:40:19 2017 (r325325) +++ vendor-crypto/openssl/dist/apps/ca.c Thu Nov 2 17:35:19 2017 (r325326) @@ -1985,10 +1985,6 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 * /* Lets add the extensions, if there are any */ if (ext_sect) { X509V3_CTX ctx; - if (ci->version == NULL) - if ((ci->version = ASN1_INTEGER_new()) == NULL) - goto err; - ASN1_INTEGER_set(ci->version, 2); /* version 3 certificate */ /* * Free the current entries if any, there should not be any I believe @@ -2049,6 +2045,15 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 * BIO_printf(bio_err, "ERROR: adding extensions from request\n"); ERR_print_errors(bio_err); goto err; + } + + { + STACK_OF(X509_EXTENSION) *exts = ci->extensions; + + if (exts != NULL && sk_X509_EXTENSION_num(exts) > 0) + /* Make it an X509 v3 certificate. */ + if (!X509_set_version(ret, 2)) + goto err; } /* Set the right value for the noemailDN option */ Modified: vendor-crypto/openssl/dist/apps/s_client.c ============================================================================== --- vendor-crypto/openssl/dist/apps/s_client.c Thu Nov 2 15:40:19 2017 (r325325) +++ vendor-crypto/openssl/dist/apps/s_client.c Thu Nov 2 17:35:19 2017 (r325326) @@ -1667,6 +1667,8 @@ int MAIN(int argc, char **argv) if (strstr(mbuf, "/stream:features>")) goto shut; seen = BIO_read(sbio, mbuf, BUFSIZZ); + if (seen <= 0) + goto shut; mbuf[seen] = 0; } BIO_printf(sbio, Modified: vendor-crypto/openssl/dist/apps/s_server.c ============================================================================== --- vendor-crypto/openssl/dist/apps/s_server.c Thu Nov 2 15:40:19 2017 (r325325) +++ vendor-crypto/openssl/dist/apps/s_server.c Thu Nov 2 17:35:19 2017 (r325326) @@ -3017,7 +3017,7 @@ static int www_body(char *hostname, int s, int stype, PEM_write_bio_X509(io, peer); } else BIO_puts(io, "no client certificate available\n"); - BIO_puts(io, "\r\n\r\n"); + BIO_puts(io, "\r\n\r\n"); break; } else if ((www == 2 || www == 3) && (strncmp("GET /", buf, 5) == 0)) { Modified: vendor-crypto/openssl/dist/apps/speed.c ============================================================================== --- vendor-crypto/openssl/dist/apps/speed.c Thu Nov 2 15:40:19 2017 (r325325) +++ vendor-crypto/openssl/dist/apps/speed.c Thu Nov 2 17:35:19 2017 (r325326) @@ -307,7 +307,8 @@ static SIGRETTYPE sig_done(int sig) # if !defined(SIGALRM) # define SIGALRM # endif -static unsigned int lapse, schlock; +static volatile unsigned int lapse; +static volatile unsigned int schlock; static void alarm_win32(unsigned int secs) { lapse = secs * 1000; @@ -725,6 +726,7 @@ int MAIN(int argc, char **argv) BIO_printf(bio_err, "no EVP given\n"); goto end; } + evp_md = NULL; evp_cipher = EVP_get_cipherbyname(*argv); if (!evp_cipher) { evp_md = EVP_get_digestbyname(*argv); Modified: vendor-crypto/openssl/dist/apps/spkac.c ============================================================================== --- vendor-crypto/openssl/dist/apps/spkac.c Thu Nov 2 15:40:19 2017 (r325325) +++ vendor-crypto/openssl/dist/apps/spkac.c Thu Nov 2 17:35:19 2017 (r325326) @@ -5,7 +5,7 @@ * 1999. Based on an original idea by Massimiliano Pala (madwolf@openca.org). */ /* ==================================================================== - * Copyright (c) 1999 The OpenSSL Project. All rights reserved. + * Copyright (c) 1999-2017 The OpenSSL Project. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -185,20 +185,23 @@ int MAIN(int argc, char **argv) } e = setup_engine(bio_err, engine, 0); - if (keyfile) { + if (keyfile != NULL) { pkey = load_key(bio_err, strcmp(keyfile, "-") ? keyfile : NULL, FORMAT_PEM, 1, passin, e, "private key"); - if (!pkey) { + if (pkey == NULL) goto end; - } spki = NETSCAPE_SPKI_new(); - if (challenge) + if (spki == NULL) + goto end; + if (challenge != NULL) ASN1_STRING_set(spki->spkac->challenge, challenge, (int)strlen(challenge)); NETSCAPE_SPKI_set_pubkey(spki, pkey); NETSCAPE_SPKI_sign(spki, pkey, EVP_md5()); spkstr = NETSCAPE_SPKI_b64_encode(spki); + if (spkstr == NULL) + goto end; if (outfile) out = BIO_new_file(outfile, "w"); @@ -253,7 +256,7 @@ int MAIN(int argc, char **argv) spki = NETSCAPE_SPKI_b64_decode(spkstr, -1); - if (!spki) { + if (spki == NULL) { BIO_printf(bio_err, "Error loading SPKAC\n"); ERR_print_errors(bio_err); goto end; @@ -282,9 +285,9 @@ int MAIN(int argc, char **argv) pkey = NETSCAPE_SPKI_get_pubkey(spki); if (verify) { i = NETSCAPE_SPKI_verify(spki, pkey); - if (i > 0) + if (i > 0) { BIO_printf(bio_err, "Signature OK\n"); - else { + } else { BIO_printf(bio_err, "Signature Failure\n"); ERR_print_errors(bio_err); goto end; Modified: vendor-crypto/openssl/dist/apps/srp.c ============================================================================== --- vendor-crypto/openssl/dist/apps/srp.c Thu Nov 2 15:40:19 2017 (r325325) +++ vendor-crypto/openssl/dist/apps/srp.c Thu Nov 2 17:35:19 2017 (r325326) @@ -123,13 +123,14 @@ static int get_index(CA_DB *db, char *id, char type) int i; if (id == NULL) return -1; - if (type == DB_SRP_INDEX) + if (type == DB_SRP_INDEX) { for (i = 0; i < sk_OPENSSL_PSTRING_num(db->db->data); i++) { pp = sk_OPENSSL_PSTRING_value(db->db->data, i); if (pp[DB_srptype][0] == DB_SRP_INDEX && !strcmp(id, pp[DB_srpid])) return i; - } else + } + } else { for (i = 0; i < sk_OPENSSL_PSTRING_num(db->db->data); i++) { pp = sk_OPENSSL_PSTRING_value(db->db->data, i); @@ -137,6 +138,7 @@ static int get_index(CA_DB *db, char *id, char type) && !strcmp(id, pp[DB_srpid])) return i; } + } return -1; } @@ -177,8 +179,8 @@ static int update_index(CA_DB *db, BIO *bio, char **ro char **irow; int i; - if ((irow = - (char **)OPENSSL_malloc(sizeof(char *) * (DB_NUMBER + 1))) == NULL) { + irow = (char **)OPENSSL_malloc(sizeof(char *) * (DB_NUMBER + 1)); + if (irow == NULL) { BIO_printf(bio_err, "Memory allocation failure\n"); return 0; } @@ -205,30 +207,32 @@ static char *srp_verify_user(const char *user, const c char *srp_usersalt, const char *g, const char *N, const char *passin, BIO *bio, int verbose) { - char password[1024]; + char password[1025]; PW_CB_DATA cb_tmp; char *verifier = NULL; char *gNid = NULL; + int len; cb_tmp.prompt_info = user; cb_tmp.password = passin; - if (password_callback(password, 1024, 0, &cb_tmp) > 0) { + len = password_callback(password, sizeof(password)-1, 0, &cb_tmp); + if (len > 0) { + password[len] = 0; VERBOSE BIO_printf(bio, "Validating\n user=\"%s\"\n srp_verifier=\"%s\"\n srp_usersalt=\"%s\"\n g=\"%s\"\n N=\"%s\"\n", user, srp_verifier, srp_usersalt, g, N); - BIO_printf(bio, "Pass %s\n", password); + VVERBOSE BIO_printf(bio, "Pass %s\n", password); - if (! - (gNid = - SRP_create_verifier(user, password, &srp_usersalt, &verifier, N, - g))) { + if (!(gNid = SRP_create_verifier(user, password, &srp_usersalt, + &verifier, N, g))) { BIO_printf(bio, "Internal error validating SRP verifier\n"); } else { if (strcmp(verifier, srp_verifier)) gNid = NULL; OPENSSL_free(verifier); } + OPENSSL_cleanse(password, len); } return gNid; } @@ -237,24 +241,27 @@ static char *srp_create_user(char *user, char **srp_ve char **srp_usersalt, char *g, char *N, char *passout, BIO *bio, int verbose) { - char password[1024]; + char password[1025]; PW_CB_DATA cb_tmp; char *gNid = NULL; char *salt = NULL; + int len; cb_tmp.prompt_info = user; cb_tmp.password = passout; - if (password_callback(password, 1024, 1, &cb_tmp) > 0) { + len = password_callback(password, sizeof(password)-1, 1, &cb_tmp); + if (len > 0) { + password[len] = 0; VERBOSE BIO_printf(bio, "Creating\n user=\"%s\"\n g=\"%s\"\n N=\"%s\"\n", user, g, N); - if (! - (gNid = - SRP_create_verifier(user, password, &salt, srp_verifier, N, - g))) { + if (!(gNid = SRP_create_verifier(user, password, &salt, + srp_verifier, N, g))) { BIO_printf(bio, "Internal error creating SRP verifier\n"); - } else + } else { *srp_usersalt = salt; + } + OPENSSL_cleanse(password, len); VVERBOSE BIO_printf(bio, "gNid=%s salt =\"%s\"\n verifier =\"%s\"\n", gNid, salt, *srp_verifier); @@ -314,9 +321,9 @@ int MAIN(int argc, char **argv) argc--; argv++; while (argc >= 1 && badops == 0) { - if (strcmp(*argv, "-verbose") == 0) + if (strcmp(*argv, "-verbose") == 0) { verbose++; - else if (strcmp(*argv, "-config") == 0) { + } else if (strcmp(*argv, "-config") == 0) { if (--argc < 1) goto bad; configfile = *(++argv); @@ -328,15 +335,15 @@ int MAIN(int argc, char **argv) if (--argc < 1) goto bad; dbfile = *(++argv); - } else if (strcmp(*argv, "-add") == 0) + } else if (strcmp(*argv, "-add") == 0) { add_user = 1; - else if (strcmp(*argv, "-delete") == 0) + } else if (strcmp(*argv, "-delete") == 0) { delete_user = 1; - else if (strcmp(*argv, "-modify") == 0) + } else if (strcmp(*argv, "-modify") == 0) { modify_user = 1; - else if (strcmp(*argv, "-list") == 0) + } else if (strcmp(*argv, "-list") == 0) { list_user = 1; - else if (strcmp(*argv, "-gn") == 0) { + } else if (strcmp(*argv, "-gn") == 0) { if (--argc < 1) goto bad; gN = *(++argv); @@ -366,8 +373,9 @@ int MAIN(int argc, char **argv) BIO_printf(bio_err, "unknown option %s\n", *argv); badops = 1; break; - } else + } else { break; + } argc--; argv++; @@ -388,7 +396,7 @@ int MAIN(int argc, char **argv) "Need at least one user for options -add, -delete, -modify. \n"); badops = 1; } - if ((passin || passout) && argc != 1) { + if ((passargin || passargout) && argc != 1) { BIO_printf(bio_err, "-passin, -passout arguments only valid with one user.\n"); badops = 1; @@ -706,9 +714,9 @@ int MAIN(int argc, char **argv) doupdatedb = 1; } } - if (--argc > 0) + if (--argc > 0) { user = *(argv++); - else { + } else { user = NULL; list_user = 0; } Modified: vendor-crypto/openssl/dist/apps/tsget ============================================================================== --- vendor-crypto/openssl/dist/apps/tsget Thu Nov 2 15:40:19 2017 (r325325) +++ vendor-crypto/openssl/dist/apps/tsget Thu Nov 2 17:35:19 2017 (r325326) @@ -193,4 +193,3 @@ REQUEST: foreach (@ARGV) { STDERR->printflush(", $output written.\n") if $options{v}; } $curl->cleanup(); -WWW::Curl::Easy::global_cleanup(); Modified: vendor-crypto/openssl/dist/crypto/asn1/Makefile ============================================================================== --- vendor-crypto/openssl/dist/crypto/asn1/Makefile Thu Nov 2 15:40:19 2017 (r325325) +++ vendor-crypto/openssl/dist/crypto/asn1/Makefile Thu Nov 2 17:35:19 2017 (r325326) @@ -680,7 +680,7 @@ tasn_fre.o: ../../include/openssl/e_os2.h ../../includ tasn_fre.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h tasn_fre.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h tasn_fre.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -tasn_fre.o: ../../include/openssl/symhacks.h tasn_fre.c +tasn_fre.o: ../../include/openssl/symhacks.h asn1_int.h tasn_fre.c tasn_new.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h tasn_new.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h tasn_new.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h @@ -688,7 +688,7 @@ tasn_new.o: ../../include/openssl/lhash.h ../../includ tasn_new.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h tasn_new.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h tasn_new.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -tasn_new.o: ../../include/openssl/symhacks.h tasn_new.c +tasn_new.o: ../../include/openssl/symhacks.h asn1_int.h tasn_new.c tasn_prn.o: ../../e_os.h ../../include/openssl/asn1.h tasn_prn.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h tasn_prn.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h Modified: vendor-crypto/openssl/dist/crypto/asn1/a_bitstr.c ============================================================================== --- vendor-crypto/openssl/dist/crypto/asn1/a_bitstr.c Thu Nov 2 15:40:19 2017 (r325325) +++ vendor-crypto/openssl/dist/crypto/asn1/a_bitstr.c Thu Nov 2 17:35:19 2017 (r325326) @@ -56,6 +56,7 @@ * [including the GNU Public Licence.] */ +#include #include #include "cryptlib.h" #include @@ -133,6 +134,11 @@ ASN1_BIT_STRING *c2i_ASN1_BIT_STRING(ASN1_BIT_STRING * if (len < 1) { i = ASN1_R_STRING_TOO_SHORT; + goto err; + } + + if (len > INT_MAX) { + i = ASN1_R_STRING_TOO_LONG; goto err; } Added: vendor-crypto/openssl/dist/crypto/asn1/asn1_int.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor-crypto/openssl/dist/crypto/asn1/asn1_int.h Thu Nov 2 17:35:19 2017 (r325326) @@ -0,0 +1,63 @@ +/* asn1t.h */ +/* + * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project + * 2006. + */ +/* ==================================================================== + * Copyright (c) 2006 The OpenSSL Project. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. All advertising materials mentioning features or use of this + * software must display the following acknowledgment: + * "This product includes software developed by the OpenSSL Project + * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" + * + * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to + * endorse or promote products derived from this software without + * prior written permission. For written permission, please contact + * licensing@OpenSSL.org. + * + * 5. Products derived from this software may not be called "OpenSSL" + * nor may "OpenSSL" appear in their names without prior written + * permission of the OpenSSL Project. + * + * 6. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by the OpenSSL Project + * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" + * + * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY + * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * ==================================================================== + * + * This product includes cryptographic software written by Eric Young + * (eay@cryptsoft.com). This product includes software written by Tim + * Hudson (tjh@cryptsoft.com). + * + */ + +/* Internal ASN1 template structures and functions: not for application use */ + +void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it, + int combine); Modified: vendor-crypto/openssl/dist/crypto/asn1/tasn_fre.c ============================================================================== --- vendor-crypto/openssl/dist/crypto/asn1/tasn_fre.c Thu Nov 2 15:40:19 2017 (r325325) +++ vendor-crypto/openssl/dist/crypto/asn1/tasn_fre.c Thu Nov 2 17:35:19 2017 (r325326) @@ -61,10 +61,8 @@ #include #include #include +#include "asn1_int.h" -static void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it, - int combine); - /* Free up an ASN1 structure */ void ASN1_item_free(ASN1_VALUE *val, const ASN1_ITEM *it) @@ -77,8 +75,7 @@ void ASN1_item_ex_free(ASN1_VALUE **pval, const ASN1_I asn1_item_combine_free(pval, it, 0); } -static void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it, - int combine) +void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it, int combine) { const ASN1_TEMPLATE *tt = NULL, *seqtt; const ASN1_EXTERN_FUNCS *ef; Modified: vendor-crypto/openssl/dist/crypto/asn1/tasn_new.c ============================================================================== --- vendor-crypto/openssl/dist/crypto/asn1/tasn_new.c Thu Nov 2 15:40:19 2017 (r325325) +++ vendor-crypto/openssl/dist/crypto/asn1/tasn_new.c Thu Nov 2 17:35:19 2017 (r325326) @@ -63,6 +63,7 @@ #include #include #include +#include "asn1_int.h" static int asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it, int combine); @@ -199,7 +200,7 @@ static int asn1_item_ex_combine_new(ASN1_VALUE **pval, return 1; memerr2: - ASN1_item_ex_free(pval, it); + asn1_item_combine_free(pval, it, combine); memerr: ASN1err(ASN1_F_ASN1_ITEM_EX_COMBINE_NEW, ERR_R_MALLOC_FAILURE); #ifdef CRYPTO_MDEBUG @@ -209,7 +210,7 @@ static int asn1_item_ex_combine_new(ASN1_VALUE **pval, return 0; auxerr2: - ASN1_item_ex_free(pval, it); + asn1_item_combine_free(pval, it, combine); auxerr: ASN1err(ASN1_F_ASN1_ITEM_EX_COMBINE_NEW, ASN1_R_AUX_ERROR); #ifdef CRYPTO_MDEBUG Modified: vendor-crypto/openssl/dist/crypto/asn1/x_name.c ============================================================================== --- vendor-crypto/openssl/dist/crypto/asn1/x_name.c Thu Nov 2 15:40:19 2017 (r325325) +++ vendor-crypto/openssl/dist/crypto/asn1/x_name.c Thu Nov 2 17:35:19 2017 (r325326) @@ -523,19 +523,11 @@ static int i2d_name_canon(STACK_OF(STACK_OF_X509_NAME_ int X509_NAME_set(X509_NAME **xn, X509_NAME *name) { - X509_NAME *in; - - if (!xn || !name) - return (0); - - if (*xn != name) { - in = X509_NAME_dup(name); - if (in != NULL) { - X509_NAME_free(*xn); - *xn = in; - } - } - return (*xn != NULL); + if ((name = X509_NAME_dup(name)) == NULL) + return 0; + X509_NAME_free(*xn); + *xn = name; + return 1; } IMPLEMENT_STACK_OF(X509_NAME_ENTRY) Modified: vendor-crypto/openssl/dist/crypto/asn1/x_pkey.c ============================================================================== --- vendor-crypto/openssl/dist/crypto/asn1/x_pkey.c Thu Nov 2 15:40:19 2017 (r325325) +++ vendor-crypto/openssl/dist/crypto/asn1/x_pkey.c Thu Nov 2 17:35:19 2017 (r325326) @@ -106,10 +106,14 @@ X509_PKEY *X509_PKEY_new(void) X509_PKEY *ret = NULL; ASN1_CTX c; - M_ASN1_New_Malloc(ret, X509_PKEY); + ret = OPENSSL_malloc(sizeof(X509_PKEY)); + if (ret == NULL) { + c.line = __LINE__; + goto err; + } ret->version = 0; - M_ASN1_New(ret->enc_algor, X509_ALGOR_new); - M_ASN1_New(ret->enc_pkey, M_ASN1_OCTET_STRING_new); + ret->enc_algor = X509_ALGOR_new(); + ret->enc_pkey = M_ASN1_OCTET_STRING_new(); ret->dec_pkey = NULL; ret->key_length = 0; ret->key_data = NULL; @@ -117,8 +121,15 @@ X509_PKEY *X509_PKEY_new(void) ret->cipher.cipher = NULL; memset(ret->cipher.iv, 0, EVP_MAX_IV_LENGTH); ret->references = 1; - return (ret); - M_ASN1_New_Error(ASN1_F_X509_PKEY_NEW); + if (ret->enc_algor == NULL || ret->enc_pkey == NULL) { + c.line = __LINE__; + goto err; + } + return ret; +err: + X509_PKEY_free(ret); + ASN1_MAC_H_err(ASN1_F_X509_PKEY_NEW, ERR_R_MALLOC_FAILURE, c.line); + return NULL; } void X509_PKEY_free(X509_PKEY *x) Modified: vendor-crypto/openssl/dist/crypto/bn/asm/x86_64-mont5.pl ============================================================================== --- vendor-crypto/openssl/dist/crypto/bn/asm/x86_64-mont5.pl Thu Nov 2 15:40:19 2017 (r325325) +++ vendor-crypto/openssl/dist/crypto/bn/asm/x86_64-mont5.pl Thu Nov 2 17:35:19 2017 (r325326) @@ -3090,11 +3090,19 @@ $code.=<<___; .align 32 .Lsqrx8x_break: - sub 16+8(%rsp),%r8 # consume last carry + xor $zero,$zero + sub 16+8(%rsp),%rbx # mov 16(%rsp),%cf + adcx $zero,%r8 mov 24+8(%rsp),$carry # initial $tptr, borrow $carry + adcx $zero,%r9 mov 0*8($aptr),%rdx # a[8], modulo-scheduled - xor %ebp,%ebp # xor $zero,$zero + adc \$0,%r10 mov %r8,0*8($tptr) + adc \$0,%r11 + adc \$0,%r12 + adc \$0,%r13 + adc \$0,%r14 + adc \$0,%r15 cmp $carry,$tptr # cf=0, of=0 je .Lsqrx8x_outer_loop Modified: vendor-crypto/openssl/dist/crypto/bn/bn_exp.c ============================================================================== --- vendor-crypto/openssl/dist/crypto/bn/bn_exp.c Thu Nov 2 15:40:19 2017 (r325325) +++ vendor-crypto/openssl/dist/crypto/bn/bn_exp.c Thu Nov 2 17:35:19 2017 (r325326) @@ -145,7 +145,8 @@ int BN_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p int i, bits, ret = 0; BIGNUM *v, *rr; - if (BN_get_flags(p, BN_FLG_CONSTTIME) != 0) { + if (BN_get_flags(p, BN_FLG_CONSTTIME) != 0 + || BN_get_flags(a, BN_FLG_CONSTTIME) != 0) { /* BN_FLG_CONSTTIME only supported by BN_mod_exp_mont() */ BNerr(BN_F_BN_EXP, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return -1; @@ -245,7 +246,9 @@ int BN_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNU if (BN_is_odd(m)) { # ifdef MONT_EXP_WORD if (a->top == 1 && !a->neg - && (BN_get_flags(p, BN_FLG_CONSTTIME) == 0)) { + && (BN_get_flags(p, BN_FLG_CONSTTIME) == 0) + && (BN_get_flags(a, BN_FLG_CONSTTIME) == 0) + && (BN_get_flags(m, BN_FLG_CONSTTIME) == 0)) { BN_ULONG A = a->d[0]; ret = BN_mod_exp_mont_word(r, A, p, m, ctx, NULL); } else @@ -277,7 +280,9 @@ int BN_mod_exp_recp(BIGNUM *r, const BIGNUM *a, const BIGNUM *val[TABLE_SIZE]; BN_RECP_CTX recp; - if (BN_get_flags(p, BN_FLG_CONSTTIME) != 0) { + if (BN_get_flags(p, BN_FLG_CONSTTIME) != 0 + || BN_get_flags(a, BN_FLG_CONSTTIME) != 0 + || BN_get_flags(m, BN_FLG_CONSTTIME) != 0) { /* BN_FLG_CONSTTIME only supported by BN_mod_exp_mont() */ BNerr(BN_F_BN_MOD_EXP_RECP, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return -1; @@ -411,7 +416,9 @@ int BN_mod_exp_mont(BIGNUM *rr, const BIGNUM *a, const BIGNUM *val[TABLE_SIZE]; BN_MONT_CTX *mont = NULL; - if (BN_get_flags(p, BN_FLG_CONSTTIME) != 0) { + if (BN_get_flags(p, BN_FLG_CONSTTIME) != 0 + || BN_get_flags(a, BN_FLG_CONSTTIME) != 0 + || BN_get_flags(m, BN_FLG_CONSTTIME) != 0) { return BN_mod_exp_mont_consttime(rr, a, p, m, ctx, in_mont); } @@ -1217,7 +1224,8 @@ int BN_mod_exp_mont_word(BIGNUM *rr, BN_ULONG a, const #define BN_TO_MONTGOMERY_WORD(r, w, mont) \ (BN_set_word(r, (w)) && BN_to_montgomery(r, r, (mont), ctx)) - if (BN_get_flags(p, BN_FLG_CONSTTIME) != 0) { + if (BN_get_flags(p, BN_FLG_CONSTTIME) != 0 + || BN_get_flags(m, BN_FLG_CONSTTIME) != 0) { /* BN_FLG_CONSTTIME only supported by BN_mod_exp_mont() */ BNerr(BN_F_BN_MOD_EXP_MONT_WORD, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return -1; @@ -1348,7 +1356,9 @@ int BN_mod_exp_simple(BIGNUM *r, const BIGNUM *a, cons /* Table of variables obtained from 'ctx' */ BIGNUM *val[TABLE_SIZE]; - if (BN_get_flags(p, BN_FLG_CONSTTIME) != 0) { + if (BN_get_flags(p, BN_FLG_CONSTTIME) != 0 + || BN_get_flags(a, BN_FLG_CONSTTIME) != 0 + || BN_get_flags(m, BN_FLG_CONSTTIME) != 0) { /* BN_FLG_CONSTTIME only supported by BN_mod_exp_mont() */ BNerr(BN_F_BN_MOD_EXP_SIMPLE, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return -1; Modified: vendor-crypto/openssl/dist/crypto/bn/bn_lib.c ============================================================================== --- vendor-crypto/openssl/dist/crypto/bn/bn_lib.c Thu Nov 2 15:40:19 2017 (r325325) +++ vendor-crypto/openssl/dist/crypto/bn/bn_lib.c Thu Nov 2 17:35:19 2017 (r325326) @@ -524,6 +524,9 @@ BIGNUM *BN_copy(BIGNUM *a, const BIGNUM *b) memcpy(a->d, b->d, sizeof(b->d[0]) * b->top); #endif + if (BN_get_flags(b, BN_FLG_CONSTTIME) != 0) + BN_set_flags(a, BN_FLG_CONSTTIME); + a->top = b->top; a->neg = b->neg; bn_check_top(a); Modified: vendor-crypto/openssl/dist/crypto/bn/bn_mont.c ============================================================================== --- vendor-crypto/openssl/dist/crypto/bn/bn_mont.c Thu Nov 2 15:40:19 2017 (r325325) +++ vendor-crypto/openssl/dist/crypto/bn/bn_mont.c Thu Nov 2 17:35:19 2017 (r325326) @@ -394,6 +394,9 @@ int BN_MONT_CTX_set(BN_MONT_CTX *mont, const BIGNUM *m tmod.dmax = 2; tmod.neg = 0; + if (BN_get_flags(mod, BN_FLG_CONSTTIME) != 0) + BN_set_flags(&tmod, BN_FLG_CONSTTIME); + mont->ri = (BN_num_bits(mod) + (BN_BITS2 - 1)) / BN_BITS2 * BN_BITS2; # if defined(OPENSSL_BN_ASM_MONT) && (BN_BITS2<=32) Modified: vendor-crypto/openssl/dist/crypto/bn/bn_mul.c ============================================================================== --- vendor-crypto/openssl/dist/crypto/bn/bn_mul.c Thu Nov 2 15:40:19 2017 (r325325) +++ vendor-crypto/openssl/dist/crypto/bn/bn_mul.c Thu Nov 2 17:35:19 2017 (r325326) @@ -1032,46 +1032,6 @@ int BN_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b rr->top = top; goto end; } -# if 0 - if (i == 1 && !BN_get_flags(b, BN_FLG_STATIC_DATA)) { - BIGNUM *tmp_bn = (BIGNUM *)b; - if (bn_wexpand(tmp_bn, al) == NULL) - goto err; - tmp_bn->d[bl] = 0; - bl++; - i--; - } else if (i == -1 && !BN_get_flags(a, BN_FLG_STATIC_DATA)) { - BIGNUM *tmp_bn = (BIGNUM *)a; - if (bn_wexpand(tmp_bn, bl) == NULL) - goto err; - tmp_bn->d[al] = 0; - al++; - i++; - } - if (i == 0) { - /* symmetric and > 4 */ - /* 16 or larger */ - j = BN_num_bits_word((BN_ULONG)al); - j = 1 << (j - 1); - k = j + j; - t = BN_CTX_get(ctx); - if (al == j) { /* exact multiple */ - if (bn_wexpand(t, k * 2) == NULL) - goto err; - if (bn_wexpand(rr, k * 2) == NULL) - goto err; - bn_mul_recursive(rr->d, a->d, b->d, al, t->d); - } else { - if (bn_wexpand(t, k * 4) == NULL) - goto err; - if (bn_wexpand(rr, k * 4) == NULL) - goto err; - bn_mul_part_recursive(rr->d, a->d, b->d, al - j, j, t->d); - } - rr->top = top; - goto end; - } -# endif } #endif /* BN_RECURSION */ if (bn_wexpand(rr, top) == NULL) Modified: vendor-crypto/openssl/dist/crypto/bn/bn_x931p.c ============================================================================== --- vendor-crypto/openssl/dist/crypto/bn/bn_x931p.c Thu Nov 2 15:40:19 2017 (r325325) +++ vendor-crypto/openssl/dist/crypto/bn/bn_x931p.c Thu Nov 2 17:35:19 2017 (r325326) @@ -217,6 +217,8 @@ int BN_X931_generate_Xpq(BIGNUM *Xp, BIGNUM *Xq, int n BN_CTX_start(ctx); t = BN_CTX_get(ctx); + if (t == NULL) + goto err; for (i = 0; i < 1000; i++) { if (!BN_rand(Xq, nbits, 1, 0)) @@ -255,10 +257,12 @@ int BN_X931_generate_prime_ex(BIGNUM *p, BIGNUM *p1, B int ret = 0; BN_CTX_start(ctx); - if (!Xp1) + if (Xp1 == NULL) Xp1 = BN_CTX_get(ctx); - if (!Xp2) + if (Xp2 == NULL) Xp2 = BN_CTX_get(ctx); + if (Xp1 == NULL || Xp2 == NULL) + goto error; if (!BN_rand(Xp1, 101, 0, 0)) goto error; Modified: vendor-crypto/openssl/dist/crypto/cryptlib.c ============================================================================== --- vendor-crypto/openssl/dist/crypto/cryptlib.c Thu Nov 2 15:40:19 2017 (r325325) +++ vendor-crypto/openssl/dist/crypto/cryptlib.c Thu Nov 2 17:35:19 2017 (r325326) @@ -469,11 +469,18 @@ void CRYPTO_THREADID_set_pointer(CRYPTO_THREADID *id, } } +#ifdef OPENSSL_FIPS +extern int FIPS_crypto_threadid_set_callback(void (*func) (CRYPTO_THREADID *)); +#endif + int CRYPTO_THREADID_set_callback(void (*func) (CRYPTO_THREADID *)) { if (threadid_callback) return 0; threadid_callback = func; +#ifdef OPENSSL_FIPS + FIPS_crypto_threadid_set_callback(func); +#endif return 1; } Modified: vendor-crypto/openssl/dist/crypto/dh/Makefile ============================================================================== --- vendor-crypto/openssl/dist/crypto/dh/Makefile Thu Nov 2 15:40:19 2017 (r325325) +++ vendor-crypto/openssl/dist/crypto/dh/Makefile Thu Nov 2 17:35:19 2017 (r325326) @@ -134,7 +134,7 @@ dh_gen.o: ../../include/openssl/opensslconf.h ../../in dh_gen.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h dh_gen.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h dh_gen.o: ../cryptlib.h dh_gen.c -dh_kdf.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h +dh_kdf.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h dh_kdf.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h dh_kdf.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h dh_kdf.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h Modified: vendor-crypto/openssl/dist/crypto/dh/dh.h ============================================================================== --- vendor-crypto/openssl/dist/crypto/dh/dh.h Thu Nov 2 15:40:19 2017 (r325325) +++ vendor-crypto/openssl/dist/crypto/dh/dh.h Thu Nov 2 17:35:19 2017 (r325326) @@ -257,11 +257,13 @@ DH *DH_get_1024_160(void); DH *DH_get_2048_224(void); DH *DH_get_2048_256(void); +# ifndef OPENSSL_NO_CMS /* RFC2631 KDF */ int DH_KDF_X9_42(unsigned char *out, size_t outlen, const unsigned char *Z, size_t Zlen, ASN1_OBJECT *key_oid, const unsigned char *ukm, size_t ukmlen, const EVP_MD *md); +# endif # define EVP_PKEY_CTX_set_dh_paramgen_prime_len(ctx, len) \ EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DH, EVP_PKEY_OP_PARAMGEN, \ Modified: vendor-crypto/openssl/dist/crypto/dh/dh_kdf.c ============================================================================== --- vendor-crypto/openssl/dist/crypto/dh/dh_kdf.c Thu Nov 2 15:40:19 2017 (r325325) +++ vendor-crypto/openssl/dist/crypto/dh/dh_kdf.c Thu Nov 2 17:35:19 2017 (r325326) @@ -51,6 +51,9 @@ * ==================================================================== */ +#include + +#ifndef OPENSSL_NO_CMS #include #include #include @@ -185,3 +188,4 @@ int DH_KDF_X9_42(unsigned char *out, size_t outlen, EVP_MD_CTX_cleanup(&mctx); return rv; } +#endif Modified: vendor-crypto/openssl/dist/crypto/dh/dh_pmeth.c ============================================================================== --- vendor-crypto/openssl/dist/crypto/dh/dh_pmeth.c Thu Nov 2 15:40:19 2017 (r325325) +++ vendor-crypto/openssl/dist/crypto/dh/dh_pmeth.c Thu Nov 2 17:35:19 2017 (r325326) @@ -207,7 +207,11 @@ static int pkey_dh_ctrl(EVP_PKEY_CTX *ctx, int type, i case EVP_PKEY_CTRL_DH_KDF_TYPE: if (p1 == -2) return dctx->kdf_type; +#ifdef OPENSSL_NO_CMS + if (p1 != EVP_PKEY_DH_KDF_NONE) +#else if (p1 != EVP_PKEY_DH_KDF_NONE && p1 != EVP_PKEY_DH_KDF_X9_42) +#endif return -2; dctx->kdf_type = p1; return 1; @@ -448,7 +452,9 @@ static int pkey_dh_derive(EVP_PKEY_CTX *ctx, unsigned return ret; *keylen = ret; return 1; - } else if (dctx->kdf_type == EVP_PKEY_DH_KDF_X9_42) { + } +#ifndef OPENSSL_NO_CMS + else if (dctx->kdf_type == EVP_PKEY_DH_KDF_X9_42) { unsigned char *Z = NULL; size_t Zlen = 0; if (!dctx->kdf_outlen || !dctx->kdf_oid) @@ -479,6 +485,7 @@ static int pkey_dh_derive(EVP_PKEY_CTX *ctx, unsigned } return ret; } +#endif return 1; } Modified: vendor-crypto/openssl/dist/crypto/dsa/dsa_ameth.c ============================================================================== --- vendor-crypto/openssl/dist/crypto/dsa/dsa_ameth.c Thu Nov 2 15:40:19 2017 (r325325) +++ vendor-crypto/openssl/dist/crypto/dsa/dsa_ameth.c Thu Nov 2 17:35:19 2017 (r325326) @@ -258,6 +258,7 @@ static int dsa_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_ goto dsaerr; } + BN_set_flags(dsa->priv_key, BN_FLG_CONSTTIME); if (!BN_mod_exp(dsa->pub_key, dsa->g, dsa->priv_key, dsa->p, ctx)) { DSAerr(DSA_F_DSA_PRIV_DECODE, DSA_R_BN_ERROR); goto dsaerr; Modified: vendor-crypto/openssl/dist/crypto/dsa/dsa_gen.c ============================================================================== --- vendor-crypto/openssl/dist/crypto/dsa/dsa_gen.c Thu Nov 2 15:40:19 2017 (r325325) +++ vendor-crypto/openssl/dist/crypto/dsa/dsa_gen.c Thu Nov 2 17:35:19 2017 (r325326) @@ -482,6 +482,8 @@ int dsa_builtin_paramgen2(DSA *ret, size_t L, size_t N } else { p = BN_CTX_get(ctx); q = BN_CTX_get(ctx); + if (q == NULL) + goto err; } if (!BN_lshift(test, BN_value_one(), L - 1)) Modified: vendor-crypto/openssl/dist/crypto/dsa/dsa_ossl.c ============================================================================== --- vendor-crypto/openssl/dist/crypto/dsa/dsa_ossl.c Thu Nov 2 15:40:19 2017 (r325325) +++ vendor-crypto/openssl/dist/crypto/dsa/dsa_ossl.c Thu Nov 2 17:35:19 2017 (r325326) @@ -224,7 +224,9 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BI { BN_CTX *ctx; BIGNUM k, kq, *K, *kinv = NULL, *r = NULL; + BIGNUM l, m; int ret = 0; + int q_bits; if (!dsa->p || !dsa->q || !dsa->g) { DSAerr(DSA_F_DSA_SIGN_SETUP, DSA_R_MISSING_PARAMETERS); @@ -233,6 +235,8 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BI BN_init(&k); BN_init(&kq); + BN_init(&l); + BN_init(&m); if (ctx_in == NULL) { if ((ctx = BN_CTX_new()) == NULL) @@ -243,6 +247,13 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BI if ((r = BN_new()) == NULL) goto err; + /* Preallocate space */ + q_bits = BN_num_bits(dsa->q); + if (!BN_set_bit(&k, q_bits) + || !BN_set_bit(&l, q_bits) + || !BN_set_bit(&m, q_bits)) + goto err; + /* Get random k */ do if (!BN_rand_range(&k, dsa->q)) @@ -263,25 +274,24 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BI /* Compute r = (g^k mod p) mod q */ if ((dsa->flags & DSA_FLAG_NO_EXP_CONSTTIME) == 0) { - if (!BN_copy(&kq, &k)) - goto err; - *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Thu Nov 2 17:35: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 1F757E5F3B9; Thu, 2 Nov 2017 17:35:51 +0000 (UTC) (envelope-from jkim@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 C59352638; Thu, 2 Nov 2017 17:35:50 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA2HZnXC059001; Thu, 2 Nov 2017 17:35:49 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA2HZnOa059000; Thu, 2 Nov 2017 17:35:49 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201711021735.vA2HZnOa059000@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Thu, 2 Nov 2017 17:35:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r325327 - vendor-crypto/openssl/1.0.2m X-SVN-Group: vendor-crypto X-SVN-Commit-Author: jkim X-SVN-Commit-Paths: vendor-crypto/openssl/1.0.2m X-SVN-Commit-Revision: 325327 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: Thu, 02 Nov 2017 17:35:51 -0000 Author: jkim Date: Thu Nov 2 17:35:49 2017 New Revision: 325327 URL: https://svnweb.freebsd.org/changeset/base/325327 Log: Tag OpenSSL 1.0.2m. Added: vendor-crypto/openssl/1.0.2m/ - copied from r325326, vendor-crypto/openssl/dist/ From owner-svn-src-all@freebsd.org Thu Nov 2 17:38: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 493E9E5F4FD; Thu, 2 Nov 2017 17:38:52 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pf0-x22e.google.com (mail-pf0-x22e.google.com [IPv6:2607:f8b0:400e:c00::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 158362841; Thu, 2 Nov 2017 17:38:52 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pf0-x22e.google.com with SMTP id a8so216307pfc.0; Thu, 02 Nov 2017 10:38:52 -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 :content-transfer-encoding:message-id:references:to; bh=mNq2LkQvrv1iZsI3mYv2aTlkP5Jskw8+KORJu+188+4=; b=QASgfVGkEL6OyHTBQ67Z6r+H3NXec1+1nmdDnl+NMrbnS8IAhWou2xntkYoS4APPgX zV+izH0SlBnwtQ6qpSLrmi+/CbRpVQz4iyRcnuIs7DJR7KBUig3OEvCux/CjILG4OOmk EYnCbsG33cr0CUYiewYal1NNX1zPjsddMI9hpycOoOkDl8dT3WVCYRbuy9mNIoXNXU7Y KZ5BGA8z69qjvrZhuVDXZh6OQCz8DCmR27c7OEjNfxkABE/Gs8h370HTWN/5kLnTY04A /e3CykZwhE8qz+YzwUNzMJH/EtdVgYcmircvUFK4uUZvYhCH3hlZ8j0a/zRl2xgD4xga aYeQ== 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 :content-transfer-encoding:message-id:references:to; bh=mNq2LkQvrv1iZsI3mYv2aTlkP5Jskw8+KORJu+188+4=; b=FfDnna5DRXBosZi46TSUyL/XMDRvipVU0+2IJ77eueTYE+zZ3oOfY9ltiW+5XJnY2o ljOuRLhp54C2KbWjb3h2s9h/nANjpBzR3zS35mkEFR78xmu0rGq9kn8hAoUSE4czqLf+ k/jlU2RC1GvKdAgiUKJF6oguB+qr/N6aJSppKqgP5TENw2a2lLtp3sRYOTidUdIYwGCf JoVDYDMs24Qop13VKMkfyai7OelMPIc2sOhzLUzIkYyl1MtcbSqfjc34lyFqoFCGs9ci 7zybfUN6rMz+beQ0/3WZwF4tRNopYmJyzNJ+i9CFldEJPbn6STvLNT9BfHTydctBsXAU tWHg== X-Gm-Message-State: AMCzsaWAFpT3YnAGaw/ILLaXi9zIG1xcnlqrMEY4RQueLLu+C6NCpvH7 aFiQH6I2oPW10IZOX5SuWGSP/DnmFlY= X-Google-Smtp-Source: ABhQp+TkMAhv+xLwuN8mtf0gihPVPtohr/FXJAjaIbqM+QCIXvjC6TfkRTrTnxya4GGZLJs6x2yjoQ== X-Received: by 10.98.31.14 with SMTP id f14mr4646026pff.235.1509644331109; Thu, 02 Nov 2017 10:38:51 -0700 (PDT) Received: from ?IPv6:2607:fb90:782a:a4d8:a5e7:98ca:fa4f:253b? ([2607:fb90:782a:a4d8:a5e7:98ca:fa4f:253b]) by smtp.gmail.com with ESMTPSA id c73sm9075525pfd.139.2017.11.02.10.38.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Nov 2017 10:38:50 -0700 (PDT) Mime-Version: 1.0 (1.0) Subject: Re: svn commit: r325320 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs From: Ngie Cooper X-Mailer: iPhone Mail (15B93) In-Reply-To: <201711021349.vA2Dn8Yg063559@repo.freebsd.org> Date: Thu, 2 Nov 2017 10:38:49 -0700 Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-Id: <5199F871-5DE2-4434-87F2-FEF88DB34037@gmail.com> References: <201711021349.vA2Dn8Yg063559@repo.freebsd.org> To: Andriy Gapon 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: Thu, 02 Nov 2017 17:38:52 -0000 > On Nov 2, 2017, at 06:49, Andriy Gapon wrote: >=20 > Author: avg > Date: Thu Nov 2 13:49:08 2017 > New Revision: 325320 > URL: https://svnweb.freebsd.org/changeset/base/325320 >=20 > Log: > Disable posix_fallocate(2) for ZFS >=20 > The generic (naive) implementation of posix_fallocate cannot provide the > standard mandated guarantee that overwrites would never fail due to the l= ack > of free space. The fundamental reason is the copy-on-write architecture > of ZFS. Other features like compression and deduplication can also > increase the size difference between the (pre-)allocated dummy content > and the future content. >=20 > So, until ZFS can properly implement the feature it's better to report > that it is unsupported rather than providing an ersatz implementation. > Please note that EINVAL is used to report that the underlying file system= > does not support the operation (POSIX.1-2008). >=20 > illumos and ZoL seem to do the same. >=20 > MFC after: 3 weeks > Sponsored by: Panzura It=E2=80=99d be nice if it worked though and was reported via the file syste= m. Posix suggests it should be, as of 2013: http://austingroupbugs.net/view= .php?id=3D687 . Need to go poking around and see what=E2=80=99s in freebsd later on tonight.= Bug filed: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D223383 . > Modified: > head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c >=20 > Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Thu= Nov 2 12:16:50 2017 (r325319) > +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Thu= Nov 2 13:49:08 2017 (r325320) > @@ -6009,6 +6009,7 @@ struct vop_vector zfs_vnodeops =3D { > .vop_inactive =3D zfs_freebsd_inactive, > .vop_reclaim =3D zfs_freebsd_reclaim, > .vop_access =3D zfs_freebsd_access, > + .vop_allocate =3D VOP_EINVAL, > .vop_lookup =3D zfs_cache_lookup, > .vop_cachedlookup =3D zfs_freebsd_lookup, > .vop_getattr =3D zfs_freebsd_getattr, >=20 From owner-svn-src-all@freebsd.org Thu Nov 2 18:04: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 6EDDBE5FB60; Thu, 2 Nov 2017 18:04:34 +0000 (UTC) (envelope-from jkim@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 019213483; Thu, 2 Nov 2017 18:04:33 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA2I4XoB071436; Thu, 2 Nov 2017 18:04:33 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA2I4TK8071402; Thu, 2 Nov 2017 18:04:29 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201711021804.vA2I4TK8071402@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Thu, 2 Nov 2017 18:04:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325328 - in head: crypto/openssl crypto/openssl/apps crypto/openssl/crypto crypto/openssl/crypto/asn1 crypto/openssl/crypto/bn crypto/openssl/crypto/bn/asm crypto/openssl/crypto/dh cry... X-SVN-Group: head X-SVN-Commit-Author: jkim X-SVN-Commit-Paths: in head: crypto/openssl crypto/openssl/apps crypto/openssl/crypto crypto/openssl/crypto/asn1 crypto/openssl/crypto/bn crypto/openssl/crypto/bn/asm crypto/openssl/crypto/dh crypto/openssl/crypto/dsa cr... X-SVN-Commit-Revision: 325328 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: Thu, 02 Nov 2017 18:04:34 -0000 Author: jkim Date: Thu Nov 2 18:04:29 2017 New Revision: 325328 URL: https://svnweb.freebsd.org/changeset/base/325328 Log: Merge OpenSSL 1.0.2m. Added: head/crypto/openssl/crypto/asn1/asn1_int.h - copied unchanged from r325326, vendor-crypto/openssl/dist/crypto/asn1/asn1_int.h head/crypto/openssl/doc/crypto/EVP_PKEY_meth_new.pod - copied unchanged from r325326, vendor-crypto/openssl/dist/doc/crypto/EVP_PKEY_meth_new.pod head/crypto/openssl/doc/crypto/X509_check_private_key.pod - copied unchanged from r325326, vendor-crypto/openssl/dist/doc/crypto/X509_check_private_key.pod head/crypto/openssl/doc/ssl/SSL_CTX_set_tlsext_servername_callback.pod - copied unchanged from r325326, vendor-crypto/openssl/dist/doc/ssl/SSL_CTX_set_tlsext_servername_callback.pod head/crypto/openssl/doc/ssl/SSL_export_keying_material.pod - copied unchanged from r325326, vendor-crypto/openssl/dist/doc/ssl/SSL_export_keying_material.pod head/secure/lib/libcrypto/man/EVP_PKEY_meth_new.3 (contents, props changed) head/secure/lib/libcrypto/man/X509_check_private_key.3 (contents, props changed) head/secure/lib/libssl/man/SSL_export_keying_material.3 (contents, props changed) Deleted: head/crypto/openssl/doc/man3/SSL_CTX_set_tlsext_servername_callback.pod Modified: head/crypto/openssl/CHANGES head/crypto/openssl/INSTALL head/crypto/openssl/Makefile head/crypto/openssl/NEWS head/crypto/openssl/README head/crypto/openssl/apps/ca.c head/crypto/openssl/apps/s_client.c head/crypto/openssl/apps/s_server.c head/crypto/openssl/apps/speed.c head/crypto/openssl/apps/spkac.c head/crypto/openssl/apps/srp.c head/crypto/openssl/apps/tsget head/crypto/openssl/crypto/asn1/Makefile head/crypto/openssl/crypto/asn1/a_bitstr.c head/crypto/openssl/crypto/asn1/tasn_fre.c head/crypto/openssl/crypto/asn1/tasn_new.c head/crypto/openssl/crypto/asn1/x_name.c head/crypto/openssl/crypto/asn1/x_pkey.c head/crypto/openssl/crypto/bn/asm/x86_64-mont5.pl head/crypto/openssl/crypto/bn/bn_exp.c head/crypto/openssl/crypto/bn/bn_lib.c head/crypto/openssl/crypto/bn/bn_mont.c head/crypto/openssl/crypto/bn/bn_mul.c head/crypto/openssl/crypto/bn/bn_x931p.c head/crypto/openssl/crypto/cryptlib.c head/crypto/openssl/crypto/dh/Makefile head/crypto/openssl/crypto/dh/dh.h head/crypto/openssl/crypto/dh/dh_kdf.c head/crypto/openssl/crypto/dh/dh_pmeth.c head/crypto/openssl/crypto/dsa/dsa_ameth.c head/crypto/openssl/crypto/dsa/dsa_gen.c head/crypto/openssl/crypto/dsa/dsa_ossl.c head/crypto/openssl/crypto/ec/asm/ecp_nistz256-x86_64.pl head/crypto/openssl/crypto/ec/ecp_mont.c head/crypto/openssl/crypto/ec/ecp_nistp224.c head/crypto/openssl/crypto/ec/ecp_nistp256.c head/crypto/openssl/crypto/ec/ecp_nistp521.c head/crypto/openssl/crypto/ecdh/ech_lib.c head/crypto/openssl/crypto/ecdsa/ecs_lib.c head/crypto/openssl/crypto/ecdsa/ecs_ossl.c head/crypto/openssl/crypto/err/err.c head/crypto/openssl/crypto/evp/e_aes_cbc_hmac_sha1.c head/crypto/openssl/crypto/evp/e_aes_cbc_hmac_sha256.c head/crypto/openssl/crypto/evp/evp.h head/crypto/openssl/crypto/evp/evp_key.c head/crypto/openssl/crypto/evp/pmeth_lib.c head/crypto/openssl/crypto/ex_data.c head/crypto/openssl/crypto/lhash/lhash.c head/crypto/openssl/crypto/ocsp/ocsp_vfy.c head/crypto/openssl/crypto/opensslv.h head/crypto/openssl/crypto/pem/pem_lib.c head/crypto/openssl/crypto/pem/pem_pk8.c head/crypto/openssl/crypto/pem/pem_pkey.c head/crypto/openssl/crypto/pkcs12/p12_kiss.c head/crypto/openssl/crypto/rsa/rsa_ameth.c head/crypto/openssl/crypto/rsa/rsa_oaep.c head/crypto/openssl/crypto/rsa/rsa_pk1.c head/crypto/openssl/crypto/rsa/rsa_pmeth.c head/crypto/openssl/crypto/ui/ui_lib.c head/crypto/openssl/crypto/whrlpool/wp_dgst.c head/crypto/openssl/crypto/x509/by_dir.c head/crypto/openssl/crypto/x509/by_file.c head/crypto/openssl/crypto/x509v3/pcy_tree.c head/crypto/openssl/crypto/x509v3/v3_addr.c head/crypto/openssl/crypto/x509v3/v3_genn.c head/crypto/openssl/crypto/x509v3/v3_ncons.c head/crypto/openssl/crypto/x86_64cpuid.pl head/crypto/openssl/doc/apps/asn1parse.pod head/crypto/openssl/doc/apps/ca.pod head/crypto/openssl/doc/apps/ciphers.pod head/crypto/openssl/doc/apps/cms.pod head/crypto/openssl/doc/apps/crl.pod head/crypto/openssl/doc/apps/crl2pkcs7.pod head/crypto/openssl/doc/apps/dgst.pod head/crypto/openssl/doc/apps/dhparam.pod head/crypto/openssl/doc/apps/dsa.pod head/crypto/openssl/doc/apps/dsaparam.pod head/crypto/openssl/doc/apps/ec.pod head/crypto/openssl/doc/apps/ecparam.pod head/crypto/openssl/doc/apps/enc.pod head/crypto/openssl/doc/apps/errstr.pod head/crypto/openssl/doc/apps/gendsa.pod head/crypto/openssl/doc/apps/genpkey.pod head/crypto/openssl/doc/apps/genrsa.pod head/crypto/openssl/doc/apps/nseq.pod head/crypto/openssl/doc/apps/ocsp.pod head/crypto/openssl/doc/apps/passwd.pod head/crypto/openssl/doc/apps/pkcs12.pod head/crypto/openssl/doc/apps/pkcs7.pod head/crypto/openssl/doc/apps/pkcs8.pod head/crypto/openssl/doc/apps/pkey.pod head/crypto/openssl/doc/apps/pkeyparam.pod head/crypto/openssl/doc/apps/pkeyutl.pod head/crypto/openssl/doc/apps/rand.pod head/crypto/openssl/doc/apps/req.pod head/crypto/openssl/doc/apps/rsa.pod head/crypto/openssl/doc/apps/rsautl.pod head/crypto/openssl/doc/apps/s_client.pod head/crypto/openssl/doc/apps/s_server.pod head/crypto/openssl/doc/apps/s_time.pod head/crypto/openssl/doc/apps/sess_id.pod head/crypto/openssl/doc/apps/smime.pod head/crypto/openssl/doc/apps/speed.pod head/crypto/openssl/doc/apps/spkac.pod head/crypto/openssl/doc/apps/ts.pod head/crypto/openssl/doc/apps/tsget.pod head/crypto/openssl/doc/apps/verify.pod head/crypto/openssl/doc/apps/version.pod head/crypto/openssl/doc/apps/x509.pod head/crypto/openssl/doc/crypto/BN_bn2bin.pod head/crypto/openssl/doc/crypto/BN_new.pod head/crypto/openssl/doc/crypto/EVP_EncryptInit.pod head/crypto/openssl/doc/crypto/RSA_padding_add_PKCS1_type_1.pod head/crypto/openssl/doc/crypto/RSA_public_encrypt.pod head/crypto/openssl/doc/crypto/hmac.pod head/crypto/openssl/doc/ssl/SSL_set_connect_state.pod head/crypto/openssl/ssl/s23_clnt.c head/crypto/openssl/ssl/s3_pkt.c head/crypto/openssl/ssl/s3_srvr.c head/crypto/openssl/ssl/ssl_ciph.c head/crypto/openssl/ssl/ssl_lib.c head/crypto/openssl/ssl/ssl_sess.c head/crypto/openssl/ssl/ssltest.c head/crypto/openssl/ssl/tls1.h head/crypto/openssl/util/copy-if-different.pl head/crypto/openssl/util/copy.pl head/crypto/openssl/util/libeay.num head/crypto/openssl/util/mk1mf.pl head/secure/lib/libcrypto/Makefile.inc head/secure/lib/libcrypto/Makefile.man head/secure/lib/libcrypto/amd64/ecp_nistz256-x86_64.S head/secure/lib/libcrypto/amd64/x86_64-mont5.S head/secure/lib/libcrypto/amd64/x86_64cpuid.S head/secure/lib/libcrypto/man/ASN1_OBJECT_new.3 head/secure/lib/libcrypto/man/ASN1_STRING_length.3 head/secure/lib/libcrypto/man/ASN1_STRING_new.3 head/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3 head/secure/lib/libcrypto/man/ASN1_TIME_set.3 head/secure/lib/libcrypto/man/ASN1_generate_nconf.3 head/secure/lib/libcrypto/man/BIO_ctrl.3 head/secure/lib/libcrypto/man/BIO_f_base64.3 head/secure/lib/libcrypto/man/BIO_f_buffer.3 head/secure/lib/libcrypto/man/BIO_f_cipher.3 head/secure/lib/libcrypto/man/BIO_f_md.3 head/secure/lib/libcrypto/man/BIO_f_null.3 head/secure/lib/libcrypto/man/BIO_f_ssl.3 head/secure/lib/libcrypto/man/BIO_find_type.3 head/secure/lib/libcrypto/man/BIO_new.3 head/secure/lib/libcrypto/man/BIO_new_CMS.3 head/secure/lib/libcrypto/man/BIO_push.3 head/secure/lib/libcrypto/man/BIO_read.3 head/secure/lib/libcrypto/man/BIO_s_accept.3 head/secure/lib/libcrypto/man/BIO_s_bio.3 head/secure/lib/libcrypto/man/BIO_s_connect.3 head/secure/lib/libcrypto/man/BIO_s_fd.3 head/secure/lib/libcrypto/man/BIO_s_file.3 head/secure/lib/libcrypto/man/BIO_s_mem.3 head/secure/lib/libcrypto/man/BIO_s_null.3 head/secure/lib/libcrypto/man/BIO_s_socket.3 head/secure/lib/libcrypto/man/BIO_set_callback.3 head/secure/lib/libcrypto/man/BIO_should_retry.3 head/secure/lib/libcrypto/man/BN_BLINDING_new.3 head/secure/lib/libcrypto/man/BN_CTX_new.3 head/secure/lib/libcrypto/man/BN_CTX_start.3 head/secure/lib/libcrypto/man/BN_add.3 head/secure/lib/libcrypto/man/BN_add_word.3 head/secure/lib/libcrypto/man/BN_bn2bin.3 head/secure/lib/libcrypto/man/BN_cmp.3 head/secure/lib/libcrypto/man/BN_copy.3 head/secure/lib/libcrypto/man/BN_generate_prime.3 head/secure/lib/libcrypto/man/BN_mod_inverse.3 head/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3 head/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3 head/secure/lib/libcrypto/man/BN_new.3 head/secure/lib/libcrypto/man/BN_num_bytes.3 head/secure/lib/libcrypto/man/BN_rand.3 head/secure/lib/libcrypto/man/BN_set_bit.3 head/secure/lib/libcrypto/man/BN_swap.3 head/secure/lib/libcrypto/man/BN_zero.3 head/secure/lib/libcrypto/man/CMS_add0_cert.3 head/secure/lib/libcrypto/man/CMS_add1_recipient_cert.3 head/secure/lib/libcrypto/man/CMS_add1_signer.3 head/secure/lib/libcrypto/man/CMS_compress.3 head/secure/lib/libcrypto/man/CMS_decrypt.3 head/secure/lib/libcrypto/man/CMS_encrypt.3 head/secure/lib/libcrypto/man/CMS_final.3 head/secure/lib/libcrypto/man/CMS_get0_RecipientInfos.3 head/secure/lib/libcrypto/man/CMS_get0_SignerInfos.3 head/secure/lib/libcrypto/man/CMS_get0_type.3 head/secure/lib/libcrypto/man/CMS_get1_ReceiptRequest.3 head/secure/lib/libcrypto/man/CMS_sign.3 head/secure/lib/libcrypto/man/CMS_sign_receipt.3 head/secure/lib/libcrypto/man/CMS_uncompress.3 head/secure/lib/libcrypto/man/CMS_verify.3 head/secure/lib/libcrypto/man/CMS_verify_receipt.3 head/secure/lib/libcrypto/man/CONF_modules_free.3 head/secure/lib/libcrypto/man/CONF_modules_load_file.3 head/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3 head/secure/lib/libcrypto/man/DH_generate_key.3 head/secure/lib/libcrypto/man/DH_generate_parameters.3 head/secure/lib/libcrypto/man/DH_get_ex_new_index.3 head/secure/lib/libcrypto/man/DH_new.3 head/secure/lib/libcrypto/man/DH_set_method.3 head/secure/lib/libcrypto/man/DH_size.3 head/secure/lib/libcrypto/man/DSA_SIG_new.3 head/secure/lib/libcrypto/man/DSA_do_sign.3 head/secure/lib/libcrypto/man/DSA_dup_DH.3 head/secure/lib/libcrypto/man/DSA_generate_key.3 head/secure/lib/libcrypto/man/DSA_generate_parameters.3 head/secure/lib/libcrypto/man/DSA_get_ex_new_index.3 head/secure/lib/libcrypto/man/DSA_new.3 head/secure/lib/libcrypto/man/DSA_set_method.3 head/secure/lib/libcrypto/man/DSA_sign.3 head/secure/lib/libcrypto/man/DSA_size.3 head/secure/lib/libcrypto/man/EC_GFp_simple_method.3 head/secure/lib/libcrypto/man/EC_GROUP_copy.3 head/secure/lib/libcrypto/man/EC_GROUP_new.3 head/secure/lib/libcrypto/man/EC_KEY_new.3 head/secure/lib/libcrypto/man/EC_POINT_add.3 head/secure/lib/libcrypto/man/EC_POINT_new.3 head/secure/lib/libcrypto/man/ERR_GET_LIB.3 head/secure/lib/libcrypto/man/ERR_clear_error.3 head/secure/lib/libcrypto/man/ERR_error_string.3 head/secure/lib/libcrypto/man/ERR_get_error.3 head/secure/lib/libcrypto/man/ERR_load_crypto_strings.3 head/secure/lib/libcrypto/man/ERR_load_strings.3 head/secure/lib/libcrypto/man/ERR_print_errors.3 head/secure/lib/libcrypto/man/ERR_put_error.3 head/secure/lib/libcrypto/man/ERR_remove_state.3 head/secure/lib/libcrypto/man/ERR_set_mark.3 head/secure/lib/libcrypto/man/EVP_BytesToKey.3 head/secure/lib/libcrypto/man/EVP_DigestInit.3 head/secure/lib/libcrypto/man/EVP_DigestSignInit.3 head/secure/lib/libcrypto/man/EVP_DigestVerifyInit.3 head/secure/lib/libcrypto/man/EVP_EncodeInit.3 head/secure/lib/libcrypto/man/EVP_EncryptInit.3 head/secure/lib/libcrypto/man/EVP_OpenInit.3 head/secure/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3 head/secure/lib/libcrypto/man/EVP_PKEY_CTX_new.3 head/secure/lib/libcrypto/man/EVP_PKEY_cmp.3 head/secure/lib/libcrypto/man/EVP_PKEY_decrypt.3 head/secure/lib/libcrypto/man/EVP_PKEY_derive.3 head/secure/lib/libcrypto/man/EVP_PKEY_encrypt.3 head/secure/lib/libcrypto/man/EVP_PKEY_get_default_digest.3 head/secure/lib/libcrypto/man/EVP_PKEY_keygen.3 head/secure/lib/libcrypto/man/EVP_PKEY_new.3 head/secure/lib/libcrypto/man/EVP_PKEY_print_private.3 head/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 head/secure/lib/libcrypto/man/EVP_PKEY_sign.3 head/secure/lib/libcrypto/man/EVP_PKEY_verify.3 head/secure/lib/libcrypto/man/EVP_PKEY_verify_recover.3 head/secure/lib/libcrypto/man/EVP_SealInit.3 head/secure/lib/libcrypto/man/EVP_SignInit.3 head/secure/lib/libcrypto/man/EVP_VerifyInit.3 head/secure/lib/libcrypto/man/OBJ_nid2obj.3 head/secure/lib/libcrypto/man/OPENSSL_Applink.3 head/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3 head/secure/lib/libcrypto/man/OPENSSL_config.3 head/secure/lib/libcrypto/man/OPENSSL_ia32cap.3 head/secure/lib/libcrypto/man/OPENSSL_instrument_bus.3 head/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3 head/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3 head/secure/lib/libcrypto/man/PEM_write_bio_CMS_stream.3 head/secure/lib/libcrypto/man/PEM_write_bio_PKCS7_stream.3 head/secure/lib/libcrypto/man/PKCS12_create.3 head/secure/lib/libcrypto/man/PKCS12_parse.3 head/secure/lib/libcrypto/man/PKCS7_decrypt.3 head/secure/lib/libcrypto/man/PKCS7_encrypt.3 head/secure/lib/libcrypto/man/PKCS7_sign.3 head/secure/lib/libcrypto/man/PKCS7_sign_add_signer.3 head/secure/lib/libcrypto/man/PKCS7_verify.3 head/secure/lib/libcrypto/man/RAND_add.3 head/secure/lib/libcrypto/man/RAND_bytes.3 head/secure/lib/libcrypto/man/RAND_cleanup.3 head/secure/lib/libcrypto/man/RAND_egd.3 head/secure/lib/libcrypto/man/RAND_load_file.3 head/secure/lib/libcrypto/man/RAND_set_rand_method.3 head/secure/lib/libcrypto/man/RSA_blinding_on.3 head/secure/lib/libcrypto/man/RSA_check_key.3 head/secure/lib/libcrypto/man/RSA_generate_key.3 head/secure/lib/libcrypto/man/RSA_get_ex_new_index.3 head/secure/lib/libcrypto/man/RSA_new.3 head/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3 head/secure/lib/libcrypto/man/RSA_print.3 head/secure/lib/libcrypto/man/RSA_private_encrypt.3 head/secure/lib/libcrypto/man/RSA_public_encrypt.3 head/secure/lib/libcrypto/man/RSA_set_method.3 head/secure/lib/libcrypto/man/RSA_sign.3 head/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3 head/secure/lib/libcrypto/man/RSA_size.3 head/secure/lib/libcrypto/man/SMIME_read_CMS.3 head/secure/lib/libcrypto/man/SMIME_read_PKCS7.3 head/secure/lib/libcrypto/man/SMIME_write_CMS.3 head/secure/lib/libcrypto/man/SMIME_write_PKCS7.3 head/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3 head/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3 head/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3 head/secure/lib/libcrypto/man/X509_NAME_print_ex.3 head/secure/lib/libcrypto/man/X509_STORE_CTX_get_error.3 head/secure/lib/libcrypto/man/X509_STORE_CTX_get_ex_new_index.3 head/secure/lib/libcrypto/man/X509_STORE_CTX_new.3 head/secure/lib/libcrypto/man/X509_STORE_CTX_set_verify_cb.3 head/secure/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3 head/secure/lib/libcrypto/man/X509_VERIFY_PARAM_set_flags.3 head/secure/lib/libcrypto/man/X509_check_host.3 head/secure/lib/libcrypto/man/X509_new.3 head/secure/lib/libcrypto/man/X509_verify_cert.3 head/secure/lib/libcrypto/man/bio.3 head/secure/lib/libcrypto/man/blowfish.3 head/secure/lib/libcrypto/man/bn.3 head/secure/lib/libcrypto/man/bn_internal.3 head/secure/lib/libcrypto/man/buffer.3 head/secure/lib/libcrypto/man/crypto.3 head/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3 head/secure/lib/libcrypto/man/d2i_CMS_ContentInfo.3 head/secure/lib/libcrypto/man/d2i_DHparams.3 head/secure/lib/libcrypto/man/d2i_DSAPublicKey.3 head/secure/lib/libcrypto/man/d2i_ECPKParameters.3 head/secure/lib/libcrypto/man/d2i_ECPrivateKey.3 head/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3 head/secure/lib/libcrypto/man/d2i_PrivateKey.3 head/secure/lib/libcrypto/man/d2i_RSAPublicKey.3 head/secure/lib/libcrypto/man/d2i_X509.3 head/secure/lib/libcrypto/man/d2i_X509_ALGOR.3 head/secure/lib/libcrypto/man/d2i_X509_CRL.3 head/secure/lib/libcrypto/man/d2i_X509_NAME.3 head/secure/lib/libcrypto/man/d2i_X509_REQ.3 head/secure/lib/libcrypto/man/d2i_X509_SIG.3 head/secure/lib/libcrypto/man/des.3 head/secure/lib/libcrypto/man/dh.3 head/secure/lib/libcrypto/man/dsa.3 head/secure/lib/libcrypto/man/ec.3 head/secure/lib/libcrypto/man/ecdsa.3 head/secure/lib/libcrypto/man/engine.3 head/secure/lib/libcrypto/man/err.3 head/secure/lib/libcrypto/man/evp.3 head/secure/lib/libcrypto/man/hmac.3 head/secure/lib/libcrypto/man/i2d_CMS_bio_stream.3 head/secure/lib/libcrypto/man/i2d_PKCS7_bio_stream.3 head/secure/lib/libcrypto/man/lh_stats.3 head/secure/lib/libcrypto/man/lhash.3 head/secure/lib/libcrypto/man/md5.3 head/secure/lib/libcrypto/man/mdc2.3 head/secure/lib/libcrypto/man/pem.3 head/secure/lib/libcrypto/man/rand.3 head/secure/lib/libcrypto/man/rc4.3 head/secure/lib/libcrypto/man/ripemd.3 head/secure/lib/libcrypto/man/rsa.3 head/secure/lib/libcrypto/man/sha.3 head/secure/lib/libcrypto/man/threads.3 head/secure/lib/libcrypto/man/ui.3 head/secure/lib/libcrypto/man/ui_compat.3 head/secure/lib/libcrypto/man/x509.3 head/secure/lib/libssl/Makefile.man head/secure/lib/libssl/man/SSL_CIPHER_get_name.3 head/secure/lib/libssl/man/SSL_COMP_add_compression_method.3 head/secure/lib/libssl/man/SSL_CONF_CTX_new.3 head/secure/lib/libssl/man/SSL_CONF_CTX_set1_prefix.3 head/secure/lib/libssl/man/SSL_CONF_CTX_set_flags.3 head/secure/lib/libssl/man/SSL_CONF_CTX_set_ssl_ctx.3 head/secure/lib/libssl/man/SSL_CONF_cmd.3 head/secure/lib/libssl/man/SSL_CONF_cmd_argv.3 head/secure/lib/libssl/man/SSL_CTX_add1_chain_cert.3 head/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3 head/secure/lib/libssl/man/SSL_CTX_add_session.3 head/secure/lib/libssl/man/SSL_CTX_ctrl.3 head/secure/lib/libssl/man/SSL_CTX_flush_sessions.3 head/secure/lib/libssl/man/SSL_CTX_free.3 head/secure/lib/libssl/man/SSL_CTX_get0_param.3 head/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3 head/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3 head/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3 head/secure/lib/libssl/man/SSL_CTX_new.3 head/secure/lib/libssl/man/SSL_CTX_sess_number.3 head/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3 head/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3 head/secure/lib/libssl/man/SSL_CTX_sessions.3 head/secure/lib/libssl/man/SSL_CTX_set1_curves.3 head/secure/lib/libssl/man/SSL_CTX_set1_verify_cert_store.3 head/secure/lib/libssl/man/SSL_CTX_set_alpn_select_cb.3 head/secure/lib/libssl/man/SSL_CTX_set_cert_cb.3 head/secure/lib/libssl/man/SSL_CTX_set_cert_store.3 head/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3 head/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3 head/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3 head/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3 head/secure/lib/libssl/man/SSL_CTX_set_custom_cli_ext.3 head/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3 head/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3 head/secure/lib/libssl/man/SSL_CTX_set_info_callback.3 head/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3 head/secure/lib/libssl/man/SSL_CTX_set_mode.3 head/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3 head/secure/lib/libssl/man/SSL_CTX_set_options.3 head/secure/lib/libssl/man/SSL_CTX_set_psk_client_callback.3 head/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3 head/secure/lib/libssl/man/SSL_CTX_set_read_ahead.3 head/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3 head/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3 head/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3 head/secure/lib/libssl/man/SSL_CTX_set_timeout.3 head/secure/lib/libssl/man/SSL_CTX_set_tlsext_servername_callback.3 head/secure/lib/libssl/man/SSL_CTX_set_tlsext_status_cb.3 head/secure/lib/libssl/man/SSL_CTX_set_tlsext_ticket_key_cb.3 head/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3 head/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3 head/secure/lib/libssl/man/SSL_CTX_set_verify.3 head/secure/lib/libssl/man/SSL_CTX_use_certificate.3 head/secure/lib/libssl/man/SSL_CTX_use_psk_identity_hint.3 head/secure/lib/libssl/man/SSL_CTX_use_serverinfo.3 head/secure/lib/libssl/man/SSL_SESSION_free.3 head/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3 head/secure/lib/libssl/man/SSL_SESSION_get_time.3 head/secure/lib/libssl/man/SSL_accept.3 head/secure/lib/libssl/man/SSL_alert_type_string.3 head/secure/lib/libssl/man/SSL_check_chain.3 head/secure/lib/libssl/man/SSL_clear.3 head/secure/lib/libssl/man/SSL_connect.3 head/secure/lib/libssl/man/SSL_do_handshake.3 head/secure/lib/libssl/man/SSL_free.3 head/secure/lib/libssl/man/SSL_get_SSL_CTX.3 head/secure/lib/libssl/man/SSL_get_ciphers.3 head/secure/lib/libssl/man/SSL_get_client_CA_list.3 head/secure/lib/libssl/man/SSL_get_current_cipher.3 head/secure/lib/libssl/man/SSL_get_default_timeout.3 head/secure/lib/libssl/man/SSL_get_error.3 head/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3 head/secure/lib/libssl/man/SSL_get_ex_new_index.3 head/secure/lib/libssl/man/SSL_get_fd.3 head/secure/lib/libssl/man/SSL_get_peer_cert_chain.3 head/secure/lib/libssl/man/SSL_get_peer_certificate.3 head/secure/lib/libssl/man/SSL_get_psk_identity.3 head/secure/lib/libssl/man/SSL_get_rbio.3 head/secure/lib/libssl/man/SSL_get_session.3 head/secure/lib/libssl/man/SSL_get_verify_result.3 head/secure/lib/libssl/man/SSL_get_version.3 head/secure/lib/libssl/man/SSL_library_init.3 head/secure/lib/libssl/man/SSL_load_client_CA_file.3 head/secure/lib/libssl/man/SSL_new.3 head/secure/lib/libssl/man/SSL_pending.3 head/secure/lib/libssl/man/SSL_read.3 head/secure/lib/libssl/man/SSL_rstate_string.3 head/secure/lib/libssl/man/SSL_session_reused.3 head/secure/lib/libssl/man/SSL_set_bio.3 head/secure/lib/libssl/man/SSL_set_connect_state.3 head/secure/lib/libssl/man/SSL_set_fd.3 head/secure/lib/libssl/man/SSL_set_session.3 head/secure/lib/libssl/man/SSL_set_shutdown.3 head/secure/lib/libssl/man/SSL_set_verify_result.3 head/secure/lib/libssl/man/SSL_shutdown.3 head/secure/lib/libssl/man/SSL_state_string.3 head/secure/lib/libssl/man/SSL_want.3 head/secure/lib/libssl/man/SSL_write.3 head/secure/lib/libssl/man/d2i_SSL_SESSION.3 head/secure/lib/libssl/man/ssl.3 head/secure/usr.bin/openssl/Makefile.man head/secure/usr.bin/openssl/man/CA.pl.1 head/secure/usr.bin/openssl/man/asn1parse.1 head/secure/usr.bin/openssl/man/c_rehash.1 head/secure/usr.bin/openssl/man/ca.1 head/secure/usr.bin/openssl/man/ciphers.1 head/secure/usr.bin/openssl/man/cms.1 head/secure/usr.bin/openssl/man/crl.1 head/secure/usr.bin/openssl/man/crl2pkcs7.1 head/secure/usr.bin/openssl/man/dgst.1 head/secure/usr.bin/openssl/man/dhparam.1 head/secure/usr.bin/openssl/man/dsa.1 head/secure/usr.bin/openssl/man/dsaparam.1 head/secure/usr.bin/openssl/man/ec.1 head/secure/usr.bin/openssl/man/ecparam.1 head/secure/usr.bin/openssl/man/enc.1 head/secure/usr.bin/openssl/man/errstr.1 head/secure/usr.bin/openssl/man/gendsa.1 head/secure/usr.bin/openssl/man/genpkey.1 head/secure/usr.bin/openssl/man/genrsa.1 head/secure/usr.bin/openssl/man/nseq.1 head/secure/usr.bin/openssl/man/ocsp.1 head/secure/usr.bin/openssl/man/openssl.1 head/secure/usr.bin/openssl/man/passwd.1 head/secure/usr.bin/openssl/man/pkcs12.1 head/secure/usr.bin/openssl/man/pkcs7.1 head/secure/usr.bin/openssl/man/pkcs8.1 head/secure/usr.bin/openssl/man/pkey.1 head/secure/usr.bin/openssl/man/pkeyparam.1 head/secure/usr.bin/openssl/man/pkeyutl.1 head/secure/usr.bin/openssl/man/rand.1 head/secure/usr.bin/openssl/man/req.1 head/secure/usr.bin/openssl/man/rsa.1 head/secure/usr.bin/openssl/man/rsautl.1 head/secure/usr.bin/openssl/man/s_client.1 head/secure/usr.bin/openssl/man/s_server.1 head/secure/usr.bin/openssl/man/s_time.1 head/secure/usr.bin/openssl/man/sess_id.1 head/secure/usr.bin/openssl/man/smime.1 head/secure/usr.bin/openssl/man/speed.1 head/secure/usr.bin/openssl/man/spkac.1 head/secure/usr.bin/openssl/man/ts.1 head/secure/usr.bin/openssl/man/tsget.1 head/secure/usr.bin/openssl/man/verify.1 head/secure/usr.bin/openssl/man/version.1 head/secure/usr.bin/openssl/man/x509.1 head/secure/usr.bin/openssl/man/x509v3_config.1 Directory Properties: head/crypto/openssl/ (props changed) Modified: head/crypto/openssl/CHANGES ============================================================================== --- head/crypto/openssl/CHANGES Thu Nov 2 17:35:49 2017 (r325327) +++ head/crypto/openssl/CHANGES Thu Nov 2 18:04:29 2017 (r325328) @@ -2,6 +2,44 @@ OpenSSL CHANGES _______________ + This is a high-level summary of the most important changes. + For a full list of changes, see the git commit log; for example, + https://github.com/openssl/openssl/commits/ and pick the appropriate + release branch. + + Changes between 1.0.2l and 1.0.2m [2 Nov 2017] + + *) bn_sqrx8x_internal carry bug on x86_64 + + There is a carry propagating bug in the x86_64 Montgomery squaring + procedure. No EC algorithms are affected. Analysis suggests that attacks + against RSA and DSA as a result of this defect would be very difficult to + perform and are not believed likely. Attacks against DH are considered just + feasible (although very difficult) because most of the work necessary to + deduce information about a private key may be performed offline. The amount + of resources required for such an attack would be very significant and + likely only accessible to a limited number of attackers. An attacker would + additionally need online access to an unpatched system using the target + private key in a scenario with persistent DH parameters and a private + key that is shared between multiple clients. + + This only affects processors that support the BMI1, BMI2 and ADX extensions + like Intel Broadwell (5th generation) and later or AMD Ryzen. + + This issue was reported to OpenSSL by the OSS-Fuzz project. + (CVE-2017-3736) + [Andy Polyakov] + + *) Malformed X.509 IPAddressFamily could cause OOB read + + If an X.509 certificate has a malformed IPAddressFamily extension, + OpenSSL could do a one-byte buffer overread. The most likely result + would be an erroneous display of the certificate in text format. + + This issue was reported to OpenSSL by the OSS-Fuzz project. + (CVE-2017-3735) + [Rich Salz] + Changes between 1.0.2k and 1.0.2l [25 May 2017] *) Have 'config' recognise 64-bit mingw and choose 'mingw64' as the target Modified: head/crypto/openssl/INSTALL ============================================================================== --- head/crypto/openssl/INSTALL Thu Nov 2 17:35:49 2017 (r325327) +++ head/crypto/openssl/INSTALL Thu Nov 2 18:04:29 2017 (r325328) @@ -190,10 +190,8 @@ the failure that isn't a problem in OpenSSL itself (like a missing or malfunctioning bc). If it is a problem with OpenSSL itself, try removing any compiler optimization flags from the CFLAG line - in Makefile.ssl and run "make clean; make". Please send a bug - report to , including the output of - "make report" in order to be added to the request tracker at - http://www.openssl.org/support/rt.html. + in Makefile.ssl and run "make clean; make". To report a bug please open an + issue on GitHub, at https://github.com/openssl/openssl/issues. 4. If everything tests ok, install OpenSSL with Modified: head/crypto/openssl/Makefile ============================================================================== --- head/crypto/openssl/Makefile Thu Nov 2 17:35:49 2017 (r325327) +++ head/crypto/openssl/Makefile Thu Nov 2 18:04:29 2017 (r325328) @@ -4,7 +4,7 @@ ## Makefile for OpenSSL ## -VERSION=1.0.2l +VERSION=1.0.2m MAJOR=1 MINOR=0.2 SHLIB_VERSION_NUMBER=1.0.0 Modified: head/crypto/openssl/NEWS ============================================================================== --- head/crypto/openssl/NEWS Thu Nov 2 17:35:49 2017 (r325327) +++ head/crypto/openssl/NEWS Thu Nov 2 18:04:29 2017 (r325328) @@ -5,6 +5,11 @@ This file gives a brief overview of the major changes between each OpenSSL release. For more details please read the CHANGES file. + Major changes between OpenSSL 1.0.2l and OpenSSL 1.0.2m [2 Nov 2017] + + o bn_sqrx8x_internal carry bug on x86_64 (CVE-2017-3736) + o Malformed X.509 IPAddressFamily could cause OOB read (CVE-2017-3735) + Major changes between OpenSSL 1.0.2k and OpenSSL 1.0.2l [25 May 2017] o config now recognises 64-bit mingw and chooses mingw64 instead of mingw Modified: head/crypto/openssl/README ============================================================================== --- head/crypto/openssl/README Thu Nov 2 17:35:49 2017 (r325327) +++ head/crypto/openssl/README Thu Nov 2 18:04:29 2017 (r325328) @@ -1,5 +1,5 @@ - OpenSSL 1.0.2l 25 May 2017 + OpenSSL 1.0.2m 2 Nov 2017 Copyright (c) 1998-2015 The OpenSSL Project Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson Modified: head/crypto/openssl/apps/ca.c ============================================================================== --- head/crypto/openssl/apps/ca.c Thu Nov 2 17:35:49 2017 (r325327) +++ head/crypto/openssl/apps/ca.c Thu Nov 2 18:04:29 2017 (r325328) @@ -1985,10 +1985,6 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 * /* Lets add the extensions, if there are any */ if (ext_sect) { X509V3_CTX ctx; - if (ci->version == NULL) - if ((ci->version = ASN1_INTEGER_new()) == NULL) - goto err; - ASN1_INTEGER_set(ci->version, 2); /* version 3 certificate */ /* * Free the current entries if any, there should not be any I believe @@ -2049,6 +2045,15 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 * BIO_printf(bio_err, "ERROR: adding extensions from request\n"); ERR_print_errors(bio_err); goto err; + } + + { + STACK_OF(X509_EXTENSION) *exts = ci->extensions; + + if (exts != NULL && sk_X509_EXTENSION_num(exts) > 0) + /* Make it an X509 v3 certificate. */ + if (!X509_set_version(ret, 2)) + goto err; } /* Set the right value for the noemailDN option */ Modified: head/crypto/openssl/apps/s_client.c ============================================================================== --- head/crypto/openssl/apps/s_client.c Thu Nov 2 17:35:49 2017 (r325327) +++ head/crypto/openssl/apps/s_client.c Thu Nov 2 18:04:29 2017 (r325328) @@ -1667,6 +1667,8 @@ int MAIN(int argc, char **argv) if (strstr(mbuf, "/stream:features>")) goto shut; seen = BIO_read(sbio, mbuf, BUFSIZZ); + if (seen <= 0) + goto shut; mbuf[seen] = 0; } BIO_printf(sbio, Modified: head/crypto/openssl/apps/s_server.c ============================================================================== --- head/crypto/openssl/apps/s_server.c Thu Nov 2 17:35:49 2017 (r325327) +++ head/crypto/openssl/apps/s_server.c Thu Nov 2 18:04:29 2017 (r325328) @@ -3017,7 +3017,7 @@ static int www_body(char *hostname, int s, int stype, PEM_write_bio_X509(io, peer); } else BIO_puts(io, "no client certificate available\n"); - BIO_puts(io, "\r\n\r\n"); + BIO_puts(io, "\r\n\r\n"); break; } else if ((www == 2 || www == 3) && (strncmp("GET /", buf, 5) == 0)) { Modified: head/crypto/openssl/apps/speed.c ============================================================================== --- head/crypto/openssl/apps/speed.c Thu Nov 2 17:35:49 2017 (r325327) +++ head/crypto/openssl/apps/speed.c Thu Nov 2 18:04:29 2017 (r325328) @@ -307,7 +307,8 @@ static SIGRETTYPE sig_done(int sig) # if !defined(SIGALRM) # define SIGALRM # endif -static unsigned int lapse, schlock; +static volatile unsigned int lapse; +static volatile unsigned int schlock; static void alarm_win32(unsigned int secs) { lapse = secs * 1000; @@ -725,6 +726,7 @@ int MAIN(int argc, char **argv) BIO_printf(bio_err, "no EVP given\n"); goto end; } + evp_md = NULL; evp_cipher = EVP_get_cipherbyname(*argv); if (!evp_cipher) { evp_md = EVP_get_digestbyname(*argv); Modified: head/crypto/openssl/apps/spkac.c ============================================================================== --- head/crypto/openssl/apps/spkac.c Thu Nov 2 17:35:49 2017 (r325327) +++ head/crypto/openssl/apps/spkac.c Thu Nov 2 18:04:29 2017 (r325328) @@ -5,7 +5,7 @@ * 1999. Based on an original idea by Massimiliano Pala (madwolf@openca.org). */ /* ==================================================================== - * Copyright (c) 1999 The OpenSSL Project. All rights reserved. + * Copyright (c) 1999-2017 The OpenSSL Project. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -185,20 +185,23 @@ int MAIN(int argc, char **argv) } e = setup_engine(bio_err, engine, 0); - if (keyfile) { + if (keyfile != NULL) { pkey = load_key(bio_err, strcmp(keyfile, "-") ? keyfile : NULL, FORMAT_PEM, 1, passin, e, "private key"); - if (!pkey) { + if (pkey == NULL) goto end; - } spki = NETSCAPE_SPKI_new(); - if (challenge) + if (spki == NULL) + goto end; + if (challenge != NULL) ASN1_STRING_set(spki->spkac->challenge, challenge, (int)strlen(challenge)); NETSCAPE_SPKI_set_pubkey(spki, pkey); NETSCAPE_SPKI_sign(spki, pkey, EVP_md5()); spkstr = NETSCAPE_SPKI_b64_encode(spki); + if (spkstr == NULL) + goto end; if (outfile) out = BIO_new_file(outfile, "w"); @@ -253,7 +256,7 @@ int MAIN(int argc, char **argv) spki = NETSCAPE_SPKI_b64_decode(spkstr, -1); - if (!spki) { + if (spki == NULL) { BIO_printf(bio_err, "Error loading SPKAC\n"); ERR_print_errors(bio_err); goto end; @@ -282,9 +285,9 @@ int MAIN(int argc, char **argv) pkey = NETSCAPE_SPKI_get_pubkey(spki); if (verify) { i = NETSCAPE_SPKI_verify(spki, pkey); - if (i > 0) + if (i > 0) { BIO_printf(bio_err, "Signature OK\n"); - else { + } else { BIO_printf(bio_err, "Signature Failure\n"); ERR_print_errors(bio_err); goto end; Modified: head/crypto/openssl/apps/srp.c ============================================================================== --- head/crypto/openssl/apps/srp.c Thu Nov 2 17:35:49 2017 (r325327) +++ head/crypto/openssl/apps/srp.c Thu Nov 2 18:04:29 2017 (r325328) @@ -123,13 +123,14 @@ static int get_index(CA_DB *db, char *id, char type) int i; if (id == NULL) return -1; - if (type == DB_SRP_INDEX) + if (type == DB_SRP_INDEX) { for (i = 0; i < sk_OPENSSL_PSTRING_num(db->db->data); i++) { pp = sk_OPENSSL_PSTRING_value(db->db->data, i); if (pp[DB_srptype][0] == DB_SRP_INDEX && !strcmp(id, pp[DB_srpid])) return i; - } else + } + } else { for (i = 0; i < sk_OPENSSL_PSTRING_num(db->db->data); i++) { pp = sk_OPENSSL_PSTRING_value(db->db->data, i); @@ -137,6 +138,7 @@ static int get_index(CA_DB *db, char *id, char type) && !strcmp(id, pp[DB_srpid])) return i; } + } return -1; } @@ -177,8 +179,8 @@ static int update_index(CA_DB *db, BIO *bio, char **ro char **irow; int i; - if ((irow = - (char **)OPENSSL_malloc(sizeof(char *) * (DB_NUMBER + 1))) == NULL) { + irow = (char **)OPENSSL_malloc(sizeof(char *) * (DB_NUMBER + 1)); + if (irow == NULL) { BIO_printf(bio_err, "Memory allocation failure\n"); return 0; } @@ -205,30 +207,32 @@ static char *srp_verify_user(const char *user, const c char *srp_usersalt, const char *g, const char *N, const char *passin, BIO *bio, int verbose) { - char password[1024]; + char password[1025]; PW_CB_DATA cb_tmp; char *verifier = NULL; char *gNid = NULL; + int len; cb_tmp.prompt_info = user; cb_tmp.password = passin; - if (password_callback(password, 1024, 0, &cb_tmp) > 0) { + len = password_callback(password, sizeof(password)-1, 0, &cb_tmp); + if (len > 0) { + password[len] = 0; VERBOSE BIO_printf(bio, "Validating\n user=\"%s\"\n srp_verifier=\"%s\"\n srp_usersalt=\"%s\"\n g=\"%s\"\n N=\"%s\"\n", user, srp_verifier, srp_usersalt, g, N); - BIO_printf(bio, "Pass %s\n", password); + VVERBOSE BIO_printf(bio, "Pass %s\n", password); - if (! - (gNid = - SRP_create_verifier(user, password, &srp_usersalt, &verifier, N, - g))) { + if (!(gNid = SRP_create_verifier(user, password, &srp_usersalt, + &verifier, N, g))) { BIO_printf(bio, "Internal error validating SRP verifier\n"); } else { if (strcmp(verifier, srp_verifier)) gNid = NULL; OPENSSL_free(verifier); } + OPENSSL_cleanse(password, len); } return gNid; } @@ -237,24 +241,27 @@ static char *srp_create_user(char *user, char **srp_ve char **srp_usersalt, char *g, char *N, char *passout, BIO *bio, int verbose) { - char password[1024]; + char password[1025]; PW_CB_DATA cb_tmp; char *gNid = NULL; char *salt = NULL; + int len; cb_tmp.prompt_info = user; cb_tmp.password = passout; - if (password_callback(password, 1024, 1, &cb_tmp) > 0) { + len = password_callback(password, sizeof(password)-1, 1, &cb_tmp); + if (len > 0) { + password[len] = 0; VERBOSE BIO_printf(bio, "Creating\n user=\"%s\"\n g=\"%s\"\n N=\"%s\"\n", user, g, N); - if (! - (gNid = - SRP_create_verifier(user, password, &salt, srp_verifier, N, - g))) { + if (!(gNid = SRP_create_verifier(user, password, &salt, + srp_verifier, N, g))) { BIO_printf(bio, "Internal error creating SRP verifier\n"); - } else + } else { *srp_usersalt = salt; + } + OPENSSL_cleanse(password, len); VVERBOSE BIO_printf(bio, "gNid=%s salt =\"%s\"\n verifier =\"%s\"\n", gNid, salt, *srp_verifier); @@ -314,9 +321,9 @@ int MAIN(int argc, char **argv) argc--; argv++; while (argc >= 1 && badops == 0) { - if (strcmp(*argv, "-verbose") == 0) + if (strcmp(*argv, "-verbose") == 0) { verbose++; - else if (strcmp(*argv, "-config") == 0) { + } else if (strcmp(*argv, "-config") == 0) { if (--argc < 1) goto bad; configfile = *(++argv); @@ -328,15 +335,15 @@ int MAIN(int argc, char **argv) if (--argc < 1) goto bad; dbfile = *(++argv); - } else if (strcmp(*argv, "-add") == 0) + } else if (strcmp(*argv, "-add") == 0) { add_user = 1; - else if (strcmp(*argv, "-delete") == 0) + } else if (strcmp(*argv, "-delete") == 0) { delete_user = 1; - else if (strcmp(*argv, "-modify") == 0) + } else if (strcmp(*argv, "-modify") == 0) { modify_user = 1; - else if (strcmp(*argv, "-list") == 0) + } else if (strcmp(*argv, "-list") == 0) { list_user = 1; - else if (strcmp(*argv, "-gn") == 0) { + } else if (strcmp(*argv, "-gn") == 0) { if (--argc < 1) goto bad; gN = *(++argv); @@ -366,8 +373,9 @@ int MAIN(int argc, char **argv) BIO_printf(bio_err, "unknown option %s\n", *argv); badops = 1; break; - } else + } else { break; + } argc--; argv++; @@ -388,7 +396,7 @@ int MAIN(int argc, char **argv) "Need at least one user for options -add, -delete, -modify. \n"); badops = 1; } - if ((passin || passout) && argc != 1) { + if ((passargin || passargout) && argc != 1) { BIO_printf(bio_err, "-passin, -passout arguments only valid with one user.\n"); badops = 1; @@ -706,9 +714,9 @@ int MAIN(int argc, char **argv) doupdatedb = 1; } } - if (--argc > 0) + if (--argc > 0) { user = *(argv++); - else { + } else { user = NULL; list_user = 0; } Modified: head/crypto/openssl/apps/tsget ============================================================================== --- head/crypto/openssl/apps/tsget Thu Nov 2 17:35:49 2017 (r325327) +++ head/crypto/openssl/apps/tsget Thu Nov 2 18:04:29 2017 (r325328) @@ -193,4 +193,3 @@ REQUEST: foreach (@ARGV) { STDERR->printflush(", $output written.\n") if $options{v}; } $curl->cleanup(); -WWW::Curl::Easy::global_cleanup(); Modified: head/crypto/openssl/crypto/asn1/Makefile ============================================================================== --- head/crypto/openssl/crypto/asn1/Makefile Thu Nov 2 17:35:49 2017 (r325327) +++ head/crypto/openssl/crypto/asn1/Makefile Thu Nov 2 18:04:29 2017 (r325328) @@ -680,7 +680,7 @@ tasn_fre.o: ../../include/openssl/e_os2.h ../../includ tasn_fre.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h tasn_fre.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h tasn_fre.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -tasn_fre.o: ../../include/openssl/symhacks.h tasn_fre.c +tasn_fre.o: ../../include/openssl/symhacks.h asn1_int.h tasn_fre.c tasn_new.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h tasn_new.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h tasn_new.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h @@ -688,7 +688,7 @@ tasn_new.o: ../../include/openssl/lhash.h ../../includ tasn_new.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h tasn_new.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h tasn_new.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -tasn_new.o: ../../include/openssl/symhacks.h tasn_new.c +tasn_new.o: ../../include/openssl/symhacks.h asn1_int.h tasn_new.c tasn_prn.o: ../../e_os.h ../../include/openssl/asn1.h tasn_prn.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h tasn_prn.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h Modified: head/crypto/openssl/crypto/asn1/a_bitstr.c ============================================================================== --- head/crypto/openssl/crypto/asn1/a_bitstr.c Thu Nov 2 17:35:49 2017 (r325327) +++ head/crypto/openssl/crypto/asn1/a_bitstr.c Thu Nov 2 18:04:29 2017 (r325328) @@ -56,6 +56,7 @@ * [including the GNU Public Licence.] */ +#include #include #include "cryptlib.h" #include @@ -133,6 +134,11 @@ ASN1_BIT_STRING *c2i_ASN1_BIT_STRING(ASN1_BIT_STRING * if (len < 1) { i = ASN1_R_STRING_TOO_SHORT; + goto err; + } + + if (len > INT_MAX) { + i = ASN1_R_STRING_TOO_LONG; goto err; } Copied: head/crypto/openssl/crypto/asn1/asn1_int.h (from r325326, vendor-crypto/openssl/dist/crypto/asn1/asn1_int.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/crypto/openssl/crypto/asn1/asn1_int.h Thu Nov 2 18:04:29 2017 (r325328, copy of r325326, vendor-crypto/openssl/dist/crypto/asn1/asn1_int.h) @@ -0,0 +1,63 @@ +/* asn1t.h */ +/* + * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project + * 2006. + */ +/* ==================================================================== + * Copyright (c) 2006 The OpenSSL Project. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. All advertising materials mentioning features or use of this + * software must display the following acknowledgment: + * "This product includes software developed by the OpenSSL Project + * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" + * + * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to + * endorse or promote products derived from this software without + * prior written permission. For written permission, please contact + * licensing@OpenSSL.org. + * + * 5. Products derived from this software may not be called "OpenSSL" + * nor may "OpenSSL" appear in their names without prior written + * permission of the OpenSSL Project. + * + * 6. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by the OpenSSL Project + * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" + * + * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY + * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * ==================================================================== + * + * This product includes cryptographic software written by Eric Young + * (eay@cryptsoft.com). This product includes software written by Tim + * Hudson (tjh@cryptsoft.com). + * + */ + +/* Internal ASN1 template structures and functions: not for application use */ + +void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it, + int combine); Modified: head/crypto/openssl/crypto/asn1/tasn_fre.c ============================================================================== --- head/crypto/openssl/crypto/asn1/tasn_fre.c Thu Nov 2 17:35:49 2017 (r325327) +++ head/crypto/openssl/crypto/asn1/tasn_fre.c Thu Nov 2 18:04:29 2017 (r325328) @@ -61,10 +61,8 @@ #include #include #include +#include "asn1_int.h" -static void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it, - int combine); - /* Free up an ASN1 structure */ void ASN1_item_free(ASN1_VALUE *val, const ASN1_ITEM *it) @@ -77,8 +75,7 @@ void ASN1_item_ex_free(ASN1_VALUE **pval, const ASN1_I asn1_item_combine_free(pval, it, 0); } -static void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it, - int combine) +void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it, int combine) { const ASN1_TEMPLATE *tt = NULL, *seqtt; const ASN1_EXTERN_FUNCS *ef; Modified: head/crypto/openssl/crypto/asn1/tasn_new.c ============================================================================== --- head/crypto/openssl/crypto/asn1/tasn_new.c Thu Nov 2 17:35:49 2017 (r325327) +++ head/crypto/openssl/crypto/asn1/tasn_new.c Thu Nov 2 18:04:29 2017 (r325328) @@ -63,6 +63,7 @@ #include #include #include +#include "asn1_int.h" static int asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it, int combine); @@ -199,7 +200,7 @@ static int asn1_item_ex_combine_new(ASN1_VALUE **pval, return 1; memerr2: - ASN1_item_ex_free(pval, it); + asn1_item_combine_free(pval, it, combine); memerr: ASN1err(ASN1_F_ASN1_ITEM_EX_COMBINE_NEW, ERR_R_MALLOC_FAILURE); #ifdef CRYPTO_MDEBUG @@ -209,7 +210,7 @@ static int asn1_item_ex_combine_new(ASN1_VALUE **pval, return 0; auxerr2: - ASN1_item_ex_free(pval, it); + asn1_item_combine_free(pval, it, combine); auxerr: ASN1err(ASN1_F_ASN1_ITEM_EX_COMBINE_NEW, ASN1_R_AUX_ERROR); #ifdef CRYPTO_MDEBUG Modified: head/crypto/openssl/crypto/asn1/x_name.c ============================================================================== --- head/crypto/openssl/crypto/asn1/x_name.c Thu Nov 2 17:35:49 2017 (r325327) +++ head/crypto/openssl/crypto/asn1/x_name.c Thu Nov 2 18:04:29 2017 (r325328) @@ -523,19 +523,11 @@ static int i2d_name_canon(STACK_OF(STACK_OF_X509_NAME_ int X509_NAME_set(X509_NAME **xn, X509_NAME *name) { - X509_NAME *in; - - if (!xn || !name) - return (0); - - if (*xn != name) { - in = X509_NAME_dup(name); - if (in != NULL) { - X509_NAME_free(*xn); - *xn = in; - } - } - return (*xn != NULL); + if ((name = X509_NAME_dup(name)) == NULL) + return 0; + X509_NAME_free(*xn); + *xn = name; + return 1; } IMPLEMENT_STACK_OF(X509_NAME_ENTRY) Modified: head/crypto/openssl/crypto/asn1/x_pkey.c ============================================================================== --- head/crypto/openssl/crypto/asn1/x_pkey.c Thu Nov 2 17:35:49 2017 (r325327) +++ head/crypto/openssl/crypto/asn1/x_pkey.c Thu Nov 2 18:04:29 2017 (r325328) @@ -106,10 +106,14 @@ X509_PKEY *X509_PKEY_new(void) X509_PKEY *ret = NULL; ASN1_CTX c; - M_ASN1_New_Malloc(ret, X509_PKEY); + ret = OPENSSL_malloc(sizeof(X509_PKEY)); + if (ret == NULL) { + c.line = __LINE__; + goto err; + } ret->version = 0; - M_ASN1_New(ret->enc_algor, X509_ALGOR_new); - M_ASN1_New(ret->enc_pkey, M_ASN1_OCTET_STRING_new); + ret->enc_algor = X509_ALGOR_new(); + ret->enc_pkey = M_ASN1_OCTET_STRING_new(); ret->dec_pkey = NULL; ret->key_length = 0; ret->key_data = NULL; @@ -117,8 +121,15 @@ X509_PKEY *X509_PKEY_new(void) ret->cipher.cipher = NULL; memset(ret->cipher.iv, 0, EVP_MAX_IV_LENGTH); ret->references = 1; - return (ret); - M_ASN1_New_Error(ASN1_F_X509_PKEY_NEW); + if (ret->enc_algor == NULL || ret->enc_pkey == NULL) { + c.line = __LINE__; + goto err; + } + return ret; +err: + X509_PKEY_free(ret); + ASN1_MAC_H_err(ASN1_F_X509_PKEY_NEW, ERR_R_MALLOC_FAILURE, c.line); + return NULL; } void X509_PKEY_free(X509_PKEY *x) Modified: head/crypto/openssl/crypto/bn/asm/x86_64-mont5.pl ============================================================================== --- head/crypto/openssl/crypto/bn/asm/x86_64-mont5.pl Thu Nov 2 17:35:49 2017 (r325327) +++ head/crypto/openssl/crypto/bn/asm/x86_64-mont5.pl Thu Nov 2 18:04:29 2017 (r325328) @@ -3090,11 +3090,19 @@ $code.=<<___; .align 32 .Lsqrx8x_break: - sub 16+8(%rsp),%r8 # consume last carry + xor $zero,$zero + sub 16+8(%rsp),%rbx # mov 16(%rsp),%cf + adcx $zero,%r8 mov 24+8(%rsp),$carry # initial $tptr, borrow $carry + adcx $zero,%r9 mov 0*8($aptr),%rdx # a[8], modulo-scheduled - xor %ebp,%ebp # xor $zero,$zero + adc \$0,%r10 mov %r8,0*8($tptr) + adc \$0,%r11 + adc \$0,%r12 + adc \$0,%r13 + adc \$0,%r14 + adc \$0,%r15 cmp $carry,$tptr # cf=0, of=0 je .Lsqrx8x_outer_loop Modified: head/crypto/openssl/crypto/bn/bn_exp.c ============================================================================== --- head/crypto/openssl/crypto/bn/bn_exp.c Thu Nov 2 17:35:49 2017 (r325327) +++ head/crypto/openssl/crypto/bn/bn_exp.c Thu Nov 2 18:04:29 2017 (r325328) @@ -145,7 +145,8 @@ int BN_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p int i, bits, ret = 0; BIGNUM *v, *rr; - if (BN_get_flags(p, BN_FLG_CONSTTIME) != 0) { + if (BN_get_flags(p, BN_FLG_CONSTTIME) != 0 + || BN_get_flags(a, BN_FLG_CONSTTIME) != 0) { /* BN_FLG_CONSTTIME only supported by BN_mod_exp_mont() */ BNerr(BN_F_BN_EXP, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return -1; @@ -245,7 +246,9 @@ int BN_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNU if (BN_is_odd(m)) { # ifdef MONT_EXP_WORD if (a->top == 1 && !a->neg - && (BN_get_flags(p, BN_FLG_CONSTTIME) == 0)) { + && (BN_get_flags(p, BN_FLG_CONSTTIME) == 0) + && (BN_get_flags(a, BN_FLG_CONSTTIME) == 0) + && (BN_get_flags(m, BN_FLG_CONSTTIME) == 0)) { BN_ULONG A = a->d[0]; ret = BN_mod_exp_mont_word(r, A, p, m, ctx, NULL); } else @@ -277,7 +280,9 @@ int BN_mod_exp_recp(BIGNUM *r, const BIGNUM *a, const BIGNUM *val[TABLE_SIZE]; BN_RECP_CTX recp; - if (BN_get_flags(p, BN_FLG_CONSTTIME) != 0) { + if (BN_get_flags(p, BN_FLG_CONSTTIME) != 0 + || BN_get_flags(a, BN_FLG_CONSTTIME) != 0 + || BN_get_flags(m, BN_FLG_CONSTTIME) != 0) { /* BN_FLG_CONSTTIME only supported by BN_mod_exp_mont() */ BNerr(BN_F_BN_MOD_EXP_RECP, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return -1; @@ -411,7 +416,9 @@ int BN_mod_exp_mont(BIGNUM *rr, const BIGNUM *a, const BIGNUM *val[TABLE_SIZE]; BN_MONT_CTX *mont = NULL; - if (BN_get_flags(p, BN_FLG_CONSTTIME) != 0) { + if (BN_get_flags(p, BN_FLG_CONSTTIME) != 0 + || BN_get_flags(a, BN_FLG_CONSTTIME) != 0 + || BN_get_flags(m, BN_FLG_CONSTTIME) != 0) { return BN_mod_exp_mont_consttime(rr, a, p, m, ctx, in_mont); } @@ -1217,7 +1224,8 @@ int BN_mod_exp_mont_word(BIGNUM *rr, BN_ULONG a, const #define BN_TO_MONTGOMERY_WORD(r, w, mont) \ (BN_set_word(r, (w)) && BN_to_montgomery(r, r, (mont), ctx)) - if (BN_get_flags(p, BN_FLG_CONSTTIME) != 0) { + if (BN_get_flags(p, BN_FLG_CONSTTIME) != 0 + || BN_get_flags(m, BN_FLG_CONSTTIME) != 0) { /* BN_FLG_CONSTTIME only supported by BN_mod_exp_mont() */ BNerr(BN_F_BN_MOD_EXP_MONT_WORD, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return -1; @@ -1348,7 +1356,9 @@ int BN_mod_exp_simple(BIGNUM *r, const BIGNUM *a, cons /* Table of variables obtained from 'ctx' */ BIGNUM *val[TABLE_SIZE]; - if (BN_get_flags(p, BN_FLG_CONSTTIME) != 0) { + if (BN_get_flags(p, BN_FLG_CONSTTIME) != 0 + || BN_get_flags(a, BN_FLG_CONSTTIME) != 0 + || BN_get_flags(m, BN_FLG_CONSTTIME) != 0) { /* BN_FLG_CONSTTIME only supported by BN_mod_exp_mont() */ BNerr(BN_F_BN_MOD_EXP_SIMPLE, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return -1; Modified: head/crypto/openssl/crypto/bn/bn_lib.c ============================================================================== --- head/crypto/openssl/crypto/bn/bn_lib.c Thu Nov 2 17:35:49 2017 (r325327) +++ head/crypto/openssl/crypto/bn/bn_lib.c Thu Nov 2 18:04:29 2017 (r325328) @@ -524,6 +524,9 @@ BIGNUM *BN_copy(BIGNUM *a, const BIGNUM *b) memcpy(a->d, b->d, sizeof(b->d[0]) * b->top); #endif + if (BN_get_flags(b, BN_FLG_CONSTTIME) != 0) + BN_set_flags(a, BN_FLG_CONSTTIME); + a->top = b->top; a->neg = b->neg; bn_check_top(a); Modified: head/crypto/openssl/crypto/bn/bn_mont.c ============================================================================== --- head/crypto/openssl/crypto/bn/bn_mont.c Thu Nov 2 17:35:49 2017 (r325327) +++ head/crypto/openssl/crypto/bn/bn_mont.c Thu Nov 2 18:04:29 2017 (r325328) @@ -394,6 +394,9 @@ int BN_MONT_CTX_set(BN_MONT_CTX *mont, const BIGNUM *m tmod.dmax = 2; tmod.neg = 0; + if (BN_get_flags(mod, BN_FLG_CONSTTIME) != 0) + BN_set_flags(&tmod, BN_FLG_CONSTTIME); + mont->ri = (BN_num_bits(mod) + (BN_BITS2 - 1)) / BN_BITS2 * BN_BITS2; # if defined(OPENSSL_BN_ASM_MONT) && (BN_BITS2<=32) Modified: head/crypto/openssl/crypto/bn/bn_mul.c ============================================================================== --- head/crypto/openssl/crypto/bn/bn_mul.c Thu Nov 2 17:35:49 2017 (r325327) +++ head/crypto/openssl/crypto/bn/bn_mul.c Thu Nov 2 18:04:29 2017 (r325328) @@ -1032,46 +1032,6 @@ int BN_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b rr->top = top; goto end; } -# if 0 - if (i == 1 && !BN_get_flags(b, BN_FLG_STATIC_DATA)) { - BIGNUM *tmp_bn = (BIGNUM *)b; - if (bn_wexpand(tmp_bn, al) == NULL) - goto err; - tmp_bn->d[bl] = 0; - bl++; - i--; - } else if (i == -1 && !BN_get_flags(a, BN_FLG_STATIC_DATA)) { - BIGNUM *tmp_bn = (BIGNUM *)a; - if (bn_wexpand(tmp_bn, bl) == NULL) - goto err; - tmp_bn->d[al] = 0; - al++; - i++; - } - if (i == 0) { - /* symmetric and > 4 */ - /* 16 or larger */ - j = BN_num_bits_word((BN_ULONG)al); - j = 1 << (j - 1); - k = j + j; - t = BN_CTX_get(ctx); - if (al == j) { /* exact multiple */ - if (bn_wexpand(t, k * 2) == NULL) - goto err; - if (bn_wexpand(rr, k * 2) == NULL) - goto err; - bn_mul_recursive(rr->d, a->d, b->d, al, t->d); - } else { - if (bn_wexpand(t, k * 4) == NULL) - goto err; - if (bn_wexpand(rr, k * 4) == NULL) - goto err; - bn_mul_part_recursive(rr->d, a->d, b->d, al - j, j, t->d); - } - rr->top = top; - goto end; - } -# endif } #endif /* BN_RECURSION */ if (bn_wexpand(rr, top) == NULL) Modified: head/crypto/openssl/crypto/bn/bn_x931p.c ============================================================================== --- head/crypto/openssl/crypto/bn/bn_x931p.c Thu Nov 2 17:35:49 2017 (r325327) +++ head/crypto/openssl/crypto/bn/bn_x931p.c Thu Nov 2 18:04:29 2017 (r325328) @@ -217,6 +217,8 @@ int BN_X931_generate_Xpq(BIGNUM *Xp, BIGNUM *Xq, int n BN_CTX_start(ctx); t = BN_CTX_get(ctx); + if (t == NULL) + goto err; for (i = 0; i < 1000; i++) { if (!BN_rand(Xq, nbits, 1, 0)) @@ -255,10 +257,12 @@ int BN_X931_generate_prime_ex(BIGNUM *p, BIGNUM *p1, B int ret = 0; BN_CTX_start(ctx); - if (!Xp1) + if (Xp1 == NULL) Xp1 = BN_CTX_get(ctx); - if (!Xp2) + if (Xp2 == NULL) Xp2 = BN_CTX_get(ctx); + if (Xp1 == NULL || Xp2 == NULL) + goto error; if (!BN_rand(Xp1, 101, 0, 0)) goto error; Modified: head/crypto/openssl/crypto/cryptlib.c ============================================================================== --- head/crypto/openssl/crypto/cryptlib.c Thu Nov 2 17:35:49 2017 (r325327) +++ head/crypto/openssl/crypto/cryptlib.c Thu Nov 2 18:04:29 2017 (r325328) @@ -469,11 +469,18 @@ void CRYPTO_THREADID_set_pointer(CRYPTO_THREADID *id, } } +#ifdef OPENSSL_FIPS +extern int FIPS_crypto_threadid_set_callback(void (*func) (CRYPTO_THREADID *)); +#endif + int CRYPTO_THREADID_set_callback(void (*func) (CRYPTO_THREADID *)) { if (threadid_callback) return 0; threadid_callback = func; +#ifdef OPENSSL_FIPS + FIPS_crypto_threadid_set_callback(func); +#endif return 1; } Modified: head/crypto/openssl/crypto/dh/Makefile ============================================================================== --- head/crypto/openssl/crypto/dh/Makefile Thu Nov 2 17:35:49 2017 (r325327) +++ head/crypto/openssl/crypto/dh/Makefile Thu Nov 2 18:04:29 2017 (r325328) @@ -134,7 +134,7 @@ dh_gen.o: ../../include/openssl/opensslconf.h ../../in dh_gen.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h dh_gen.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h dh_gen.o: ../cryptlib.h dh_gen.c -dh_kdf.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h +dh_kdf.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h dh_kdf.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h dh_kdf.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h dh_kdf.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h Modified: head/crypto/openssl/crypto/dh/dh.h ============================================================================== --- head/crypto/openssl/crypto/dh/dh.h Thu Nov 2 17:35:49 2017 (r325327) +++ head/crypto/openssl/crypto/dh/dh.h Thu Nov 2 18:04:29 2017 (r325328) @@ -257,11 +257,13 @@ DH *DH_get_1024_160(void); DH *DH_get_2048_224(void); DH *DH_get_2048_256(void); +# ifndef OPENSSL_NO_CMS /* RFC2631 KDF */ int DH_KDF_X9_42(unsigned char *out, size_t outlen, const unsigned char *Z, size_t Zlen, ASN1_OBJECT *key_oid, const unsigned char *ukm, size_t ukmlen, const EVP_MD *md); +# endif # define EVP_PKEY_CTX_set_dh_paramgen_prime_len(ctx, len) \ EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DH, EVP_PKEY_OP_PARAMGEN, \ Modified: head/crypto/openssl/crypto/dh/dh_kdf.c ============================================================================== --- head/crypto/openssl/crypto/dh/dh_kdf.c Thu Nov 2 17:35:49 2017 (r325327) +++ head/crypto/openssl/crypto/dh/dh_kdf.c Thu Nov 2 18:04:29 2017 (r325328) @@ -51,6 +51,9 @@ * ==================================================================== */ +#include + +#ifndef OPENSSL_NO_CMS #include #include #include @@ -185,3 +188,4 @@ int DH_KDF_X9_42(unsigned char *out, size_t outlen, EVP_MD_CTX_cleanup(&mctx); return rv; } +#endif Modified: head/crypto/openssl/crypto/dh/dh_pmeth.c ============================================================================== --- head/crypto/openssl/crypto/dh/dh_pmeth.c Thu Nov 2 17:35:49 2017 (r325327) +++ head/crypto/openssl/crypto/dh/dh_pmeth.c Thu Nov 2 18:04:29 2017 (r325328) @@ -207,7 +207,11 @@ static int pkey_dh_ctrl(EVP_PKEY_CTX *ctx, int type, i case EVP_PKEY_CTRL_DH_KDF_TYPE: if (p1 == -2) return dctx->kdf_type; +#ifdef OPENSSL_NO_CMS + if (p1 != EVP_PKEY_DH_KDF_NONE) +#else if (p1 != EVP_PKEY_DH_KDF_NONE && p1 != EVP_PKEY_DH_KDF_X9_42) +#endif return -2; dctx->kdf_type = p1; return 1; @@ -448,7 +452,9 @@ static int pkey_dh_derive(EVP_PKEY_CTX *ctx, unsigned return ret; *keylen = ret; return 1; - } else if (dctx->kdf_type == EVP_PKEY_DH_KDF_X9_42) { + } +#ifndef OPENSSL_NO_CMS + else if (dctx->kdf_type == EVP_PKEY_DH_KDF_X9_42) { unsigned char *Z = NULL; size_t Zlen = 0; if (!dctx->kdf_outlen || !dctx->kdf_oid) @@ -479,6 +485,7 @@ static int pkey_dh_derive(EVP_PKEY_CTX *ctx, unsigned } return ret; } +#endif return 1; } Modified: head/crypto/openssl/crypto/dsa/dsa_ameth.c ============================================================================== --- head/crypto/openssl/crypto/dsa/dsa_ameth.c Thu Nov 2 17:35:49 2017 (r325327) +++ head/crypto/openssl/crypto/dsa/dsa_ameth.c Thu Nov 2 18:04:29 2017 (r325328) @@ -258,6 +258,7 @@ static int dsa_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_ goto dsaerr; } + BN_set_flags(dsa->priv_key, BN_FLG_CONSTTIME); if (!BN_mod_exp(dsa->pub_key, dsa->g, dsa->priv_key, dsa->p, ctx)) { DSAerr(DSA_F_DSA_PRIV_DECODE, DSA_R_BN_ERROR); goto dsaerr; Modified: head/crypto/openssl/crypto/dsa/dsa_gen.c ============================================================================== --- head/crypto/openssl/crypto/dsa/dsa_gen.c Thu Nov 2 17:35:49 2017 (r325327) +++ head/crypto/openssl/crypto/dsa/dsa_gen.c Thu Nov 2 18:04:29 2017 (r325328) @@ -482,6 +482,8 @@ int dsa_builtin_paramgen2(DSA *ret, size_t L, size_t N } else { p = BN_CTX_get(ctx); q = BN_CTX_get(ctx); + if (q == NULL) + goto err; } if (!BN_lshift(test, BN_value_one(), L - 1)) Modified: head/crypto/openssl/crypto/dsa/dsa_ossl.c ============================================================================== --- head/crypto/openssl/crypto/dsa/dsa_ossl.c Thu Nov 2 17:35:49 2017 (r325327) +++ head/crypto/openssl/crypto/dsa/dsa_ossl.c Thu Nov 2 18:04:29 2017 (r325328) @@ -224,7 +224,9 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BI { BN_CTX *ctx; BIGNUM k, kq, *K, *kinv = NULL, *r = NULL; + BIGNUM l, m; int ret = 0; + int q_bits; if (!dsa->p || !dsa->q || !dsa->g) { DSAerr(DSA_F_DSA_SIGN_SETUP, DSA_R_MISSING_PARAMETERS); @@ -233,6 +235,8 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BI BN_init(&k); BN_init(&kq); + BN_init(&l); + BN_init(&m); if (ctx_in == NULL) { if ((ctx = BN_CTX_new()) == NULL) @@ -243,6 +247,13 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BI if ((r = BN_new()) == NULL) goto err; + /* Preallocate space */ + q_bits = BN_num_bits(dsa->q); + if (!BN_set_bit(&k, q_bits) + || !BN_set_bit(&l, q_bits) + || !BN_set_bit(&m, q_bits)) + goto err; + /* Get random k */ do if (!BN_rand_range(&k, dsa->q)) @@ -263,25 +274,24 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BI /* Compute r = (g^k mod p) mod q */ if ((dsa->flags & DSA_FLAG_NO_EXP_CONSTTIME) == 0) { - if (!BN_copy(&kq, &k)) - goto err; - - BN_set_flags(&kq, BN_FLG_CONSTTIME); - /* * We do not want timing information to leak the length of k, so we - * compute g^k using an equivalent exponent of fixed length. (This - * is a kludge that we need because the BN_mod_exp_mont() does not - * let us specify the desired timing behaviour.) + * compute G^k using an equivalent scalar of fixed bit-length. + * + * We unconditionally perform both of these additions to prevent a + * small timing information leakage. We then choose the sum that is + * one bit longer than the modulus. + * *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Thu Nov 2 18:08: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 72920E5FC5A; Thu, 2 Nov 2017 18:08:37 +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 4EE60364E; Thu, 2 Nov 2017 18:08: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 vA2I8aAS071628; Thu, 2 Nov 2017 18:08:36 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA2I8aJP071625; Thu, 2 Nov 2017 18:08:36 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201711021808.vA2I8aJP071625@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Thu, 2 Nov 2017 18:08:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325329 - in head: . targets/pseudo/bootstrap-tools X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: in head: . targets/pseudo/bootstrap-tools X-SVN-Commit-Revision: 325329 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: Thu, 02 Nov 2017 18:08:37 -0000 Author: bdrewery Date: Thu Nov 2 18:08:36 2017 New Revision: 325329 URL: https://svnweb.freebsd.org/changeset/base/325329 Log: Reduce MAKEOBJDIRPREFIX path spam by specifying a direct objdir to use. Sponsored by: Dell EMC Isilon Modified: head/Makefile.inc1 head/Makefile.libcompat head/targets/pseudo/bootstrap-tools/Makefile Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Thu Nov 2 18:04:29 2017 (r325328) +++ head/Makefile.inc1 Thu Nov 2 18:08:36 2017 (r325329) @@ -521,6 +521,8 @@ BMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" # need to keep this in sync with targets/pseudo/bootstrap-tools/Makefile BSARGS= DESTDIR= \ + OBJTOP='${WORLDTMP}/obj-$${BWPHASE}' \ + OBJROOT='$${OBJTOP}/' \ BOOTSTRAPPING=${OSRELDATE} \ BWPHASE=${.TARGET:C,^_,,} \ SSP_CFLAGS= \ @@ -531,7 +533,7 @@ BSARGS= DESTDIR= \ MK_LLDB=no MK_TESTS=no \ MK_INCLUDES=yes -BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \ +BMAKE= \ ${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \ ${BSARGS} @@ -558,9 +560,11 @@ XMAKE= ${BMAKE} \ KTMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${BPATH}:${PATH} \ WORLDTMP=${WORLDTMP} -KTMAKE= TOOLS_PREFIX=${WORLDTMP} MAKEOBJDIRPREFIX=${WORLDTMP} \ +KTMAKE= TOOLS_PREFIX=${WORLDTMP} \ ${KTMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \ DESTDIR= \ + OBJTOP='${WORLDTMP}/obj-kernel-tools' \ + OBJROOT='$${OBJTOP}/' \ BOOTSTRAPPING=${OSRELDATE} \ SSP_CFLAGS= \ MK_HTML=no -DNO_LINT MK_MAN=no \ Modified: head/Makefile.libcompat ============================================================================== --- head/Makefile.libcompat Thu Nov 2 18:04:29 2017 (r325328) +++ head/Makefile.libcompat Thu Nov 2 18:08:36 2017 (r325329) @@ -108,7 +108,8 @@ LIBCOMPATCXXFLAGS+= -isystem ${LIBCOMPATTMP}/usr/inclu # Yes, the flags are redundant. LIBCOMPATWMAKEENV+= \ - MAKEOBJDIRPREFIX=${LIBCOMPAT_OBJTOP} \ + OBJTOP=${LIBCOMPAT_OBJTOP} \ + OBJROOT='$${OBJTOP}/' \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${TMPPATH} \ SYSROOT=${LIBCOMPATTMP} \ @@ -184,7 +185,8 @@ build${libcompat}: .PHONY ${_+_}cd ${.CURDIR}/${_dir}; \ WORLDTMP=${WORLDTMP} \ MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \ - MAKEOBJDIRPREFIX=${LIBCOMPAT_OBJTOP} \ + OBJTOP=${LIBCOMPAT_OBJTOP} \ + OBJROOT='$${OBJTOP}/' \ ${MAKE} SSP_CFLAGS= DESTDIR= \ DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \ build-tools Modified: head/targets/pseudo/bootstrap-tools/Makefile ============================================================================== --- head/targets/pseudo/bootstrap-tools/Makefile Thu Nov 2 18:04:29 2017 (r325328) +++ head/targets/pseudo/bootstrap-tools/Makefile Thu Nov 2 18:08:36 2017 (r325329) @@ -13,10 +13,10 @@ TARGET_MACHINE= host HOST_MACHINE!= uname -m HOST_MACHINE_ARCH!= uname -p BTOOLSDIR?= ${HOST_OBJTOP}/tools +WORLDTMP= ${BTOOLSDIR} LEGACY_TOOLS?= ${BTOOLSDIR}/legacy BSENV= \ - unset MAKEOBJDIR; MAKEOBJDIRPREFIX=${BTOOLSDIR} \ MAKESYSPATH=${SRCTOP}/tools/build/mk:${SRCTOP}/share/mk \ TARGET=${HOST_MACHINE} TARGET_ARCH=${HOST_MACHINE_ARCH} \ WITHOUT_STAGING=1 STAGE_ROOT= BOOTSTRAPPING_TOOLS=1 \ @@ -34,6 +34,8 @@ OSRELDATE?= 0 # need to keep this in sync with src/Makefile.inc1 BSARGS= DESTDIR= \ + OBJTOP='${WORLDTMP}/obj-$${BWPHASE}' \ + OBJROOT='$${OBJTOP}/' \ BOOTSTRAPPING=${OSRELDATE} \ BWPHASE=${.TARGET} \ SSP_CFLAGS= \ @@ -44,8 +46,6 @@ BSARGS= DESTDIR= \ MK_LLDB=no MK_TESTS=no \ MK_INCLUDES=yes -# Need to override these so OBJTOP uses are proper in the non-meta build. -BSARGS+= OBJTOP=${BTOOLSDIR}${SRCTOP} OBJROOT='$${OBJTOP}/' # We will handle building the toolchain and cross-compiler. BSARGS+= MK_CROSS_COMPILER=no MK_CLANG=no MK_GCC=no From owner-svn-src-all@freebsd.org Thu Nov 2 18:09: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 DA6E7E5FCC2; Thu, 2 Nov 2017 18:09:08 +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 B2BCF3795; Thu, 2 Nov 2017 18:09:08 +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 vA2I97Yt071703; Thu, 2 Nov 2017 18:09:07 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA2I97HI071697; Thu, 2 Nov 2017 18:09:07 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201711021809.vA2I97HI071697@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Thu, 2 Nov 2017 18:09:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325330 - in head: . share/mk tools/build/options X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: in head: . share/mk tools/build/options X-SVN-Commit-Revision: 325330 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: Thu, 02 Nov 2017 18:09:09 -0000 Author: bdrewery Date: Thu Nov 2 18:09:07 2017 New Revision: 325330 URL: https://svnweb.freebsd.org/changeset/base/325330 Log: Enable AUTO_OBJ by default if the OBJDIR is writable, only for in-tree builds. This can be disabled by putting WITHOUT_AUTO_OBJ=yes in /etc/src-env.conf, not /etc/src.conf, or passing it in the environment. The purpose of this rather than simply flipping the default of AUTO_OBJ to yes is to avoid hassling users with auto.obj.mk failures if the wanted OBJDIR is not writable. It will fallback to writing to the source directory like it does today if MAKEOBJDIRPREFIX is not writable. The act of enabling MK_AUTO_OBJ disables all 'make obj' treewalks since previous work has made those not run if MK_AUTO_OBJ==yes in Makefile.inc1. Relnotes: yes Reviewed by: sjg Discussed at: https://lists.freebsd.org/pipermail/freebsd-arch/2016-May/017805.html Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D12841 Added: head/tools/build/options/WITHOUT_AUTO_OBJ (contents, props changed) Modified: head/UPDATING head/share/mk/src.sys.mk head/share/mk/src.sys.obj.mk head/share/mk/sys.mk Modified: head/UPDATING ============================================================================== --- head/UPDATING Thu Nov 2 18:08:36 2017 (r325329) +++ head/UPDATING Thu Nov 2 18:09:07 2017 (r325330) @@ -51,6 +51,14 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW: ****************************** SPECIAL WARNING: ****************************** +20171102: + Building in a FreeBSD src checkout will automatically create object + directories now rather than store files in the current directory if + 'make obj' was not ran. Calling 'make obj' is no longer necesarry. + This feature can be disabled by setting WITHOUT_AUTO_OBJ=yes in + /etc/src-env.conf (not /etc/src.conf), or passing the option in the + environment. + 20171101: The default MAKEOBJDIR has changed from /usr/obj/ for native builds, and /usr/obj// for cross-builds, to a unified Modified: head/share/mk/src.sys.mk ============================================================================== --- head/share/mk/src.sys.mk Thu Nov 2 18:08:36 2017 (r325329) +++ head/share/mk/src.sys.mk Thu Nov 2 18:09:07 2017 (r325330) @@ -14,7 +14,7 @@ SRCCONF?= /etc/src.conf # Validate that the user didn't try setting an env-only variable in # their src.conf. This benefits from already including bsd.mkopt.mk. -.for var in ${__ENV_ONLY_OPTIONS} +.for var in ${__ENV_ONLY_OPTIONS:O:u} __presrcconf_${var}:= ${MK_${var}:U-}${WITHOUT_${var}:Uno:Dyes}${WITH_${var}:Uno:Dyes} .endfor @@ -22,7 +22,7 @@ __presrcconf_${var}:= ${MK_${var}:U-}${WITHOUT_${var}: _srcconf_included_: .NOTMAIN # Validate the env-only variables. -.for var in ${__ENV_ONLY_OPTIONS} +.for var in ${__ENV_ONLY_OPTIONS:O:u} __postrcconf_${var}:= ${MK_${var}:U-}${WITHOUT_${var}:Uno:Dyes}${WITH_${var}:Uno:Dyes} .if ${__presrcconf_${var}} != ${__postrcconf_${var}} .error Option ${var} may only be defined in ${SRC_ENV_CONF}, environment, or make argument, not ${SRCCONF}. Modified: head/share/mk/src.sys.obj.mk ============================================================================== --- head/share/mk/src.sys.obj.mk Thu Nov 2 18:08:36 2017 (r325329) +++ head/share/mk/src.sys.obj.mk Thu Nov 2 18:09:07 2017 (r325330) @@ -94,7 +94,68 @@ OBJTOP:= ${MAKEOBJDIRPREFIX}${SRCTOP} OBJROOT:= ${OBJTOP}/ .endif -# Assign this directory as .OBJDIR if possible +# Try to enable MK_AUTO_OBJ by default if we can write to the OBJROOT. Only +# do this if AUTO_OBJ is not disabled by the user, not cleaning, and this +# is the first make ran. +.if ${.MAKE.LEVEL} == 0 && \ + ${MK_AUTO_OBJ} == "no" && empty(.MAKEOVERRIDES:MMK_AUTO_OBJ) && \ + !defined(WITHOUT_AUTO_OBJ) && !make(showconfig) && !make(print-dir) && \ + !defined(NO_OBJ) && \ + (${.TARGETS} == "" || ${.TARGETS:Nclean*:N*clean:Ndestroy*} != "") +# Find the last existing directory component and check if we can write to it. +# If the last component is a symlink then recurse on the new path. +CheckAutoObj= \ +DirIsCreatable() { \ + [ -w "$${1}" ] && return 0; \ + d="$${1}"; \ + IFS=/; \ + set -- $${d}; \ + unset dir; \ + while [ $$\# -gt 0 ]; do \ + d="$${1}"; \ + shift; \ + if [ ! -d "$${dir}$${d}/" ]; then \ + if [ -L "$${dir}$${d}" ]; then \ + dir="$$(readlink "$${dir}$${d}")/"; \ + for d in "$${@}"; do \ + dir="$${dir}$${d}/"; \ + done; \ + ret=0; \ + DirIsCreatable "$${dir%/}" || ret=$$?; \ + return $${ret}; \ + else \ + break; \ + fi; \ + fi; \ + dir="$${dir}$${d}/"; \ + done; \ + [ -w "$${dir}" ]; \ +}; \ +CheckAutoObj() { \ + if DirIsCreatable "$${1}"; then \ + echo yes; \ + else \ + echo no; \ + fi; \ +} +.if !empty(MAKEOBJDIRPREFIX) +WANTED_OBJDIR= ${MAKEOBJDIRPREFIX}${.CURDIR} +.else +WANTED_OBJDIR= ${MAKEOBJDIR} +.endif +OBJDIR_WRITABLE!= \ + ${CheckAutoObj}; CheckAutoObj "${WANTED_OBJDIR}" || echo no +# Export the decision to sub-makes. +MK_AUTO_OBJ:= ${OBJDIR_WRITABLE} +.export MK_AUTO_OBJ +.elif make(showconfig) +# Need to export for showconfig internally running make -dg1. It is enabled +# in sys.mk by default. +.export MK_AUTO_OBJ +.endif # ${MK_AUTO_OBJ} == "no" && ... + +# Assign this directory as .OBJDIR if possible after determining if AUTO_OBJ +# can be enabled by default. .if ${MK_AUTO_OBJ} == "no" # The expected OBJDIR already exists, set it as .OBJDIR. .if !empty(MAKEOBJDIRPREFIX) && exists(${MAKEOBJDIRPREFIX}${.CURDIR}) Modified: head/share/mk/sys.mk ============================================================================== --- head/share/mk/sys.mk Thu Nov 2 18:08:36 2017 (r325329) +++ head/share/mk/sys.mk Thu Nov 2 18:09:07 2017 (r325330) @@ -20,6 +20,12 @@ MACHINE_CPUARCH=${MACHINE_ARCH:${__TO_CPUARCH}} __DEFAULT_YES_OPTIONS+= \ UNIFIED_OBJDIR +# src.sys.obj.mk enables AUTO_OBJ by default if possible but it is otherwise +# disabled. Ensure src.conf.5 shows it as default on. +.if make(showconfig) +__DEFAULT_YES_OPTIONS+= AUTO_OBJ +.endif + # Some options we need now __DEFAULT_NO_OPTIONS= \ DIRDEPS_BUILD \ Added: head/tools/build/options/WITHOUT_AUTO_OBJ ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITHOUT_AUTO_OBJ Thu Nov 2 18:09:07 2017 (r325330) @@ -0,0 +1,3 @@ +.\" $FreeBSD$ +Disable automatic creation of objdirs. +This is enabled by default if the wanted OBJDIR is writable by the current user. From owner-svn-src-all@freebsd.org Thu Nov 2 18:09:12 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 22E44E5FCE4; Thu, 2 Nov 2017 18:09:12 +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 E3CA23797; Thu, 2 Nov 2017 18:09:11 +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 vA2I9Bwh071748; Thu, 2 Nov 2017 18:09:11 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA2I9BoT071747; Thu, 2 Nov 2017 18:09:11 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201711021809.vA2I9BoT071747@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Thu, 2 Nov 2017 18:09:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325331 - head/share/man/man5 X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/share/man/man5 X-SVN-Commit-Revision: 325331 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: Thu, 02 Nov 2017 18:09:12 -0000 Author: bdrewery Date: Thu Nov 2 18:09:10 2017 New Revision: 325331 URL: https://svnweb.freebsd.org/changeset/base/325331 Log: Regenerate for AUTO_OBJ. Sponsored by: Dell EMC Isilon Modified: head/share/man/man5/src.conf.5 Modified: head/share/man/man5/src.conf.5 ============================================================================== --- head/share/man/man5/src.conf.5 Thu Nov 2 18:09:07 2017 (r325330) +++ head/share/man/man5/src.conf.5 Thu Nov 2 18:09:10 2017 (r325331) @@ -1,6 +1,6 @@ .\" DO NOT EDIT-- this file is generated by tools/build/options/makeman. .\" $FreeBSD$ -.Dd November 1, 2017 +.Dd November 2, 2017 .Dt SRC.CONF 5 .Os .Sh NAME @@ -129,8 +129,9 @@ Set to not build Set to not build .Xr autofs 5 related programs, libraries, and kernel modules. -.It Va WITH_AUTO_OBJ -Enable automatic creation of objdirs. +.It Va WITHOUT_AUTO_OBJ +Disable automatic creation of objdirs. +This is enabled by default if the wanted OBJDIR is writable by the current user. .Pp This must be set in the environment, make command line, or .Pa /etc/src-env.conf , @@ -537,10 +538,6 @@ When set, it enforces these options: When set, these options are also in effect: .Pp .Bl -inset -compact -.It Va WITH_AUTO_OBJ -(unless -.Va WITHOUT_AUTO_OBJ -is set explicitly) .It Va WITH_META_MODE (unless .Va WITHOUT_META_MODE From owner-svn-src-all@freebsd.org Thu Nov 2 18:13: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 CEAA5E600D7; Thu, 2 Nov 2017 18:13:28 +0000 (UTC) (envelope-from royger@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 4E7813F96; Thu, 2 Nov 2017 18:13:28 +0000 (UTC) (envelope-from royger@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA2IDQMt075741; Thu, 2 Nov 2017 18:13:27 GMT (envelope-from royger@FreeBSD.org) Received: (from royger@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA2IDQTu075740; Thu, 2 Nov 2017 18:13:26 GMT (envelope-from royger@FreeBSD.org) Message-Id: <201711021813.vA2IDQTu075740@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: royger set sender to royger@FreeBSD.org using -f From: =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= Date: Thu, 2 Nov 2017 18:13:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325332 - head/sys/boot/i386/loader X-SVN-Group: head X-SVN-Commit-Author: royger X-SVN-Commit-Paths: head/sys/boot/i386/loader X-SVN-Commit-Revision: 325332 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: Thu, 02 Nov 2017 18:13:29 -0000 Author: royger Date: Thu Nov 2 18:13:26 2017 New Revision: 325332 URL: https://svnweb.freebsd.org/changeset/base/325332 Log: loader: re-enable gzip support for x86 r324653 inadvertently disabled default gzip support on x86, re-enable. Sponsored by: Citrix System R&D Reviewed by: imp Differential revision: https://reviews.freebsd.org/D12913 Modified: head/sys/boot/i386/loader/Makefile Modified: head/sys/boot/i386/loader/Makefile ============================================================================== --- head/sys/boot/i386/loader/Makefile Thu Nov 2 18:09:10 2017 (r325331) +++ head/sys/boot/i386/loader/Makefile Thu Nov 2 18:13:26 2017 (r325332) @@ -18,6 +18,7 @@ LOADER_CD9660_SUPPORT?= no LOADER_EXT2FS_SUPPORT?= no LOADER_MSDOS_SUPPORT?= no LOADER_UFS_SUPPORT?= yes +LOADER_GZIP_SUPPORT?= yes # architecture-specific loader code SRCS= main.c conf.c vers.c chain.c From owner-svn-src-all@freebsd.org Thu Nov 2 18:16:03 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 0E1AAE60259; Thu, 2 Nov 2017 18:16:03 +0000 (UTC) (envelope-from jkim@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 DB387634A4; Thu, 2 Nov 2017 18:16:02 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA2IG1gX075884; Thu, 2 Nov 2017 18:16:01 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA2IG1El075878; Thu, 2 Nov 2017 18:16:01 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201711021816.vA2IG1El075878@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Thu, 2 Nov 2017 18:16: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: r325333 - in stable/11: crypto/openssl/crypto crypto/openssl/crypto/aes/asm crypto/openssl/crypto/modes/asm secure/lib/libcrypto secure/lib/libcrypto/aarch64 X-SVN-Group: stable-11 X-SVN-Commit-Author: jkim X-SVN-Commit-Paths: in stable/11: crypto/openssl/crypto crypto/openssl/crypto/aes/asm crypto/openssl/crypto/modes/asm secure/lib/libcrypto secure/lib/libcrypto/aarch64 X-SVN-Commit-Revision: 325333 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: Thu, 02 Nov 2017 18:16:03 -0000 Author: jkim Date: Thu Nov 2 18:16:01 2017 New Revision: 325333 URL: https://svnweb.freebsd.org/changeset/base/325333 Log: MFC: r307976 Build OpenSSL assembly sources for aarch64. Added: stable/11/secure/lib/libcrypto/aarch64/ - copied from r307976, head/secure/lib/libcrypto/aarch64/ Modified: stable/11/crypto/openssl/crypto/aes/asm/aesv8-armx.pl stable/11/crypto/openssl/crypto/arm64cpuid.S stable/11/crypto/openssl/crypto/modes/asm/ghashv8-armx.pl stable/11/secure/lib/libcrypto/Makefile stable/11/secure/lib/libcrypto/Makefile.asm stable/11/secure/lib/libcrypto/Makefile.inc Directory Properties: stable/11/ (props changed) Modified: stable/11/crypto/openssl/crypto/aes/asm/aesv8-armx.pl ============================================================================== --- stable/11/crypto/openssl/crypto/aes/asm/aesv8-armx.pl Thu Nov 2 18:13:26 2017 (r325332) +++ stable/11/crypto/openssl/crypto/aes/asm/aesv8-armx.pl Thu Nov 2 18:16:01 2017 (r325333) @@ -42,7 +42,7 @@ $code=<<___; #if __ARM_MAX_ARCH__>=7 .text ___ -$code.=".arch armv8-a+crypto\n" if ($flavour =~ /64/); +# $code.=".arch armv8-a+crypto\n" if ($flavour =~ /64/); $code.=".arch armv7-a\n.fpu neon\n.code 32\n" if ($flavour !~ /64/); #^^^^^^ this is done to simplify adoption by not depending # on latest binutils. Modified: stable/11/crypto/openssl/crypto/arm64cpuid.S ============================================================================== --- stable/11/crypto/openssl/crypto/arm64cpuid.S Thu Nov 2 18:13:26 2017 (r325332) +++ stable/11/crypto/openssl/crypto/arm64cpuid.S Thu Nov 2 18:16:01 2017 (r325333) @@ -1,7 +1,6 @@ #include "arm_arch.h" .text -.arch armv8-a+crypto .align 5 .global _armv7_neon_probe Modified: stable/11/crypto/openssl/crypto/modes/asm/ghashv8-armx.pl ============================================================================== --- stable/11/crypto/openssl/crypto/modes/asm/ghashv8-armx.pl Thu Nov 2 18:13:26 2017 (r325332) +++ stable/11/crypto/openssl/crypto/modes/asm/ghashv8-armx.pl Thu Nov 2 18:16:01 2017 (r325333) @@ -49,7 +49,7 @@ $code=<<___; .text ___ -$code.=".arch armv8-a+crypto\n" if ($flavour =~ /64/); +# $code.=".arch armv8-a+crypto\n" if ($flavour =~ /64/); $code.=".fpu neon\n.code 32\n" if ($flavour !~ /64/); ################################################################################ Modified: stable/11/secure/lib/libcrypto/Makefile ============================================================================== --- stable/11/secure/lib/libcrypto/Makefile Thu Nov 2 18:13:26 2017 (r325332) +++ stable/11/secure/lib/libcrypto/Makefile Thu Nov 2 18:16:01 2017 (r325333) @@ -22,7 +22,10 @@ MAN+= config.5 des_modes.7 # base sources SRCS= cpt_err.c cryptlib.c cversion.c ex_data.c mem.c mem_dbg.c o_dir.c \ o_fips.c o_init.c o_str.c o_time.c uid.c -.if defined(ASM_amd64) +.if defined(ASM_aarch64) +SRCS+= arm64cpuid.S armcap.c mem_clr.c +CFLAGS.arm64cpuid.S= -march=armv8-a+crypto +.elif defined(ASM_amd64) SRCS+= x86_64cpuid.S .elif defined(ASM_arm) SRCS+= armcap.c armv4cpuid.S @@ -35,7 +38,10 @@ INCS+= crypto.h ebcdic.h opensslv.h ossl_typ.h symhack # aes SRCS+= aes_cfb.c aes_ctr.c aes_ecb.c aes_ige.c aes_misc.c aes_ofb.c aes_wrap.c -.if defined(ASM_amd64) +.if defined(ASM_aarch64) +SRCS+= aes_cbc.c aes_core.c aesv8-armx.S +CFLAGS.aesv8-armx.S= -march=armv8-a+crypto +.elif defined(ASM_amd64) SRCS+= aes-x86_64.S aesni-mb-x86_64.S aesni-sha1-x86_64.S \ aesni-sha256-x86_64.S aesni-x86_64.S bsaes-x86_64.S vpaes-x86_64.S .elif defined(ASM_arm) @@ -238,7 +244,10 @@ INCS+= mdc2.h # modes SRCS+= cbc128.c ccm128.c cfb128.c ctr128.c cts128.c gcm128.c ofb128.c \ wrap128.c xts128.c -.if defined(ASM_amd64) +.if defined(ASM_aarch64) +SRCS+= ghashv8-armx.S +CFLAGS.ghashv8-armx.S= -march=armv8-a+crypto +.elif defined(ASM_amd64) SRCS+= aesni-gcm-x86_64.S ghash-x86_64.S .elif defined(ASM_arm) SRCS+= ghash-armv4.S ghashv8-armx.S @@ -324,7 +333,9 @@ INCS+= seed.h # sha SRCS+= sha1_one.c sha1dgst.c sha256.c sha512.c sha_dgst.c sha_one.c -.if defined(ASM_amd64) +.if defined(ASM_aarch64) +SRCS+= sha1-armv8.S sha256-armv8.S sha512-armv8.S +.elif defined(ASM_amd64) SRCS+= sha1-mb-x86_64.S sha1-x86_64.S sha256-mb-x86_64.S sha256-x86_64.S \ sha512-x86_64.S .elif defined(ASM_arm) Modified: stable/11/secure/lib/libcrypto/Makefile.asm ============================================================================== --- stable/11/secure/lib/libcrypto/Makefile.asm Thu Nov 2 18:13:26 2017 (r325332) +++ stable/11/secure/lib/libcrypto/Makefile.asm Thu Nov 2 18:16:01 2017 (r325333) @@ -6,7 +6,44 @@ .include "Makefile.inc" -.if defined(ASM_amd64) +.if defined(ASM_aarch64) + +.PATH: ${LCRYPTO_SRC}/crypto \ + ${LCRYPTO_SRC}/crypto/aes/asm \ + ${LCRYPTO_SRC}/crypto/modes/asm \ + ${LCRYPTO_SRC}/crypto/sha/asm + +PERLPATH= -I${LCRYPTO_SRC}/crypto/perlasm + +# aes +SRCS= aesv8-armx.pl + +# modes +SRCS+= ghashv8-armx.pl + +# sha +SRCS+= sha1-armv8.pl sha512-armv8.pl + +ASM= ${SRCS:R:S/$/.S/} sha256-armv8.S + +all: ${ASM} + +CLEANFILES= ${ASM} ${SRCS:R:S/$/.s/} sha256-armv8.s +.SUFFIXES: .pl + +sha256-armv8.S: sha512-armv8.pl + env CC=cc perl ${.ALLSRC} 64 ${.TARGET:R:S/$/.s/} + ( echo '/* $$'FreeBSD'$$ */' ;\ + echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} + +.pl.S: + env CC=cc perl ${.IMPSRC} 64 ${.TARGET:R:S/$/.s/} + ( echo '/* $$'FreeBSD'$$ */' ;\ + echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T:R:S/$/.pl/}. */' ;\ + cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} + +.elif defined(ASM_amd64) .PATH: ${LCRYPTO_SRC}/crypto \ ${LCRYPTO_SRC}/crypto/aes/asm \ Modified: stable/11/secure/lib/libcrypto/Makefile.inc ============================================================================== --- stable/11/secure/lib/libcrypto/Makefile.inc Thu Nov 2 18:13:26 2017 (r325332) +++ stable/11/secure/lib/libcrypto/Makefile.inc Thu Nov 2 18:16:01 2017 (r325333) @@ -21,7 +21,9 @@ CFLAGS+=-DL_ENDIAN CFLAGS+=-DB_ENDIAN .endif -.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" +.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm" +ASM_${MACHINE_CPUARCH}= +.elif ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" _ASM_AVX!= { \ echo vzeroall | \ ${CC} -x assembler -o /dev/null -c - 2> /dev/null; \ @@ -29,11 +31,11 @@ _ASM_AVX!= { \ .if ${_ASM_AVX} == yes ASM_${MACHINE_CPUARCH}= .endif -.elif ${MACHINE_CPUARCH} == "arm" -ASM_arm= .endif -.if defined(ASM_amd64) +.if defined(ASM_aarch64) +CFLAGS+=-DSHA1_ASM -DSHA256_ASM -DSHA512_ASM +.elif defined(ASM_amd64) CFLAGS+=-DOPENSSL_IA32_SSE2 CFLAGS+=-DAES_ASM -DBSAES_ASM -DVPAES_ASM CFLAGS+=-DECP_NISTZ256_ASM From owner-svn-src-all@freebsd.org Thu Nov 2 18:20: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 1C26CE60377; Thu, 2 Nov 2017 18:20:07 +0000 (UTC) (envelope-from jkim@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 DCCE163680; Thu, 2 Nov 2017 18:20:06 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA2IK65W076099; Thu, 2 Nov 2017 18:20:06 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA2IK6C8076098; Thu, 2 Nov 2017 18:20:06 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201711021820.vA2IK6C8076098@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Thu, 2 Nov 2017 18:20:06 +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: r325334 - stable/11/crypto/openssl/crypto X-SVN-Group: stable-11 X-SVN-Commit-Author: jkim X-SVN-Commit-Paths: stable/11/crypto/openssl/crypto X-SVN-Commit-Revision: 325334 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: Thu, 02 Nov 2017 18:20:07 -0000 Author: jkim Date: Thu Nov 2 18:20:05 2017 New Revision: 325334 URL: https://svnweb.freebsd.org/changeset/base/325334 Log: MFC: r316607 (andrew) Fix linking with lld by marking OPENSSL_armcap_P as hidden. Linking with lld fails as it contains a relative address, however the data this address is for may be relocated from the shared object to the main executable. Fix this by adding the hidden attribute. This stops moving this value to the main executable. It seems this is implicit upstream as it uses a version script. Modified: stable/11/crypto/openssl/crypto/armcap.c Directory Properties: stable/11/ (props changed) Modified: stable/11/crypto/openssl/crypto/armcap.c ============================================================================== --- stable/11/crypto/openssl/crypto/armcap.c Thu Nov 2 18:16:01 2017 (r325333) +++ stable/11/crypto/openssl/crypto/armcap.c Thu Nov 2 18:20:05 2017 (r325334) @@ -7,6 +7,7 @@ #include "arm_arch.h" +__attribute__ ((visibility("hidden"))) unsigned int OPENSSL_armcap_P = 0; #if __ARM_MAX_ARCH__<7 From owner-svn-src-all@freebsd.org Thu Nov 2 18:22: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 985D4E60587; Thu, 2 Nov 2017 18:22:59 +0000 (UTC) (envelope-from jkim@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 20B7E63A6E; Thu, 2 Nov 2017 18:22:59 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA2IMwoF080299; Thu, 2 Nov 2017 18:22:58 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA2IMsqQ080258; Thu, 2 Nov 2017 18:22:54 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201711021822.vA2IMsqQ080258@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Thu, 2 Nov 2017 18:22:54 +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: r325335 - in stable/11: crypto/openssl crypto/openssl/apps crypto/openssl/crypto crypto/openssl/crypto/aes crypto/openssl/crypto/aes/asm crypto/openssl/crypto/asn1 crypto/openssl/crypto... X-SVN-Group: stable-11 X-SVN-Commit-Author: jkim X-SVN-Commit-Paths: in stable/11: crypto/openssl crypto/openssl/apps crypto/openssl/crypto crypto/openssl/crypto/aes crypto/openssl/crypto/aes/asm crypto/openssl/crypto/asn1 crypto/openssl/crypto/bio crypto/openssl/crypt... X-SVN-Commit-Revision: 325335 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: Thu, 02 Nov 2017 18:22:59 -0000 Author: jkim Date: Thu Nov 2 18:22:53 2017 New Revision: 325335 URL: https://svnweb.freebsd.org/changeset/base/325335 Log: MFC: r318899 Merge OpenSSL 1.0.2l. Added: stable/11/crypto/openssl/doc/man3/ - copied from r318899, head/crypto/openssl/doc/man3/ stable/11/secure/lib/libssl/man/SSL_CTX_set_tlsext_servername_callback.3 - copied unchanged from r318899, head/secure/lib/libssl/man/SSL_CTX_set_tlsext_servername_callback.3 Modified: stable/11/crypto/openssl/CHANGES stable/11/crypto/openssl/Configure stable/11/crypto/openssl/LICENSE stable/11/crypto/openssl/Makefile stable/11/crypto/openssl/Makefile.org stable/11/crypto/openssl/NEWS stable/11/crypto/openssl/README stable/11/crypto/openssl/apps/ca.c stable/11/crypto/openssl/apps/dhparam.c stable/11/crypto/openssl/apps/enc.c stable/11/crypto/openssl/apps/engine.c stable/11/crypto/openssl/apps/pkeyutl.c stable/11/crypto/openssl/apps/prime.c stable/11/crypto/openssl/apps/progs.h stable/11/crypto/openssl/apps/progs.pl stable/11/crypto/openssl/apps/req.c stable/11/crypto/openssl/apps/s_client.c stable/11/crypto/openssl/apps/s_server.c stable/11/crypto/openssl/apps/srp.c stable/11/crypto/openssl/appveyor.yml stable/11/crypto/openssl/config stable/11/crypto/openssl/crypto/aes/Makefile stable/11/crypto/openssl/crypto/aes/asm/aesni-sha1-x86_64.pl stable/11/crypto/openssl/crypto/aes/asm/aesni-sha256-x86_64.pl stable/11/crypto/openssl/crypto/aes/asm/bsaes-armv7.pl stable/11/crypto/openssl/crypto/asn1/a_bitstr.c stable/11/crypto/openssl/crypto/asn1/a_digest.c stable/11/crypto/openssl/crypto/asn1/a_gentm.c stable/11/crypto/openssl/crypto/asn1/a_strnid.c stable/11/crypto/openssl/crypto/asn1/a_time.c stable/11/crypto/openssl/crypto/asn1/a_utctm.c stable/11/crypto/openssl/crypto/asn1/f_enum.c stable/11/crypto/openssl/crypto/asn1/f_int.c stable/11/crypto/openssl/crypto/asn1/tasn_dec.c stable/11/crypto/openssl/crypto/asn1/tasn_new.c stable/11/crypto/openssl/crypto/asn1/x_long.c stable/11/crypto/openssl/crypto/asn1/x_name.c stable/11/crypto/openssl/crypto/bio/b_print.c stable/11/crypto/openssl/crypto/bio/bio_cb.c stable/11/crypto/openssl/crypto/bio/bss_file.c stable/11/crypto/openssl/crypto/bn/Makefile stable/11/crypto/openssl/crypto/bn/asm/sparcv9-mont.pl stable/11/crypto/openssl/crypto/bn/bn_prime.c stable/11/crypto/openssl/crypto/bn/bn_prime.h stable/11/crypto/openssl/crypto/bn/bn_prime.pl stable/11/crypto/openssl/crypto/bn/bn_print.c stable/11/crypto/openssl/crypto/comp/c_rle.c stable/11/crypto/openssl/crypto/conf/conf.h stable/11/crypto/openssl/crypto/conf/conf_def.c stable/11/crypto/openssl/crypto/conf/conf_err.c stable/11/crypto/openssl/crypto/des/Makefile stable/11/crypto/openssl/crypto/des/set_key.c stable/11/crypto/openssl/crypto/dh/dh.h stable/11/crypto/openssl/crypto/ec/ec_ameth.c stable/11/crypto/openssl/crypto/ec/ec_asn1.c stable/11/crypto/openssl/crypto/ec/ec_mult.c stable/11/crypto/openssl/crypto/ec/eck_prn.c stable/11/crypto/openssl/crypto/engine/eng_cryptodev.c stable/11/crypto/openssl/crypto/err/err.c stable/11/crypto/openssl/crypto/err/err.h stable/11/crypto/openssl/crypto/evp/e_aes.c stable/11/crypto/openssl/crypto/evp/e_aes_cbc_hmac_sha1.c stable/11/crypto/openssl/crypto/evp/e_aes_cbc_hmac_sha256.c stable/11/crypto/openssl/crypto/evp/e_des3.c stable/11/crypto/openssl/crypto/evp/evp_enc.c stable/11/crypto/openssl/crypto/evp/pmeth_lib.c stable/11/crypto/openssl/crypto/ex_data.c stable/11/crypto/openssl/crypto/hmac/hm_pmeth.c stable/11/crypto/openssl/crypto/md5/Makefile stable/11/crypto/openssl/crypto/mem.c stable/11/crypto/openssl/crypto/modes/Makefile stable/11/crypto/openssl/crypto/o_dir.c stable/11/crypto/openssl/crypto/o_time.c stable/11/crypto/openssl/crypto/opensslv.h stable/11/crypto/openssl/crypto/perlasm/x86_64-xlate.pl stable/11/crypto/openssl/crypto/pkcs12/p12_mutl.c stable/11/crypto/openssl/crypto/ppccap.c stable/11/crypto/openssl/crypto/rand/md_rand.c stable/11/crypto/openssl/crypto/rc4/Makefile stable/11/crypto/openssl/crypto/rsa/rsa_pmeth.c stable/11/crypto/openssl/crypto/rsa/rsa_pss.c stable/11/crypto/openssl/crypto/sha/Makefile stable/11/crypto/openssl/crypto/srp/srp_vfy.c stable/11/crypto/openssl/crypto/txt_db/txt_db.c stable/11/crypto/openssl/crypto/ui/ui_lib.c stable/11/crypto/openssl/crypto/x509/x509_lu.c stable/11/crypto/openssl/crypto/x509v3/v3_alt.c stable/11/crypto/openssl/crypto/x509v3/v3_cpols.c stable/11/crypto/openssl/crypto/x509v3/v3_info.c stable/11/crypto/openssl/crypto/x509v3/v3_purp.c stable/11/crypto/openssl/crypto/x86_64cpuid.pl stable/11/crypto/openssl/crypto/x86cpuid.pl stable/11/crypto/openssl/doc/apps/ciphers.pod stable/11/crypto/openssl/doc/apps/config.pod stable/11/crypto/openssl/doc/apps/genrsa.pod stable/11/crypto/openssl/doc/apps/req.pod stable/11/crypto/openssl/doc/apps/s_client.pod stable/11/crypto/openssl/doc/apps/s_server.pod stable/11/crypto/openssl/doc/crypto/EVP_EncryptInit.pod stable/11/crypto/openssl/doc/crypto/RSA_private_encrypt.pod stable/11/crypto/openssl/doc/crypto/RSA_public_encrypt.pod stable/11/crypto/openssl/doc/crypto/X509_STORE_CTX_new.pod stable/11/crypto/openssl/doc/crypto/des.pod stable/11/crypto/openssl/ssl/d1_both.c stable/11/crypto/openssl/ssl/d1_clnt.c stable/11/crypto/openssl/ssl/d1_pkt.c stable/11/crypto/openssl/ssl/d1_srvr.c stable/11/crypto/openssl/ssl/s23_clnt.c stable/11/crypto/openssl/ssl/s23_srvr.c stable/11/crypto/openssl/ssl/s3_clnt.c stable/11/crypto/openssl/ssl/s3_enc.c stable/11/crypto/openssl/ssl/s3_lib.c stable/11/crypto/openssl/ssl/s3_pkt.c stable/11/crypto/openssl/ssl/s3_srvr.c stable/11/crypto/openssl/ssl/ssl_cert.c stable/11/crypto/openssl/ssl/ssl_ciph.c stable/11/crypto/openssl/ssl/ssl_lib.c stable/11/crypto/openssl/ssl/ssl_locl.h stable/11/crypto/openssl/ssl/ssl_rsa.c stable/11/crypto/openssl/ssl/ssl_sess.c stable/11/crypto/openssl/ssl/ssltest.c stable/11/crypto/openssl/ssl/t1_ext.c stable/11/crypto/openssl/ssl/t1_lib.c stable/11/crypto/openssl/util/domd stable/11/crypto/openssl/util/mk1mf.pl stable/11/secure/lib/libcrypto/Makefile.inc stable/11/secure/lib/libcrypto/Makefile.man stable/11/secure/lib/libcrypto/amd64/aesni-sha1-x86_64.S stable/11/secure/lib/libcrypto/amd64/aesni-sha256-x86_64.S stable/11/secure/lib/libcrypto/amd64/x86_64cpuid.S stable/11/secure/lib/libcrypto/arm/bsaes-armv7.S stable/11/secure/lib/libcrypto/i386/x86cpuid.S stable/11/secure/lib/libcrypto/man/ASN1_OBJECT_new.3 stable/11/secure/lib/libcrypto/man/ASN1_STRING_length.3 stable/11/secure/lib/libcrypto/man/ASN1_STRING_new.3 stable/11/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3 stable/11/secure/lib/libcrypto/man/ASN1_TIME_set.3 stable/11/secure/lib/libcrypto/man/ASN1_generate_nconf.3 stable/11/secure/lib/libcrypto/man/BIO_ctrl.3 stable/11/secure/lib/libcrypto/man/BIO_f_base64.3 stable/11/secure/lib/libcrypto/man/BIO_f_buffer.3 stable/11/secure/lib/libcrypto/man/BIO_f_cipher.3 stable/11/secure/lib/libcrypto/man/BIO_f_md.3 stable/11/secure/lib/libcrypto/man/BIO_f_null.3 stable/11/secure/lib/libcrypto/man/BIO_f_ssl.3 stable/11/secure/lib/libcrypto/man/BIO_find_type.3 stable/11/secure/lib/libcrypto/man/BIO_new.3 stable/11/secure/lib/libcrypto/man/BIO_new_CMS.3 stable/11/secure/lib/libcrypto/man/BIO_push.3 stable/11/secure/lib/libcrypto/man/BIO_read.3 stable/11/secure/lib/libcrypto/man/BIO_s_accept.3 stable/11/secure/lib/libcrypto/man/BIO_s_bio.3 stable/11/secure/lib/libcrypto/man/BIO_s_connect.3 stable/11/secure/lib/libcrypto/man/BIO_s_fd.3 stable/11/secure/lib/libcrypto/man/BIO_s_file.3 stable/11/secure/lib/libcrypto/man/BIO_s_mem.3 stable/11/secure/lib/libcrypto/man/BIO_s_null.3 stable/11/secure/lib/libcrypto/man/BIO_s_socket.3 stable/11/secure/lib/libcrypto/man/BIO_set_callback.3 stable/11/secure/lib/libcrypto/man/BIO_should_retry.3 stable/11/secure/lib/libcrypto/man/BN_BLINDING_new.3 stable/11/secure/lib/libcrypto/man/BN_CTX_new.3 stable/11/secure/lib/libcrypto/man/BN_CTX_start.3 stable/11/secure/lib/libcrypto/man/BN_add.3 stable/11/secure/lib/libcrypto/man/BN_add_word.3 stable/11/secure/lib/libcrypto/man/BN_bn2bin.3 stable/11/secure/lib/libcrypto/man/BN_cmp.3 stable/11/secure/lib/libcrypto/man/BN_copy.3 stable/11/secure/lib/libcrypto/man/BN_generate_prime.3 stable/11/secure/lib/libcrypto/man/BN_mod_inverse.3 stable/11/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3 stable/11/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3 stable/11/secure/lib/libcrypto/man/BN_new.3 stable/11/secure/lib/libcrypto/man/BN_num_bytes.3 stable/11/secure/lib/libcrypto/man/BN_rand.3 stable/11/secure/lib/libcrypto/man/BN_set_bit.3 stable/11/secure/lib/libcrypto/man/BN_swap.3 stable/11/secure/lib/libcrypto/man/BN_zero.3 stable/11/secure/lib/libcrypto/man/CMS_add0_cert.3 stable/11/secure/lib/libcrypto/man/CMS_add1_recipient_cert.3 stable/11/secure/lib/libcrypto/man/CMS_add1_signer.3 stable/11/secure/lib/libcrypto/man/CMS_compress.3 stable/11/secure/lib/libcrypto/man/CMS_decrypt.3 stable/11/secure/lib/libcrypto/man/CMS_encrypt.3 stable/11/secure/lib/libcrypto/man/CMS_final.3 stable/11/secure/lib/libcrypto/man/CMS_get0_RecipientInfos.3 stable/11/secure/lib/libcrypto/man/CMS_get0_SignerInfos.3 stable/11/secure/lib/libcrypto/man/CMS_get0_type.3 stable/11/secure/lib/libcrypto/man/CMS_get1_ReceiptRequest.3 stable/11/secure/lib/libcrypto/man/CMS_sign.3 stable/11/secure/lib/libcrypto/man/CMS_sign_receipt.3 stable/11/secure/lib/libcrypto/man/CMS_uncompress.3 stable/11/secure/lib/libcrypto/man/CMS_verify.3 stable/11/secure/lib/libcrypto/man/CMS_verify_receipt.3 stable/11/secure/lib/libcrypto/man/CONF_modules_free.3 stable/11/secure/lib/libcrypto/man/CONF_modules_load_file.3 stable/11/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3 stable/11/secure/lib/libcrypto/man/DH_generate_key.3 stable/11/secure/lib/libcrypto/man/DH_generate_parameters.3 stable/11/secure/lib/libcrypto/man/DH_get_ex_new_index.3 stable/11/secure/lib/libcrypto/man/DH_new.3 stable/11/secure/lib/libcrypto/man/DH_set_method.3 stable/11/secure/lib/libcrypto/man/DH_size.3 stable/11/secure/lib/libcrypto/man/DSA_SIG_new.3 stable/11/secure/lib/libcrypto/man/DSA_do_sign.3 stable/11/secure/lib/libcrypto/man/DSA_dup_DH.3 stable/11/secure/lib/libcrypto/man/DSA_generate_key.3 stable/11/secure/lib/libcrypto/man/DSA_generate_parameters.3 stable/11/secure/lib/libcrypto/man/DSA_get_ex_new_index.3 stable/11/secure/lib/libcrypto/man/DSA_new.3 stable/11/secure/lib/libcrypto/man/DSA_set_method.3 stable/11/secure/lib/libcrypto/man/DSA_sign.3 stable/11/secure/lib/libcrypto/man/DSA_size.3 stable/11/secure/lib/libcrypto/man/EC_GFp_simple_method.3 stable/11/secure/lib/libcrypto/man/EC_GROUP_copy.3 stable/11/secure/lib/libcrypto/man/EC_GROUP_new.3 stable/11/secure/lib/libcrypto/man/EC_KEY_new.3 stable/11/secure/lib/libcrypto/man/EC_POINT_add.3 stable/11/secure/lib/libcrypto/man/EC_POINT_new.3 stable/11/secure/lib/libcrypto/man/ERR_GET_LIB.3 stable/11/secure/lib/libcrypto/man/ERR_clear_error.3 stable/11/secure/lib/libcrypto/man/ERR_error_string.3 stable/11/secure/lib/libcrypto/man/ERR_get_error.3 stable/11/secure/lib/libcrypto/man/ERR_load_crypto_strings.3 stable/11/secure/lib/libcrypto/man/ERR_load_strings.3 stable/11/secure/lib/libcrypto/man/ERR_print_errors.3 stable/11/secure/lib/libcrypto/man/ERR_put_error.3 stable/11/secure/lib/libcrypto/man/ERR_remove_state.3 stable/11/secure/lib/libcrypto/man/ERR_set_mark.3 stable/11/secure/lib/libcrypto/man/EVP_BytesToKey.3 stable/11/secure/lib/libcrypto/man/EVP_DigestInit.3 stable/11/secure/lib/libcrypto/man/EVP_DigestSignInit.3 stable/11/secure/lib/libcrypto/man/EVP_DigestVerifyInit.3 stable/11/secure/lib/libcrypto/man/EVP_EncodeInit.3 stable/11/secure/lib/libcrypto/man/EVP_EncryptInit.3 stable/11/secure/lib/libcrypto/man/EVP_OpenInit.3 stable/11/secure/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3 stable/11/secure/lib/libcrypto/man/EVP_PKEY_CTX_new.3 stable/11/secure/lib/libcrypto/man/EVP_PKEY_cmp.3 stable/11/secure/lib/libcrypto/man/EVP_PKEY_decrypt.3 stable/11/secure/lib/libcrypto/man/EVP_PKEY_derive.3 stable/11/secure/lib/libcrypto/man/EVP_PKEY_encrypt.3 stable/11/secure/lib/libcrypto/man/EVP_PKEY_get_default_digest.3 stable/11/secure/lib/libcrypto/man/EVP_PKEY_keygen.3 stable/11/secure/lib/libcrypto/man/EVP_PKEY_new.3 stable/11/secure/lib/libcrypto/man/EVP_PKEY_print_private.3 stable/11/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 stable/11/secure/lib/libcrypto/man/EVP_PKEY_sign.3 stable/11/secure/lib/libcrypto/man/EVP_PKEY_verify.3 stable/11/secure/lib/libcrypto/man/EVP_PKEY_verify_recover.3 stable/11/secure/lib/libcrypto/man/EVP_SealInit.3 stable/11/secure/lib/libcrypto/man/EVP_SignInit.3 stable/11/secure/lib/libcrypto/man/EVP_VerifyInit.3 stable/11/secure/lib/libcrypto/man/OBJ_nid2obj.3 stable/11/secure/lib/libcrypto/man/OPENSSL_Applink.3 stable/11/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3 stable/11/secure/lib/libcrypto/man/OPENSSL_config.3 stable/11/secure/lib/libcrypto/man/OPENSSL_ia32cap.3 stable/11/secure/lib/libcrypto/man/OPENSSL_instrument_bus.3 stable/11/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3 stable/11/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3 stable/11/secure/lib/libcrypto/man/PEM_write_bio_CMS_stream.3 stable/11/secure/lib/libcrypto/man/PEM_write_bio_PKCS7_stream.3 stable/11/secure/lib/libcrypto/man/PKCS12_create.3 stable/11/secure/lib/libcrypto/man/PKCS12_parse.3 stable/11/secure/lib/libcrypto/man/PKCS7_decrypt.3 stable/11/secure/lib/libcrypto/man/PKCS7_encrypt.3 stable/11/secure/lib/libcrypto/man/PKCS7_sign.3 stable/11/secure/lib/libcrypto/man/PKCS7_sign_add_signer.3 stable/11/secure/lib/libcrypto/man/PKCS7_verify.3 stable/11/secure/lib/libcrypto/man/RAND_add.3 stable/11/secure/lib/libcrypto/man/RAND_bytes.3 stable/11/secure/lib/libcrypto/man/RAND_cleanup.3 stable/11/secure/lib/libcrypto/man/RAND_egd.3 stable/11/secure/lib/libcrypto/man/RAND_load_file.3 stable/11/secure/lib/libcrypto/man/RAND_set_rand_method.3 stable/11/secure/lib/libcrypto/man/RSA_blinding_on.3 stable/11/secure/lib/libcrypto/man/RSA_check_key.3 stable/11/secure/lib/libcrypto/man/RSA_generate_key.3 stable/11/secure/lib/libcrypto/man/RSA_get_ex_new_index.3 stable/11/secure/lib/libcrypto/man/RSA_new.3 stable/11/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3 stable/11/secure/lib/libcrypto/man/RSA_print.3 stable/11/secure/lib/libcrypto/man/RSA_private_encrypt.3 stable/11/secure/lib/libcrypto/man/RSA_public_encrypt.3 stable/11/secure/lib/libcrypto/man/RSA_set_method.3 stable/11/secure/lib/libcrypto/man/RSA_sign.3 stable/11/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3 stable/11/secure/lib/libcrypto/man/RSA_size.3 stable/11/secure/lib/libcrypto/man/SMIME_read_CMS.3 stable/11/secure/lib/libcrypto/man/SMIME_read_PKCS7.3 stable/11/secure/lib/libcrypto/man/SMIME_write_CMS.3 stable/11/secure/lib/libcrypto/man/SMIME_write_PKCS7.3 stable/11/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3 stable/11/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3 stable/11/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3 stable/11/secure/lib/libcrypto/man/X509_NAME_print_ex.3 stable/11/secure/lib/libcrypto/man/X509_STORE_CTX_get_error.3 stable/11/secure/lib/libcrypto/man/X509_STORE_CTX_get_ex_new_index.3 stable/11/secure/lib/libcrypto/man/X509_STORE_CTX_new.3 stable/11/secure/lib/libcrypto/man/X509_STORE_CTX_set_verify_cb.3 stable/11/secure/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3 stable/11/secure/lib/libcrypto/man/X509_VERIFY_PARAM_set_flags.3 stable/11/secure/lib/libcrypto/man/X509_check_host.3 stable/11/secure/lib/libcrypto/man/X509_new.3 stable/11/secure/lib/libcrypto/man/X509_verify_cert.3 stable/11/secure/lib/libcrypto/man/bio.3 stable/11/secure/lib/libcrypto/man/blowfish.3 stable/11/secure/lib/libcrypto/man/bn.3 stable/11/secure/lib/libcrypto/man/bn_internal.3 stable/11/secure/lib/libcrypto/man/buffer.3 stable/11/secure/lib/libcrypto/man/crypto.3 stable/11/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3 stable/11/secure/lib/libcrypto/man/d2i_CMS_ContentInfo.3 stable/11/secure/lib/libcrypto/man/d2i_DHparams.3 stable/11/secure/lib/libcrypto/man/d2i_DSAPublicKey.3 stable/11/secure/lib/libcrypto/man/d2i_ECPKParameters.3 stable/11/secure/lib/libcrypto/man/d2i_ECPrivateKey.3 stable/11/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3 stable/11/secure/lib/libcrypto/man/d2i_PrivateKey.3 stable/11/secure/lib/libcrypto/man/d2i_RSAPublicKey.3 stable/11/secure/lib/libcrypto/man/d2i_X509.3 stable/11/secure/lib/libcrypto/man/d2i_X509_ALGOR.3 stable/11/secure/lib/libcrypto/man/d2i_X509_CRL.3 stable/11/secure/lib/libcrypto/man/d2i_X509_NAME.3 stable/11/secure/lib/libcrypto/man/d2i_X509_REQ.3 stable/11/secure/lib/libcrypto/man/d2i_X509_SIG.3 stable/11/secure/lib/libcrypto/man/des.3 stable/11/secure/lib/libcrypto/man/dh.3 stable/11/secure/lib/libcrypto/man/dsa.3 stable/11/secure/lib/libcrypto/man/ec.3 stable/11/secure/lib/libcrypto/man/ecdsa.3 stable/11/secure/lib/libcrypto/man/engine.3 stable/11/secure/lib/libcrypto/man/err.3 stable/11/secure/lib/libcrypto/man/evp.3 stable/11/secure/lib/libcrypto/man/hmac.3 stable/11/secure/lib/libcrypto/man/i2d_CMS_bio_stream.3 stable/11/secure/lib/libcrypto/man/i2d_PKCS7_bio_stream.3 stable/11/secure/lib/libcrypto/man/lh_stats.3 stable/11/secure/lib/libcrypto/man/lhash.3 stable/11/secure/lib/libcrypto/man/md5.3 stable/11/secure/lib/libcrypto/man/mdc2.3 stable/11/secure/lib/libcrypto/man/pem.3 stable/11/secure/lib/libcrypto/man/rand.3 stable/11/secure/lib/libcrypto/man/rc4.3 stable/11/secure/lib/libcrypto/man/ripemd.3 stable/11/secure/lib/libcrypto/man/rsa.3 stable/11/secure/lib/libcrypto/man/sha.3 stable/11/secure/lib/libcrypto/man/threads.3 stable/11/secure/lib/libcrypto/man/ui.3 stable/11/secure/lib/libcrypto/man/ui_compat.3 stable/11/secure/lib/libcrypto/man/x509.3 stable/11/secure/lib/libssl/Makefile.man stable/11/secure/lib/libssl/man/SSL_CIPHER_get_name.3 stable/11/secure/lib/libssl/man/SSL_COMP_add_compression_method.3 stable/11/secure/lib/libssl/man/SSL_CONF_CTX_new.3 stable/11/secure/lib/libssl/man/SSL_CONF_CTX_set1_prefix.3 stable/11/secure/lib/libssl/man/SSL_CONF_CTX_set_flags.3 stable/11/secure/lib/libssl/man/SSL_CONF_CTX_set_ssl_ctx.3 stable/11/secure/lib/libssl/man/SSL_CONF_cmd.3 stable/11/secure/lib/libssl/man/SSL_CONF_cmd_argv.3 stable/11/secure/lib/libssl/man/SSL_CTX_add1_chain_cert.3 stable/11/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3 stable/11/secure/lib/libssl/man/SSL_CTX_add_session.3 stable/11/secure/lib/libssl/man/SSL_CTX_ctrl.3 stable/11/secure/lib/libssl/man/SSL_CTX_flush_sessions.3 stable/11/secure/lib/libssl/man/SSL_CTX_free.3 stable/11/secure/lib/libssl/man/SSL_CTX_get0_param.3 stable/11/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3 stable/11/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3 stable/11/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3 stable/11/secure/lib/libssl/man/SSL_CTX_new.3 stable/11/secure/lib/libssl/man/SSL_CTX_sess_number.3 stable/11/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3 stable/11/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3 stable/11/secure/lib/libssl/man/SSL_CTX_sessions.3 stable/11/secure/lib/libssl/man/SSL_CTX_set1_curves.3 stable/11/secure/lib/libssl/man/SSL_CTX_set1_verify_cert_store.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_alpn_select_cb.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_cert_cb.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_cert_store.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_custom_cli_ext.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_info_callback.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_mode.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_options.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_psk_client_callback.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_read_ahead.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_timeout.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_tlsext_status_cb.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_tlsext_ticket_key_cb.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_verify.3 stable/11/secure/lib/libssl/man/SSL_CTX_use_certificate.3 stable/11/secure/lib/libssl/man/SSL_CTX_use_psk_identity_hint.3 stable/11/secure/lib/libssl/man/SSL_CTX_use_serverinfo.3 stable/11/secure/lib/libssl/man/SSL_SESSION_free.3 stable/11/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3 stable/11/secure/lib/libssl/man/SSL_SESSION_get_time.3 stable/11/secure/lib/libssl/man/SSL_accept.3 stable/11/secure/lib/libssl/man/SSL_alert_type_string.3 stable/11/secure/lib/libssl/man/SSL_check_chain.3 stable/11/secure/lib/libssl/man/SSL_clear.3 stable/11/secure/lib/libssl/man/SSL_connect.3 stable/11/secure/lib/libssl/man/SSL_do_handshake.3 stable/11/secure/lib/libssl/man/SSL_free.3 stable/11/secure/lib/libssl/man/SSL_get_SSL_CTX.3 stable/11/secure/lib/libssl/man/SSL_get_ciphers.3 stable/11/secure/lib/libssl/man/SSL_get_client_CA_list.3 stable/11/secure/lib/libssl/man/SSL_get_current_cipher.3 stable/11/secure/lib/libssl/man/SSL_get_default_timeout.3 stable/11/secure/lib/libssl/man/SSL_get_error.3 stable/11/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3 stable/11/secure/lib/libssl/man/SSL_get_ex_new_index.3 stable/11/secure/lib/libssl/man/SSL_get_fd.3 stable/11/secure/lib/libssl/man/SSL_get_peer_cert_chain.3 stable/11/secure/lib/libssl/man/SSL_get_peer_certificate.3 stable/11/secure/lib/libssl/man/SSL_get_psk_identity.3 stable/11/secure/lib/libssl/man/SSL_get_rbio.3 stable/11/secure/lib/libssl/man/SSL_get_session.3 stable/11/secure/lib/libssl/man/SSL_get_verify_result.3 stable/11/secure/lib/libssl/man/SSL_get_version.3 stable/11/secure/lib/libssl/man/SSL_library_init.3 stable/11/secure/lib/libssl/man/SSL_load_client_CA_file.3 stable/11/secure/lib/libssl/man/SSL_new.3 stable/11/secure/lib/libssl/man/SSL_pending.3 stable/11/secure/lib/libssl/man/SSL_read.3 stable/11/secure/lib/libssl/man/SSL_rstate_string.3 stable/11/secure/lib/libssl/man/SSL_session_reused.3 stable/11/secure/lib/libssl/man/SSL_set_bio.3 stable/11/secure/lib/libssl/man/SSL_set_connect_state.3 stable/11/secure/lib/libssl/man/SSL_set_fd.3 stable/11/secure/lib/libssl/man/SSL_set_session.3 stable/11/secure/lib/libssl/man/SSL_set_shutdown.3 stable/11/secure/lib/libssl/man/SSL_set_verify_result.3 stable/11/secure/lib/libssl/man/SSL_shutdown.3 stable/11/secure/lib/libssl/man/SSL_state_string.3 stable/11/secure/lib/libssl/man/SSL_want.3 stable/11/secure/lib/libssl/man/SSL_write.3 stable/11/secure/lib/libssl/man/d2i_SSL_SESSION.3 stable/11/secure/lib/libssl/man/ssl.3 stable/11/secure/usr.bin/openssl/Makefile.man stable/11/secure/usr.bin/openssl/man/CA.pl.1 stable/11/secure/usr.bin/openssl/man/asn1parse.1 stable/11/secure/usr.bin/openssl/man/c_rehash.1 stable/11/secure/usr.bin/openssl/man/ca.1 stable/11/secure/usr.bin/openssl/man/ciphers.1 stable/11/secure/usr.bin/openssl/man/cms.1 stable/11/secure/usr.bin/openssl/man/crl.1 stable/11/secure/usr.bin/openssl/man/crl2pkcs7.1 stable/11/secure/usr.bin/openssl/man/dgst.1 stable/11/secure/usr.bin/openssl/man/dhparam.1 stable/11/secure/usr.bin/openssl/man/dsa.1 stable/11/secure/usr.bin/openssl/man/dsaparam.1 stable/11/secure/usr.bin/openssl/man/ec.1 stable/11/secure/usr.bin/openssl/man/ecparam.1 stable/11/secure/usr.bin/openssl/man/enc.1 stable/11/secure/usr.bin/openssl/man/errstr.1 stable/11/secure/usr.bin/openssl/man/gendsa.1 stable/11/secure/usr.bin/openssl/man/genpkey.1 stable/11/secure/usr.bin/openssl/man/genrsa.1 stable/11/secure/usr.bin/openssl/man/nseq.1 stable/11/secure/usr.bin/openssl/man/ocsp.1 stable/11/secure/usr.bin/openssl/man/openssl.1 stable/11/secure/usr.bin/openssl/man/passwd.1 stable/11/secure/usr.bin/openssl/man/pkcs12.1 stable/11/secure/usr.bin/openssl/man/pkcs7.1 stable/11/secure/usr.bin/openssl/man/pkcs8.1 stable/11/secure/usr.bin/openssl/man/pkey.1 stable/11/secure/usr.bin/openssl/man/pkeyparam.1 stable/11/secure/usr.bin/openssl/man/pkeyutl.1 stable/11/secure/usr.bin/openssl/man/rand.1 stable/11/secure/usr.bin/openssl/man/req.1 stable/11/secure/usr.bin/openssl/man/rsa.1 stable/11/secure/usr.bin/openssl/man/rsautl.1 stable/11/secure/usr.bin/openssl/man/s_client.1 stable/11/secure/usr.bin/openssl/man/s_server.1 stable/11/secure/usr.bin/openssl/man/s_time.1 stable/11/secure/usr.bin/openssl/man/sess_id.1 stable/11/secure/usr.bin/openssl/man/smime.1 stable/11/secure/usr.bin/openssl/man/speed.1 stable/11/secure/usr.bin/openssl/man/spkac.1 stable/11/secure/usr.bin/openssl/man/ts.1 stable/11/secure/usr.bin/openssl/man/tsget.1 stable/11/secure/usr.bin/openssl/man/verify.1 stable/11/secure/usr.bin/openssl/man/version.1 stable/11/secure/usr.bin/openssl/man/x509.1 stable/11/secure/usr.bin/openssl/man/x509v3_config.1 Directory Properties: stable/11/ (props changed) Modified: stable/11/crypto/openssl/CHANGES ============================================================================== --- stable/11/crypto/openssl/CHANGES Thu Nov 2 18:20:05 2017 (r325334) +++ stable/11/crypto/openssl/CHANGES Thu Nov 2 18:22:53 2017 (r325335) @@ -2,6 +2,12 @@ OpenSSL CHANGES _______________ + Changes between 1.0.2k and 1.0.2l [25 May 2017] + + *) Have 'config' recognise 64-bit mingw and choose 'mingw64' as the target + platform rather than 'mingw'. + [Richard Levitte] + Changes between 1.0.2j and 1.0.2k [26 Jan 2017] *) Truncated packet could crash via OOB read Modified: stable/11/crypto/openssl/Configure ============================================================================== --- stable/11/crypto/openssl/Configure Thu Nov 2 18:20:05 2017 (r325334) +++ stable/11/crypto/openssl/Configure Thu Nov 2 18:22:53 2017 (r325335) @@ -109,7 +109,7 @@ my $usage="Usage: Configure [no- ...] [enable- # Minimum warning options... any contributions to OpenSSL should at least get # past these. -my $gcc_devteam_warn = "-Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED"; +my $gcc_devteam_warn = "-Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Wundef -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED"; # TODO(openssl-team): fix problems and investigate if (at least) the following # warnings can also be enabled: @@ -2041,12 +2041,13 @@ EOF close(OUT); } else { my $make_command = "$make PERL=\'$perl\'"; - my $make_targets = ""; - $make_targets .= " links" if $symlink; - $make_targets .= " depend" if $depflags ne $default_depflags && $make_depend; - $make_targets .= " gentests" if $symlink; - (system $make_command.$make_targets) == 0 or exit $? - if $make_targets ne ""; + my @make_targets = (); + push @make_targets, "links" if $symlink; + push @make_targets, "depend" if $depflags ne $default_depflags && $make_depend; + push @make_targets, "gentests" if $symlink; + foreach my $make_target (@make_targets) { + (system "$make_command $make_target") == 0 or exit $?; + } if ( $perl =~ m@^/@) { &dofile("tools/c_rehash",$perl,'^#!/', '#!%s','^my \$dir;$', 'my $dir = "' . $openssldir . '";', '^my \$prefix;$', 'my $prefix = "' . $prefix . '";'); &dofile("apps/CA.pl",$perl,'^#!/', '#!%s'); @@ -2056,8 +2057,8 @@ EOF &dofile("apps/CA.pl",'/usr/local/bin/perl','^#!/', '#!%s'); } if ($depflags ne $default_depflags && !$make_depend) { - $warn_make_depend++; - } + $warn_make_depend++; + } } # create the ms/version32.rc file if needed Modified: stable/11/crypto/openssl/LICENSE ============================================================================== --- stable/11/crypto/openssl/LICENSE Thu Nov 2 18:20:05 2017 (r325334) +++ stable/11/crypto/openssl/LICENSE Thu Nov 2 18:22:53 2017 (r325335) @@ -2,7 +2,7 @@ LICENSE ISSUES ============== - The OpenSSL toolkit stays under a dual license, i.e. both the conditions of + The OpenSSL toolkit stays under a double license, i.e. both the conditions of the OpenSSL License and the original SSLeay license apply to the toolkit. See below for the actual license texts. Actually both licenses are BSD-style Open Source licenses. In case of any license issues related to OpenSSL @@ -12,7 +12,7 @@ --------------- /* ==================================================================== - * Copyright (c) 1998-2016 The OpenSSL Project. All rights reserved. + * Copyright (c) 1998-2017 The OpenSSL Project. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: stable/11/crypto/openssl/Makefile ============================================================================== --- stable/11/crypto/openssl/Makefile Thu Nov 2 18:20:05 2017 (r325334) +++ stable/11/crypto/openssl/Makefile Thu Nov 2 18:22:53 2017 (r325335) @@ -4,7 +4,7 @@ ## Makefile for OpenSSL ## -VERSION=1.0.2k +VERSION=1.0.2l MAJOR=1 MINOR=0.2 SHLIB_VERSION_NUMBER=1.0.0 @@ -425,6 +425,14 @@ clean: libclean do \ rm -fr $$i/*; \ done + +distclean: clean + -$(RM) `find . -name .git -prune -o -type l -print` + $(RM) apps/CA.pl + $(RM) test/evptests.txt test/newkey.pem test/testkey.pem test/testreq.pem + $(RM) tools/c_rehash + $(RM) crypto/opensslconf.h + $(RM) Makefile Makefile.bak makefile.one: files $(PERL) util/mk1mf.pl >makefile.one; \ Modified: stable/11/crypto/openssl/Makefile.org ============================================================================== --- stable/11/crypto/openssl/Makefile.org Thu Nov 2 18:20:05 2017 (r325334) +++ stable/11/crypto/openssl/Makefile.org Thu Nov 2 18:22:53 2017 (r325335) @@ -424,6 +424,14 @@ clean: libclean rm -fr $$i/*; \ done +distclean: clean + -$(RM) `find . -name .git -prune -o -type l -print` + $(RM) apps/CA.pl + $(RM) test/evptests.txt test/newkey.pem test/testkey.pem test/testreq.pem + $(RM) tools/c_rehash + $(RM) crypto/opensslconf.h + $(RM) Makefile Makefile.bak + makefile.one: files $(PERL) util/mk1mf.pl >makefile.one; \ sh util/do_ms.sh Modified: stable/11/crypto/openssl/NEWS ============================================================================== --- stable/11/crypto/openssl/NEWS Thu Nov 2 18:20:05 2017 (r325334) +++ stable/11/crypto/openssl/NEWS Thu Nov 2 18:22:53 2017 (r325335) @@ -5,6 +5,10 @@ This file gives a brief overview of the major changes between each OpenSSL release. For more details please read the CHANGES file. + Major changes between OpenSSL 1.0.2k and OpenSSL 1.0.2l [25 May 2017] + + o config now recognises 64-bit mingw and chooses mingw64 instead of mingw + Major changes between OpenSSL 1.0.2j and OpenSSL 1.0.2k [26 Jan 2017] o Truncated packet could crash via OOB read (CVE-2017-3731) Modified: stable/11/crypto/openssl/README ============================================================================== --- stable/11/crypto/openssl/README Thu Nov 2 18:20:05 2017 (r325334) +++ stable/11/crypto/openssl/README Thu Nov 2 18:22:53 2017 (r325335) @@ -1,5 +1,5 @@ - OpenSSL 1.0.2k 26 Jan 2017 + OpenSSL 1.0.2l 25 May 2017 Copyright (c) 1998-2015 The OpenSSL Project Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson Modified: stable/11/crypto/openssl/apps/ca.c ============================================================================== --- stable/11/crypto/openssl/apps/ca.c Thu Nov 2 18:20:05 2017 (r325334) +++ stable/11/crypto/openssl/apps/ca.c Thu Nov 2 18:22:53 2017 (r325335) @@ -2126,10 +2126,8 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 * goto err; } - for (i = 0; i < DB_NUMBER; i++) { + for (i = 0; i < DB_NUMBER; i++) irow[i] = row[i]; - row[i] = NULL; - } irow[DB_NUMBER] = NULL; if (!TXT_DB_insert(db->db, irow)) { @@ -2137,11 +2135,14 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 * BIO_printf(bio_err, "TXT_DB error number %ld\n", db->db->error); goto err; } + irow = NULL; ok = 1; err: - for (i = 0; i < DB_NUMBER; i++) - if (row[i] != NULL) + if (irow != NULL) { + for (i = 0; i < DB_NUMBER; i++) OPENSSL_free(row[i]); + OPENSSL_free(irow); + } if (CAname != NULL) X509_NAME_free(CAname); @@ -2396,17 +2397,19 @@ static int do_revoke(X509 *x509, CA_DB *db, int type, goto err; } - for (i = 0; i < DB_NUMBER; i++) { + for (i = 0; i < DB_NUMBER; i++) irow[i] = row[i]; - row[i] = NULL; - } irow[DB_NUMBER] = NULL; if (!TXT_DB_insert(db->db, irow)) { BIO_printf(bio_err, "failed to update database\n"); BIO_printf(bio_err, "TXT_DB error number %ld\n", db->db->error); + OPENSSL_free(irow); goto err; } + + for (i = 0; i < DB_NUMBER; i++) + row[i] = NULL; /* Revoke Certificate */ if (type == -1) Modified: stable/11/crypto/openssl/apps/dhparam.c ============================================================================== --- stable/11/crypto/openssl/apps/dhparam.c Thu Nov 2 18:20:05 2017 (r325334) +++ stable/11/crypto/openssl/apps/dhparam.c Thu Nov 2 18:22:53 2017 (r325335) @@ -381,10 +381,19 @@ int MAIN(int argc, char **argv) } else # endif { - if (informat == FORMAT_ASN1) + if (informat == FORMAT_ASN1) { + /* + * We have no PEM header to determine what type of DH params it + * is. We'll just try both. + */ dh = d2i_DHparams_bio(in, NULL); - else /* informat == FORMAT_PEM */ + /* BIO_reset() returns 0 for success for file BIOs only!!! */ + if (dh == NULL && BIO_reset(in) == 0) + dh = d2i_DHxparams_bio(in, NULL); + } else { + /* informat == FORMAT_PEM */ dh = PEM_read_bio_DHparams(in, NULL, NULL, NULL); + } if (dh == NULL) { BIO_printf(bio_err, "unable to load DH parameters\n"); @@ -484,10 +493,13 @@ int MAIN(int argc, char **argv) } if (!noout) { - if (outformat == FORMAT_ASN1) - i = i2d_DHparams_bio(out, dh); - else if (outformat == FORMAT_PEM) { - if (dh->q) + if (outformat == FORMAT_ASN1) { + if (dh->q != NULL) + i = i2d_DHxparams_bio(out, dh); + else + i = i2d_DHparams_bio(out, dh); + } else if (outformat == FORMAT_PEM) { + if (dh->q != NULL) i = PEM_write_bio_DHxparams(out, dh); else i = PEM_write_bio_DHparams(out, dh); Modified: stable/11/crypto/openssl/apps/enc.c ============================================================================== --- stable/11/crypto/openssl/apps/enc.c Thu Nov 2 18:20:05 2017 (r325334) +++ stable/11/crypto/openssl/apps/enc.c Thu Nov 2 18:22:53 2017 (r325335) @@ -81,20 +81,32 @@ int set_hex(char *in, unsigned char *out, int size); #define BSIZE (8*1024) #define PROG enc_main -static void show_ciphers(const OBJ_NAME *name, void *bio_) +struct doall_enc_ciphers { + BIO *bio; + int n; +}; + +static void show_ciphers(const OBJ_NAME *name, void *arg) { - BIO *bio = bio_; - static int n; + struct doall_enc_ciphers *dec = (struct doall_enc_ciphers *)arg; + const EVP_CIPHER *cipher; if (!islower((unsigned char)*name->name)) return; - BIO_printf(bio, "-%-25s", name->name); - if (++n == 3) { - BIO_printf(bio, "\n"); - n = 0; + /* Filter out ciphers that we cannot use */ + cipher = EVP_get_cipherbyname(name->name); + if (cipher == NULL || + (EVP_CIPHER_flags(cipher) & EVP_CIPH_FLAG_AEAD_CIPHER) != 0 || + EVP_CIPHER_mode(cipher) == EVP_CIPH_XTS_MODE) + return; + + BIO_printf(dec->bio, "-%-25s", name->name); + if (++dec->n == 3) { + BIO_printf(dec->bio, "\n"); + dec->n = 0; } else - BIO_printf(bio, " "); + BIO_printf(dec->bio, " "); } int MAIN(int, char **); @@ -130,6 +142,7 @@ int MAIN(int argc, char **argv) ENGINE *e = NULL; const EVP_MD *dgst = NULL; int non_fips_allow = 0; + struct doall_enc_ciphers dec; apps_startup(); @@ -311,8 +324,10 @@ int MAIN(int argc, char **argv) #endif BIO_printf(bio_err, "Cipher Types\n"); + dec.n = 0; + dec.bio = bio_err; OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH, - show_ciphers, bio_err); + show_ciphers, &dec); BIO_printf(bio_err, "\n"); goto end; Modified: stable/11/crypto/openssl/apps/engine.c ============================================================================== --- stable/11/crypto/openssl/apps/engine.c Thu Nov 2 18:20:05 2017 (r325334) +++ stable/11/crypto/openssl/apps/engine.c Thu Nov 2 18:22:53 2017 (r325335) @@ -108,12 +108,15 @@ static int append_buf(char **buf, const char *s, int * } if (strlen(*buf) + strlen(s) >= (unsigned int)*size) { + char *p = *buf; + *size += step; *buf = OPENSSL_realloc(*buf, *size); + if (*buf == NULL) { + OPENSSL_free(p); + return 0; + } } - - if (*buf == NULL) - return 0; if (**buf != '\0') BUF_strlcat(*buf, ", ", *size); Modified: stable/11/crypto/openssl/apps/pkeyutl.c ============================================================================== --- stable/11/crypto/openssl/apps/pkeyutl.c Thu Nov 2 18:20:05 2017 (r325334) +++ stable/11/crypto/openssl/apps/pkeyutl.c Thu Nov 2 18:22:53 2017 (r325335) @@ -322,8 +322,10 @@ int MAIN(int argc, char **argv) buf_in, (size_t)buf_inlen); if (rv == 0) BIO_puts(out, "Signature Verification Failure\n"); - else if (rv == 1) + else if (rv == 1) { BIO_puts(out, "Signature Verified Successfully\n"); + ret = 0; + } if (rv >= 0) goto end; } else { Modified: stable/11/crypto/openssl/apps/prime.c ============================================================================== --- stable/11/crypto/openssl/apps/prime.c Thu Nov 2 18:20:05 2017 (r325334) +++ stable/11/crypto/openssl/apps/prime.c Thu Nov 2 18:22:53 2017 (r325335) @@ -155,5 +155,8 @@ int MAIN(int argc, char **argv) BIO_printf(bio_err, "options are\n"); BIO_printf(bio_err, "%-14s hex\n", "-hex"); BIO_printf(bio_err, "%-14s number of checks\n", "-checks "); + BIO_printf(bio_err, "%-14s generate prime\n", "-generate"); + BIO_printf(bio_err, "%-14s number of bits\n", "-bits "); + BIO_printf(bio_err, "%-14s safe prime\n", "-safe"); return 1; } Modified: stable/11/crypto/openssl/apps/progs.h ============================================================================== --- stable/11/crypto/openssl/apps/progs.h Thu Nov 2 18:20:05 2017 (r325334) +++ stable/11/crypto/openssl/apps/progs.h Thu Nov 2 18:22:53 2017 (r325335) @@ -58,7 +58,7 @@ extern int srp_main(int argc, char *argv[]); typedef struct { int type; const char *name; - int (*func) (int argc, char *argv[]); + int (*func)(int argc, char *argv[]); } FUNCTION; DECLARE_LHASH_OF(FUNCTION); Modified: stable/11/crypto/openssl/apps/progs.pl ============================================================================== --- stable/11/crypto/openssl/apps/progs.pl Thu Nov 2 18:20:05 2017 (r325334) +++ stable/11/crypto/openssl/apps/progs.pl Thu Nov 2 18:22:53 2017 (r325335) @@ -6,22 +6,22 @@ print "/* automatically generated by progs.pl for open grep(s/^asn1pars$/asn1parse/,@ARGV); foreach (@ARGV) - { printf "extern int %s_main(int argc,char *argv[]);\n",$_; } + { printf "extern int %s_main(int argc, char *argv[]);\n",$_; } print <<'EOF'; -#define FUNC_TYPE_GENERAL 1 -#define FUNC_TYPE_MD 2 -#define FUNC_TYPE_CIPHER 3 -#define FUNC_TYPE_PKEY 4 -#define FUNC_TYPE_MD_ALG 5 -#define FUNC_TYPE_CIPHER_ALG 6 +#define FUNC_TYPE_GENERAL 1 +#define FUNC_TYPE_MD 2 +#define FUNC_TYPE_CIPHER 3 +#define FUNC_TYPE_PKEY 4 +#define FUNC_TYPE_MD_ALG 5 +#define FUNC_TYPE_CIPHER_ALG 6 typedef struct { - int type; - const char *name; - int (*func)(int argc,char *argv[]); - } FUNCTION; + int type; + const char *name; + int (*func)(int argc, char *argv[]); +} FUNCTION; DECLARE_LHASH_OF(FUNCTION); FUNCTION functions[] = { @@ -30,7 +30,7 @@ EOF foreach (@ARGV) { push(@files,$_); - $str="\t{FUNC_TYPE_GENERAL,\"$_\",${_}_main},\n"; + $str=" {FUNC_TYPE_GENERAL, \"$_\", ${_}_main},\n"; if (($_ =~ /^s_/) || ($_ =~ /^ciphers$/)) { print "#if !defined(OPENSSL_NO_SOCK)\n${str}#endif\n"; } elsif ( ($_ =~ /^speed$/)) @@ -60,7 +60,7 @@ foreach (@ARGV) foreach ("md2","md4","md5","sha","sha1","mdc2","rmd160") { push(@files,$_); - printf "#ifndef OPENSSL_NO_".uc($_)."\n\t{FUNC_TYPE_MD,\"".$_."\",dgst_main},\n#endif\n"; + printf "#ifndef OPENSSL_NO_".uc($_)."\n {FUNC_TYPE_MD, \"".$_."\", dgst_main},\n#endif\n"; } foreach ( @@ -86,7 +86,7 @@ foreach ( { push(@files,$_); - $t=sprintf("\t{FUNC_TYPE_CIPHER,\"%s\",enc_main},\n",$_); + $t=sprintf(" {FUNC_TYPE_CIPHER, \"%s\", enc_main},\n",$_); if ($_ =~ /des/) { $t="#ifndef OPENSSL_NO_DES\n${t}#endif\n"; } elsif ($_ =~ /aes/) { $t="#ifndef OPENSSL_NO_AES\n${t}#endif\n"; } elsif ($_ =~ /camellia/) { $t="#ifndef OPENSSL_NO_CAMELLIA\n${t}#endif\n"; } @@ -101,4 +101,4 @@ foreach ( print $t; } -print "\t{0,NULL,NULL}\n\t};\n"; +print " {0, NULL, NULL}\n};\n"; Modified: stable/11/crypto/openssl/apps/req.c ============================================================================== --- stable/11/crypto/openssl/apps/req.c Thu Nov 2 18:20:05 2017 (r325334) +++ stable/11/crypto/openssl/apps/req.c Thu Nov 2 18:22:53 2017 (r325335) @@ -331,7 +331,6 @@ int MAIN(int argc, char **argv) else if (strcmp(*argv, "-text") == 0) text = 1; else if (strcmp(*argv, "-x509") == 0) { - newreq = 1; x509 = 1; } else if (strcmp(*argv, "-asn1-kludge") == 0) kludge = 1; @@ -447,6 +446,9 @@ int MAIN(int argc, char **argv) goto end; } + if (x509 && infile == NULL) + newreq = 1; + ERR_load_crypto_strings(); if (!app_passwd(bio_err, passargin, passargout, &passin, &passout)) { BIO_printf(bio_err, "Error getting passwords\n"); @@ -753,7 +755,7 @@ int MAIN(int argc, char **argv) } } - if (newreq) { + if (newreq || x509) { if (pkey == NULL) { BIO_printf(bio_err, "you need to specify a private key\n"); goto end; Modified: stable/11/crypto/openssl/apps/s_client.c ============================================================================== --- stable/11/crypto/openssl/apps/s_client.c Thu Nov 2 18:20:05 2017 (r325334) +++ stable/11/crypto/openssl/apps/s_client.c Thu Nov 2 18:22:53 2017 (r325335) @@ -2132,6 +2132,7 @@ int MAIN(int argc, char **argv) BIO_free(bio_c_msg); bio_c_msg = NULL; } + SSL_COMP_free_compression_methods(); apps_shutdown(); OPENSSL_EXIT(ret); } Modified: stable/11/crypto/openssl/apps/s_server.c ============================================================================== --- stable/11/crypto/openssl/apps/s_server.c Thu Nov 2 18:20:05 2017 (r325334) +++ stable/11/crypto/openssl/apps/s_server.c Thu Nov 2 18:22:53 2017 (r325335) @@ -2132,6 +2132,7 @@ int MAIN(int argc, char *argv[]) BIO_free(bio_s_msg); bio_s_msg = NULL; } + SSL_COMP_free_compression_methods(); apps_shutdown(); OPENSSL_EXIT(ret); } Modified: stable/11/crypto/openssl/apps/srp.c ============================================================================== --- stable/11/crypto/openssl/apps/srp.c Thu Nov 2 18:20:05 2017 (r325334) +++ stable/11/crypto/openssl/apps/srp.c Thu Nov 2 18:22:53 2017 (r325335) @@ -183,10 +183,8 @@ static int update_index(CA_DB *db, BIO *bio, char **ro return 0; } - for (i = 0; i < DB_NUMBER; i++) { + for (i = 0; i < DB_NUMBER; i++) irow[i] = row[i]; - row[i] = NULL; - } irow[DB_NUMBER] = NULL; if (!TXT_DB_insert(db->db, irow)) { Modified: stable/11/crypto/openssl/appveyor.yml ============================================================================== --- stable/11/crypto/openssl/appveyor.yml Thu Nov 2 18:20:05 2017 (r325334) +++ stable/11/crypto/openssl/appveyor.yml Thu Nov 2 18:22:53 2017 (r325335) @@ -50,11 +50,3 @@ build_script: test_script: - nmake /f ms\%MAK% test - -notifications: - - provider: Email - to: - - openssl-commits@openssl.org - on_build_success: false - on_build_failure: true - on_build_status_changed: true Modified: stable/11/crypto/openssl/config ============================================================================== --- stable/11/crypto/openssl/config Thu Nov 2 18:20:05 2017 (r325334) +++ stable/11/crypto/openssl/config Thu Nov 2 18:22:53 2017 (r325335) @@ -344,6 +344,15 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in echo "mips-sony-newsos4"; exit 0; ;; + # The following combinations are supported + # MINGW64* on x86_64 => mingw64 + # MINGW32* on x86_64 => mingw + # MINGW32* on i?86 => mingw + # + # MINGW64* on i?86 isn't expected to work... + MINGW64*:*:*:x86_64) + echo "${MACHINE}-whatever-mingw64"; exit 0; + ;; MINGW*) echo "${MACHINE}-whatever-mingw"; exit 0; ;; Modified: stable/11/crypto/openssl/crypto/aes/Makefile ============================================================================== --- stable/11/crypto/openssl/crypto/aes/Makefile Thu Nov 2 18:20:05 2017 (r325334) +++ stable/11/crypto/openssl/crypto/aes/Makefile Thu Nov 2 18:22:53 2017 (r325335) @@ -133,7 +133,7 @@ dclean: mv -f Makefile.new $(MAKEFILE) clean: - rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff + rm -f *.s *.S *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff # DO NOT DELETE THIS LINE -- make depend depends on it. Modified: stable/11/crypto/openssl/crypto/aes/asm/aesni-sha1-x86_64.pl ============================================================================== --- stable/11/crypto/openssl/crypto/aes/asm/aesni-sha1-x86_64.pl Thu Nov 2 18:20:05 2017 (r325334) +++ stable/11/crypto/openssl/crypto/aes/asm/aesni-sha1-x86_64.pl Thu Nov 2 18:22:53 2017 (r325335) @@ -1702,6 +1702,7 @@ $code.=<<___; mov 240($key),$rounds sub $in0,$out movups ($key),$rndkey0 # $key[0] + movups ($ivp),$iv # load IV movups 16($key),$rndkey[0] # forward reference lea 112($key),$key # size optimization Modified: stable/11/crypto/openssl/crypto/aes/asm/aesni-sha256-x86_64.pl ============================================================================== --- stable/11/crypto/openssl/crypto/aes/asm/aesni-sha256-x86_64.pl Thu Nov 2 18:20:05 2017 (r325334) +++ stable/11/crypto/openssl/crypto/aes/asm/aesni-sha256-x86_64.pl Thu Nov 2 18:22:53 2017 (r325335) @@ -1299,6 +1299,7 @@ $code.=<<___; mov 240($key),$rounds sub $in0,$out movups ($key),$rndkey0 # $key[0] + movups ($ivp),$iv # load IV movups 16($key),$rndkey[0] # forward reference lea 112($key),$key # size optimization Modified: stable/11/crypto/openssl/crypto/aes/asm/bsaes-armv7.pl ============================================================================== --- stable/11/crypto/openssl/crypto/aes/asm/bsaes-armv7.pl Thu Nov 2 18:20:05 2017 (r325334) +++ stable/11/crypto/openssl/crypto/aes/asm/bsaes-armv7.pl Thu Nov 2 18:22:53 2017 (r325335) @@ -1333,7 +1333,7 @@ bsaes_cbc_encrypt: vmov @XMM[4],@XMM[15] @ just in case ensure that IV vmov @XMM[5],@XMM[0] @ and input are preserved bl AES_decrypt - vld1.8 {@XMM[0]}, [$fp,:64] @ load result + vld1.8 {@XMM[0]}, [$fp] @ load result veor @XMM[0], @XMM[0], @XMM[4] @ ^= IV vmov @XMM[15], @XMM[5] @ @XMM[5] holds input vst1.8 {@XMM[0]}, [$rounds] @ write output Modified: stable/11/crypto/openssl/crypto/asn1/a_bitstr.c ============================================================================== --- stable/11/crypto/openssl/crypto/asn1/a_bitstr.c Thu Nov 2 18:20:05 2017 (r325334) +++ stable/11/crypto/openssl/crypto/asn1/a_bitstr.c Thu Nov 2 18:22:53 2017 (r325335) @@ -114,10 +114,11 @@ int i2c_ASN1_BIT_STRING(ASN1_BIT_STRING *a, unsigned c *(p++) = (unsigned char)bits; d = a->data; - memcpy(p, d, len); - p += len; - if (len > 0) + if (len > 0) { + memcpy(p, d, len); + p += len; p[-1] &= (0xff << bits); + } *pp = p; return (ret); } Modified: stable/11/crypto/openssl/crypto/asn1/a_digest.c ============================================================================== --- stable/11/crypto/openssl/crypto/asn1/a_digest.c Thu Nov 2 18:20:05 2017 (r325334) +++ stable/11/crypto/openssl/crypto/asn1/a_digest.c Thu Nov 2 18:22:53 2017 (r325335) @@ -86,8 +86,10 @@ int ASN1_digest(i2d_of_void *i2d, const EVP_MD *type, p = str; i2d(data, &p); - if (!EVP_Digest(str, i, md, len, type, NULL)) + if (!EVP_Digest(str, i, md, len, type, NULL)) { + OPENSSL_free(str); return 0; + } OPENSSL_free(str); return (1); } @@ -104,8 +106,10 @@ int ASN1_item_digest(const ASN1_ITEM *it, const EVP_MD if (!str) return (0); - if (!EVP_Digest(str, i, md, len, type, NULL)) + if (!EVP_Digest(str, i, md, len, type, NULL)) { + OPENSSL_free(str); return 0; + } OPENSSL_free(str); return (1); } Modified: stable/11/crypto/openssl/crypto/asn1/a_gentm.c ============================================================================== --- stable/11/crypto/openssl/crypto/asn1/a_gentm.c Thu Nov 2 18:20:05 2017 (r325334) +++ stable/11/crypto/openssl/crypto/asn1/a_gentm.c Thu Nov 2 18:22:53 2017 (r325335) @@ -202,7 +202,7 @@ int asn1_generalizedtime_to_tm(struct tm *tm, const AS if (a[o] == 'Z') o++; else if ((a[o] == '+') || (a[o] == '-')) { - int offsign = a[o] == '-' ? -1 : 1, offset = 0; + int offsign = a[o] == '-' ? 1 : -1, offset = 0; o++; if (o + 4 > l) goto err; Modified: stable/11/crypto/openssl/crypto/asn1/a_strnid.c ============================================================================== --- stable/11/crypto/openssl/crypto/asn1/a_strnid.c Thu Nov 2 18:20:05 2017 (r325334) +++ stable/11/crypto/openssl/crypto/asn1/a_strnid.c Thu Nov 2 18:22:53 2017 (r325335) @@ -192,7 +192,8 @@ static const ASN1_STRING_TABLE tbl_standard[] = { {NID_name, 1, ub_name, DIRSTRING_TYPE, 0}, {NID_dnQualifier, -1, -1, B_ASN1_PRINTABLESTRING, STABLE_NO_MASK}, {NID_domainComponent, 1, -1, B_ASN1_IA5STRING, STABLE_NO_MASK}, - {NID_ms_csp_name, -1, -1, B_ASN1_BMPSTRING, STABLE_NO_MASK} + {NID_ms_csp_name, -1, -1, B_ASN1_BMPSTRING, STABLE_NO_MASK}, + {NID_jurisdictionCountryName, 2, 2, B_ASN1_PRINTABLESTRING, STABLE_NO_MASK} }; static int sk_table_cmp(const ASN1_STRING_TABLE *const *a, Modified: stable/11/crypto/openssl/crypto/asn1/a_time.c ============================================================================== --- stable/11/crypto/openssl/crypto/asn1/a_time.c Thu Nov 2 18:20:05 2017 (r325334) +++ stable/11/crypto/openssl/crypto/asn1/a_time.c Thu Nov 2 18:22:53 2017 (r325335) @@ -137,7 +137,7 @@ int ASN1_TIME_check(ASN1_TIME *t) ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(ASN1_TIME *t, ASN1_GENERALIZEDTIME **out) { - ASN1_GENERALIZEDTIME *ret; + ASN1_GENERALIZEDTIME *ret = NULL; char *str; int newlen; @@ -146,22 +146,21 @@ ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(ASN if (!out || !*out) { if (!(ret = ASN1_GENERALIZEDTIME_new())) - return NULL; - if (out) - *out = ret; - } else + goto err; + } else { ret = *out; + } /* If already GeneralizedTime just copy across */ if (t->type == V_ASN1_GENERALIZEDTIME) { if (!ASN1_STRING_set(ret, t->data, t->length)) - return NULL; - return ret; + goto err; + goto done; } /* grow the string */ if (!ASN1_STRING_set(ret, NULL, t->length + 2)) - return NULL; + goto err; /* ASN1_STRING_set() allocated 'len + 1' bytes. */ newlen = t->length + 2 + 1; str = (char *)ret->data; @@ -173,8 +172,17 @@ ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(ASN BUF_strlcat(str, (char *)t->data, newlen); - return ret; + done: + if (out != NULL && *out == NULL) + *out = ret; + return ret; + + err: + if (out == NULL || *out != ret) + ASN1_GENERALIZEDTIME_free(ret); + return NULL; } + int ASN1_TIME_set_string(ASN1_TIME *s, const char *str) { Modified: stable/11/crypto/openssl/crypto/asn1/a_utctm.c ============================================================================== --- stable/11/crypto/openssl/crypto/asn1/a_utctm.c Thu Nov 2 18:20:05 2017 (r325334) +++ stable/11/crypto/openssl/crypto/asn1/a_utctm.c Thu Nov 2 18:22:53 2017 (r325335) @@ -172,7 +172,7 @@ int asn1_utctime_to_tm(struct tm *tm, const ASN1_UTCTI if (a[o] == 'Z') o++; else if ((a[o] == '+') || (a[o] == '-')) { - int offsign = a[o] == '-' ? -1 : 1, offset = 0; + int offsign = a[o] == '-' ? 1 : -1, offset = 0; o++; if (o + 4 > l) goto err; Modified: stable/11/crypto/openssl/crypto/asn1/f_enum.c ============================================================================== --- stable/11/crypto/openssl/crypto/asn1/f_enum.c Thu Nov 2 18:20:05 2017 (r325334) +++ stable/11/crypto/openssl/crypto/asn1/f_enum.c Thu Nov 2 18:22:53 2017 (r325335) @@ -138,7 +138,7 @@ int a2i_ASN1_ENUMERATED(BIO *bp, ASN1_ENUMERATED *bs, bufp = (unsigned char *)buf; if (first) { first = 0; - if ((bufp[0] == '0') && (buf[1] == '0')) { + if ((bufp[0] == '0') && (bufp[1] == '0')) { bufp += 2; i -= 2; } Modified: stable/11/crypto/openssl/crypto/asn1/f_int.c ============================================================================== --- stable/11/crypto/openssl/crypto/asn1/f_int.c Thu Nov 2 18:20:05 2017 (r325334) +++ stable/11/crypto/openssl/crypto/asn1/f_int.c Thu Nov 2 18:22:53 2017 (r325335) @@ -152,7 +152,7 @@ int a2i_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *bs, char * bufp = (unsigned char *)buf; if (first) { first = 0; - if ((bufp[0] == '0') && (buf[1] == '0')) { + if ((bufp[0] == '0') && (bufp[1] == '0')) { bufp += 2; i -= 2; } Modified: stable/11/crypto/openssl/crypto/asn1/tasn_dec.c ============================================================================== --- stable/11/crypto/openssl/crypto/asn1/tasn_dec.c Thu Nov 2 18:20:05 2017 (r325334) +++ stable/11/crypto/openssl/crypto/asn1/tasn_dec.c Thu Nov 2 18:22:53 2017 (r325335) @@ -673,6 +673,7 @@ static int asn1_template_noexp_d2i(ASN1_VALUE **val, } len -= p - q; if (!sk_ASN1_VALUE_push((STACK_OF(ASN1_VALUE) *)*val, skfield)) { + ASN1_item_ex_free(&skfield, ASN1_ITEM_ptr(tt->item)); ASN1err(ASN1_F_ASN1_TEMPLATE_NOEXP_D2I, ERR_R_MALLOC_FAILURE); goto err; } Modified: stable/11/crypto/openssl/crypto/asn1/tasn_new.c ============================================================================== --- stable/11/crypto/openssl/crypto/asn1/tasn_new.c Thu Nov 2 18:20:05 2017 (r325334) +++ stable/11/crypto/openssl/crypto/asn1/tasn_new.c Thu Nov 2 18:22:53 2017 (r325335) @@ -158,7 +158,7 @@ static int asn1_item_ex_combine_new(ASN1_VALUE **pval, } asn1_set_choice_selector(pval, -1, it); if (asn1_cb && !asn1_cb(ASN1_OP_NEW_POST, pval, it, NULL)) - goto auxerr; + goto auxerr2; break; case ASN1_ITYPE_NDEF_SEQUENCE: @@ -186,10 +186,10 @@ static int asn1_item_ex_combine_new(ASN1_VALUE **pval, for (i = 0, tt = it->templates; i < it->tcount; tt++, i++) { pseqval = asn1_get_field_ptr(pval, tt); if (!ASN1_template_new(pseqval, tt)) - goto memerr; + goto memerr2; } if (asn1_cb && !asn1_cb(ASN1_OP_NEW_POST, pval, it, NULL)) - goto auxerr; + goto auxerr2; break; } #ifdef CRYPTO_MDEBUG @@ -198,6 +198,8 @@ static int asn1_item_ex_combine_new(ASN1_VALUE **pval, #endif return 1; + memerr2: + ASN1_item_ex_free(pval, it); memerr: ASN1err(ASN1_F_ASN1_ITEM_EX_COMBINE_NEW, ERR_R_MALLOC_FAILURE); #ifdef CRYPTO_MDEBUG @@ -206,9 +208,10 @@ static int asn1_item_ex_combine_new(ASN1_VALUE **pval, #endif return 0; + auxerr2: + ASN1_item_ex_free(pval, it); auxerr: ASN1err(ASN1_F_ASN1_ITEM_EX_COMBINE_NEW, ASN1_R_AUX_ERROR); - ASN1_item_ex_free(pval, it); #ifdef CRYPTO_MDEBUG if (it->sname) CRYPTO_pop_info(); Modified: stable/11/crypto/openssl/crypto/asn1/x_long.c ============================================================================== --- stable/11/crypto/openssl/crypto/asn1/x_long.c Thu Nov 2 18:20:05 2017 (r325334) +++ stable/11/crypto/openssl/crypto/asn1/x_long.c Thu Nov 2 18:22:53 2017 (r325335) @@ -126,7 +126,7 @@ static int long_i2c(ASN1_VALUE **pval, unsigned char * * set. */ if (ltmp < 0) - utmp = -ltmp - 1; + utmp = 0 - (unsigned long)ltmp - 1; else utmp = ltmp; clen = BN_num_bits_word(utmp); @@ -155,19 +155,41 @@ static int long_i2c(ASN1_VALUE **pval, unsigned char * static int long_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len, int utype, char *free_cont, const ASN1_ITEM *it) { - int neg, i; + int neg = -1, i; long ltmp; unsigned long utmp = 0; char *cp = (char *)pval; + + if (len) { + /* + * Check possible pad byte. Worst case, we're skipping past actual + * content, but since that's only with 0x00 and 0xff and we set neg + * accordingly, the result will be correct in the end anyway. + */ + switch (cont[0]) { + case 0xff: + cont++; + len--; + neg = 1; + break; + case 0: + cont++; + len--; + neg = 0; + break; + } + } if (len > (int)sizeof(long)) { ASN1err(ASN1_F_LONG_C2I, ASN1_R_INTEGER_TOO_LARGE_FOR_LONG); return 0; } - /* Is it negative? */ - if (len && (cont[0] & 0x80)) - neg = 1; - else - neg = 0; + if (neg == -1) { + /* Is it negative? */ + if (len && (cont[0] & 0x80)) + neg = 1; + else + neg = 0; + } utmp = 0; for (i = 0; i < len; i++) { utmp <<= 8; @@ -178,8 +200,8 @@ static int long_c2i(ASN1_VALUE **pval, const unsigned } ltmp = (long)utmp; if (neg) { - ltmp++; ltmp = -ltmp; + ltmp--; } if (ltmp == it->size) { ASN1err(ASN1_F_LONG_C2I, ASN1_R_INTEGER_TOO_LARGE_FOR_LONG); Modified: stable/11/crypto/openssl/crypto/asn1/x_name.c ============================================================================== --- stable/11/crypto/openssl/crypto/asn1/x_name.c Thu Nov 2 18:20:05 2017 (r325334) +++ stable/11/crypto/openssl/crypto/asn1/x_name.c Thu Nov 2 18:22:53 2017 (r325335) @@ -178,6 +178,16 @@ static void x509_name_ex_free(ASN1_VALUE **pval, const *pval = NULL; } +static void local_sk_X509_NAME_ENTRY_free(STACK_OF(X509_NAME_ENTRY) *ne) +{ + sk_X509_NAME_ENTRY_free(ne); +} + +static void local_sk_X509_NAME_ENTRY_pop_free(STACK_OF(X509_NAME_ENTRY) *ne) +{ + sk_X509_NAME_ENTRY_pop_free(ne, X509_NAME_ENTRY_free); +} + static int x509_name_ex_d2i(ASN1_VALUE **val, const unsigned char **in, long len, const ASN1_ITEM *it, int tag, int aclass, @@ -228,13 +238,14 @@ static int x509_name_ex_d2i(ASN1_VALUE **val, entry->set = i; if (!sk_X509_NAME_ENTRY_push(nm.x->entries, entry)) goto err; + sk_X509_NAME_ENTRY_set(entries, j, NULL); } - sk_X509_NAME_ENTRY_free(entries); } - sk_STACK_OF_X509_NAME_ENTRY_free(intname.s); ret = x509_name_canon(nm.x); if (!ret) goto err; + sk_STACK_OF_X509_NAME_ENTRY_pop_free(intname.s, + local_sk_X509_NAME_ENTRY_free); nm.x->modified = 0; *val = nm.a; *in = p; @@ -242,6 +253,8 @@ static int x509_name_ex_d2i(ASN1_VALUE **val, err: if (nm.x != NULL) X509_NAME_free(nm.x); + sk_STACK_OF_X509_NAME_ENTRY_pop_free(intname.s, + local_sk_X509_NAME_ENTRY_pop_free); ASN1err(ASN1_F_X509_NAME_EX_D2I, ERR_R_NESTED_ASN1_ERROR); return 0; } @@ -267,16 +280,6 @@ static int x509_name_ex_i2d(ASN1_VALUE **val, unsigned return ret; } -static void local_sk_X509_NAME_ENTRY_free(STACK_OF(X509_NAME_ENTRY) *ne) -{ - sk_X509_NAME_ENTRY_free(ne); -} - -static void local_sk_X509_NAME_ENTRY_pop_free(STACK_OF(X509_NAME_ENTRY) *ne) -{ - sk_X509_NAME_ENTRY_pop_free(ne, X509_NAME_ENTRY_free); -} - static int x509_name_encode(X509_NAME *a) { union { @@ -299,8 +302,10 @@ static int x509_name_encode(X509_NAME *a) entries = sk_X509_NAME_ENTRY_new_null(); if (!entries) goto memerr; - if (!sk_STACK_OF_X509_NAME_ENTRY_push(intname.s, entries)) + if (!sk_STACK_OF_X509_NAME_ENTRY_push(intname.s, entries)) { + sk_X509_NAME_ENTRY_free(entries); goto memerr; + } set = entry->set; } if (!sk_X509_NAME_ENTRY_push(entries, entry)) @@ -370,8 +375,10 @@ static int x509_name_canon(X509_NAME *a) entries = sk_X509_NAME_ENTRY_new_null(); if (!entries) goto err; - if (!sk_STACK_OF_X509_NAME_ENTRY_push(intname, entries)) + if (!sk_STACK_OF_X509_NAME_ENTRY_push(intname, entries)) { + sk_X509_NAME_ENTRY_free(entries); goto err; + } set = entry->set; } tmpentry = X509_NAME_ENTRY_new(); Modified: stable/11/crypto/openssl/crypto/bio/b_print.c ============================================================================== --- stable/11/crypto/openssl/crypto/bio/b_print.c Thu Nov 2 18:20:05 2017 (r325334) +++ stable/11/crypto/openssl/crypto/bio/b_print.c Thu Nov 2 18:22:53 2017 (r325335) @@ -502,7 +502,7 @@ fmtint(char **sbuffer, if (!(flags & DP_F_UNSIGNED)) { if (value < 0) { signvalue = '-'; - uvalue = -value; + uvalue = -(unsigned LLONG)value; } else if (flags & DP_F_PLUS) signvalue = '+'; else if (flags & DP_F_SPACE) Modified: stable/11/crypto/openssl/crypto/bio/bio_cb.c ============================================================================== --- stable/11/crypto/openssl/crypto/bio/bio_cb.c Thu Nov 2 18:20:05 2017 (r325334) +++ stable/11/crypto/openssl/crypto/bio/bio_cb.c Thu Nov 2 18:22:53 2017 (r325335) @@ -78,6 +78,9 @@ long MS_CALLBACK BIO_debug_callback(BIO *bio, int cmd, len = BIO_snprintf(buf,sizeof buf,"BIO[%p]: ",(void *)bio); + /* Ignore errors and continue printing the other information. */ + if (len < 0) + len = 0; p = buf + len; p_maxlen = sizeof(buf) - len; Modified: stable/11/crypto/openssl/crypto/bio/bss_file.c ============================================================================== --- stable/11/crypto/openssl/crypto/bio/bss_file.c Thu Nov 2 18:20:05 2017 (r325334) +++ stable/11/crypto/openssl/crypto/bio/bss_file.c Thu Nov 2 18:22:53 2017 (r325335) @@ -251,7 +251,7 @@ static int MS_CALLBACK file_read(BIO *b, char *out, in ret = fread(out, 1, (int)outl, (FILE *)b->ptr); if (ret == 0 && (b->flags & BIO_FLAGS_UPLINK) ? UP_ferror((FILE *)b->ptr) : - ferror((FILE *)b->ptr)) { + ferror((FILE *)b->ptr)) { SYSerr(SYS_F_FREAD, get_last_sys_error()); BIOerr(BIO_F_FILE_READ, ERR_R_SYS_LIB); ret = -1; @@ -287,6 +287,7 @@ static long MS_CALLBACK file_ctrl(BIO *b, int cmd, lon FILE *fp = (FILE *)b->ptr; FILE **fpp; char p[4]; + int st; switch (cmd) { case BIO_C_FILE_SEEK: @@ -318,8 +319,11 @@ static long MS_CALLBACK file_ctrl(BIO *b, int cmd, lon # if defined(__MINGW32__) && defined(__MSVCRT__) && !defined(_IOB_ENTRIES) # define _IOB_ENTRIES 20 # endif -# if defined(_IOB_ENTRIES) /* Safety net to catch purely internal BIO_set_fp calls */ +# if defined(_MSC_VER) && _MSC_VER>=1900 + if (ptr == stdin || ptr == stdout || ptr == stderr) + BIO_clear_flags(b, BIO_FLAGS_UPLINK); +# elif defined(_IOB_ENTRIES) if ((size_t)ptr >= (size_t)stdin && (size_t)ptr < (size_t)(stdin + _IOB_ENTRIES)) BIO_clear_flags(b, BIO_FLAGS_UPLINK); @@ -424,10 +428,14 @@ static long MS_CALLBACK file_ctrl(BIO *b, int cmd, lon b->shutdown = (int)num; break; case BIO_CTRL_FLUSH: - if (b->flags & BIO_FLAGS_UPLINK) - UP_fflush(b->ptr); - else - fflush((FILE *)b->ptr); + st = b->flags & BIO_FLAGS_UPLINK + ? UP_fflush(b->ptr) : fflush((FILE *)b->ptr); + if (st == EOF) { + SYSerr(SYS_F_FFLUSH, get_last_sys_error()); + ERR_add_error_data(1, "fflush()"); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Thu Nov 2 18:27: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 A8E32E60675; Thu, 2 Nov 2017 18:27:33 +0000 (UTC) (envelope-from jkim@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 7778863C45; Thu, 2 Nov 2017 18:27:33 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA2IRWpC080517; Thu, 2 Nov 2017 18:27:32 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA2IRWIH080516; Thu, 2 Nov 2017 18:27:32 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201711021827.vA2IRWIH080516@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Thu, 2 Nov 2017 18:27:32 +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: r325336 - stable/11/secure/lib/libcrypto X-SVN-Group: stable-11 X-SVN-Commit-Author: jkim X-SVN-Commit-Paths: stable/11/secure/lib/libcrypto X-SVN-Commit-Revision: 325336 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: Thu, 02 Nov 2017 18:27:33 -0000 Author: jkim Date: Thu Nov 2 18:27:32 2017 New Revision: 325336 URL: https://svnweb.freebsd.org/changeset/base/325336 Log: MFC: r307977 Prefer ACFLAGS over CFLAGS for compiling aarch64 assembly files. Modified: stable/11/secure/lib/libcrypto/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/11/secure/lib/libcrypto/Makefile ============================================================================== --- stable/11/secure/lib/libcrypto/Makefile Thu Nov 2 18:22:53 2017 (r325335) +++ stable/11/secure/lib/libcrypto/Makefile Thu Nov 2 18:27:32 2017 (r325336) @@ -24,7 +24,7 @@ SRCS= cpt_err.c cryptlib.c cversion.c ex_data.c mem.c o_fips.c o_init.c o_str.c o_time.c uid.c .if defined(ASM_aarch64) SRCS+= arm64cpuid.S armcap.c mem_clr.c -CFLAGS.arm64cpuid.S= -march=armv8-a+crypto +ACFLAGS.arm64cpuid.S= -march=armv8-a+crypto .elif defined(ASM_amd64) SRCS+= x86_64cpuid.S .elif defined(ASM_arm) @@ -40,7 +40,7 @@ INCS+= crypto.h ebcdic.h opensslv.h ossl_typ.h symhack SRCS+= aes_cfb.c aes_ctr.c aes_ecb.c aes_ige.c aes_misc.c aes_ofb.c aes_wrap.c .if defined(ASM_aarch64) SRCS+= aes_cbc.c aes_core.c aesv8-armx.S -CFLAGS.aesv8-armx.S= -march=armv8-a+crypto +ACFLAGS.aesv8-armx.S= -march=armv8-a+crypto .elif defined(ASM_amd64) SRCS+= aes-x86_64.S aesni-mb-x86_64.S aesni-sha1-x86_64.S \ aesni-sha256-x86_64.S aesni-x86_64.S bsaes-x86_64.S vpaes-x86_64.S @@ -246,7 +246,7 @@ SRCS+= cbc128.c ccm128.c cfb128.c ctr128.c cts128.c gc wrap128.c xts128.c .if defined(ASM_aarch64) SRCS+= ghashv8-armx.S -CFLAGS.ghashv8-armx.S= -march=armv8-a+crypto +ACFLAGS.ghashv8-armx.S= -march=armv8-a+crypto .elif defined(ASM_amd64) SRCS+= aesni-gcm-x86_64.S ghash-x86_64.S .elif defined(ASM_arm) From owner-svn-src-all@freebsd.org Thu Nov 2 18:30: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 C0534E60777; Thu, 2 Nov 2017 18:30:46 +0000 (UTC) (envelope-from jkim@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 4107A63E1F; Thu, 2 Nov 2017 18:30:46 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA2IUj7v080763; Thu, 2 Nov 2017 18:30:45 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA2IUgZY080727; Thu, 2 Nov 2017 18:30:42 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201711021830.vA2IUgZY080727@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Thu, 2 Nov 2017 18:30: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: r325337 - in stable/11: crypto/openssl crypto/openssl/apps crypto/openssl/crypto crypto/openssl/crypto/asn1 crypto/openssl/crypto/bn crypto/openssl/crypto/bn/asm crypto/openssl/crypto/d... X-SVN-Group: stable-11 X-SVN-Commit-Author: jkim X-SVN-Commit-Paths: in stable/11: crypto/openssl crypto/openssl/apps crypto/openssl/crypto crypto/openssl/crypto/asn1 crypto/openssl/crypto/bn crypto/openssl/crypto/bn/asm crypto/openssl/crypto/dh crypto/openssl/crypto/d... X-SVN-Commit-Revision: 325337 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: Thu, 02 Nov 2017 18:30:46 -0000 Author: jkim Date: Thu Nov 2 18:30:41 2017 New Revision: 325337 URL: https://svnweb.freebsd.org/changeset/base/325337 Log: MFC: r325328 Merge OpenSSL 1.0.2m. Added: stable/11/crypto/openssl/crypto/asn1/asn1_int.h - copied unchanged from r325328, head/crypto/openssl/crypto/asn1/asn1_int.h stable/11/crypto/openssl/doc/crypto/EVP_PKEY_meth_new.pod - copied unchanged from r325328, head/crypto/openssl/doc/crypto/EVP_PKEY_meth_new.pod stable/11/crypto/openssl/doc/crypto/X509_check_private_key.pod - copied unchanged from r325328, head/crypto/openssl/doc/crypto/X509_check_private_key.pod stable/11/crypto/openssl/doc/ssl/SSL_CTX_set_tlsext_servername_callback.pod - copied unchanged from r325328, head/crypto/openssl/doc/ssl/SSL_CTX_set_tlsext_servername_callback.pod stable/11/crypto/openssl/doc/ssl/SSL_export_keying_material.pod - copied unchanged from r325328, head/crypto/openssl/doc/ssl/SSL_export_keying_material.pod stable/11/secure/lib/libcrypto/man/EVP_PKEY_meth_new.3 - copied unchanged from r325328, head/secure/lib/libcrypto/man/EVP_PKEY_meth_new.3 stable/11/secure/lib/libcrypto/man/X509_check_private_key.3 - copied unchanged from r325328, head/secure/lib/libcrypto/man/X509_check_private_key.3 stable/11/secure/lib/libssl/man/SSL_export_keying_material.3 - copied unchanged from r325328, head/secure/lib/libssl/man/SSL_export_keying_material.3 Deleted: stable/11/crypto/openssl/doc/man3/SSL_CTX_set_tlsext_servername_callback.pod Modified: stable/11/crypto/openssl/CHANGES stable/11/crypto/openssl/INSTALL stable/11/crypto/openssl/Makefile stable/11/crypto/openssl/NEWS stable/11/crypto/openssl/README stable/11/crypto/openssl/apps/ca.c stable/11/crypto/openssl/apps/s_client.c stable/11/crypto/openssl/apps/s_server.c stable/11/crypto/openssl/apps/speed.c stable/11/crypto/openssl/apps/spkac.c stable/11/crypto/openssl/apps/srp.c stable/11/crypto/openssl/apps/tsget stable/11/crypto/openssl/crypto/asn1/Makefile stable/11/crypto/openssl/crypto/asn1/a_bitstr.c stable/11/crypto/openssl/crypto/asn1/tasn_fre.c stable/11/crypto/openssl/crypto/asn1/tasn_new.c stable/11/crypto/openssl/crypto/asn1/x_name.c stable/11/crypto/openssl/crypto/asn1/x_pkey.c stable/11/crypto/openssl/crypto/bn/asm/x86_64-mont5.pl stable/11/crypto/openssl/crypto/bn/bn_exp.c stable/11/crypto/openssl/crypto/bn/bn_lib.c stable/11/crypto/openssl/crypto/bn/bn_mont.c stable/11/crypto/openssl/crypto/bn/bn_mul.c stable/11/crypto/openssl/crypto/bn/bn_x931p.c stable/11/crypto/openssl/crypto/cryptlib.c stable/11/crypto/openssl/crypto/dh/Makefile stable/11/crypto/openssl/crypto/dh/dh.h stable/11/crypto/openssl/crypto/dh/dh_kdf.c stable/11/crypto/openssl/crypto/dh/dh_pmeth.c stable/11/crypto/openssl/crypto/dsa/dsa_ameth.c stable/11/crypto/openssl/crypto/dsa/dsa_gen.c stable/11/crypto/openssl/crypto/dsa/dsa_ossl.c stable/11/crypto/openssl/crypto/ec/asm/ecp_nistz256-x86_64.pl stable/11/crypto/openssl/crypto/ec/ecp_mont.c stable/11/crypto/openssl/crypto/ec/ecp_nistp224.c stable/11/crypto/openssl/crypto/ec/ecp_nistp256.c stable/11/crypto/openssl/crypto/ec/ecp_nistp521.c stable/11/crypto/openssl/crypto/ecdh/ech_lib.c stable/11/crypto/openssl/crypto/ecdsa/ecs_lib.c stable/11/crypto/openssl/crypto/ecdsa/ecs_ossl.c stable/11/crypto/openssl/crypto/err/err.c stable/11/crypto/openssl/crypto/evp/e_aes_cbc_hmac_sha1.c stable/11/crypto/openssl/crypto/evp/e_aes_cbc_hmac_sha256.c stable/11/crypto/openssl/crypto/evp/evp.h stable/11/crypto/openssl/crypto/evp/evp_key.c stable/11/crypto/openssl/crypto/evp/pmeth_lib.c stable/11/crypto/openssl/crypto/ex_data.c stable/11/crypto/openssl/crypto/lhash/lhash.c stable/11/crypto/openssl/crypto/ocsp/ocsp_vfy.c stable/11/crypto/openssl/crypto/opensslv.h stable/11/crypto/openssl/crypto/pem/pem_lib.c stable/11/crypto/openssl/crypto/pem/pem_pk8.c stable/11/crypto/openssl/crypto/pem/pem_pkey.c stable/11/crypto/openssl/crypto/pkcs12/p12_kiss.c stable/11/crypto/openssl/crypto/rsa/rsa_ameth.c stable/11/crypto/openssl/crypto/rsa/rsa_oaep.c stable/11/crypto/openssl/crypto/rsa/rsa_pk1.c stable/11/crypto/openssl/crypto/rsa/rsa_pmeth.c stable/11/crypto/openssl/crypto/ui/ui_lib.c stable/11/crypto/openssl/crypto/whrlpool/wp_dgst.c stable/11/crypto/openssl/crypto/x509/by_dir.c stable/11/crypto/openssl/crypto/x509/by_file.c stable/11/crypto/openssl/crypto/x509v3/pcy_tree.c stable/11/crypto/openssl/crypto/x509v3/v3_addr.c stable/11/crypto/openssl/crypto/x509v3/v3_genn.c stable/11/crypto/openssl/crypto/x509v3/v3_ncons.c stable/11/crypto/openssl/crypto/x86_64cpuid.pl stable/11/crypto/openssl/doc/apps/asn1parse.pod stable/11/crypto/openssl/doc/apps/ca.pod stable/11/crypto/openssl/doc/apps/ciphers.pod stable/11/crypto/openssl/doc/apps/cms.pod stable/11/crypto/openssl/doc/apps/crl.pod stable/11/crypto/openssl/doc/apps/crl2pkcs7.pod stable/11/crypto/openssl/doc/apps/dgst.pod stable/11/crypto/openssl/doc/apps/dhparam.pod stable/11/crypto/openssl/doc/apps/dsa.pod stable/11/crypto/openssl/doc/apps/dsaparam.pod stable/11/crypto/openssl/doc/apps/ec.pod stable/11/crypto/openssl/doc/apps/ecparam.pod stable/11/crypto/openssl/doc/apps/enc.pod stable/11/crypto/openssl/doc/apps/errstr.pod stable/11/crypto/openssl/doc/apps/gendsa.pod stable/11/crypto/openssl/doc/apps/genpkey.pod stable/11/crypto/openssl/doc/apps/genrsa.pod stable/11/crypto/openssl/doc/apps/nseq.pod stable/11/crypto/openssl/doc/apps/ocsp.pod stable/11/crypto/openssl/doc/apps/passwd.pod stable/11/crypto/openssl/doc/apps/pkcs12.pod stable/11/crypto/openssl/doc/apps/pkcs7.pod stable/11/crypto/openssl/doc/apps/pkcs8.pod stable/11/crypto/openssl/doc/apps/pkey.pod stable/11/crypto/openssl/doc/apps/pkeyparam.pod stable/11/crypto/openssl/doc/apps/pkeyutl.pod stable/11/crypto/openssl/doc/apps/rand.pod stable/11/crypto/openssl/doc/apps/req.pod stable/11/crypto/openssl/doc/apps/rsa.pod stable/11/crypto/openssl/doc/apps/rsautl.pod stable/11/crypto/openssl/doc/apps/s_client.pod stable/11/crypto/openssl/doc/apps/s_server.pod stable/11/crypto/openssl/doc/apps/s_time.pod stable/11/crypto/openssl/doc/apps/sess_id.pod stable/11/crypto/openssl/doc/apps/smime.pod stable/11/crypto/openssl/doc/apps/speed.pod stable/11/crypto/openssl/doc/apps/spkac.pod stable/11/crypto/openssl/doc/apps/ts.pod stable/11/crypto/openssl/doc/apps/tsget.pod stable/11/crypto/openssl/doc/apps/verify.pod stable/11/crypto/openssl/doc/apps/version.pod stable/11/crypto/openssl/doc/apps/x509.pod stable/11/crypto/openssl/doc/crypto/BN_bn2bin.pod stable/11/crypto/openssl/doc/crypto/BN_new.pod stable/11/crypto/openssl/doc/crypto/EVP_EncryptInit.pod stable/11/crypto/openssl/doc/crypto/RSA_padding_add_PKCS1_type_1.pod stable/11/crypto/openssl/doc/crypto/RSA_public_encrypt.pod stable/11/crypto/openssl/doc/crypto/hmac.pod stable/11/crypto/openssl/doc/ssl/SSL_set_connect_state.pod stable/11/crypto/openssl/ssl/s23_clnt.c stable/11/crypto/openssl/ssl/s3_pkt.c stable/11/crypto/openssl/ssl/s3_srvr.c stable/11/crypto/openssl/ssl/ssl_ciph.c stable/11/crypto/openssl/ssl/ssl_lib.c stable/11/crypto/openssl/ssl/ssl_sess.c stable/11/crypto/openssl/ssl/ssltest.c stable/11/crypto/openssl/ssl/tls1.h stable/11/crypto/openssl/util/copy-if-different.pl stable/11/crypto/openssl/util/copy.pl stable/11/crypto/openssl/util/libeay.num stable/11/crypto/openssl/util/mk1mf.pl stable/11/secure/lib/libcrypto/Makefile.inc stable/11/secure/lib/libcrypto/Makefile.man stable/11/secure/lib/libcrypto/amd64/ecp_nistz256-x86_64.S stable/11/secure/lib/libcrypto/amd64/x86_64-mont5.S stable/11/secure/lib/libcrypto/amd64/x86_64cpuid.S stable/11/secure/lib/libcrypto/man/ASN1_OBJECT_new.3 stable/11/secure/lib/libcrypto/man/ASN1_STRING_length.3 stable/11/secure/lib/libcrypto/man/ASN1_STRING_new.3 stable/11/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3 stable/11/secure/lib/libcrypto/man/ASN1_TIME_set.3 stable/11/secure/lib/libcrypto/man/ASN1_generate_nconf.3 stable/11/secure/lib/libcrypto/man/BIO_ctrl.3 stable/11/secure/lib/libcrypto/man/BIO_f_base64.3 stable/11/secure/lib/libcrypto/man/BIO_f_buffer.3 stable/11/secure/lib/libcrypto/man/BIO_f_cipher.3 stable/11/secure/lib/libcrypto/man/BIO_f_md.3 stable/11/secure/lib/libcrypto/man/BIO_f_null.3 stable/11/secure/lib/libcrypto/man/BIO_f_ssl.3 stable/11/secure/lib/libcrypto/man/BIO_find_type.3 stable/11/secure/lib/libcrypto/man/BIO_new.3 stable/11/secure/lib/libcrypto/man/BIO_new_CMS.3 stable/11/secure/lib/libcrypto/man/BIO_push.3 stable/11/secure/lib/libcrypto/man/BIO_read.3 stable/11/secure/lib/libcrypto/man/BIO_s_accept.3 stable/11/secure/lib/libcrypto/man/BIO_s_bio.3 stable/11/secure/lib/libcrypto/man/BIO_s_connect.3 stable/11/secure/lib/libcrypto/man/BIO_s_fd.3 stable/11/secure/lib/libcrypto/man/BIO_s_file.3 stable/11/secure/lib/libcrypto/man/BIO_s_mem.3 stable/11/secure/lib/libcrypto/man/BIO_s_null.3 stable/11/secure/lib/libcrypto/man/BIO_s_socket.3 stable/11/secure/lib/libcrypto/man/BIO_set_callback.3 stable/11/secure/lib/libcrypto/man/BIO_should_retry.3 stable/11/secure/lib/libcrypto/man/BN_BLINDING_new.3 stable/11/secure/lib/libcrypto/man/BN_CTX_new.3 stable/11/secure/lib/libcrypto/man/BN_CTX_start.3 stable/11/secure/lib/libcrypto/man/BN_add.3 stable/11/secure/lib/libcrypto/man/BN_add_word.3 stable/11/secure/lib/libcrypto/man/BN_bn2bin.3 stable/11/secure/lib/libcrypto/man/BN_cmp.3 stable/11/secure/lib/libcrypto/man/BN_copy.3 stable/11/secure/lib/libcrypto/man/BN_generate_prime.3 stable/11/secure/lib/libcrypto/man/BN_mod_inverse.3 stable/11/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3 stable/11/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3 stable/11/secure/lib/libcrypto/man/BN_new.3 stable/11/secure/lib/libcrypto/man/BN_num_bytes.3 stable/11/secure/lib/libcrypto/man/BN_rand.3 stable/11/secure/lib/libcrypto/man/BN_set_bit.3 stable/11/secure/lib/libcrypto/man/BN_swap.3 stable/11/secure/lib/libcrypto/man/BN_zero.3 stable/11/secure/lib/libcrypto/man/CMS_add0_cert.3 stable/11/secure/lib/libcrypto/man/CMS_add1_recipient_cert.3 stable/11/secure/lib/libcrypto/man/CMS_add1_signer.3 stable/11/secure/lib/libcrypto/man/CMS_compress.3 stable/11/secure/lib/libcrypto/man/CMS_decrypt.3 stable/11/secure/lib/libcrypto/man/CMS_encrypt.3 stable/11/secure/lib/libcrypto/man/CMS_final.3 stable/11/secure/lib/libcrypto/man/CMS_get0_RecipientInfos.3 stable/11/secure/lib/libcrypto/man/CMS_get0_SignerInfos.3 stable/11/secure/lib/libcrypto/man/CMS_get0_type.3 stable/11/secure/lib/libcrypto/man/CMS_get1_ReceiptRequest.3 stable/11/secure/lib/libcrypto/man/CMS_sign.3 stable/11/secure/lib/libcrypto/man/CMS_sign_receipt.3 stable/11/secure/lib/libcrypto/man/CMS_uncompress.3 stable/11/secure/lib/libcrypto/man/CMS_verify.3 stable/11/secure/lib/libcrypto/man/CMS_verify_receipt.3 stable/11/secure/lib/libcrypto/man/CONF_modules_free.3 stable/11/secure/lib/libcrypto/man/CONF_modules_load_file.3 stable/11/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3 stable/11/secure/lib/libcrypto/man/DH_generate_key.3 stable/11/secure/lib/libcrypto/man/DH_generate_parameters.3 stable/11/secure/lib/libcrypto/man/DH_get_ex_new_index.3 stable/11/secure/lib/libcrypto/man/DH_new.3 stable/11/secure/lib/libcrypto/man/DH_set_method.3 stable/11/secure/lib/libcrypto/man/DH_size.3 stable/11/secure/lib/libcrypto/man/DSA_SIG_new.3 stable/11/secure/lib/libcrypto/man/DSA_do_sign.3 stable/11/secure/lib/libcrypto/man/DSA_dup_DH.3 stable/11/secure/lib/libcrypto/man/DSA_generate_key.3 stable/11/secure/lib/libcrypto/man/DSA_generate_parameters.3 stable/11/secure/lib/libcrypto/man/DSA_get_ex_new_index.3 stable/11/secure/lib/libcrypto/man/DSA_new.3 stable/11/secure/lib/libcrypto/man/DSA_set_method.3 stable/11/secure/lib/libcrypto/man/DSA_sign.3 stable/11/secure/lib/libcrypto/man/DSA_size.3 stable/11/secure/lib/libcrypto/man/EC_GFp_simple_method.3 stable/11/secure/lib/libcrypto/man/EC_GROUP_copy.3 stable/11/secure/lib/libcrypto/man/EC_GROUP_new.3 stable/11/secure/lib/libcrypto/man/EC_KEY_new.3 stable/11/secure/lib/libcrypto/man/EC_POINT_add.3 stable/11/secure/lib/libcrypto/man/EC_POINT_new.3 stable/11/secure/lib/libcrypto/man/ERR_GET_LIB.3 stable/11/secure/lib/libcrypto/man/ERR_clear_error.3 stable/11/secure/lib/libcrypto/man/ERR_error_string.3 stable/11/secure/lib/libcrypto/man/ERR_get_error.3 stable/11/secure/lib/libcrypto/man/ERR_load_crypto_strings.3 stable/11/secure/lib/libcrypto/man/ERR_load_strings.3 stable/11/secure/lib/libcrypto/man/ERR_print_errors.3 stable/11/secure/lib/libcrypto/man/ERR_put_error.3 stable/11/secure/lib/libcrypto/man/ERR_remove_state.3 stable/11/secure/lib/libcrypto/man/ERR_set_mark.3 stable/11/secure/lib/libcrypto/man/EVP_BytesToKey.3 stable/11/secure/lib/libcrypto/man/EVP_DigestInit.3 stable/11/secure/lib/libcrypto/man/EVP_DigestSignInit.3 stable/11/secure/lib/libcrypto/man/EVP_DigestVerifyInit.3 stable/11/secure/lib/libcrypto/man/EVP_EncodeInit.3 stable/11/secure/lib/libcrypto/man/EVP_EncryptInit.3 stable/11/secure/lib/libcrypto/man/EVP_OpenInit.3 stable/11/secure/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3 stable/11/secure/lib/libcrypto/man/EVP_PKEY_CTX_new.3 stable/11/secure/lib/libcrypto/man/EVP_PKEY_cmp.3 stable/11/secure/lib/libcrypto/man/EVP_PKEY_decrypt.3 stable/11/secure/lib/libcrypto/man/EVP_PKEY_derive.3 stable/11/secure/lib/libcrypto/man/EVP_PKEY_encrypt.3 stable/11/secure/lib/libcrypto/man/EVP_PKEY_get_default_digest.3 stable/11/secure/lib/libcrypto/man/EVP_PKEY_keygen.3 stable/11/secure/lib/libcrypto/man/EVP_PKEY_new.3 stable/11/secure/lib/libcrypto/man/EVP_PKEY_print_private.3 stable/11/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 stable/11/secure/lib/libcrypto/man/EVP_PKEY_sign.3 stable/11/secure/lib/libcrypto/man/EVP_PKEY_verify.3 stable/11/secure/lib/libcrypto/man/EVP_PKEY_verify_recover.3 stable/11/secure/lib/libcrypto/man/EVP_SealInit.3 stable/11/secure/lib/libcrypto/man/EVP_SignInit.3 stable/11/secure/lib/libcrypto/man/EVP_VerifyInit.3 stable/11/secure/lib/libcrypto/man/OBJ_nid2obj.3 stable/11/secure/lib/libcrypto/man/OPENSSL_Applink.3 stable/11/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3 stable/11/secure/lib/libcrypto/man/OPENSSL_config.3 stable/11/secure/lib/libcrypto/man/OPENSSL_ia32cap.3 stable/11/secure/lib/libcrypto/man/OPENSSL_instrument_bus.3 stable/11/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3 stable/11/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3 stable/11/secure/lib/libcrypto/man/PEM_write_bio_CMS_stream.3 stable/11/secure/lib/libcrypto/man/PEM_write_bio_PKCS7_stream.3 stable/11/secure/lib/libcrypto/man/PKCS12_create.3 stable/11/secure/lib/libcrypto/man/PKCS12_parse.3 stable/11/secure/lib/libcrypto/man/PKCS7_decrypt.3 stable/11/secure/lib/libcrypto/man/PKCS7_encrypt.3 stable/11/secure/lib/libcrypto/man/PKCS7_sign.3 stable/11/secure/lib/libcrypto/man/PKCS7_sign_add_signer.3 stable/11/secure/lib/libcrypto/man/PKCS7_verify.3 stable/11/secure/lib/libcrypto/man/RAND_add.3 stable/11/secure/lib/libcrypto/man/RAND_bytes.3 stable/11/secure/lib/libcrypto/man/RAND_cleanup.3 stable/11/secure/lib/libcrypto/man/RAND_egd.3 stable/11/secure/lib/libcrypto/man/RAND_load_file.3 stable/11/secure/lib/libcrypto/man/RAND_set_rand_method.3 stable/11/secure/lib/libcrypto/man/RSA_blinding_on.3 stable/11/secure/lib/libcrypto/man/RSA_check_key.3 stable/11/secure/lib/libcrypto/man/RSA_generate_key.3 stable/11/secure/lib/libcrypto/man/RSA_get_ex_new_index.3 stable/11/secure/lib/libcrypto/man/RSA_new.3 stable/11/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3 stable/11/secure/lib/libcrypto/man/RSA_print.3 stable/11/secure/lib/libcrypto/man/RSA_private_encrypt.3 stable/11/secure/lib/libcrypto/man/RSA_public_encrypt.3 stable/11/secure/lib/libcrypto/man/RSA_set_method.3 stable/11/secure/lib/libcrypto/man/RSA_sign.3 stable/11/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3 stable/11/secure/lib/libcrypto/man/RSA_size.3 stable/11/secure/lib/libcrypto/man/SMIME_read_CMS.3 stable/11/secure/lib/libcrypto/man/SMIME_read_PKCS7.3 stable/11/secure/lib/libcrypto/man/SMIME_write_CMS.3 stable/11/secure/lib/libcrypto/man/SMIME_write_PKCS7.3 stable/11/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3 stable/11/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3 stable/11/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3 stable/11/secure/lib/libcrypto/man/X509_NAME_print_ex.3 stable/11/secure/lib/libcrypto/man/X509_STORE_CTX_get_error.3 stable/11/secure/lib/libcrypto/man/X509_STORE_CTX_get_ex_new_index.3 stable/11/secure/lib/libcrypto/man/X509_STORE_CTX_new.3 stable/11/secure/lib/libcrypto/man/X509_STORE_CTX_set_verify_cb.3 stable/11/secure/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3 stable/11/secure/lib/libcrypto/man/X509_VERIFY_PARAM_set_flags.3 stable/11/secure/lib/libcrypto/man/X509_check_host.3 stable/11/secure/lib/libcrypto/man/X509_new.3 stable/11/secure/lib/libcrypto/man/X509_verify_cert.3 stable/11/secure/lib/libcrypto/man/bio.3 stable/11/secure/lib/libcrypto/man/blowfish.3 stable/11/secure/lib/libcrypto/man/bn.3 stable/11/secure/lib/libcrypto/man/bn_internal.3 stable/11/secure/lib/libcrypto/man/buffer.3 stable/11/secure/lib/libcrypto/man/crypto.3 stable/11/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3 stable/11/secure/lib/libcrypto/man/d2i_CMS_ContentInfo.3 stable/11/secure/lib/libcrypto/man/d2i_DHparams.3 stable/11/secure/lib/libcrypto/man/d2i_DSAPublicKey.3 stable/11/secure/lib/libcrypto/man/d2i_ECPKParameters.3 stable/11/secure/lib/libcrypto/man/d2i_ECPrivateKey.3 stable/11/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3 stable/11/secure/lib/libcrypto/man/d2i_PrivateKey.3 stable/11/secure/lib/libcrypto/man/d2i_RSAPublicKey.3 stable/11/secure/lib/libcrypto/man/d2i_X509.3 stable/11/secure/lib/libcrypto/man/d2i_X509_ALGOR.3 stable/11/secure/lib/libcrypto/man/d2i_X509_CRL.3 stable/11/secure/lib/libcrypto/man/d2i_X509_NAME.3 stable/11/secure/lib/libcrypto/man/d2i_X509_REQ.3 stable/11/secure/lib/libcrypto/man/d2i_X509_SIG.3 stable/11/secure/lib/libcrypto/man/des.3 stable/11/secure/lib/libcrypto/man/dh.3 stable/11/secure/lib/libcrypto/man/dsa.3 stable/11/secure/lib/libcrypto/man/ec.3 stable/11/secure/lib/libcrypto/man/ecdsa.3 stable/11/secure/lib/libcrypto/man/engine.3 stable/11/secure/lib/libcrypto/man/err.3 stable/11/secure/lib/libcrypto/man/evp.3 stable/11/secure/lib/libcrypto/man/hmac.3 stable/11/secure/lib/libcrypto/man/i2d_CMS_bio_stream.3 stable/11/secure/lib/libcrypto/man/i2d_PKCS7_bio_stream.3 stable/11/secure/lib/libcrypto/man/lh_stats.3 stable/11/secure/lib/libcrypto/man/lhash.3 stable/11/secure/lib/libcrypto/man/md5.3 stable/11/secure/lib/libcrypto/man/mdc2.3 stable/11/secure/lib/libcrypto/man/pem.3 stable/11/secure/lib/libcrypto/man/rand.3 stable/11/secure/lib/libcrypto/man/rc4.3 stable/11/secure/lib/libcrypto/man/ripemd.3 stable/11/secure/lib/libcrypto/man/rsa.3 stable/11/secure/lib/libcrypto/man/sha.3 stable/11/secure/lib/libcrypto/man/threads.3 stable/11/secure/lib/libcrypto/man/ui.3 stable/11/secure/lib/libcrypto/man/ui_compat.3 stable/11/secure/lib/libcrypto/man/x509.3 stable/11/secure/lib/libssl/Makefile.man stable/11/secure/lib/libssl/man/SSL_CIPHER_get_name.3 stable/11/secure/lib/libssl/man/SSL_COMP_add_compression_method.3 stable/11/secure/lib/libssl/man/SSL_CONF_CTX_new.3 stable/11/secure/lib/libssl/man/SSL_CONF_CTX_set1_prefix.3 stable/11/secure/lib/libssl/man/SSL_CONF_CTX_set_flags.3 stable/11/secure/lib/libssl/man/SSL_CONF_CTX_set_ssl_ctx.3 stable/11/secure/lib/libssl/man/SSL_CONF_cmd.3 stable/11/secure/lib/libssl/man/SSL_CONF_cmd_argv.3 stable/11/secure/lib/libssl/man/SSL_CTX_add1_chain_cert.3 stable/11/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3 stable/11/secure/lib/libssl/man/SSL_CTX_add_session.3 stable/11/secure/lib/libssl/man/SSL_CTX_ctrl.3 stable/11/secure/lib/libssl/man/SSL_CTX_flush_sessions.3 stable/11/secure/lib/libssl/man/SSL_CTX_free.3 stable/11/secure/lib/libssl/man/SSL_CTX_get0_param.3 stable/11/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3 stable/11/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3 stable/11/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3 stable/11/secure/lib/libssl/man/SSL_CTX_new.3 stable/11/secure/lib/libssl/man/SSL_CTX_sess_number.3 stable/11/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3 stable/11/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3 stable/11/secure/lib/libssl/man/SSL_CTX_sessions.3 stable/11/secure/lib/libssl/man/SSL_CTX_set1_curves.3 stable/11/secure/lib/libssl/man/SSL_CTX_set1_verify_cert_store.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_alpn_select_cb.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_cert_cb.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_cert_store.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_custom_cli_ext.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_info_callback.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_mode.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_options.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_psk_client_callback.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_read_ahead.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_timeout.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_tlsext_servername_callback.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_tlsext_status_cb.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_tlsext_ticket_key_cb.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3 stable/11/secure/lib/libssl/man/SSL_CTX_set_verify.3 stable/11/secure/lib/libssl/man/SSL_CTX_use_certificate.3 stable/11/secure/lib/libssl/man/SSL_CTX_use_psk_identity_hint.3 stable/11/secure/lib/libssl/man/SSL_CTX_use_serverinfo.3 stable/11/secure/lib/libssl/man/SSL_SESSION_free.3 stable/11/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3 stable/11/secure/lib/libssl/man/SSL_SESSION_get_time.3 stable/11/secure/lib/libssl/man/SSL_accept.3 stable/11/secure/lib/libssl/man/SSL_alert_type_string.3 stable/11/secure/lib/libssl/man/SSL_check_chain.3 stable/11/secure/lib/libssl/man/SSL_clear.3 stable/11/secure/lib/libssl/man/SSL_connect.3 stable/11/secure/lib/libssl/man/SSL_do_handshake.3 stable/11/secure/lib/libssl/man/SSL_free.3 stable/11/secure/lib/libssl/man/SSL_get_SSL_CTX.3 stable/11/secure/lib/libssl/man/SSL_get_ciphers.3 stable/11/secure/lib/libssl/man/SSL_get_client_CA_list.3 stable/11/secure/lib/libssl/man/SSL_get_current_cipher.3 stable/11/secure/lib/libssl/man/SSL_get_default_timeout.3 stable/11/secure/lib/libssl/man/SSL_get_error.3 stable/11/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3 stable/11/secure/lib/libssl/man/SSL_get_ex_new_index.3 stable/11/secure/lib/libssl/man/SSL_get_fd.3 stable/11/secure/lib/libssl/man/SSL_get_peer_cert_chain.3 stable/11/secure/lib/libssl/man/SSL_get_peer_certificate.3 stable/11/secure/lib/libssl/man/SSL_get_psk_identity.3 stable/11/secure/lib/libssl/man/SSL_get_rbio.3 stable/11/secure/lib/libssl/man/SSL_get_session.3 stable/11/secure/lib/libssl/man/SSL_get_verify_result.3 stable/11/secure/lib/libssl/man/SSL_get_version.3 stable/11/secure/lib/libssl/man/SSL_library_init.3 stable/11/secure/lib/libssl/man/SSL_load_client_CA_file.3 stable/11/secure/lib/libssl/man/SSL_new.3 stable/11/secure/lib/libssl/man/SSL_pending.3 stable/11/secure/lib/libssl/man/SSL_read.3 stable/11/secure/lib/libssl/man/SSL_rstate_string.3 stable/11/secure/lib/libssl/man/SSL_session_reused.3 stable/11/secure/lib/libssl/man/SSL_set_bio.3 stable/11/secure/lib/libssl/man/SSL_set_connect_state.3 stable/11/secure/lib/libssl/man/SSL_set_fd.3 stable/11/secure/lib/libssl/man/SSL_set_session.3 stable/11/secure/lib/libssl/man/SSL_set_shutdown.3 stable/11/secure/lib/libssl/man/SSL_set_verify_result.3 stable/11/secure/lib/libssl/man/SSL_shutdown.3 stable/11/secure/lib/libssl/man/SSL_state_string.3 stable/11/secure/lib/libssl/man/SSL_want.3 stable/11/secure/lib/libssl/man/SSL_write.3 stable/11/secure/lib/libssl/man/d2i_SSL_SESSION.3 stable/11/secure/lib/libssl/man/ssl.3 stable/11/secure/usr.bin/openssl/Makefile.man stable/11/secure/usr.bin/openssl/man/CA.pl.1 stable/11/secure/usr.bin/openssl/man/asn1parse.1 stable/11/secure/usr.bin/openssl/man/c_rehash.1 stable/11/secure/usr.bin/openssl/man/ca.1 stable/11/secure/usr.bin/openssl/man/ciphers.1 stable/11/secure/usr.bin/openssl/man/cms.1 stable/11/secure/usr.bin/openssl/man/crl.1 stable/11/secure/usr.bin/openssl/man/crl2pkcs7.1 stable/11/secure/usr.bin/openssl/man/dgst.1 stable/11/secure/usr.bin/openssl/man/dhparam.1 stable/11/secure/usr.bin/openssl/man/dsa.1 stable/11/secure/usr.bin/openssl/man/dsaparam.1 stable/11/secure/usr.bin/openssl/man/ec.1 stable/11/secure/usr.bin/openssl/man/ecparam.1 stable/11/secure/usr.bin/openssl/man/enc.1 stable/11/secure/usr.bin/openssl/man/errstr.1 stable/11/secure/usr.bin/openssl/man/gendsa.1 stable/11/secure/usr.bin/openssl/man/genpkey.1 stable/11/secure/usr.bin/openssl/man/genrsa.1 stable/11/secure/usr.bin/openssl/man/nseq.1 stable/11/secure/usr.bin/openssl/man/ocsp.1 stable/11/secure/usr.bin/openssl/man/openssl.1 stable/11/secure/usr.bin/openssl/man/passwd.1 stable/11/secure/usr.bin/openssl/man/pkcs12.1 stable/11/secure/usr.bin/openssl/man/pkcs7.1 stable/11/secure/usr.bin/openssl/man/pkcs8.1 stable/11/secure/usr.bin/openssl/man/pkey.1 stable/11/secure/usr.bin/openssl/man/pkeyparam.1 stable/11/secure/usr.bin/openssl/man/pkeyutl.1 stable/11/secure/usr.bin/openssl/man/rand.1 stable/11/secure/usr.bin/openssl/man/req.1 stable/11/secure/usr.bin/openssl/man/rsa.1 stable/11/secure/usr.bin/openssl/man/rsautl.1 stable/11/secure/usr.bin/openssl/man/s_client.1 stable/11/secure/usr.bin/openssl/man/s_server.1 stable/11/secure/usr.bin/openssl/man/s_time.1 stable/11/secure/usr.bin/openssl/man/sess_id.1 stable/11/secure/usr.bin/openssl/man/smime.1 stable/11/secure/usr.bin/openssl/man/speed.1 stable/11/secure/usr.bin/openssl/man/spkac.1 stable/11/secure/usr.bin/openssl/man/ts.1 stable/11/secure/usr.bin/openssl/man/tsget.1 stable/11/secure/usr.bin/openssl/man/verify.1 stable/11/secure/usr.bin/openssl/man/version.1 stable/11/secure/usr.bin/openssl/man/x509.1 stable/11/secure/usr.bin/openssl/man/x509v3_config.1 Directory Properties: stable/11/ (props changed) Modified: stable/11/crypto/openssl/CHANGES ============================================================================== --- stable/11/crypto/openssl/CHANGES Thu Nov 2 18:27:32 2017 (r325336) +++ stable/11/crypto/openssl/CHANGES Thu Nov 2 18:30:41 2017 (r325337) @@ -2,6 +2,44 @@ OpenSSL CHANGES _______________ + This is a high-level summary of the most important changes. + For a full list of changes, see the git commit log; for example, + https://github.com/openssl/openssl/commits/ and pick the appropriate + release branch. + + Changes between 1.0.2l and 1.0.2m [2 Nov 2017] + + *) bn_sqrx8x_internal carry bug on x86_64 + + There is a carry propagating bug in the x86_64 Montgomery squaring + procedure. No EC algorithms are affected. Analysis suggests that attacks + against RSA and DSA as a result of this defect would be very difficult to + perform and are not believed likely. Attacks against DH are considered just + feasible (although very difficult) because most of the work necessary to + deduce information about a private key may be performed offline. The amount + of resources required for such an attack would be very significant and + likely only accessible to a limited number of attackers. An attacker would + additionally need online access to an unpatched system using the target + private key in a scenario with persistent DH parameters and a private + key that is shared between multiple clients. + + This only affects processors that support the BMI1, BMI2 and ADX extensions + like Intel Broadwell (5th generation) and later or AMD Ryzen. + + This issue was reported to OpenSSL by the OSS-Fuzz project. + (CVE-2017-3736) + [Andy Polyakov] + + *) Malformed X.509 IPAddressFamily could cause OOB read + + If an X.509 certificate has a malformed IPAddressFamily extension, + OpenSSL could do a one-byte buffer overread. The most likely result + would be an erroneous display of the certificate in text format. + + This issue was reported to OpenSSL by the OSS-Fuzz project. + (CVE-2017-3735) + [Rich Salz] + Changes between 1.0.2k and 1.0.2l [25 May 2017] *) Have 'config' recognise 64-bit mingw and choose 'mingw64' as the target Modified: stable/11/crypto/openssl/INSTALL ============================================================================== --- stable/11/crypto/openssl/INSTALL Thu Nov 2 18:27:32 2017 (r325336) +++ stable/11/crypto/openssl/INSTALL Thu Nov 2 18:30:41 2017 (r325337) @@ -190,10 +190,8 @@ the failure that isn't a problem in OpenSSL itself (like a missing or malfunctioning bc). If it is a problem with OpenSSL itself, try removing any compiler optimization flags from the CFLAG line - in Makefile.ssl and run "make clean; make". Please send a bug - report to , including the output of - "make report" in order to be added to the request tracker at - http://www.openssl.org/support/rt.html. + in Makefile.ssl and run "make clean; make". To report a bug please open an + issue on GitHub, at https://github.com/openssl/openssl/issues. 4. If everything tests ok, install OpenSSL with Modified: stable/11/crypto/openssl/Makefile ============================================================================== --- stable/11/crypto/openssl/Makefile Thu Nov 2 18:27:32 2017 (r325336) +++ stable/11/crypto/openssl/Makefile Thu Nov 2 18:30:41 2017 (r325337) @@ -4,7 +4,7 @@ ## Makefile for OpenSSL ## -VERSION=1.0.2l +VERSION=1.0.2m MAJOR=1 MINOR=0.2 SHLIB_VERSION_NUMBER=1.0.0 Modified: stable/11/crypto/openssl/NEWS ============================================================================== --- stable/11/crypto/openssl/NEWS Thu Nov 2 18:27:32 2017 (r325336) +++ stable/11/crypto/openssl/NEWS Thu Nov 2 18:30:41 2017 (r325337) @@ -5,6 +5,11 @@ This file gives a brief overview of the major changes between each OpenSSL release. For more details please read the CHANGES file. + Major changes between OpenSSL 1.0.2l and OpenSSL 1.0.2m [2 Nov 2017] + + o bn_sqrx8x_internal carry bug on x86_64 (CVE-2017-3736) + o Malformed X.509 IPAddressFamily could cause OOB read (CVE-2017-3735) + Major changes between OpenSSL 1.0.2k and OpenSSL 1.0.2l [25 May 2017] o config now recognises 64-bit mingw and chooses mingw64 instead of mingw Modified: stable/11/crypto/openssl/README ============================================================================== --- stable/11/crypto/openssl/README Thu Nov 2 18:27:32 2017 (r325336) +++ stable/11/crypto/openssl/README Thu Nov 2 18:30:41 2017 (r325337) @@ -1,5 +1,5 @@ - OpenSSL 1.0.2l 25 May 2017 + OpenSSL 1.0.2m 2 Nov 2017 Copyright (c) 1998-2015 The OpenSSL Project Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson Modified: stable/11/crypto/openssl/apps/ca.c ============================================================================== --- stable/11/crypto/openssl/apps/ca.c Thu Nov 2 18:27:32 2017 (r325336) +++ stable/11/crypto/openssl/apps/ca.c Thu Nov 2 18:30:41 2017 (r325337) @@ -1985,10 +1985,6 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 * /* Lets add the extensions, if there are any */ if (ext_sect) { X509V3_CTX ctx; - if (ci->version == NULL) - if ((ci->version = ASN1_INTEGER_new()) == NULL) - goto err; - ASN1_INTEGER_set(ci->version, 2); /* version 3 certificate */ /* * Free the current entries if any, there should not be any I believe @@ -2049,6 +2045,15 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 * BIO_printf(bio_err, "ERROR: adding extensions from request\n"); ERR_print_errors(bio_err); goto err; + } + + { + STACK_OF(X509_EXTENSION) *exts = ci->extensions; + + if (exts != NULL && sk_X509_EXTENSION_num(exts) > 0) + /* Make it an X509 v3 certificate. */ + if (!X509_set_version(ret, 2)) + goto err; } /* Set the right value for the noemailDN option */ Modified: stable/11/crypto/openssl/apps/s_client.c ============================================================================== --- stable/11/crypto/openssl/apps/s_client.c Thu Nov 2 18:27:32 2017 (r325336) +++ stable/11/crypto/openssl/apps/s_client.c Thu Nov 2 18:30:41 2017 (r325337) @@ -1667,6 +1667,8 @@ int MAIN(int argc, char **argv) if (strstr(mbuf, "/stream:features>")) goto shut; seen = BIO_read(sbio, mbuf, BUFSIZZ); + if (seen <= 0) + goto shut; mbuf[seen] = 0; } BIO_printf(sbio, Modified: stable/11/crypto/openssl/apps/s_server.c ============================================================================== --- stable/11/crypto/openssl/apps/s_server.c Thu Nov 2 18:27:32 2017 (r325336) +++ stable/11/crypto/openssl/apps/s_server.c Thu Nov 2 18:30:41 2017 (r325337) @@ -3017,7 +3017,7 @@ static int www_body(char *hostname, int s, int stype, PEM_write_bio_X509(io, peer); } else BIO_puts(io, "no client certificate available\n"); - BIO_puts(io, "\r\n\r\n"); + BIO_puts(io, "\r\n\r\n"); break; } else if ((www == 2 || www == 3) && (strncmp("GET /", buf, 5) == 0)) { Modified: stable/11/crypto/openssl/apps/speed.c ============================================================================== --- stable/11/crypto/openssl/apps/speed.c Thu Nov 2 18:27:32 2017 (r325336) +++ stable/11/crypto/openssl/apps/speed.c Thu Nov 2 18:30:41 2017 (r325337) @@ -307,7 +307,8 @@ static SIGRETTYPE sig_done(int sig) # if !defined(SIGALRM) # define SIGALRM # endif -static unsigned int lapse, schlock; +static volatile unsigned int lapse; +static volatile unsigned int schlock; static void alarm_win32(unsigned int secs) { lapse = secs * 1000; @@ -725,6 +726,7 @@ int MAIN(int argc, char **argv) BIO_printf(bio_err, "no EVP given\n"); goto end; } + evp_md = NULL; evp_cipher = EVP_get_cipherbyname(*argv); if (!evp_cipher) { evp_md = EVP_get_digestbyname(*argv); Modified: stable/11/crypto/openssl/apps/spkac.c ============================================================================== --- stable/11/crypto/openssl/apps/spkac.c Thu Nov 2 18:27:32 2017 (r325336) +++ stable/11/crypto/openssl/apps/spkac.c Thu Nov 2 18:30:41 2017 (r325337) @@ -5,7 +5,7 @@ * 1999. Based on an original idea by Massimiliano Pala (madwolf@openca.org). */ /* ==================================================================== - * Copyright (c) 1999 The OpenSSL Project. All rights reserved. + * Copyright (c) 1999-2017 The OpenSSL Project. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -185,20 +185,23 @@ int MAIN(int argc, char **argv) } e = setup_engine(bio_err, engine, 0); - if (keyfile) { + if (keyfile != NULL) { pkey = load_key(bio_err, strcmp(keyfile, "-") ? keyfile : NULL, FORMAT_PEM, 1, passin, e, "private key"); - if (!pkey) { + if (pkey == NULL) goto end; - } spki = NETSCAPE_SPKI_new(); - if (challenge) + if (spki == NULL) + goto end; + if (challenge != NULL) ASN1_STRING_set(spki->spkac->challenge, challenge, (int)strlen(challenge)); NETSCAPE_SPKI_set_pubkey(spki, pkey); NETSCAPE_SPKI_sign(spki, pkey, EVP_md5()); spkstr = NETSCAPE_SPKI_b64_encode(spki); + if (spkstr == NULL) + goto end; if (outfile) out = BIO_new_file(outfile, "w"); @@ -253,7 +256,7 @@ int MAIN(int argc, char **argv) spki = NETSCAPE_SPKI_b64_decode(spkstr, -1); - if (!spki) { + if (spki == NULL) { BIO_printf(bio_err, "Error loading SPKAC\n"); ERR_print_errors(bio_err); goto end; @@ -282,9 +285,9 @@ int MAIN(int argc, char **argv) pkey = NETSCAPE_SPKI_get_pubkey(spki); if (verify) { i = NETSCAPE_SPKI_verify(spki, pkey); - if (i > 0) + if (i > 0) { BIO_printf(bio_err, "Signature OK\n"); - else { + } else { BIO_printf(bio_err, "Signature Failure\n"); ERR_print_errors(bio_err); goto end; Modified: stable/11/crypto/openssl/apps/srp.c ============================================================================== --- stable/11/crypto/openssl/apps/srp.c Thu Nov 2 18:27:32 2017 (r325336) +++ stable/11/crypto/openssl/apps/srp.c Thu Nov 2 18:30:41 2017 (r325337) @@ -123,13 +123,14 @@ static int get_index(CA_DB *db, char *id, char type) int i; if (id == NULL) return -1; - if (type == DB_SRP_INDEX) + if (type == DB_SRP_INDEX) { for (i = 0; i < sk_OPENSSL_PSTRING_num(db->db->data); i++) { pp = sk_OPENSSL_PSTRING_value(db->db->data, i); if (pp[DB_srptype][0] == DB_SRP_INDEX && !strcmp(id, pp[DB_srpid])) return i; - } else + } + } else { for (i = 0; i < sk_OPENSSL_PSTRING_num(db->db->data); i++) { pp = sk_OPENSSL_PSTRING_value(db->db->data, i); @@ -137,6 +138,7 @@ static int get_index(CA_DB *db, char *id, char type) && !strcmp(id, pp[DB_srpid])) return i; } + } return -1; } @@ -177,8 +179,8 @@ static int update_index(CA_DB *db, BIO *bio, char **ro char **irow; int i; - if ((irow = - (char **)OPENSSL_malloc(sizeof(char *) * (DB_NUMBER + 1))) == NULL) { + irow = (char **)OPENSSL_malloc(sizeof(char *) * (DB_NUMBER + 1)); + if (irow == NULL) { BIO_printf(bio_err, "Memory allocation failure\n"); return 0; } @@ -205,30 +207,32 @@ static char *srp_verify_user(const char *user, const c char *srp_usersalt, const char *g, const char *N, const char *passin, BIO *bio, int verbose) { - char password[1024]; + char password[1025]; PW_CB_DATA cb_tmp; char *verifier = NULL; char *gNid = NULL; + int len; cb_tmp.prompt_info = user; cb_tmp.password = passin; - if (password_callback(password, 1024, 0, &cb_tmp) > 0) { + len = password_callback(password, sizeof(password)-1, 0, &cb_tmp); + if (len > 0) { + password[len] = 0; VERBOSE BIO_printf(bio, "Validating\n user=\"%s\"\n srp_verifier=\"%s\"\n srp_usersalt=\"%s\"\n g=\"%s\"\n N=\"%s\"\n", user, srp_verifier, srp_usersalt, g, N); - BIO_printf(bio, "Pass %s\n", password); + VVERBOSE BIO_printf(bio, "Pass %s\n", password); - if (! - (gNid = - SRP_create_verifier(user, password, &srp_usersalt, &verifier, N, - g))) { + if (!(gNid = SRP_create_verifier(user, password, &srp_usersalt, + &verifier, N, g))) { BIO_printf(bio, "Internal error validating SRP verifier\n"); } else { if (strcmp(verifier, srp_verifier)) gNid = NULL; OPENSSL_free(verifier); } + OPENSSL_cleanse(password, len); } return gNid; } @@ -237,24 +241,27 @@ static char *srp_create_user(char *user, char **srp_ve char **srp_usersalt, char *g, char *N, char *passout, BIO *bio, int verbose) { - char password[1024]; + char password[1025]; PW_CB_DATA cb_tmp; char *gNid = NULL; char *salt = NULL; + int len; cb_tmp.prompt_info = user; cb_tmp.password = passout; - if (password_callback(password, 1024, 1, &cb_tmp) > 0) { + len = password_callback(password, sizeof(password)-1, 1, &cb_tmp); + if (len > 0) { + password[len] = 0; VERBOSE BIO_printf(bio, "Creating\n user=\"%s\"\n g=\"%s\"\n N=\"%s\"\n", user, g, N); - if (! - (gNid = - SRP_create_verifier(user, password, &salt, srp_verifier, N, - g))) { + if (!(gNid = SRP_create_verifier(user, password, &salt, + srp_verifier, N, g))) { BIO_printf(bio, "Internal error creating SRP verifier\n"); - } else + } else { *srp_usersalt = salt; + } + OPENSSL_cleanse(password, len); VVERBOSE BIO_printf(bio, "gNid=%s salt =\"%s\"\n verifier =\"%s\"\n", gNid, salt, *srp_verifier); @@ -314,9 +321,9 @@ int MAIN(int argc, char **argv) argc--; argv++; while (argc >= 1 && badops == 0) { - if (strcmp(*argv, "-verbose") == 0) + if (strcmp(*argv, "-verbose") == 0) { verbose++; - else if (strcmp(*argv, "-config") == 0) { + } else if (strcmp(*argv, "-config") == 0) { if (--argc < 1) goto bad; configfile = *(++argv); @@ -328,15 +335,15 @@ int MAIN(int argc, char **argv) if (--argc < 1) goto bad; dbfile = *(++argv); - } else if (strcmp(*argv, "-add") == 0) + } else if (strcmp(*argv, "-add") == 0) { add_user = 1; - else if (strcmp(*argv, "-delete") == 0) + } else if (strcmp(*argv, "-delete") == 0) { delete_user = 1; - else if (strcmp(*argv, "-modify") == 0) + } else if (strcmp(*argv, "-modify") == 0) { modify_user = 1; - else if (strcmp(*argv, "-list") == 0) + } else if (strcmp(*argv, "-list") == 0) { list_user = 1; - else if (strcmp(*argv, "-gn") == 0) { + } else if (strcmp(*argv, "-gn") == 0) { if (--argc < 1) goto bad; gN = *(++argv); @@ -366,8 +373,9 @@ int MAIN(int argc, char **argv) BIO_printf(bio_err, "unknown option %s\n", *argv); badops = 1; break; - } else + } else { break; + } argc--; argv++; @@ -388,7 +396,7 @@ int MAIN(int argc, char **argv) "Need at least one user for options -add, -delete, -modify. \n"); badops = 1; } - if ((passin || passout) && argc != 1) { + if ((passargin || passargout) && argc != 1) { BIO_printf(bio_err, "-passin, -passout arguments only valid with one user.\n"); badops = 1; @@ -706,9 +714,9 @@ int MAIN(int argc, char **argv) doupdatedb = 1; } } - if (--argc > 0) + if (--argc > 0) { user = *(argv++); - else { + } else { user = NULL; list_user = 0; } Modified: stable/11/crypto/openssl/apps/tsget ============================================================================== --- stable/11/crypto/openssl/apps/tsget Thu Nov 2 18:27:32 2017 (r325336) +++ stable/11/crypto/openssl/apps/tsget Thu Nov 2 18:30:41 2017 (r325337) @@ -193,4 +193,3 @@ REQUEST: foreach (@ARGV) { STDERR->printflush(", $output written.\n") if $options{v}; } $curl->cleanup(); -WWW::Curl::Easy::global_cleanup(); Modified: stable/11/crypto/openssl/crypto/asn1/Makefile ============================================================================== --- stable/11/crypto/openssl/crypto/asn1/Makefile Thu Nov 2 18:27:32 2017 (r325336) +++ stable/11/crypto/openssl/crypto/asn1/Makefile Thu Nov 2 18:30:41 2017 (r325337) @@ -680,7 +680,7 @@ tasn_fre.o: ../../include/openssl/e_os2.h ../../includ tasn_fre.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h tasn_fre.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h tasn_fre.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -tasn_fre.o: ../../include/openssl/symhacks.h tasn_fre.c +tasn_fre.o: ../../include/openssl/symhacks.h asn1_int.h tasn_fre.c tasn_new.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h tasn_new.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h tasn_new.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h @@ -688,7 +688,7 @@ tasn_new.o: ../../include/openssl/lhash.h ../../includ tasn_new.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h tasn_new.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h tasn_new.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -tasn_new.o: ../../include/openssl/symhacks.h tasn_new.c +tasn_new.o: ../../include/openssl/symhacks.h asn1_int.h tasn_new.c tasn_prn.o: ../../e_os.h ../../include/openssl/asn1.h tasn_prn.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h tasn_prn.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h Modified: stable/11/crypto/openssl/crypto/asn1/a_bitstr.c ============================================================================== --- stable/11/crypto/openssl/crypto/asn1/a_bitstr.c Thu Nov 2 18:27:32 2017 (r325336) +++ stable/11/crypto/openssl/crypto/asn1/a_bitstr.c Thu Nov 2 18:30:41 2017 (r325337) @@ -56,6 +56,7 @@ * [including the GNU Public Licence.] */ +#include #include #include "cryptlib.h" #include @@ -133,6 +134,11 @@ ASN1_BIT_STRING *c2i_ASN1_BIT_STRING(ASN1_BIT_STRING * if (len < 1) { i = ASN1_R_STRING_TOO_SHORT; + goto err; + } + + if (len > INT_MAX) { + i = ASN1_R_STRING_TOO_LONG; goto err; } Copied: stable/11/crypto/openssl/crypto/asn1/asn1_int.h (from r325328, head/crypto/openssl/crypto/asn1/asn1_int.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/11/crypto/openssl/crypto/asn1/asn1_int.h Thu Nov 2 18:30:41 2017 (r325337, copy of r325328, head/crypto/openssl/crypto/asn1/asn1_int.h) @@ -0,0 +1,63 @@ +/* asn1t.h */ +/* + * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project + * 2006. + */ +/* ==================================================================== + * Copyright (c) 2006 The OpenSSL Project. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. All advertising materials mentioning features or use of this + * software must display the following acknowledgment: + * "This product includes software developed by the OpenSSL Project + * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" + * + * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to + * endorse or promote products derived from this software without + * prior written permission. For written permission, please contact + * licensing@OpenSSL.org. + * + * 5. Products derived from this software may not be called "OpenSSL" + * nor may "OpenSSL" appear in their names without prior written + * permission of the OpenSSL Project. + * + * 6. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by the OpenSSL Project + * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" + * + * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY + * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * ==================================================================== + * + * This product includes cryptographic software written by Eric Young + * (eay@cryptsoft.com). This product includes software written by Tim + * Hudson (tjh@cryptsoft.com). + * + */ + +/* Internal ASN1 template structures and functions: not for application use */ + +void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it, + int combine); Modified: stable/11/crypto/openssl/crypto/asn1/tasn_fre.c ============================================================================== --- stable/11/crypto/openssl/crypto/asn1/tasn_fre.c Thu Nov 2 18:27:32 2017 (r325336) +++ stable/11/crypto/openssl/crypto/asn1/tasn_fre.c Thu Nov 2 18:30:41 2017 (r325337) @@ -61,10 +61,8 @@ #include #include #include +#include "asn1_int.h" -static void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it, - int combine); - /* Free up an ASN1 structure */ void ASN1_item_free(ASN1_VALUE *val, const ASN1_ITEM *it) @@ -77,8 +75,7 @@ void ASN1_item_ex_free(ASN1_VALUE **pval, const ASN1_I asn1_item_combine_free(pval, it, 0); } -static void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it, - int combine) +void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it, int combine) { const ASN1_TEMPLATE *tt = NULL, *seqtt; const ASN1_EXTERN_FUNCS *ef; Modified: stable/11/crypto/openssl/crypto/asn1/tasn_new.c ============================================================================== --- stable/11/crypto/openssl/crypto/asn1/tasn_new.c Thu Nov 2 18:27:32 2017 (r325336) +++ stable/11/crypto/openssl/crypto/asn1/tasn_new.c Thu Nov 2 18:30:41 2017 (r325337) @@ -63,6 +63,7 @@ #include #include #include +#include "asn1_int.h" static int asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it, int combine); @@ -199,7 +200,7 @@ static int asn1_item_ex_combine_new(ASN1_VALUE **pval, return 1; memerr2: - ASN1_item_ex_free(pval, it); + asn1_item_combine_free(pval, it, combine); memerr: ASN1err(ASN1_F_ASN1_ITEM_EX_COMBINE_NEW, ERR_R_MALLOC_FAILURE); #ifdef CRYPTO_MDEBUG @@ -209,7 +210,7 @@ static int asn1_item_ex_combine_new(ASN1_VALUE **pval, return 0; auxerr2: - ASN1_item_ex_free(pval, it); + asn1_item_combine_free(pval, it, combine); auxerr: ASN1err(ASN1_F_ASN1_ITEM_EX_COMBINE_NEW, ASN1_R_AUX_ERROR); #ifdef CRYPTO_MDEBUG Modified: stable/11/crypto/openssl/crypto/asn1/x_name.c ============================================================================== --- stable/11/crypto/openssl/crypto/asn1/x_name.c Thu Nov 2 18:27:32 2017 (r325336) +++ stable/11/crypto/openssl/crypto/asn1/x_name.c Thu Nov 2 18:30:41 2017 (r325337) @@ -523,19 +523,11 @@ static int i2d_name_canon(STACK_OF(STACK_OF_X509_NAME_ int X509_NAME_set(X509_NAME **xn, X509_NAME *name) { - X509_NAME *in; - - if (!xn || !name) - return (0); - - if (*xn != name) { - in = X509_NAME_dup(name); - if (in != NULL) { - X509_NAME_free(*xn); - *xn = in; - } - } - return (*xn != NULL); + if ((name = X509_NAME_dup(name)) == NULL) + return 0; + X509_NAME_free(*xn); + *xn = name; + return 1; } IMPLEMENT_STACK_OF(X509_NAME_ENTRY) Modified: stable/11/crypto/openssl/crypto/asn1/x_pkey.c ============================================================================== --- stable/11/crypto/openssl/crypto/asn1/x_pkey.c Thu Nov 2 18:27:32 2017 (r325336) +++ stable/11/crypto/openssl/crypto/asn1/x_pkey.c Thu Nov 2 18:30:41 2017 (r325337) @@ -106,10 +106,14 @@ X509_PKEY *X509_PKEY_new(void) X509_PKEY *ret = NULL; ASN1_CTX c; - M_ASN1_New_Malloc(ret, X509_PKEY); + ret = OPENSSL_malloc(sizeof(X509_PKEY)); + if (ret == NULL) { + c.line = __LINE__; + goto err; + } ret->version = 0; - M_ASN1_New(ret->enc_algor, X509_ALGOR_new); - M_ASN1_New(ret->enc_pkey, M_ASN1_OCTET_STRING_new); + ret->enc_algor = X509_ALGOR_new(); + ret->enc_pkey = M_ASN1_OCTET_STRING_new(); ret->dec_pkey = NULL; ret->key_length = 0; ret->key_data = NULL; @@ -117,8 +121,15 @@ X509_PKEY *X509_PKEY_new(void) ret->cipher.cipher = NULL; memset(ret->cipher.iv, 0, EVP_MAX_IV_LENGTH); ret->references = 1; - return (ret); - M_ASN1_New_Error(ASN1_F_X509_PKEY_NEW); + if (ret->enc_algor == NULL || ret->enc_pkey == NULL) { + c.line = __LINE__; + goto err; + } + return ret; +err: + X509_PKEY_free(ret); + ASN1_MAC_H_err(ASN1_F_X509_PKEY_NEW, ERR_R_MALLOC_FAILURE, c.line); + return NULL; } void X509_PKEY_free(X509_PKEY *x) Modified: stable/11/crypto/openssl/crypto/bn/asm/x86_64-mont5.pl ============================================================================== --- stable/11/crypto/openssl/crypto/bn/asm/x86_64-mont5.pl Thu Nov 2 18:27:32 2017 (r325336) +++ stable/11/crypto/openssl/crypto/bn/asm/x86_64-mont5.pl Thu Nov 2 18:30:41 2017 (r325337) @@ -3090,11 +3090,19 @@ $code.=<<___; .align 32 .Lsqrx8x_break: - sub 16+8(%rsp),%r8 # consume last carry + xor $zero,$zero + sub 16+8(%rsp),%rbx # mov 16(%rsp),%cf + adcx $zero,%r8 mov 24+8(%rsp),$carry # initial $tptr, borrow $carry + adcx $zero,%r9 mov 0*8($aptr),%rdx # a[8], modulo-scheduled - xor %ebp,%ebp # xor $zero,$zero + adc \$0,%r10 mov %r8,0*8($tptr) + adc \$0,%r11 + adc \$0,%r12 + adc \$0,%r13 + adc \$0,%r14 + adc \$0,%r15 cmp $carry,$tptr # cf=0, of=0 je .Lsqrx8x_outer_loop Modified: stable/11/crypto/openssl/crypto/bn/bn_exp.c ============================================================================== --- stable/11/crypto/openssl/crypto/bn/bn_exp.c Thu Nov 2 18:27:32 2017 (r325336) +++ stable/11/crypto/openssl/crypto/bn/bn_exp.c Thu Nov 2 18:30:41 2017 (r325337) @@ -145,7 +145,8 @@ int BN_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p int i, bits, ret = 0; BIGNUM *v, *rr; - if (BN_get_flags(p, BN_FLG_CONSTTIME) != 0) { + if (BN_get_flags(p, BN_FLG_CONSTTIME) != 0 + || BN_get_flags(a, BN_FLG_CONSTTIME) != 0) { /* BN_FLG_CONSTTIME only supported by BN_mod_exp_mont() */ BNerr(BN_F_BN_EXP, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return -1; @@ -245,7 +246,9 @@ int BN_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNU if (BN_is_odd(m)) { # ifdef MONT_EXP_WORD if (a->top == 1 && !a->neg - && (BN_get_flags(p, BN_FLG_CONSTTIME) == 0)) { + && (BN_get_flags(p, BN_FLG_CONSTTIME) == 0) + && (BN_get_flags(a, BN_FLG_CONSTTIME) == 0) + && (BN_get_flags(m, BN_FLG_CONSTTIME) == 0)) { BN_ULONG A = a->d[0]; ret = BN_mod_exp_mont_word(r, A, p, m, ctx, NULL); } else @@ -277,7 +280,9 @@ int BN_mod_exp_recp(BIGNUM *r, const BIGNUM *a, const BIGNUM *val[TABLE_SIZE]; BN_RECP_CTX recp; - if (BN_get_flags(p, BN_FLG_CONSTTIME) != 0) { + if (BN_get_flags(p, BN_FLG_CONSTTIME) != 0 + || BN_get_flags(a, BN_FLG_CONSTTIME) != 0 + || BN_get_flags(m, BN_FLG_CONSTTIME) != 0) { /* BN_FLG_CONSTTIME only supported by BN_mod_exp_mont() */ BNerr(BN_F_BN_MOD_EXP_RECP, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return -1; @@ -411,7 +416,9 @@ int BN_mod_exp_mont(BIGNUM *rr, const BIGNUM *a, const BIGNUM *val[TABLE_SIZE]; BN_MONT_CTX *mont = NULL; - if (BN_get_flags(p, BN_FLG_CONSTTIME) != 0) { + if (BN_get_flags(p, BN_FLG_CONSTTIME) != 0 + || BN_get_flags(a, BN_FLG_CONSTTIME) != 0 + || BN_get_flags(m, BN_FLG_CONSTTIME) != 0) { return BN_mod_exp_mont_consttime(rr, a, p, m, ctx, in_mont); } @@ -1217,7 +1224,8 @@ int BN_mod_exp_mont_word(BIGNUM *rr, BN_ULONG a, const #define BN_TO_MONTGOMERY_WORD(r, w, mont) \ (BN_set_word(r, (w)) && BN_to_montgomery(r, r, (mont), ctx)) - if (BN_get_flags(p, BN_FLG_CONSTTIME) != 0) { + if (BN_get_flags(p, BN_FLG_CONSTTIME) != 0 + || BN_get_flags(m, BN_FLG_CONSTTIME) != 0) { /* BN_FLG_CONSTTIME only supported by BN_mod_exp_mont() */ BNerr(BN_F_BN_MOD_EXP_MONT_WORD, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return -1; @@ -1348,7 +1356,9 @@ int BN_mod_exp_simple(BIGNUM *r, const BIGNUM *a, cons /* Table of variables obtained from 'ctx' */ BIGNUM *val[TABLE_SIZE]; - if (BN_get_flags(p, BN_FLG_CONSTTIME) != 0) { + if (BN_get_flags(p, BN_FLG_CONSTTIME) != 0 + || BN_get_flags(a, BN_FLG_CONSTTIME) != 0 + || BN_get_flags(m, BN_FLG_CONSTTIME) != 0) { /* BN_FLG_CONSTTIME only supported by BN_mod_exp_mont() */ BNerr(BN_F_BN_MOD_EXP_SIMPLE, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return -1; Modified: stable/11/crypto/openssl/crypto/bn/bn_lib.c ============================================================================== --- stable/11/crypto/openssl/crypto/bn/bn_lib.c Thu Nov 2 18:27:32 2017 (r325336) +++ stable/11/crypto/openssl/crypto/bn/bn_lib.c Thu Nov 2 18:30:41 2017 (r325337) @@ -524,6 +524,9 @@ BIGNUM *BN_copy(BIGNUM *a, const BIGNUM *b) memcpy(a->d, b->d, sizeof(b->d[0]) * b->top); #endif + if (BN_get_flags(b, BN_FLG_CONSTTIME) != 0) + BN_set_flags(a, BN_FLG_CONSTTIME); + a->top = b->top; a->neg = b->neg; bn_check_top(a); Modified: stable/11/crypto/openssl/crypto/bn/bn_mont.c ============================================================================== --- stable/11/crypto/openssl/crypto/bn/bn_mont.c Thu Nov 2 18:27:32 2017 (r325336) +++ stable/11/crypto/openssl/crypto/bn/bn_mont.c Thu Nov 2 18:30:41 2017 (r325337) @@ -394,6 +394,9 @@ int BN_MONT_CTX_set(BN_MONT_CTX *mont, const BIGNUM *m tmod.dmax = 2; tmod.neg = 0; + if (BN_get_flags(mod, BN_FLG_CONSTTIME) != 0) + BN_set_flags(&tmod, BN_FLG_CONSTTIME); + mont->ri = (BN_num_bits(mod) + (BN_BITS2 - 1)) / BN_BITS2 * BN_BITS2; # if defined(OPENSSL_BN_ASM_MONT) && (BN_BITS2<=32) Modified: stable/11/crypto/openssl/crypto/bn/bn_mul.c ============================================================================== --- stable/11/crypto/openssl/crypto/bn/bn_mul.c Thu Nov 2 18:27:32 2017 (r325336) +++ stable/11/crypto/openssl/crypto/bn/bn_mul.c Thu Nov 2 18:30:41 2017 (r325337) @@ -1032,46 +1032,6 @@ int BN_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b rr->top = top; goto end; } -# if 0 - if (i == 1 && !BN_get_flags(b, BN_FLG_STATIC_DATA)) { - BIGNUM *tmp_bn = (BIGNUM *)b; - if (bn_wexpand(tmp_bn, al) == NULL) - goto err; - tmp_bn->d[bl] = 0; - bl++; - i--; - } else if (i == -1 && !BN_get_flags(a, BN_FLG_STATIC_DATA)) { - BIGNUM *tmp_bn = (BIGNUM *)a; - if (bn_wexpand(tmp_bn, bl) == NULL) - goto err; - tmp_bn->d[al] = 0; - al++; - i++; - } - if (i == 0) { - /* symmetric and > 4 */ - /* 16 or larger */ - j = BN_num_bits_word((BN_ULONG)al); - j = 1 << (j - 1); - k = j + j; - t = BN_CTX_get(ctx); - if (al == j) { /* exact multiple */ - if (bn_wexpand(t, k * 2) == NULL) - goto err; - if (bn_wexpand(rr, k * 2) == NULL) - goto err; - bn_mul_recursive(rr->d, a->d, b->d, al, t->d); - } else { - if (bn_wexpand(t, k * 4) == NULL) - goto err; - if (bn_wexpand(rr, k * 4) == NULL) - goto err; - bn_mul_part_recursive(rr->d, a->d, b->d, al - j, j, t->d); - } - rr->top = top; - goto end; - } -# endif } #endif /* BN_RECURSION */ if (bn_wexpand(rr, top) == NULL) Modified: stable/11/crypto/openssl/crypto/bn/bn_x931p.c ============================================================================== --- stable/11/crypto/openssl/crypto/bn/bn_x931p.c Thu Nov 2 18:27:32 2017 (r325336) +++ stable/11/crypto/openssl/crypto/bn/bn_x931p.c Thu Nov 2 18:30:41 2017 (r325337) @@ -217,6 +217,8 @@ int BN_X931_generate_Xpq(BIGNUM *Xp, BIGNUM *Xq, int n BN_CTX_start(ctx); t = BN_CTX_get(ctx); + if (t == NULL) + goto err; for (i = 0; i < 1000; i++) { if (!BN_rand(Xq, nbits, 1, 0)) @@ -255,10 +257,12 @@ int BN_X931_generate_prime_ex(BIGNUM *p, BIGNUM *p1, B int ret = 0; BN_CTX_start(ctx); - if (!Xp1) + if (Xp1 == NULL) Xp1 = BN_CTX_get(ctx); - if (!Xp2) + if (Xp2 == NULL) Xp2 = BN_CTX_get(ctx); + if (Xp1 == NULL || Xp2 == NULL) + goto error; if (!BN_rand(Xp1, 101, 0, 0)) goto error; Modified: stable/11/crypto/openssl/crypto/cryptlib.c ============================================================================== --- stable/11/crypto/openssl/crypto/cryptlib.c Thu Nov 2 18:27:32 2017 (r325336) +++ stable/11/crypto/openssl/crypto/cryptlib.c Thu Nov 2 18:30:41 2017 (r325337) @@ -469,11 +469,18 @@ void CRYPTO_THREADID_set_pointer(CRYPTO_THREADID *id, } } +#ifdef OPENSSL_FIPS +extern int FIPS_crypto_threadid_set_callback(void (*func) (CRYPTO_THREADID *)); +#endif + int CRYPTO_THREADID_set_callback(void (*func) (CRYPTO_THREADID *)) { if (threadid_callback) return 0; threadid_callback = func; +#ifdef OPENSSL_FIPS + FIPS_crypto_threadid_set_callback(func); +#endif return 1; } Modified: stable/11/crypto/openssl/crypto/dh/Makefile ============================================================================== --- stable/11/crypto/openssl/crypto/dh/Makefile Thu Nov 2 18:27:32 2017 (r325336) +++ stable/11/crypto/openssl/crypto/dh/Makefile Thu Nov 2 18:30:41 2017 (r325337) @@ -134,7 +134,7 @@ dh_gen.o: ../../include/openssl/opensslconf.h ../../in dh_gen.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h dh_gen.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h dh_gen.o: ../cryptlib.h dh_gen.c -dh_kdf.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h +dh_kdf.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h dh_kdf.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h dh_kdf.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h dh_kdf.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h Modified: stable/11/crypto/openssl/crypto/dh/dh.h ============================================================================== --- stable/11/crypto/openssl/crypto/dh/dh.h Thu Nov 2 18:27:32 2017 (r325336) +++ stable/11/crypto/openssl/crypto/dh/dh.h Thu Nov 2 18:30:41 2017 (r325337) @@ -257,11 +257,13 @@ DH *DH_get_1024_160(void); DH *DH_get_2048_224(void); DH *DH_get_2048_256(void); +# ifndef OPENSSL_NO_CMS /* RFC2631 KDF */ int DH_KDF_X9_42(unsigned char *out, size_t outlen, const unsigned char *Z, size_t Zlen, ASN1_OBJECT *key_oid, const unsigned char *ukm, size_t ukmlen, const EVP_MD *md); +# endif # define EVP_PKEY_CTX_set_dh_paramgen_prime_len(ctx, len) \ EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DH, EVP_PKEY_OP_PARAMGEN, \ Modified: stable/11/crypto/openssl/crypto/dh/dh_kdf.c ============================================================================== --- stable/11/crypto/openssl/crypto/dh/dh_kdf.c Thu Nov 2 18:27:32 2017 (r325336) +++ stable/11/crypto/openssl/crypto/dh/dh_kdf.c Thu Nov 2 18:30:41 2017 (r325337) @@ -51,6 +51,9 @@ * ==================================================================== */ +#include + +#ifndef OPENSSL_NO_CMS #include #include #include @@ -185,3 +188,4 @@ int DH_KDF_X9_42(unsigned char *out, size_t outlen, EVP_MD_CTX_cleanup(&mctx); return rv; } +#endif Modified: stable/11/crypto/openssl/crypto/dh/dh_pmeth.c ============================================================================== --- stable/11/crypto/openssl/crypto/dh/dh_pmeth.c Thu Nov 2 18:27:32 2017 (r325336) +++ stable/11/crypto/openssl/crypto/dh/dh_pmeth.c Thu Nov 2 18:30:41 2017 (r325337) @@ -207,7 +207,11 @@ static int pkey_dh_ctrl(EVP_PKEY_CTX *ctx, int type, i case EVP_PKEY_CTRL_DH_KDF_TYPE: if (p1 == -2) return dctx->kdf_type; +#ifdef OPENSSL_NO_CMS + if (p1 != EVP_PKEY_DH_KDF_NONE) +#else if (p1 != EVP_PKEY_DH_KDF_NONE && p1 != EVP_PKEY_DH_KDF_X9_42) +#endif return -2; dctx->kdf_type = p1; return 1; @@ -448,7 +452,9 @@ static int pkey_dh_derive(EVP_PKEY_CTX *ctx, unsigned return ret; *keylen = ret; return 1; - } else if (dctx->kdf_type == EVP_PKEY_DH_KDF_X9_42) { + } +#ifndef OPENSSL_NO_CMS + else if (dctx->kdf_type == EVP_PKEY_DH_KDF_X9_42) { unsigned char *Z = NULL; size_t Zlen = 0; if (!dctx->kdf_outlen || !dctx->kdf_oid) @@ -479,6 +485,7 @@ static int pkey_dh_derive(EVP_PKEY_CTX *ctx, unsigned } return ret; } +#endif return 1; } Modified: stable/11/crypto/openssl/crypto/dsa/dsa_ameth.c ============================================================================== --- stable/11/crypto/openssl/crypto/dsa/dsa_ameth.c Thu Nov 2 18:27:32 2017 (r325336) +++ stable/11/crypto/openssl/crypto/dsa/dsa_ameth.c Thu Nov 2 18:30:41 2017 (r325337) @@ -258,6 +258,7 @@ static int dsa_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_ goto dsaerr; } + BN_set_flags(dsa->priv_key, BN_FLG_CONSTTIME); if (!BN_mod_exp(dsa->pub_key, dsa->g, dsa->priv_key, dsa->p, ctx)) { DSAerr(DSA_F_DSA_PRIV_DECODE, DSA_R_BN_ERROR); goto dsaerr; Modified: stable/11/crypto/openssl/crypto/dsa/dsa_gen.c ============================================================================== --- stable/11/crypto/openssl/crypto/dsa/dsa_gen.c Thu Nov 2 18:27:32 2017 (r325336) +++ stable/11/crypto/openssl/crypto/dsa/dsa_gen.c Thu Nov 2 18:30:41 2017 (r325337) @@ -482,6 +482,8 @@ int dsa_builtin_paramgen2(DSA *ret, size_t L, size_t N } else { p = BN_CTX_get(ctx); q = BN_CTX_get(ctx); + if (q == NULL) + goto err; } if (!BN_lshift(test, BN_value_one(), L - 1)) Modified: stable/11/crypto/openssl/crypto/dsa/dsa_ossl.c ============================================================================== --- stable/11/crypto/openssl/crypto/dsa/dsa_ossl.c Thu Nov 2 18:27:32 2017 (r325336) +++ stable/11/crypto/openssl/crypto/dsa/dsa_ossl.c Thu Nov 2 18:30:41 2017 (r325337) @@ -224,7 +224,9 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BI { BN_CTX *ctx; BIGNUM k, kq, *K, *kinv = NULL, *r = NULL; + BIGNUM l, m; int ret = 0; + int q_bits; if (!dsa->p || !dsa->q || !dsa->g) { DSAerr(DSA_F_DSA_SIGN_SETUP, DSA_R_MISSING_PARAMETERS); @@ -233,6 +235,8 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BI BN_init(&k); BN_init(&kq); + BN_init(&l); + BN_init(&m); if (ctx_in == NULL) { if ((ctx = BN_CTX_new()) == NULL) @@ -243,6 +247,13 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BI if ((r = BN_new()) == NULL) goto err; + /* Preallocate space */ + q_bits = BN_num_bits(dsa->q); + if (!BN_set_bit(&k, q_bits) + || !BN_set_bit(&l, q_bits) + || !BN_set_bit(&m, q_bits)) + goto err; + /* Get random k */ do if (!BN_rand_range(&k, dsa->q)) @@ -263,25 +274,24 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BI /* Compute r = (g^k mod p) mod q */ if ((dsa->flags & DSA_FLAG_NO_EXP_CONSTTIME) == 0) { - if (!BN_copy(&kq, &k)) - goto err; - - BN_set_flags(&kq, BN_FLG_CONSTTIME); - /* * We do not want timing information to leak the length of k, so we - * compute g^k using an equivalent exponent of fixed length. (This - * is a kludge that we need because the BN_mod_exp_mont() does not - * let us specify the desired timing behaviour.) + * compute G^k using an equivalent scalar of fixed bit-length. + * + * We unconditionally perform both of these additions to prevent a + * small timing information leakage. We then choose the sum that is + * one bit longer than the modulus. + * *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Thu Nov 2 19:45: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 04715E61D77; Thu, 2 Nov 2017 19:45:53 +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 BEE8D66C38; Thu, 2 Nov 2017 19:45:52 +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 vA2Jjpkk015860; Thu, 2 Nov 2017 19:45:51 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA2JjpbA015859; Thu, 2 Nov 2017 19:45:51 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201711021945.vA2JjpbA015859@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Thu, 2 Nov 2017 19:45:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325338 - head/sys/boot/i386/loader X-SVN-Group: head X-SVN-Commit-Author: avg X-SVN-Commit-Paths: head/sys/boot/i386/loader X-SVN-Commit-Revision: 325338 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: Thu, 02 Nov 2017 19:45:53 -0000 Author: avg Date: Thu Nov 2 19:45:51 2017 New Revision: 325338 URL: https://svnweb.freebsd.org/changeset/base/325338 Log: loader: fix BOOTSRC -> BOOTOBJ in a library path Modified: head/sys/boot/i386/loader/Makefile Modified: head/sys/boot/i386/loader/Makefile ============================================================================== --- head/sys/boot/i386/loader/Makefile Thu Nov 2 18:30:41 2017 (r325337) +++ head/sys/boot/i386/loader/Makefile Thu Nov 2 19:45:51 2017 (r325338) @@ -26,7 +26,7 @@ SRCS= main.c conf.c vers.c chain.c # Put LOADER_FIREWIRE_SUPPORT=yes in /etc/make.conf for FireWire/dcons support .if defined(LOADER_FIREWIRE_SUPPORT) CFLAGS+= -DLOADER_FIREWIRE_SUPPORT -LIBFIREWIRE= ${BOOTSRC}/i386/libfirewire/libfirewire.a +LIBFIREWIRE= ${BOOTOBJ}/i386/libfirewire/libfirewire.a .endif # Set by zfsloader Makefile From owner-svn-src-all@freebsd.org Thu Nov 2 19:53: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 D1187E61F52; Thu, 2 Nov 2017 19:53:52 +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 95CDF670F9; Thu, 2 Nov 2017 19:53:52 +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 vA2JrpwX019993; Thu, 2 Nov 2017 19:53:51 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA2JrpZT019992; Thu, 2 Nov 2017 19:53:51 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201711021953.vA2JrpZT019992@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Thu, 2 Nov 2017 19:53:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325339 - head/sys/boot/i386/loader X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/sys/boot/i386/loader X-SVN-Commit-Revision: 325339 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: Thu, 02 Nov 2017 19:53:52 -0000 Author: imp Date: Thu Nov 2 19:53:51 2017 New Revision: 325339 URL: https://svnweb.freebsd.org/changeset/base/325339 Log: This used to have bzip2 support too. Modified: head/sys/boot/i386/loader/Makefile Modified: head/sys/boot/i386/loader/Makefile ============================================================================== --- head/sys/boot/i386/loader/Makefile Thu Nov 2 19:45:51 2017 (r325338) +++ head/sys/boot/i386/loader/Makefile Thu Nov 2 19:53:51 2017 (r325339) @@ -19,6 +19,7 @@ LOADER_EXT2FS_SUPPORT?= no LOADER_MSDOS_SUPPORT?= no LOADER_UFS_SUPPORT?= yes LOADER_GZIP_SUPPORT?= yes +LOADER_BZIP2_SUPPORT?= yes # architecture-specific loader code SRCS= main.c conf.c vers.c chain.c From owner-svn-src-all@freebsd.org Thu Nov 2 20:08:03 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 C4EBAE6218C; Thu, 2 Nov 2017 20:08:03 +0000 (UTC) (envelope-from sjg@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 908796759C; Thu, 2 Nov 2017 20:08:03 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA2K8298024273; Thu, 2 Nov 2017 20:08:02 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA2K80pQ024246; Thu, 2 Nov 2017 20:08:00 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201711022008.vA2K80pQ024246@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Thu, 2 Nov 2017 20:08:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325340 - in head: contrib/bmake contrib/bmake/mk contrib/bmake/unit-tests usr.bin/bmake X-SVN-Group: head X-SVN-Commit-Author: sjg X-SVN-Commit-Paths: in head: contrib/bmake contrib/bmake/mk contrib/bmake/unit-tests usr.bin/bmake X-SVN-Commit-Revision: 325340 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: Thu, 02 Nov 2017 20:08:03 -0000 Author: sjg Date: Thu Nov 2 20:08:00 2017 New Revision: 325340 URL: https://svnweb.freebsd.org/changeset/base/325340 Log: Update to bmake-20171028 Ignore empty MAKEOBJDIR[PREFIX] Reported by: bdrewery Added: head/contrib/bmake/VERSION - copied unchanged from r325339, vendor/NetBSD/bmake/dist/VERSION Modified: head/contrib/bmake/ChangeLog head/contrib/bmake/FILES head/contrib/bmake/Makefile head/contrib/bmake/Makefile.config.in head/contrib/bmake/bsd.after-import.mk head/contrib/bmake/configure head/contrib/bmake/configure.in head/contrib/bmake/machine.sh head/contrib/bmake/main.c head/contrib/bmake/make-bootstrap.sh.in head/contrib/bmake/meta.c head/contrib/bmake/mk/ChangeLog head/contrib/bmake/mk/autoconf.mk head/contrib/bmake/mk/dirdeps.mk head/contrib/bmake/mk/dpadd.mk head/contrib/bmake/mk/gendirdeps.mk head/contrib/bmake/mk/install-mk head/contrib/bmake/mk/meta.autodep.mk head/contrib/bmake/mk/meta.stage.mk head/contrib/bmake/mk/sys.clean-env.mk head/contrib/bmake/mk/whats.mk head/contrib/bmake/os.sh head/contrib/bmake/unit-tests/dotwait.exp head/contrib/bmake/unit-tests/dotwait.mk head/usr.bin/bmake/Makefile head/usr.bin/bmake/Makefile.config head/usr.bin/bmake/config.h Directory Properties: head/contrib/bmake/ (props changed) Modified: head/contrib/bmake/ChangeLog ============================================================================== --- head/contrib/bmake/ChangeLog Thu Nov 2 19:53:51 2017 (r325339) +++ head/contrib/bmake/ChangeLog Thu Nov 2 20:08:00 2017 (r325340) @@ -1,3 +1,36 @@ +2017-10-28 Simon J. Gerraty + + * VERSION: 20171028 + Merge with NetBSD make, pick up + o main.c: ignore empty MAKEOBJDIR + + * Makefile.config.in: + make @prefix@ @machine*@ and @default_sys_path@ defaults. + +2017-10-05 Simon J. Gerraty + + * VERSION: 20171005 + + * unit-tests/dotwait.mk: redirect stderr through pipe for more + consistent result on some platforms. + +2017-08-13 Simon J. Gerraty + + * machine.sh: entry for AIX + +2017-08-12 Simon J. Gerraty + + * VERSION (_MAKE_VERSION): Move the setting of _MAKE_VERSION + to a file that can be included by configure as well as make. + This allows configure to set set _MAKE_VERSION in make-bootstrap.sh + +2017-08-10 Simon J. Gerraty + + * Makefile (_MAKE_VERSION): 20170810 + Merge with NetBSD make, pick up + o meta.c: if target is in subdir we only need subdir name in + meta_name. + 2017-07-20 Simon J. Gerraty * Makefile (_MAKE_VERSION): 20170720 Modified: head/contrib/bmake/FILES ============================================================================== --- head/contrib/bmake/FILES Thu Nov 2 19:53:51 2017 (r325339) +++ head/contrib/bmake/FILES Thu Nov 2 20:08:00 2017 (r325340) @@ -5,6 +5,7 @@ Makefile.config.in PSD.doc/Makefile PSD.doc/tutorial.ms README +VERSION aclocal.m4 arch.c bmake.1 Modified: head/contrib/bmake/Makefile ============================================================================== --- head/contrib/bmake/Makefile Thu Nov 2 19:53:51 2017 (r325339) +++ head/contrib/bmake/Makefile Thu Nov 2 20:08:00 2017 (r325340) @@ -1,8 +1,5 @@ -# $Id: Makefile,v 1.95 2017/07/20 19:36:13 sjg Exp $ +# $Id: Makefile,v 1.99 2017/08/13 20:12:53 sjg Exp $ -# Base version on src date -_MAKE_VERSION= 20170720 - PROG= bmake SRCS= \ @@ -58,6 +55,8 @@ SRCS+= \ lstReplace.c \ lstSucc.c +.-include "VERSION" + # this file gets generated by configure .-include "Makefile.config" @@ -192,11 +191,13 @@ MANDIR= ${MANDIR.bmake:U${SHAREDIR}/man} ${OBJS}: config.h .endif +# start-delete2 for bsd.after-import.mk + # make sure that MAKE_VERSION gets updated. -main.o: ${SRCS} ${MAKEFILE} +main.o: ${SRCS} ${.CURDIR}/VERSION -# start-delete2 for bsd.after-import.mk .if ${MK_AUTOCONF_MK} == "yes" +CONFIGURE_DEPS += ${.CURDIR}/VERSION .include .endif SHARE_MK?=${SHAREDIR}/mk Modified: head/contrib/bmake/Makefile.config.in ============================================================================== --- head/contrib/bmake/Makefile.config.in Thu Nov 2 19:53:51 2017 (r325339) +++ head/contrib/bmake/Makefile.config.in Thu Nov 2 20:08:00 2017 (r325340) @@ -1,11 +1,13 @@ # things set by configure -prefix= @prefix@ +_MAKE_VERSION=@_MAKE_VERSION@ + +prefix?= @prefix@ srcdir= @srcdir@ CC?= @CC@ -MACHINE= @machine@ -MACHINE_ARCH= @machine_arch@ -DEFAULT_SYS_PATH= @default_sys_path@ +MACHINE?= @machine@ +MACHINE_ARCH?= @machine_arch@ +DEFAULT_SYS_PATH?= @default_sys_path@ CPPFLAGS+= @CPPFLAGS@ CFLAGS+= ${CPPFLAGS} @DEFS@ @@ -17,4 +19,3 @@ FILEMON_H= @filemon_h@ BMAKE_PATH_MAX?= @bmake_path_max@ # used if MAXPATHLEN not defined CPPFLAGS+= -DBMAKE_PATH_MAX=${BMAKE_PATH_MAX} - Copied: head/contrib/bmake/VERSION (from r325339, vendor/NetBSD/bmake/dist/VERSION) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/contrib/bmake/VERSION Thu Nov 2 20:08:00 2017 (r325340, copy of r325339, vendor/NetBSD/bmake/dist/VERSION) @@ -0,0 +1,2 @@ +# keep this compatible with sh and make +_MAKE_VERSION=20171028 Modified: head/contrib/bmake/bsd.after-import.mk ============================================================================== --- head/contrib/bmake/bsd.after-import.mk Thu Nov 2 19:53:51 2017 (r325339) +++ head/contrib/bmake/bsd.after-import.mk Thu Nov 2 20:08:00 2017 (r325340) @@ -1,4 +1,4 @@ -# $Id: bsd.after-import.mk,v 1.12 2014/02/14 23:45:49 sjg Exp $ +# $Id: bsd.after-import.mk,v 1.13 2017/08/13 00:56:10 sjg Exp $ # This makefile is for use when integrating bmake into a BSD build # system. Use this makefile after importing bmake. @@ -56,6 +56,7 @@ bootstrap: ${BMAKE_SRC}/boot-strap ${MAKEFILE} # Makefiles need a little more tweaking than say config.h MAKEFILE_SED = sed -e '/^MACHINE/d' \ + -e '/include.*VERSION/d' \ -e '/^PROG/ { s,=,?=,;s,bmake,$${.CURDIR:T},; }' \ -e 's,^.-include,.sinclude,' \ -e '/^\..*include * #ifndef lint @@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 #if 0 static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: main.c,v 1.272 2017/06/19 19:58:24 christos Exp $"); +__RCSID("$NetBSD: main.c,v 1.273 2017/10/28 21:54:54 sjg Exp $"); #endif #endif /* not lint */ #endif @@ -792,7 +792,8 @@ Main_SetVarObjdir(const char *var, const char *suffix) { char *p, *path, *xpath; - if ((path = Var_Value(var, VAR_CMD, &p)) == NULL) + if ((path = Var_Value(var, VAR_CMD, &p)) == NULL || + *path == '\0') return FALSE; /* expand variable substitutions */ Modified: head/contrib/bmake/make-bootstrap.sh.in ============================================================================== --- head/contrib/bmake/make-bootstrap.sh.in Thu Nov 2 19:53:51 2017 (r325339) +++ head/contrib/bmake/make-bootstrap.sh.in Thu Nov 2 20:08:00 2017 (r325340) @@ -13,7 +13,7 @@ esac CC="@CC@" CFLAGS="@CFLAGS@ -I. -I${srcdir} @DEFS@ @CPPFLAGS@ -DMAKE_NATIVE ${XDEFS} -DBMAKE_PATH_MAX=@bmake_path_max@" -MAKE_VERSION=`sed -n '/^_MAKE_VERSION=/s,.*=[^0-9]*,,p' $srcdir/Makefile` +MAKE_VERSION=@_MAKE_VERSION@ MDEFS="-DMAKE_VERSION=\"$MAKE_VERSION\" \ -D@force_machine@MACHINE=\"@machine@\" -DMACHINE_ARCH=\"@machine_arch@\" \ Modified: head/contrib/bmake/meta.c ============================================================================== --- head/contrib/bmake/meta.c Thu Nov 2 19:53:51 2017 (r325339) +++ head/contrib/bmake/meta.c Thu Nov 2 20:08:00 2017 (r325340) @@ -1,4 +1,4 @@ -/* $NetBSD: meta.c,v 1.68 2017/07/09 04:54:00 sjg Exp $ */ +/* $NetBSD: meta.c,v 1.69 2017/08/10 21:07:48 sjg Exp $ */ /* * Implement 'meta' mode. @@ -250,6 +250,8 @@ meta_name(char *mname, size_t mnamelen, char *rp; char *cp; char *tp; + char *dtp; + size_t ldname; /* * Weed out relative paths from the target file name. @@ -286,10 +288,15 @@ meta_name(char *mname, size_t mnamelen, } /* on some systems dirname may modify its arg */ tp = bmake_strdup(tname); - if (strcmp(dname, dirname(tp)) == 0) + dtp = dirname(tp); + if (strcmp(dname, dtp) == 0) snprintf(mname, mnamelen, "%s.meta", tname); else { - snprintf(mname, mnamelen, "%s/%s.meta", dname, tname); + ldname = strlen(dname); + if (strncmp(dname, dtp, ldname) == 0 && dtp[ldname] == '/') + snprintf(mname, mnamelen, "%s/%s.meta", dname, &tname[ldname+1]); + else + snprintf(mname, mnamelen, "%s/%s.meta", dname, tname); /* * Replace path separators in the file name after the Modified: head/contrib/bmake/mk/ChangeLog ============================================================================== --- head/contrib/bmake/mk/ChangeLog Thu Nov 2 19:53:51 2017 (r325339) +++ head/contrib/bmake/mk/ChangeLog Thu Nov 2 20:08:00 2017 (r325340) @@ -1,3 +1,21 @@ +2017-10-25 Simon J. Gerraty + + * Allow for host32 on rare occasions. + +2017-10-18 Simon J. Gerraty + + * install-mk (MK_VERSION): 20171018 + + * whats.mk: include what_thing in what_uuid to avoid problem + when building multiple apps in the same directory. + +2017-08-12 Simon J. Gerraty + + * install-mk (MK_VERSION): 20170812 + + * autoconf.mk: Use CONFIGURE_DEPS so Makefile can + add dependencies for config.recheck and config.gen + 2017-06-30 Simon J. Gerraty * install-mk (MK_VERSION): 20170630 Modified: head/contrib/bmake/mk/autoconf.mk ============================================================================== --- head/contrib/bmake/mk/autoconf.mk Thu Nov 2 19:53:51 2017 (r325339) +++ head/contrib/bmake/mk/autoconf.mk Thu Nov 2 20:08:00 2017 (r325340) @@ -1,4 +1,4 @@ -# $Id: autoconf.mk,v 1.8 2012/11/19 05:37:48 sjg Exp $ +# $Id: autoconf.mk,v 1.9 2017/08/13 20:03:13 sjg Exp $ # # @(#) Copyright (c) 1996-2009, Simon J. Gerraty # @@ -15,8 +15,10 @@ .NOPATH: config.h config.status +CONFIGURE_DEPS += ${.CURDIR}/config.h.in ${.CURDIR}/configure + .if !target(config.h) -config.h: ${.CURDIR}/config.h.in config.status +config.h: ${CONFIGURE_DEPS} config.status ./config.status .endif @@ -28,11 +30,11 @@ config.status: config.recheck config.status: config.gen .endif -config.recheck: config.h.in ${.CURDIR}/configure +config.recheck: ${CONFIGURE_DEPS} ./config.status --recheck @touch $@ -config.gen: config.h.in ${.CURDIR}/configure +config.gen: ${CONFIGURE_DEPS} CC="${CC} ${CCMODE}" ${.CURDIR}/configure --no-create ${CONFIGURE_ARGS} @touch $@ config.recheck Modified: head/contrib/bmake/mk/dirdeps.mk ============================================================================== --- head/contrib/bmake/mk/dirdeps.mk Thu Nov 2 19:53:51 2017 (r325339) +++ head/contrib/bmake/mk/dirdeps.mk Thu Nov 2 20:08:00 2017 (r325340) @@ -1,4 +1,4 @@ -# $Id: dirdeps.mk,v 1.89 2017/05/17 17:41:47 sjg Exp $ +# $Id: dirdeps.mk,v 1.90 2017/10/25 23:44:20 sjg Exp $ # Copyright (c) 2010-2013, Juniper Networks, Inc. # All rights reserved. @@ -536,9 +536,13 @@ _machines := ${DEP_MACHINE} # this is the machine list we actually use below _machines := ${_only_machines} -.if defined(HOSTPROG) || ${DEP_MACHINE} == "host" +.if defined(HOSTPROG) || ${DEP_MACHINE:Nhost*} == "" # we need to build this guy's dependencies for host as well. +.if ${DEP_MACHINE:Nhost*} == "" +_machines += ${DEP_MACHINE} +.else _machines += host +.endif .endif _machines := ${_machines:O:u} Modified: head/contrib/bmake/mk/dpadd.mk ============================================================================== --- head/contrib/bmake/mk/dpadd.mk Thu Nov 2 19:53:51 2017 (r325339) +++ head/contrib/bmake/mk/dpadd.mk Thu Nov 2 20:08:00 2017 (r325340) @@ -1,4 +1,4 @@ -# $Id: dpadd.mk,v 1.23 2017/02/13 16:46:01 sjg Exp $ +# $Id: dpadd.mk,v 1.24 2017/10/25 23:44:20 sjg Exp $ # # @(#) Copyright (c) 2004, Simon J. Gerraty # @@ -195,7 +195,7 @@ __dpadd_incs += ${__dpadd_libs:O:u:@s@${SRC_LIBS_${s:T __dpadd_last_incs += ${__dpadd_libs:u:@x@${INCLUDES_LAST_${x:T:R}}@} __dpadd_last_incs += ${__dpadd_libs:O:u:@s@${SRC_LIBS_${s:T:R}:U}@:@x@${INCLUDES_LAST_${x:T:R}}@} -.if defined(HOSTPROG) || ${MACHINE} == "host" +.if defined(HOSTPROG) || ${MACHINE:Nhost*} == "" # we want any -I/usr/* last __dpadd_last_incs := \ ${__dpadd_last_incs:N-I/usr/*} \ Modified: head/contrib/bmake/mk/gendirdeps.mk ============================================================================== --- head/contrib/bmake/mk/gendirdeps.mk Thu Nov 2 19:53:51 2017 (r325339) +++ head/contrib/bmake/mk/gendirdeps.mk Thu Nov 2 20:08:00 2017 (r325340) @@ -1,4 +1,4 @@ -# $Id: gendirdeps.mk,v 1.33 2016/10/11 22:37:28 sjg Exp $ +# $Id: gendirdeps.mk,v 1.34 2017/10/26 00:46:26 sjg Exp $ # Copyright (c) 2010-2013, Juniper Networks, Inc. # All rights reserved. @@ -194,7 +194,7 @@ dpadd_dir_list += ${f:H:tA} .endfor .if !empty(ddep_list) ddeps != cat ${ddep_list:O:u} | ${META2DEPS_FILTER} ${_skip_gendirdeps} \ - sed 's,//*$$,,;s,\.${HOST_TARGET}$$,.host,;s,\.${MACHINE}$$,,' + sed 's,//*$$,,;s,\.${HOST_TARGET:Uhost}$$,.host,;s,\.${HOST_TARGET32:Uhost32}$$,.host32,;s,\.${MACHINE}$$,,' .if ${DEBUG_GENDIRDEPS:Uno:@x@${RELDIR:M$x}@} != "" .info ${RELDIR}: raw_dir_list='${dir_list}' Modified: head/contrib/bmake/mk/install-mk ============================================================================== --- head/contrib/bmake/mk/install-mk Thu Nov 2 19:53:51 2017 (r325339) +++ head/contrib/bmake/mk/install-mk Thu Nov 2 20:08:00 2017 (r325340) @@ -55,7 +55,7 @@ # Simon J. Gerraty # RCSid: -# $Id: install-mk,v 1.148 2017/06/30 23:46:15 sjg Exp $ +# $Id: install-mk,v 1.150 2017/10/19 03:50:51 sjg Exp $ # # @(#) Copyright (c) 1994 Simon J. Gerraty # @@ -70,7 +70,7 @@ # sjg@crufty.net # -MK_VERSION=20170630 +MK_VERSION=20171018 OWNER= GROUP= MODE=444 Modified: head/contrib/bmake/mk/meta.autodep.mk ============================================================================== --- head/contrib/bmake/mk/meta.autodep.mk Thu Nov 2 19:53:51 2017 (r325339) +++ head/contrib/bmake/mk/meta.autodep.mk Thu Nov 2 20:08:00 2017 (r325340) @@ -1,4 +1,4 @@ -# $Id: meta.autodep.mk,v 1.45 2016/06/03 17:22:32 sjg Exp $ +# $Id: meta.autodep.mk,v 1.46 2017/10/25 23:44:20 sjg Exp $ # # @(#) Copyright (c) 2010, Simon J. Gerraty @@ -261,7 +261,7 @@ META_FILES = ${.MAKE.META.FILES:T:N.depend*:N*o.meta:O _makesyspath:= ${_PARSEDIR} ${_DEPENDFILE}: ${_depend} ${.PARSEDIR}/gendirdeps.mk ${META2DEPS} $${.MAKE.META.CREATED} @echo Checking $@: ${.OODATE:T:[1..8]} - @(cd . && \ + @(cd . && ${GENDIRDEPS_ENV} \ SKIP_GENDIRDEPS='${SKIP_GENDIRDEPS:O:u}' \ DPADD='${FORCE_DPADD:O:u}' ${_gendirdeps_mutex} \ MAKESYSPATH=${_makesyspath} \ Modified: head/contrib/bmake/mk/meta.stage.mk ============================================================================== --- head/contrib/bmake/mk/meta.stage.mk Thu Nov 2 19:53:51 2017 (r325339) +++ head/contrib/bmake/mk/meta.stage.mk Thu Nov 2 20:08:00 2017 (r325340) @@ -1,4 +1,4 @@ -# $Id: meta.stage.mk,v 1.54 2017/07/06 23:20:33 sjg Exp $ +# $Id: meta.stage.mk,v 1.55 2017/10/27 01:17:09 sjg Exp $ # # @(#) Copyright (c) 2011-2017, Simon J. Gerraty # @@ -20,9 +20,9 @@ .if ${.MAKE.DEPENDFILE_PREFERENCE:U${.MAKE.DEPENDFILE}:M*.${MACHINE}} != "" # this is generally safer anyway -_dirdep = ${RELDIR}.${MACHINE} +_dirdep ?= ${RELDIR}.${MACHINE} .else -_dirdep = ${RELDIR} +_dirdep ?= ${RELDIR} .endif CLEANFILES+= .dirdep Modified: head/contrib/bmake/mk/sys.clean-env.mk ============================================================================== --- head/contrib/bmake/mk/sys.clean-env.mk Thu Nov 2 19:53:51 2017 (r325339) +++ head/contrib/bmake/mk/sys.clean-env.mk Thu Nov 2 20:08:00 2017 (r325340) @@ -1,4 +1,4 @@ -# $Id: sys.clean-env.mk,v 1.21 2016/02/18 21:16:40 sjg Exp $ +# $Id: sys.clean-env.mk,v 1.22 2017/10/25 23:44:20 sjg Exp $ # # @(#) Copyright (c) 2009, Simon J. Gerraty # @@ -97,7 +97,7 @@ _objroot := ${OBJROOT:U${SB_OBJROOT:U${SB}/${SB_OBJPRE .if ${MAKE_VERSION} < 20160218 _objtop := ${OBJTOP:U${_objroot}${MACHINE}} # Take care of ${MACHINE} -.if ${MACHINE} == "host" || ${OBJTOP} == ${HOST_OBJTOP:Uno} +.if ${MACHINE:Nhost*} == "" || ${OBJTOP} == ${HOST_OBJTOP:Uno} OBJTOP = ${_objtop:S,${HOST_TARGET}$,\${MACHINE},} .else OBJTOP = ${_objtop:S,${MACHINE}$,\${MACHINE},} Modified: head/contrib/bmake/mk/whats.mk ============================================================================== --- head/contrib/bmake/mk/whats.mk Thu Nov 2 19:53:51 2017 (r325339) +++ head/contrib/bmake/mk/whats.mk Thu Nov 2 20:08:00 2017 (r325340) @@ -1,4 +1,4 @@ -# $Id: whats.mk,v 1.1 2014/08/30 22:40:47 sjg Exp $ +# $Id: whats.mk,v 1.3 2017/10/19 06:09:14 sjg Exp $ # # @(#) Copyright (c) 2014, Simon J. Gerraty # @@ -36,7 +36,8 @@ what_build_thing?= ${KMOD}.ko .if !empty(what_thing) # a unique name that won't conflict with anything -what_uuid = what_${.CURDIR:T:hash} +what_uuid = what_${what_thing}_${.CURDIR:T:hash} +what_var = what_${.CURDIR:T:hash} .if !empty(what_build_thing) ${what_build_thing}: ${what_build_exts:@e@${what_uuid}.$e@} @@ -57,7 +58,7 @@ _what1:= @(\#)${what_thing:tu} built ${%Y%m%d:L:localt _what2:= @(\#)${what_location} ${what_uuid}.c: - echo '${_what_t} ${what_uuid}1[] = "${_what1}";' > $@ ${.OODATE:MNO_META_CMP} - echo '${_what_t} ${what_uuid}2[] = "${_what2}";' >> $@ + echo '${_what_t} ${what_var}1[] = "${_what1}";' > $@ ${.OODATE:MNO_META_CMP} + echo '${_what_t} ${what_var}2[] = "${_what2}";' >> $@ .endif .endif Modified: head/contrib/bmake/os.sh ============================================================================== --- head/contrib/bmake/os.sh Thu Nov 2 19:53:51 2017 (r325339) +++ head/contrib/bmake/os.sh Thu Nov 2 20:08:00 2017 (r325340) @@ -17,7 +17,7 @@ # Simon J. Gerraty # RCSid: -# $Id: os.sh,v 1.53 2017/01/11 20:01:09 sjg Exp $ +# $Id: os.sh,v 1.54 2017/09/08 06:17:22 sjg Exp $ # # @(#) Copyright (c) 1994 Simon J. Gerraty # @@ -246,5 +246,7 @@ case /$0 in echo "$v='$vv'" done ;; +*/host_target32) echo $HOST_TARGET32;; +*/host_target) echo $HOST_TARGET;; esac Modified: head/contrib/bmake/unit-tests/dotwait.exp ============================================================================== --- head/contrib/bmake/unit-tests/dotwait.exp Thu Nov 2 19:53:51 2017 (r325339) +++ head/contrib/bmake/unit-tests/dotwait.exp Thu Nov 2 20:08:00 2017 (r325340) @@ -22,9 +22,9 @@ shared.2.1 shared.2.1 shared.2.99 shared.2.99 +cycle.1.99 +cycle.1.99 make: Graph cycles through `cycle.2.99' make: Graph cycles through `cycle.2.98' make: Graph cycles through `cycle.2.97' -cycle.1.99 -cycle.1.99 exit status 0 Modified: head/contrib/bmake/unit-tests/dotwait.mk ============================================================================== --- head/contrib/bmake/unit-tests/dotwait.mk Thu Nov 2 19:53:51 2017 (r325339) +++ head/contrib/bmake/unit-tests/dotwait.mk Thu Nov 2 20:08:00 2017 (r325340) @@ -1,4 +1,4 @@ -# $NetBSD: dotwait.mk,v 1.1 2014/08/21 13:44:51 apb Exp $ +# $NetBSD: dotwait.mk,v 1.2 2017/10/08 20:44:19 sjg Exp $ THISMAKEFILE:= ${.PARSEDIR}/${.PARSEFILE} @@ -11,7 +11,7 @@ PAUSE= sleep 1 # Ignore "--- target ---" lines printed by parallel make. all: .for t in ${TESTS} - @${.MAKE} -f ${THISMAKEFILE} -j4 $t | grep -v "^--- " + @${.MAKE} -f ${THISMAKEFILE} -j4 $t 2>&1 | grep -v "^--- " .endfor # Modified: head/usr.bin/bmake/Makefile ============================================================================== --- head/usr.bin/bmake/Makefile Thu Nov 2 19:53:51 2017 (r325339) +++ head/usr.bin/bmake/Makefile Thu Nov 2 20:08:00 2017 (r325340) @@ -14,11 +14,8 @@ CFLAGS+= -I${.CURDIR} CLEANDIRS+= FreeBSD CLEANFILES+= bootstrap -# $Id: Makefile,v 1.95 2017/07/20 19:36:13 sjg Exp $ +# $Id: Makefile,v 1.99 2017/08/13 20:12:53 sjg Exp $ -# Base version on src date -_MAKE_VERSION= 20170720 - PROG?= ${.CURDIR:T} SRCS= \ @@ -74,6 +71,7 @@ SRCS+= \ lstReplace.c \ lstSucc.c + # this file gets generated by configure .sinclude "Makefile.config" @@ -159,9 +157,6 @@ MANDIR= ${MANDIR.bmake:U${SHAREDIR}/man} .if !exists(.depend) ${OBJS}: config.h .endif - -# make sure that MAKE_VERSION gets updated. -main.o: ${SRCS} ${MAKEFILE} # A simple unit-test driver to help catch regressions Modified: head/usr.bin/bmake/Makefile.config ============================================================================== --- head/usr.bin/bmake/Makefile.config Thu Nov 2 19:53:51 2017 (r325339) +++ head/usr.bin/bmake/Makefile.config Thu Nov 2 20:08:00 2017 (r325340) @@ -7,10 +7,12 @@ SRCTOP?= ${.CURDIR:H:H} # things set by configure -prefix= /usr +_MAKE_VERSION=20171028 + +prefix?= /usr srcdir= ${SRCTOP}/contrib/bmake CC?= gcc -DEFAULT_SYS_PATH= .../share/mk:/usr/share/mk +DEFAULT_SYS_PATH?= .../share/mk:/usr/share/mk CPPFLAGS+= CFLAGS+= ${CPPFLAGS} -DHAVE_CONFIG_H @@ -22,4 +24,3 @@ FILEMON_H= /usr/include/dev/filemon/filemon.h BMAKE_PATH_MAX?= 1024 # used if MAXPATHLEN not defined CPPFLAGS+= -DBMAKE_PATH_MAX=${BMAKE_PATH_MAX} - Modified: head/usr.bin/bmake/config.h ============================================================================== --- head/usr.bin/bmake/config.h Thu Nov 2 19:53:51 2017 (r325339) +++ head/usr.bin/bmake/config.h Thu Nov 2 20:08:00 2017 (r325340) @@ -245,7 +245,7 @@ #define PACKAGE_NAME "bmake" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "bmake 20160606" +#define PACKAGE_STRING "bmake 20170812" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "bmake" @@ -254,7 +254,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "20160606" +#define PACKAGE_VERSION "20170812" /* Define as the return type of signal handlers (`int' or `void'). */ #define RETSIGTYPE void From owner-svn-src-all@freebsd.org Thu Nov 2 20:28: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 9A80FE625F6; Thu, 2 Nov 2017 20:28:54 +0000 (UTC) (envelope-from rmacklem@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 74965680F5; Thu, 2 Nov 2017 20:28:54 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA2KSrgc032902; Thu, 2 Nov 2017 20:28:53 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA2KSr5B032900; Thu, 2 Nov 2017 20:28:53 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201711022028.vA2KSr5B032900@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Thu, 2 Nov 2017 20:28:53 +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: r325341 - stable/11/sys/fs/nfsserver X-SVN-Group: stable-11 X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: stable/11/sys/fs/nfsserver X-SVN-Commit-Revision: 325341 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: Thu, 02 Nov 2017 20:28:54 -0000 Author: rmacklem Date: Thu Nov 2 20:28:53 2017 New Revision: 325341 URL: https://svnweb.freebsd.org/changeset/base/325341 Log: MFC: r324639 Fix the client IP address reported by nfsdumpstate for 64bit arch and NFSv4.1. The client IP address was not being reported for some NFSv4 mounts by nfsdumpstate. Upon investigation, two problems were found for mounts using IPv4. One was that the code (originally written and tested on i386) assumed that a "u_long" was a "uint32_t" and would exactly store an IPv4 host address. Not correct for 64bit arches. Also, for NFSv4.1 mounts, the field was not being filled in. This was basically correct, because NFSv4.1 does not use a callback address. However, it meant that nfsdumpstate could not report the client IP addr. This patch should fix both of these issues. For IPv6, the address will still not be reported. The original NFSv4 RFC only specified IPv4 callback addresses. I think this has changed and, if so, a future commit to fix reporting of IPv6 addresses will be needed. Modified: stable/11/sys/fs/nfsserver/nfs_nfsdserv.c stable/11/sys/fs/nfsserver/nfs_nfsdstate.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/fs/nfsserver/nfs_nfsdserv.c ============================================================================== --- stable/11/sys/fs/nfsserver/nfs_nfsdserv.c Thu Nov 2 20:08:00 2017 (r325340) +++ stable/11/sys/fs/nfsserver/nfs_nfsdserv.c Thu Nov 2 20:28:53 2017 (r325341) @@ -3729,6 +3729,7 @@ nfsrvd_exchangeid(struct nfsrv_descript *nd, __unused uint32_t sp4type, v41flags; uint64_t owner_minor; struct timespec verstime; + struct sockaddr_in *sad, *rad; if (nfs_rootfhset == 0 || nfsd_checkrootexp(nd) != 0) { nd->nd_repstat = NFSERR_WRONGSEC; @@ -3752,6 +3753,13 @@ nfsrvd_exchangeid(struct nfsrv_descript *nd, __unused NFSINITSOCKMUTEX(&clp->lc_req.nr_mtx); NFSSOCKADDRALLOC(clp->lc_req.nr_nam); NFSSOCKADDRSIZE(clp->lc_req.nr_nam, sizeof (struct sockaddr_in)); + sad = NFSSOCKADDR(nd->nd_nam, struct sockaddr_in *); + rad = NFSSOCKADDR(clp->lc_req.nr_nam, struct sockaddr_in *); + rad->sin_family = AF_INET; + rad->sin_addr.s_addr = 0; + rad->sin_port = 0; + if (sad->sin_family == AF_INET) + rad->sin_addr.s_addr = sad->sin_addr.s_addr; clp->lc_req.nr_cred = NULL; NFSBCOPY(verf, clp->lc_verf, NFSX_VERF); clp->lc_idlen = idlen; Modified: stable/11/sys/fs/nfsserver/nfs_nfsdstate.c ============================================================================== --- stable/11/sys/fs/nfsserver/nfs_nfsdstate.c Thu Nov 2 20:08:00 2017 (r325340) +++ stable/11/sys/fs/nfsserver/nfs_nfsdstate.c Thu Nov 2 20:28:53 2017 (r325341) @@ -3891,11 +3891,11 @@ nfsrv_getclientipaddr(struct nfsrv_descript *nd, struc u_char protocol[5], addr[24]; int error = 0, cantparse = 0; union { - u_long ival; + in_addr_t ival; u_char cval[4]; } ip; union { - u_short sval; + in_port_t sval; u_char cval[2]; } port; @@ -3989,8 +3989,10 @@ nfsrv_getclientipaddr(struct nfsrv_descript *nd, struc } if (cantparse) { sad = NFSSOCKADDR(nd->nd_nam, struct sockaddr_in *); - rad->sin_addr.s_addr = sad->sin_addr.s_addr; - rad->sin_port = 0x0; + if (sad->sin_family == AF_INET) { + rad->sin_addr.s_addr = sad->sin_addr.s_addr; + rad->sin_port = 0x0; + } clp->lc_program = 0; } nfsmout: From owner-svn-src-all@freebsd.org Thu Nov 2 20:45: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 06A56E62BDC; Thu, 2 Nov 2017 20:45:06 +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 C9BA368ACA; Thu, 2 Nov 2017 20:45:05 +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 vA2Kj4j7041159; Thu, 2 Nov 2017 20:45:04 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA2Kj4p7041157; Thu, 2 Nov 2017 20:45:04 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201711022045.vA2Kj4p7041157@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Thu, 2 Nov 2017 20:45:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325342 - in head: . share/mk X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: in head: . share/mk X-SVN-Commit-Revision: 325342 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: Thu, 02 Nov 2017 20:45:06 -0000 Author: bdrewery Date: Thu Nov 2 20:45:04 2017 New Revision: 325342 URL: https://svnweb.freebsd.org/changeset/base/325342 Log: DIRDEPS_BUILD: Cleanup leftover WORLDTMP files. This will force any existing objects to rebuild if their .meta files reference files from WORLDTMP. This is a problem after the UNIFIED_OBJDIR effort caused buildworld and DIRDEPS_BUILD to share an OBJDIR. Without cleaning these files the Makefile.depend files end up with odd tmp/legacy/... entries since some bootstrap-tools linger from there and otherwise don't rebuild. Removing the files causes anything having used WORLDTMP to rebuild. Sponsored by: Dell EMC Isilon Modified: head/Makefile.inc1 head/share/mk/local.dirdeps.mk Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Thu Nov 2 20:28:53 2017 (r325341) +++ head/Makefile.inc1 Thu Nov 2 20:45:04 2017 (r325342) @@ -815,6 +815,7 @@ _worldtmp: .PHONY @echo "--------------------------------------------------------------" .if !defined(NO_CLEAN) rm -rf ${WORLDTMP} + @mkdir -p ${WORLDTMP} .else .if exists(${WORLDTMP}) @echo ">>> Deleting stale files in build tree..." @@ -831,6 +832,7 @@ _worldtmp: .PHONY .endfor .endif # ${USING_SYSTEM_COMPILER} == "yes" .endif # !defined(NO_CLEAN) + @touch ${WORLDTMP}/${.TARGET} .for _dir in \ lib lib/casper usr legacy/bin legacy/usr Modified: head/share/mk/local.dirdeps.mk ============================================================================== --- head/share/mk/local.dirdeps.mk Thu Nov 2 20:28:53 2017 (r325341) +++ head/share/mk/local.dirdeps.mk Thu Nov 2 20:45:04 2017 (r325342) @@ -49,6 +49,20 @@ DIRDEPS_FILTER.host = \ DIRDEPS_FILTER+= \ Nbin/cat.host \ ${DIRDEPS_FILTER.xtras:U} + +# Cleanup a buildworld's WORLDTMP so that any files generated from it +# or using it will rebuild with the DIRDEPS SYSROOT. Otherwise existing +# object .meta files may still reference those directories and not be +# rebuilt and lead to incorrect Makefile.depend files due to lack of +# .dirdep files. +.if !defined(NO_CLEANUP_WORLDTMP) && exists(${OBJTOP}/tmp/_worldtmp) +cleanup_worldtmp: .PHONY .NOMETA + @echo "Cleaning leftover WORLDTMP from buildworld." + -rm -rf ${OBJTOP}/tmp/* + -chflags -R 0 ${OBJTOP}/tmp/* + rm -rf ${OBJTOP}/tmp +beforedirdeps: cleanup_worldtmp +.endif .endif # reset this each time From owner-svn-src-all@freebsd.org Thu Nov 2 21:13:26 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 3F1ADE63264; Thu, 2 Nov 2017 21:13:26 +0000 (UTC) (envelope-from wulf@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 0B12169CFA; Thu, 2 Nov 2017 21:13:25 +0000 (UTC) (envelope-from wulf@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA2LDPHp055476; Thu, 2 Nov 2017 21:13:25 GMT (envelope-from wulf@FreeBSD.org) Received: (from wulf@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA2LDPFX055475; Thu, 2 Nov 2017 21:13:25 GMT (envelope-from wulf@FreeBSD.org) Message-Id: <201711022113.vA2LDPFX055475@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wulf set sender to wulf@FreeBSD.org using -f From: Vladimir Kondratyev Date: Thu, 2 Nov 2017 21:13:25 +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: r325343 - stable/11/sys/dev/usb/input X-SVN-Group: stable-11 X-SVN-Commit-Author: wulf X-SVN-Commit-Paths: stable/11/sys/dev/usb/input X-SVN-Commit-Revision: 325343 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: Thu, 02 Nov 2017 21:13:26 -0000 Author: wulf Date: Thu Nov 2 21:13:24 2017 New Revision: 325343 URL: https://svnweb.freebsd.org/changeset/base/325343 Log: MFC: r324772 ums(4): Unreverse evdev Tilt-axis reporting to match Linux. sysmouse tilt to button mapping remained unchanged. Reviewed by: hselasky Approved by: gonzo (mentor) Differential Revision: https://reviews.freebsd.org/D12671 Modified: stable/11/sys/dev/usb/input/ums.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/usb/input/ums.c ============================================================================== --- stable/11/sys/dev/usb/input/ums.c Thu Nov 2 20:45:04 2017 (r325342) +++ stable/11/sys/dev/usb/input/ums.c Thu Nov 2 21:13:24 2017 (r325343) @@ -296,7 +296,7 @@ ums_intr_callback(struct usb_xfer *xfer, usb_error_t e if ((info->sc_flags & UMS_FLAG_T_AXIS) && (id == info->sc_iid_t)) { - dt -= hid_get_data(buf, len, &info->sc_loc_t); + dt += hid_get_data(buf, len, &info->sc_loc_t); /* T-axis is translated into button presses */ buttons_found |= (1UL << 5) | (1UL << 6); } @@ -332,10 +332,10 @@ ums_intr_callback(struct usb_xfer *xfer, usb_error_t e /* translate T-axis into button presses until further */ if (dt > 0) { ums_put_queue(sc, 0, 0, 0, 0, buttons); - buttons |= 1UL << 5; + buttons |= 1UL << 6; } else if (dt < 0) { ums_put_queue(sc, 0, 0, 0, 0, buttons); - buttons |= 1UL << 6; + buttons |= 1UL << 5; } sc->sc_status.button = buttons; From owner-svn-src-all@freebsd.org Thu Nov 2 21:17: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 4FE7FE6337C; Thu, 2 Nov 2017 21:17:06 +0000 (UTC) (envelope-from wulf@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 1E85E69F37; Thu, 2 Nov 2017 21:17:06 +0000 (UTC) (envelope-from wulf@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA2LH5QP055655; Thu, 2 Nov 2017 21:17:05 GMT (envelope-from wulf@FreeBSD.org) Received: (from wulf@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA2LH52j055654; Thu, 2 Nov 2017 21:17:05 GMT (envelope-from wulf@FreeBSD.org) Message-Id: <201711022117.vA2LH52j055654@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wulf set sender to wulf@FreeBSD.org using -f From: Vladimir Kondratyev Date: Thu, 2 Nov 2017 21:17:05 +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: r325344 - stable/11/usr.sbin/bluetooth/bthidd X-SVN-Group: stable-11 X-SVN-Commit-Author: wulf X-SVN-Commit-Paths: stable/11/usr.sbin/bluetooth/bthidd X-SVN-Commit-Revision: 325344 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: Thu, 02 Nov 2017 21:17:06 -0000 Author: wulf Date: Thu Nov 2 21:17:05 2017 New Revision: 325344 URL: https://svnweb.freebsd.org/changeset/base/325344 Log: MFC: r324770 bthidd: Fix leds on multireport keyboards broken after r297217 Reviewed by: emax, gonzo Approved by: gonzo (mentor) Differential Revision: https://reviews.freebsd.org/D12214 Modified: stable/11/usr.sbin/bluetooth/bthidd/kbd.c Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.sbin/bluetooth/bthidd/kbd.c ============================================================================== --- stable/11/usr.sbin/bluetooth/bthidd/kbd.c Thu Nov 2 21:13:24 2017 (r325343) +++ stable/11/usr.sbin/bluetooth/bthidd/kbd.c Thu Nov 2 21:17:05 2017 (r325344) @@ -569,6 +569,11 @@ kbd_status_changed(bthid_session_p s, uint8_t *data, i } hid_end_parse(d); + if (report_id != NO_REPORT_ID) { + data[2] = data[1]; + data[1] = report_id; + } + if (found) write(s->intr, data, (report_id != NO_REPORT_ID) ? 3 : 2); From owner-svn-src-all@freebsd.org Thu Nov 2 21:19:19 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 0B54AE633F0; Thu, 2 Nov 2017 21:19:19 +0000 (UTC) (envelope-from wulf@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 CB7CA6A09B; Thu, 2 Nov 2017 21:19:18 +0000 (UTC) (envelope-from wulf@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA2LJHcm055784; Thu, 2 Nov 2017 21:19:17 GMT (envelope-from wulf@FreeBSD.org) Received: (from wulf@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA2LJHhc055782; Thu, 2 Nov 2017 21:19:17 GMT (envelope-from wulf@FreeBSD.org) Message-Id: <201711022119.vA2LJHhc055782@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wulf set sender to wulf@FreeBSD.org using -f From: Vladimir Kondratyev Date: Thu, 2 Nov 2017 21:19:17 +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: r325345 - stable/11/sys/dev/atkbdc X-SVN-Group: stable-11 X-SVN-Commit-Author: wulf X-SVN-Commit-Paths: stable/11/sys/dev/atkbdc X-SVN-Commit-Revision: 325345 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: Thu, 02 Nov 2017 21:19:19 -0000 Author: wulf Date: Thu Nov 2 21:19:17 2017 New Revision: 325345 URL: https://svnweb.freebsd.org/changeset/base/325345 Log: MFC: r324774 psm(4): Add sanity checks to Synaptics touchpad driver resolution parser. This fixes "Kernel has only x or y resolution, not both" libinput error. Reported by: Ivan Tested by: Ivan Approved by: gonzo (mentor) Modified: stable/11/sys/dev/atkbdc/psm.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/atkbdc/psm.c ============================================================================== --- stable/11/sys/dev/atkbdc/psm.c Thu Nov 2 21:17:05 2017 (r325344) +++ stable/11/sys/dev/atkbdc/psm.c Thu Nov 2 21:19:17 2017 (r325345) @@ -6094,8 +6094,10 @@ enable_synaptics(struct psm_softc *sc, enum probearg a if (get_mouse_status(kbdc, status, 0, 3) != 3) return (FALSE); - synhw.infoXupmm = status[0]; - synhw.infoYupmm = status[2]; + if (status[0] != 0 && (status[1] & 0x80) && status[2] != 0) { + synhw.infoXupmm = status[0]; + synhw.infoYupmm = status[2]; + } if (verbose >= 2) { printf(" Extended capabilities:\n"); From owner-svn-src-all@freebsd.org Thu Nov 2 21:58:19 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 DDDBBE63F30; Thu, 2 Nov 2017 21:58:19 +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 AB7AA6B627; Thu, 2 Nov 2017 21:58:19 +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 vA2LwI4G075404; Thu, 2 Nov 2017 21:58:18 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA2LwIV4075403; Thu, 2 Nov 2017 21:58:18 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201711022158.vA2LwIV4075403@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Thu, 2 Nov 2017 21:58:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325346 - head X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 325346 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: Thu, 02 Nov 2017 21:58:20 -0000 Author: bdrewery Date: Thu Nov 2 21:58:18 2017 New Revision: 325346 URL: https://svnweb.freebsd.org/changeset/base/325346 Log: Follow-up r325342: Always ensure WORLDTMP exists. Reported by: Herbert J. Skuhra Sponsored by: Dell EMC Isilon Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Thu Nov 2 21:19:17 2017 (r325345) +++ head/Makefile.inc1 Thu Nov 2 21:58:18 2017 (r325346) @@ -815,7 +815,6 @@ _worldtmp: .PHONY @echo "--------------------------------------------------------------" .if !defined(NO_CLEAN) rm -rf ${WORLDTMP} - @mkdir -p ${WORLDTMP} .else .if exists(${WORLDTMP}) @echo ">>> Deleting stale files in build tree..." @@ -832,6 +831,7 @@ _worldtmp: .PHONY .endfor .endif # ${USING_SYSTEM_COMPILER} == "yes" .endif # !defined(NO_CLEAN) + @mkdir -p ${WORLDTMP} @touch ${WORLDTMP}/${.TARGET} .for _dir in \ From owner-svn-src-all@freebsd.org Thu Nov 2 22:23: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 E5638E64500; Thu, 2 Nov 2017 22:23:01 +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 B2B626C23D; Thu, 2 Nov 2017 22:23:01 +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 vA2MN0w4087592; Thu, 2 Nov 2017 22:23:00 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA2MN09q087591; Thu, 2 Nov 2017 22:23:00 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201711022223.vA2MN09q087591@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Thu, 2 Nov 2017 22:23:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325347 - head X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 325347 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: Thu, 02 Nov 2017 22:23:02 -0000 Author: bdrewery Date: Thu Nov 2 22:23:00 2017 New Revision: 325347 URL: https://svnweb.freebsd.org/changeset/base/325347 Log: Something is very wrong Modified: head/Makefile Modified: head/Makefile ============================================================================== --- head/Makefile Thu Nov 2 21:58:18 2017 (r325346) +++ head/Makefile Thu Nov 2 22:23:00 2017 (r325347) @@ -1,3 +1,4 @@ +.error Bad revision, please wait for a fix in head # # $FreeBSD$ # From owner-svn-src-all@freebsd.org Thu Nov 2 23:00:05 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 741F5E64C9B; Thu, 2 Nov 2017 23:00:05 +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 4134D6D033; Thu, 2 Nov 2017 23:00:05 +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 vA2N04CC000327; Thu, 2 Nov 2017 23:00:04 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA2N04NV000325; Thu, 2 Nov 2017 23:00:04 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201711022300.vA2N04NV000325@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Thu, 2 Nov 2017 23:00:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325348 - in head: . share/mk X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: in head: . share/mk X-SVN-Commit-Revision: 325348 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: Thu, 02 Nov 2017 23:00:05 -0000 Author: bdrewery Date: Thu Nov 2 23:00:04 2017 New Revision: 325348 URL: https://svnweb.freebsd.org/changeset/base/325348 Log: AUTO_OBJ is unsafe at the moment as it is for some reason removing /etc with _cleanobj. Modified: head/Makefile head/share/mk/src.sys.obj.mk Modified: head/Makefile ============================================================================== --- head/Makefile Thu Nov 2 22:23:00 2017 (r325347) +++ head/Makefile Thu Nov 2 23:00:04 2017 (r325348) @@ -1,4 +1,3 @@ -.error Bad revision, please wait for a fix in head # # $FreeBSD$ # Modified: head/share/mk/src.sys.obj.mk ============================================================================== --- head/share/mk/src.sys.obj.mk Thu Nov 2 22:23:00 2017 (r325347) +++ head/share/mk/src.sys.obj.mk Thu Nov 2 23:00:04 2017 (r325348) @@ -97,7 +97,7 @@ OBJROOT:= ${OBJTOP}/ # Try to enable MK_AUTO_OBJ by default if we can write to the OBJROOT. Only # do this if AUTO_OBJ is not disabled by the user, not cleaning, and this # is the first make ran. -.if ${.MAKE.LEVEL} == 0 && \ +.if 0 && ${.MAKE.LEVEL} == 0 && \ ${MK_AUTO_OBJ} == "no" && empty(.MAKEOVERRIDES:MMK_AUTO_OBJ) && \ !defined(WITHOUT_AUTO_OBJ) && !make(showconfig) && !make(print-dir) && \ !defined(NO_OBJ) && \ From owner-svn-src-all@freebsd.org Fri Nov 3 00:12: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 B6613E661A6; Fri, 3 Nov 2017 00:12:33 +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 8321C6ED0F; Fri, 3 Nov 2017 00:12:33 +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 vA30CWQK032729; Fri, 3 Nov 2017 00:12:32 GMT (envelope-from avos@FreeBSD.org) Received: (from avos@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA30CWZ8032728; Fri, 3 Nov 2017 00:12:32 GMT (envelope-from avos@FreeBSD.org) Message-Id: <201711030012.vA30CWZ8032728@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avos set sender to avos@FreeBSD.org using -f From: Andriy Voskoboinyk Date: Fri, 3 Nov 2017 00:12:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325349 - head/usr.sbin/pmcstat X-SVN-Group: head X-SVN-Commit-Author: avos X-SVN-Commit-Paths: head/usr.sbin/pmcstat X-SVN-Commit-Revision: 325349 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: Fri, 03 Nov 2017 00:12:33 -0000 Author: avos Date: Fri Nov 3 00:12:32 2017 New Revision: 325349 URL: https://svnweb.freebsd.org/changeset/base/325349 Log: pmcstat(8): unbreak build with LDFLAGS+=-Wl,--as-needed libpmcstat.a requires libelf.so; reorder them accordingly. Modified: head/usr.sbin/pmcstat/Makefile Modified: head/usr.sbin/pmcstat/Makefile ============================================================================== --- head/usr.sbin/pmcstat/Makefile Thu Nov 2 23:00:04 2017 (r325348) +++ head/usr.sbin/pmcstat/Makefile Fri Nov 3 00:12:32 2017 (r325349) @@ -5,7 +5,7 @@ PROG= pmcstat MAN= pmcstat.8 -LIBADD= elf kvm pmc m ncursesw pmcstat +LIBADD= kvm pmc m ncursesw pmcstat elf SRCS= pmcstat.c pmcstat.h pmcstat_log.c \ pmcpl_callgraph.c pmcpl_gprof.c pmcpl_annotate.c \ From owner-svn-src-all@freebsd.org Fri Nov 3 00:29: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 1C4D5E66500; Fri, 3 Nov 2017 00:29: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 DE4126F271; Fri, 3 Nov 2017 00:29: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 vA30Thvk037436; Fri, 3 Nov 2017 00:29:43 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA30TgYq037434; Fri, 3 Nov 2017 00:29:42 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201711030029.vA30TgYq037434@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Fri, 3 Nov 2017 00:29:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325350 - in head: . targets/pseudo/bootstrap-tools X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: in head: . targets/pseudo/bootstrap-tools X-SVN-Commit-Revision: 325350 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: Fri, 03 Nov 2017 00:29:44 -0000 Author: bdrewery Date: Fri Nov 3 00:29:42 2017 New Revision: 325350 URL: https://svnweb.freebsd.org/changeset/base/325350 Log: Follow-up r325329: Store all WORLDTMP objects back in the same directory. This still keeps the reduced MAKEOBJDIRPREFIX (SRCTOP) redundancy removed in the OBJDIR, but now keeps all early phase objects in the same directory rather than split per phase. The problem of splitting per phase is that later phases want to link in libraries from earlier phases and base their location on ${OBJTOP}. Pointyhat to: bdrewery Reported by: mjoras, Mark Millard Sponsored by: Dell EMC Isilon Modified: head/Makefile.inc1 head/targets/pseudo/bootstrap-tools/Makefile Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Fri Nov 3 00:12:32 2017 (r325349) +++ head/Makefile.inc1 Fri Nov 3 00:29:42 2017 (r325350) @@ -521,7 +521,7 @@ BMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" # need to keep this in sync with targets/pseudo/bootstrap-tools/Makefile BSARGS= DESTDIR= \ - OBJTOP='${WORLDTMP}/obj-$${BWPHASE}' \ + OBJTOP='${WORLDTMP}/obj-tools' \ OBJROOT='$${OBJTOP}/' \ BOOTSTRAPPING=${OSRELDATE} \ BWPHASE=${.TARGET:C,^_,,} \ Modified: head/targets/pseudo/bootstrap-tools/Makefile ============================================================================== --- head/targets/pseudo/bootstrap-tools/Makefile Fri Nov 3 00:12:32 2017 (r325349) +++ head/targets/pseudo/bootstrap-tools/Makefile Fri Nov 3 00:29:42 2017 (r325350) @@ -34,7 +34,7 @@ OSRELDATE?= 0 # need to keep this in sync with src/Makefile.inc1 BSARGS= DESTDIR= \ - OBJTOP='${WORLDTMP}/obj-$${BWPHASE}' \ + OBJTOP='${WORLDTMP}/obj-tools' \ OBJROOT='$${OBJTOP}/' \ BOOTSTRAPPING=${OSRELDATE} \ BWPHASE=${.TARGET} \ From owner-svn-src-all@freebsd.org Fri Nov 3 01:09:36 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 3E905E66FAA; Fri, 3 Nov 2017 01:09:36 +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 037077031C; Fri, 3 Nov 2017 01:09:35 +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 vA319ZTp053764; Fri, 3 Nov 2017 01:09:35 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA319Zf8053763; Fri, 3 Nov 2017 01:09:35 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201711030109.vA319Zf8053763@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Fri, 3 Nov 2017 01:09:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325351 - head/share/mk X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/share/mk X-SVN-Commit-Revision: 325351 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: Fri, 03 Nov 2017 01:09:36 -0000 Author: bdrewery Date: Fri Nov 3 01:09:35 2017 New Revision: 325351 URL: https://svnweb.freebsd.org/changeset/base/325351 Log: AUTO_OBJ: If the wanted .OBJDIR was not used then disable the feature. This is to prevent downstream checks from assuming they can trust .OBJDIR when MK_AUTO_OBJ is yes, such as the bsd.obj.mk checks. Pointyhat to: bdrewery Sponsored by: Dell EMC Isilon Modified: head/share/mk/sys.mk Modified: head/share/mk/sys.mk ============================================================================== --- head/share/mk/sys.mk Fri Nov 3 00:29:42 2017 (r325350) +++ head/share/mk/sys.mk Fri Nov 3 01:09:35 2017 (r325351) @@ -120,8 +120,14 @@ NO_META_IGNORE_HOST_HEADERS= 1 # is not expected. .if !make(showconfig) && !make(print-dir) .sinclude +# The .OBJDIR was not set, disable MK_AUTO_OBJ so downstream checks won't +# assume .OBJDIR is proper. +.if defined(__objdir) && ${.OBJDIR} != ${__objdir} +.MAKEOVERRIDES+= MK_AUTO_OBJ +MK_AUTO_OBJ= no .endif .endif +.endif # ${MK_AUTO_OBJ} == "yes" .else # bmake .include .endif From owner-svn-src-all@freebsd.org Fri Nov 3 03:13:16 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 AE638E6A2D5; Fri, 3 Nov 2017 03:13:16 +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 77DBC74F00; Fri, 3 Nov 2017 03:13:16 +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 vA33DFEJ007565; Fri, 3 Nov 2017 03:13:15 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA33DFv1007564; Fri, 3 Nov 2017 03:13:15 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201711030313.vA33DFv1007564@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Fri, 3 Nov 2017 03:13:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325352 - head/sys/powerpc/mpc85xx X-SVN-Group: head X-SVN-Commit-Author: jhibbits X-SVN-Commit-Paths: head/sys/powerpc/mpc85xx X-SVN-Commit-Revision: 325352 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: Fri, 03 Nov 2017 03:13:16 -0000 Author: jhibbits Date: Fri Nov 3 03:13:15 2017 New Revision: 325352 URL: https://svnweb.freebsd.org/changeset/base/325352 Log: Fix integer type and format in debug print gcc complains "cast to pointer from integer of different size". phandle_t is *always* a uint32_t, so treat it as such, not as a pointer. Fixes 64-bit build. Modified: head/sys/powerpc/mpc85xx/lbc.c Modified: head/sys/powerpc/mpc85xx/lbc.c ============================================================================== --- head/sys/powerpc/mpc85xx/lbc.c Fri Nov 3 01:09:35 2017 (r325351) +++ head/sys/powerpc/mpc85xx/lbc.c Fri Nov 3 03:13:15 2017 (r325352) @@ -651,8 +651,8 @@ lbc_attach(device_t dev) free(di, M_LBC); continue; } - debugf("added child name='%s', node=%p\n", di->di_ofw.obd_name, - (void *)child); + debugf("added child name='%s', node=%x\n", di->di_ofw.obd_name, + child); device_set_ivars(cdev, di); } From owner-svn-src-all@freebsd.org Fri Nov 3 07:30: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 4CAA7E6DF40; Fri, 3 Nov 2017 07:30:55 +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 0F0037F256; Fri, 3 Nov 2017 07:30:54 +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 vA37Usxq013341; Fri, 3 Nov 2017 07:30:54 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA37UsIA013340; Fri, 3 Nov 2017 07:30:54 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201711030730.vA37UsIA013340@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Fri, 3 Nov 2017 07:30:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325353 - head/targets/pseudo/userland X-SVN-Group: head X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: head/targets/pseudo/userland X-SVN-Commit-Revision: 325353 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: Fri, 03 Nov 2017 07:30:55 -0000 Author: eadler Date: Fri Nov 3 07:30:54 2017 New Revision: 325353 URL: https://svnweb.freebsd.org/changeset/base/325353 Log: chase removal of csup in r267863 from 2014.. Modified: head/targets/pseudo/userland/Makefile.depend Modified: head/targets/pseudo/userland/Makefile.depend ============================================================================== --- head/targets/pseudo/userland/Makefile.depend Fri Nov 3 03:13:15 2017 (r325352) +++ head/targets/pseudo/userland/Makefile.depend Fri Nov 3 07:30:54 2017 (r325353) @@ -197,7 +197,6 @@ DIRDEPS+= \ usr.bin/cpio \ usr.bin/cpuset \ usr.bin/csplit \ - usr.bin/csup \ usr.bin/ctags \ usr.bin/ctlstat \ usr.bin/cut \ From owner-svn-src-all@freebsd.org Fri Nov 3 10: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 E0C0EE4E40B; Fri, 3 Nov 2017 10:27:24 +0000 (UTC) (envelope-from fabient@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 835DC8365F; Fri, 3 Nov 2017 10:27:24 +0000 (UTC) (envelope-from fabient@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA3ARNup084957; Fri, 3 Nov 2017 10:27:23 GMT (envelope-from fabient@FreeBSD.org) Received: (from fabient@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA3ARNJn084950; Fri, 3 Nov 2017 10:27:23 GMT (envelope-from fabient@FreeBSD.org) Message-Id: <201711031027.vA3ARNJn084950@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fabient set sender to fabient@FreeBSD.org using -f From: Fabien Thomas Date: Fri, 3 Nov 2017 10:27:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325354 - in head: share/man/man9 sys/netipsec sys/opencrypto X-SVN-Group: head X-SVN-Commit-Author: fabient X-SVN-Commit-Paths: in head: share/man/man9 sys/netipsec sys/opencrypto X-SVN-Commit-Revision: 325354 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: Fri, 03 Nov 2017 10:27:25 -0000 Author: fabient Date: Fri Nov 3 10:27:22 2017 New Revision: 325354 URL: https://svnweb.freebsd.org/changeset/base/325354 Log: crypto(9) is called from ipsec in CRYPTO_F_CBIFSYNC mode. This is working fine when a lot of different flows to be ciphered/deciphered are involved. However, when a software crypto driver is used, there are situations where we could benefit from making crypto(9) multi threaded: - a single flow is to be ciphered: only one thread is used to cipher it, - a single ESP flow is to be deciphered: only one thread is used to decipher it. The idea here is to call crypto(9) using a new mode (CRYPTO_F_ASYNC) to dispatch the crypto jobs on multiple threads, if the underlying crypto driver is working in synchronous mode. Another flag is added (CRYPTO_F_ASYNC_KEEPORDER) to make crypto(9) dispatch the crypto jobs in the order they are received (an additional queue/thread is used), so that the packets are reinjected in the network using the same order they were posted. A new sysctl net.inet.ipsec.async_crypto can be used to activate this new behavior (disabled by default). Submitted by: Emeric Poupon Reviewed by: ae, jmg, jhb Differential Revision: https://reviews.freebsd.org/D10680 Sponsored by: Stormshield Modified: head/share/man/man9/crypto.9 head/sys/netipsec/ipsec.c head/sys/netipsec/ipsec.h head/sys/netipsec/xform_ah.c head/sys/netipsec/xform_esp.c head/sys/opencrypto/crypto.c head/sys/opencrypto/cryptodev.h Modified: head/share/man/man9/crypto.9 ============================================================================== --- head/share/man/man9/crypto.9 Fri Nov 3 07:30:54 2017 (r325353) +++ head/share/man/man9/crypto.9 Fri Nov 3 10:27:22 2017 (r325354) @@ -331,6 +331,17 @@ Do callback immediately if operation is synchronous (t specified the .Dv CRYPTOCAP_F_SYNC flag). +.It Dv CRYPTO_F_ASYNC +Try to do the crypto operation in a pool of workers +if the operation is synchronous (that the driver specified the +.Dv CRYPTOCAP_F_SYNC +flag). It aims to speed up processing by dispatching crypto operations +on different processors. +.It Dv CRYPTO_F_ASYNC_KEEPORDER +Dispatch callbacks in the same order they are posted. +Only relevant if the +.Dv CRYPTO_F_ASYNC +flag is set and if the operation is synchronous. .El .It Va crp_buf Points to the input buffer. Modified: head/sys/netipsec/ipsec.c ============================================================================== --- head/sys/netipsec/ipsec.c Fri Nov 3 07:30:54 2017 (r325353) +++ head/sys/netipsec/ipsec.c Fri Nov 3 10:27:22 2017 (r325354) @@ -149,7 +149,16 @@ sysctl_def_policy(SYSCTL_HANDLER_ARGS) * 0 take anything */ VNET_DEFINE(int, crypto_support) = CRYPTOCAP_F_HARDWARE | CRYPTOCAP_F_SOFTWARE; + /* + * Use asynchronous mode to parallelize crypto jobs: + * + * 0 - disabled + * 1 - enabled + */ +VNET_DEFINE(int, async_crypto) = 0; + +/* * TCP/UDP checksum handling policy for transport mode NAT-T (RFC3948) * * 0 - auto: incrementally recompute, when checksum delta is known; @@ -195,6 +204,9 @@ SYSCTL_INT(_net_inet_ipsec, IPSECCTL_ECN, ecn, SYSCTL_INT(_net_inet_ipsec, OID_AUTO, crypto_support, CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(crypto_support), 0, "Crypto driver selection."); +SYSCTL_INT(_net_inet_ipsec, OID_AUTO, async_crypto, + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(async_crypto), 0, + "Use asynchronous mode to parallelize crypto jobs."); SYSCTL_INT(_net_inet_ipsec, OID_AUTO, check_policy_history, CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(check_policy_history), 0, "Use strict check of inbound packets to security policy compliance."); Modified: head/sys/netipsec/ipsec.h ============================================================================== --- head/sys/netipsec/ipsec.h Fri Nov 3 07:30:54 2017 (r325353) +++ head/sys/netipsec/ipsec.h Fri Nov 3 10:27:22 2017 (r325354) @@ -283,6 +283,7 @@ VNET_DECLARE(int, ip4_ipsec_dfbit); VNET_DECLARE(int, ip4_ipsec_ecn); VNET_DECLARE(int, ip4_esp_randpad); VNET_DECLARE(int, crypto_support); +VNET_DECLARE(int, async_crypto); VNET_DECLARE(int, natt_cksum_policy); #define IPSECSTAT_INC(name) \ @@ -296,6 +297,7 @@ VNET_DECLARE(int, natt_cksum_policy); #define V_ip4_ipsec_ecn VNET(ip4_ipsec_ecn) #define V_ip4_esp_randpad VNET(ip4_esp_randpad) #define V_crypto_support VNET(crypto_support) +#define V_async_crypto VNET(async_crypto) #define V_natt_cksum_policy VNET(natt_cksum_policy) #define ipseclog(x) do { if (V_ipsec_debug) log x; } while (0) Modified: head/sys/netipsec/xform_ah.c ============================================================================== --- head/sys/netipsec/xform_ah.c Fri Nov 3 07:30:54 2017 (r325353) +++ head/sys/netipsec/xform_ah.c Fri Nov 3 10:27:22 2017 (r325354) @@ -657,6 +657,8 @@ ah_input(struct mbuf *m, struct secasvar *sav, int ski /* Crypto operation descriptor. */ crp->crp_ilen = m->m_pkthdr.len; /* Total input length. */ crp->crp_flags = CRYPTO_F_IMBUF | CRYPTO_F_CBIFSYNC; + if (V_async_crypto) + crp->crp_flags |= CRYPTO_F_ASYNC | CRYPTO_F_ASYNC_KEEPORDER; crp->crp_buf = (caddr_t) m; crp->crp_callback = ah_input_cb; crp->crp_sid = cryptoid; @@ -1033,6 +1035,8 @@ ah_output(struct mbuf *m, struct secpolicy *sp, struct /* Crypto operation descriptor. */ crp->crp_ilen = m->m_pkthdr.len; /* Total input length. */ crp->crp_flags = CRYPTO_F_IMBUF | CRYPTO_F_CBIFSYNC; + if (V_async_crypto) + crp->crp_flags |= CRYPTO_F_ASYNC | CRYPTO_F_ASYNC_KEEPORDER; crp->crp_buf = (caddr_t) m; crp->crp_callback = ah_output_cb; crp->crp_sid = cryptoid; Modified: head/sys/netipsec/xform_esp.c ============================================================================== --- head/sys/netipsec/xform_esp.c Fri Nov 3 07:30:54 2017 (r325353) +++ head/sys/netipsec/xform_esp.c Fri Nov 3 10:27:22 2017 (r325354) @@ -385,6 +385,8 @@ esp_input(struct mbuf *m, struct secasvar *sav, int sk /* Crypto operation descriptor */ crp->crp_ilen = m->m_pkthdr.len; /* Total input length */ crp->crp_flags = CRYPTO_F_IMBUF | CRYPTO_F_CBIFSYNC; + if (V_async_crypto) + crp->crp_flags |= CRYPTO_F_ASYNC | CRYPTO_F_ASYNC_KEEPORDER; crp->crp_buf = (caddr_t) m; crp->crp_callback = esp_input_cb; crp->crp_sid = cryptoid; @@ -841,6 +843,8 @@ esp_output(struct mbuf *m, struct secpolicy *sp, struc /* Crypto operation descriptor. */ crp->crp_ilen = m->m_pkthdr.len; /* Total input length. */ crp->crp_flags = CRYPTO_F_IMBUF | CRYPTO_F_CBIFSYNC; + if (V_async_crypto) + crp->crp_flags |= CRYPTO_F_ASYNC | CRYPTO_F_ASYNC_KEEPORDER; crp->crp_buf = (caddr_t) m; crp->crp_callback = esp_output_cb; crp->crp_opaque = (caddr_t) xd; Modified: head/sys/opencrypto/crypto.c ============================================================================== --- head/sys/opencrypto/crypto.c Fri Nov 3 07:30:54 2017 (r325353) +++ head/sys/opencrypto/crypto.c Fri Nov 3 10:27:22 2017 (r325354) @@ -70,7 +70,9 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include +#include #include @@ -135,27 +137,52 @@ static int crypto_drivers_num = 0; * operations. */ static int crp_sleep = 0; -static TAILQ_HEAD(,cryptop) crp_q; /* request queues */ +static TAILQ_HEAD(cryptop_q ,cryptop) crp_q; /* request queues */ static TAILQ_HEAD(,cryptkop) crp_kq; static struct mtx crypto_q_mtx; #define CRYPTO_Q_LOCK() mtx_lock(&crypto_q_mtx) #define CRYPTO_Q_UNLOCK() mtx_unlock(&crypto_q_mtx) /* - * There are two queues for processing completed crypto requests; one - * for the symmetric and one for the asymmetric ops. We only need one - * but have two to avoid type futzing (cryptop vs. cryptkop). A single - * mutex is used to lock access to both queues. Note that this lock - * must be separate from the lock on request queues to insure driver - * callbacks don't generate lock order reversals. + * Taskqueue used to dispatch the crypto requests + * that have the CRYPTO_F_ASYNC flag */ -static TAILQ_HEAD(,cryptop) crp_ret_q; /* callback queues */ -static TAILQ_HEAD(,cryptkop) crp_ret_kq; -static struct mtx crypto_ret_q_mtx; -#define CRYPTO_RETQ_LOCK() mtx_lock(&crypto_ret_q_mtx) -#define CRYPTO_RETQ_UNLOCK() mtx_unlock(&crypto_ret_q_mtx) -#define CRYPTO_RETQ_EMPTY() (TAILQ_EMPTY(&crp_ret_q) && TAILQ_EMPTY(&crp_ret_kq)) +static struct taskqueue *crypto_tq; +/* + * Crypto seq numbers are operated on with modular arithmetic + */ +#define CRYPTO_SEQ_GT(a,b) ((int)((a)-(b)) > 0) + +struct crypto_ret_worker { + struct mtx crypto_ret_mtx; + + TAILQ_HEAD(,cryptop) crp_ordered_ret_q; /* ordered callback queue for symetric jobs */ + TAILQ_HEAD(,cryptop) crp_ret_q; /* callback queue for symetric jobs */ + TAILQ_HEAD(,cryptkop) crp_ret_kq; /* callback queue for asym jobs */ + + u_int32_t reorder_ops; /* total ordered sym jobs received */ + u_int32_t reorder_cur_seq; /* current sym job dispatched */ + + struct proc *cryptoretproc; +}; +static struct crypto_ret_worker *crypto_ret_workers = NULL; + +#define CRYPTO_RETW(i) (&crypto_ret_workers[i]) +#define CRYPTO_RETW_ID(w) ((w) - crypto_ret_workers) +#define FOREACH_CRYPTO_RETW(w) \ + for (w = crypto_ret_workers; w < crypto_ret_workers + crypto_workers_num; ++w) + +#define CRYPTO_RETW_LOCK(w) mtx_lock(&w->crypto_ret_mtx) +#define CRYPTO_RETW_UNLOCK(w) mtx_unlock(&w->crypto_ret_mtx) +#define CRYPTO_RETW_EMPTY(w) \ + (TAILQ_EMPTY(&w->crp_ret_q) && TAILQ_EMPTY(&w->crp_ret_kq) && TAILQ_EMPTY(&w->crp_ordered_ret_q)) + +static int crypto_workers_num = 0; +SYSCTL_INT(_kern, OID_AUTO, crypto_workers_num, CTLFLAG_RDTUN, + &crypto_workers_num, 0, + "Number of crypto workers used to dispatch crypto jobs"); + static uma_zone_t cryptop_zone; static uma_zone_t cryptodesc_zone; @@ -172,11 +199,12 @@ MALLOC_DEFINE(M_CRYPTO_DATA, "crypto", "crypto session static void crypto_proc(void); static struct proc *cryptoproc; -static void crypto_ret_proc(void); -static struct proc *cryptoretproc; +static void crypto_ret_proc(struct crypto_ret_worker *ret_worker); static void crypto_destroy(void); static int crypto_invoke(struct cryptocap *cap, struct cryptop *crp, int hint); static int crypto_kinvoke(struct cryptkop *krp, int flags); +static void crypto_task_invoke(void *ctx, int pending); +static void crypto_batch_enqueue(struct cryptop *crp); static struct cryptostats cryptostats; SYSCTL_STRUCT(_kern, OID_AUTO, crypto_stats, CTLFLAG_RW, &cryptostats, @@ -222,6 +250,7 @@ struct keybuf * get_keybuf(void) { static int crypto_init(void) { + struct crypto_ret_worker *ret_worker; int error; mtx_init(&crypto_drivers_mtx, "crypto", "crypto driver table", @@ -231,10 +260,6 @@ crypto_init(void) TAILQ_INIT(&crp_kq); mtx_init(&crypto_q_mtx, "crypto", "crypto op queues", MTX_DEF); - TAILQ_INIT(&crp_ret_q); - TAILQ_INIT(&crp_ret_kq); - mtx_init(&crypto_ret_q_mtx, "crypto", "crypto return queues", MTX_DEF); - cryptop_zone = uma_zcreate("cryptop", sizeof (struct cryptop), 0, 0, 0, 0, UMA_ALIGN_PTR, UMA_ZONE_ZINIT); @@ -256,6 +281,20 @@ crypto_init(void) goto bad; } + if (crypto_workers_num < 1 || crypto_workers_num > mp_ncpus) + crypto_workers_num = mp_ncpus; + + crypto_tq = taskqueue_create("crypto", M_WAITOK|M_ZERO, + taskqueue_thread_enqueue, &crypto_tq); + if (crypto_tq == NULL) { + printf("crypto init: cannot setup crypto taskqueue\n"); + error = ENOMEM; + goto bad; + } + + taskqueue_start_threads(&crypto_tq, crypto_workers_num, PRI_MIN_KERN, + "crypto"); + error = kproc_create((void (*)(void *)) crypto_proc, NULL, &cryptoproc, 0, 0, "crypto"); if (error) { @@ -264,16 +303,36 @@ crypto_init(void) goto bad; } - error = kproc_create((void (*)(void *)) crypto_ret_proc, NULL, - &cryptoretproc, 0, 0, "crypto returns"); - if (error) { - printf("crypto_init: cannot start cryptoret thread; error %d", - error); + crypto_ret_workers = malloc(crypto_workers_num * sizeof(struct crypto_ret_worker), + M_CRYPTO_DATA, M_NOWAIT|M_ZERO); + if (crypto_ret_workers == NULL) { + error = ENOMEM; + printf("crypto_init: cannot allocate ret workers\n"); goto bad; } - keybuf_init(); + FOREACH_CRYPTO_RETW(ret_worker) { + TAILQ_INIT(&ret_worker->crp_ordered_ret_q); + TAILQ_INIT(&ret_worker->crp_ret_q); + TAILQ_INIT(&ret_worker->crp_ret_kq); + + ret_worker->reorder_ops = 0; + ret_worker->reorder_cur_seq = 0; + + mtx_init(&ret_worker->crypto_ret_mtx, "crypto", "crypto return queues", MTX_DEF); + + error = kproc_create((void (*)(void *)) crypto_ret_proc, ret_worker, + &ret_worker->cryptoretproc, 0, 0, "crypto returns %td", CRYPTO_RETW_ID(ret_worker)); + if (error) { + printf("crypto_init: cannot start cryptoret thread; error %d", + error); + goto bad; + } + } + + keybuf_init(); + return 0; bad: crypto_destroy(); @@ -308,12 +367,17 @@ crypto_terminate(struct proc **pp, void *q) static void crypto_destroy(void) { + struct crypto_ret_worker *ret_worker; + /* * Terminate any crypto threads. */ + if (crypto_tq != NULL) + taskqueue_drain_all(crypto_tq); CRYPTO_DRIVER_LOCK(); crypto_terminate(&cryptoproc, &crp_q); - crypto_terminate(&cryptoretproc, &crp_ret_q); + FOREACH_CRYPTO_RETW(ret_worker) + crypto_terminate(&ret_worker->cryptoretproc, &ret_worker->crp_ret_q); CRYPTO_DRIVER_UNLOCK(); /* XXX flush queues??? */ @@ -329,7 +393,11 @@ crypto_destroy(void) if (cryptop_zone != NULL) uma_zdestroy(cryptop_zone); mtx_destroy(&crypto_q_mtx); - mtx_destroy(&crypto_ret_q_mtx); + FOREACH_CRYPTO_RETW(ret_worker) + mtx_destroy(&ret_worker->crypto_ret_mtx); + free(crypto_ret_workers, M_CRYPTO_DATA); + if (crypto_tq != NULL) + taskqueue_free(crypto_tq); mtx_destroy(&crypto_drivers_mtx); } @@ -828,9 +896,26 @@ crypto_dispatch(struct cryptop *crp) binuptime(&crp->crp_tstamp); #endif - hid = CRYPTO_SESID2HID(crp->crp_sid); + if (CRYPTOP_ASYNC(crp)) { + if (crp->crp_flags & CRYPTO_F_ASYNC_KEEPORDER) { + struct crypto_ret_worker *ret_worker; + crp->crp_retw_id = crp->crp_sid % crypto_workers_num; + ret_worker = CRYPTO_RETW(crp->crp_retw_id); + + CRYPTO_RETW_LOCK(ret_worker); + crp->crp_seq = ret_worker->reorder_ops++; + CRYPTO_RETW_UNLOCK(ret_worker); + } + + TASK_INIT(&crp->crp_task, 0, crypto_task_invoke, crp); + taskqueue_enqueue(crypto_tq, &crp->crp_task); + return (0); + } + if ((crp->crp_flags & CRYPTO_F_BATCH) == 0) { + hid = CRYPTO_SESID2HID(crp->crp_sid); + /* * Caller marked the request to be processed * immediately; dispatch it directly to the @@ -849,12 +934,19 @@ crypto_dispatch(struct cryptop *crp) */ } } + crypto_batch_enqueue(crp); + return 0; +} + +void +crypto_batch_enqueue(struct cryptop *crp) +{ + CRYPTO_Q_LOCK(); TAILQ_INSERT_TAIL(&crp_q, crp, crp_next); if (crp_sleep) wakeup_one(&crp_q); CRYPTO_Q_UNLOCK(); - return 0; } /* @@ -1035,6 +1127,23 @@ crypto_tstat(struct cryptotstat *ts, struct bintime *b } #endif +static void +crypto_task_invoke(void *ctx, int pending) +{ + struct cryptocap *cap; + struct cryptop *crp; + int hid, result; + + crp = (struct cryptop *)ctx; + + hid = CRYPTO_SESID2HID(crp->crp_sid); + cap = crypto_checkdriver(hid); + + result = crypto_invoke(cap, crp, 0); + if (result == ERESTART) + crypto_batch_enqueue(crp); +} + /* * Dispatch a crypto request to the appropriate crypto devices. */ @@ -1097,6 +1206,7 @@ crypto_freereq(struct cryptop *crp) #ifdef DIAGNOSTIC { struct cryptop *crp2; + struct crypto_ret_worker *ret_worker; CRYPTO_Q_LOCK(); TAILQ_FOREACH(crp2, &crp_q, crp_next) { @@ -1105,13 +1215,16 @@ crypto_freereq(struct cryptop *crp) crp)); } CRYPTO_Q_UNLOCK(); - CRYPTO_RETQ_LOCK(); - TAILQ_FOREACH(crp2, &crp_ret_q, crp_next) { - KASSERT(crp2 != crp, - ("Freeing cryptop from the return queue (%p).", - crp)); + + FOREACH_CRYPTO_RETW(ret_worker) { + CRYPTO_RETW_LOCK(ret_worker); + TAILQ_FOREACH(crp2, &ret_worker->crp_ret_q, crp_next) { + KASSERT(crp2 != crp, + ("Freeing cryptop from the return queue (%p).", + crp)); + } + CRYPTO_RETW_UNLOCK(ret_worker); } - CRYPTO_RETQ_UNLOCK(); } #endif @@ -1169,9 +1282,10 @@ crypto_done(struct cryptop *crp) * doing extraneous context switches; the latter is mostly * used with the software crypto driver. */ - if ((crp->crp_flags & CRYPTO_F_CBIMM) || + if (!CRYPTOP_ASYNC_KEEPORDER(crp) && + ((crp->crp_flags & CRYPTO_F_CBIMM) || ((crp->crp_flags & CRYPTO_F_CBIFSYNC) && - (CRYPTO_SESID2CAPS(crp->crp_sid) & CRYPTOCAP_F_SYNC))) { + (CRYPTO_SESID2CAPS(crp->crp_sid) & CRYPTOCAP_F_SYNC)))) { /* * Do the callback directly. This is ok when the * callback routine does very little (e.g. the @@ -1192,14 +1306,45 @@ crypto_done(struct cryptop *crp) #endif crp->crp_callback(crp); } else { + struct crypto_ret_worker *ret_worker; + bool wake; + + ret_worker = CRYPTO_RETW(crp->crp_retw_id); + wake = false; + /* * Normal case; queue the callback for the thread. */ - CRYPTO_RETQ_LOCK(); - if (CRYPTO_RETQ_EMPTY()) - wakeup_one(&crp_ret_q); /* shared wait channel */ - TAILQ_INSERT_TAIL(&crp_ret_q, crp, crp_next); - CRYPTO_RETQ_UNLOCK(); + CRYPTO_RETW_LOCK(ret_worker); + if (CRYPTOP_ASYNC_KEEPORDER(crp)) { + struct cryptop *tmp; + + TAILQ_FOREACH_REVERSE(tmp, &ret_worker->crp_ordered_ret_q, + cryptop_q, crp_next) { + if (CRYPTO_SEQ_GT(crp->crp_seq, tmp->crp_seq)) { + TAILQ_INSERT_AFTER(&ret_worker->crp_ordered_ret_q, + tmp, crp, crp_next); + break; + } + } + if (tmp == NULL) { + TAILQ_INSERT_HEAD(&ret_worker->crp_ordered_ret_q, + crp, crp_next); + } + + if (crp->crp_seq == ret_worker->reorder_cur_seq) + wake = true; + } + else { + if (CRYPTO_RETW_EMPTY(ret_worker)) + wake = true; + + TAILQ_INSERT_TAIL(&ret_worker->crp_ret_q, crp, crp_next); + } + + if (wake) + wakeup_one(&ret_worker->crp_ret_q); /* shared wait channel */ + CRYPTO_RETW_UNLOCK(ret_worker); } } @@ -1209,6 +1354,7 @@ crypto_done(struct cryptop *crp) void crypto_kdone(struct cryptkop *krp) { + struct crypto_ret_worker *ret_worker; struct cryptocap *cap; if (krp->krp_status != 0) @@ -1223,11 +1369,14 @@ crypto_kdone(struct cryptkop *krp) crypto_remove(cap); } CRYPTO_DRIVER_UNLOCK(); - CRYPTO_RETQ_LOCK(); - if (CRYPTO_RETQ_EMPTY()) - wakeup_one(&crp_ret_q); /* shared wait channel */ - TAILQ_INSERT_TAIL(&crp_ret_kq, krp, krp_next); - CRYPTO_RETQ_UNLOCK(); + + ret_worker = CRYPTO_RETW(0); + + CRYPTO_RETW_LOCK(ret_worker); + if (CRYPTO_RETW_EMPTY(ret_worker)) + wakeup_one(&ret_worker->crp_ret_q); /* shared wait channel */ + TAILQ_INSERT_TAIL(&ret_worker->crp_ret_kq, krp, krp_next); + CRYPTO_RETW_UNLOCK(ret_worker); } int @@ -1427,24 +1576,36 @@ crypto_proc(void) * callbacks typically are expensive and would slow interrupt handling. */ static void -crypto_ret_proc(void) +crypto_ret_proc(struct crypto_ret_worker *ret_worker) { struct cryptop *crpt; struct cryptkop *krpt; - CRYPTO_RETQ_LOCK(); + CRYPTO_RETW_LOCK(ret_worker); for (;;) { /* Harvest return q's for completed ops */ - crpt = TAILQ_FIRST(&crp_ret_q); - if (crpt != NULL) - TAILQ_REMOVE(&crp_ret_q, crpt, crp_next); + crpt = TAILQ_FIRST(&ret_worker->crp_ordered_ret_q); + if (crpt != NULL) { + if (crpt->crp_seq == ret_worker->reorder_cur_seq) { + TAILQ_REMOVE(&ret_worker->crp_ordered_ret_q, crpt, crp_next); + ret_worker->reorder_cur_seq++; + } else { + crpt = NULL; + } + } - krpt = TAILQ_FIRST(&crp_ret_kq); + if (crpt == NULL) { + crpt = TAILQ_FIRST(&ret_worker->crp_ret_q); + if (crpt != NULL) + TAILQ_REMOVE(&ret_worker->crp_ret_q, crpt, crp_next); + } + + krpt = TAILQ_FIRST(&ret_worker->crp_ret_kq); if (krpt != NULL) - TAILQ_REMOVE(&crp_ret_kq, krpt, krp_next); + TAILQ_REMOVE(&ret_worker->crp_ret_kq, krpt, krp_next); if (crpt != NULL || krpt != NULL) { - CRYPTO_RETQ_UNLOCK(); + CRYPTO_RETW_UNLOCK(ret_worker); /* * Run callbacks unlocked. */ @@ -1466,22 +1627,22 @@ crypto_ret_proc(void) } if (krpt != NULL) krpt->krp_callback(krpt); - CRYPTO_RETQ_LOCK(); + CRYPTO_RETW_LOCK(ret_worker); } else { /* * Nothing more to be processed. Sleep until we're * woken because there are more returns to process. */ - msleep(&crp_ret_q, &crypto_ret_q_mtx, PWAIT, + msleep(&ret_worker->crp_ret_q, &ret_worker->crypto_ret_mtx, PWAIT, "crypto_ret_wait", 0); - if (cryptoretproc == NULL) + if (ret_worker->cryptoretproc == NULL) break; cryptostats.cs_rets++; } } - CRYPTO_RETQ_UNLOCK(); + CRYPTO_RETW_UNLOCK(ret_worker); - crypto_finis(&crp_ret_q); + crypto_finis(&ret_worker->crp_ret_q); } #ifdef DDB @@ -1516,6 +1677,7 @@ db_show_drivers(void) DB_SHOW_COMMAND(crypto, db_show_crypto) { struct cryptop *crp; + struct crypto_ret_worker *ret_worker; db_show_drivers(); db_printf("\n"); @@ -1534,16 +1696,19 @@ DB_SHOW_COMMAND(crypto, db_show_crypto) , crp->crp_callback ); } - if (!TAILQ_EMPTY(&crp_ret_q)) { - db_printf("\n%4s %4s %4s %8s\n", - "HID", "Etype", "Flags", "Callback"); - TAILQ_FOREACH(crp, &crp_ret_q, crp_next) { - db_printf("%4u %4u %04x %8p\n" - , (int) CRYPTO_SESID2HID(crp->crp_sid) - , crp->crp_etype - , crp->crp_flags - , crp->crp_callback - ); + FOREACH_CRYPTO_RETW(ret_worker) { + db_printf("\n%8s %4s %4s %4s %8s\n", + "ret_worker", "HID", "Etype", "Flags", "Callback"); + if (!TAILQ_EMPTY(&ret_worker->crp_ret_q)) { + TAILQ_FOREACH(crp, &ret_worker->crp_ret_q, crp_next) { + db_printf("%8td %4u %4u %04x %8p\n" + , CRYPTO_RETW_ID(ret_worker) + , (int) CRYPTO_SESID2HID(crp->crp_sid) + , crp->crp_etype + , crp->crp_flags + , crp->crp_callback + ); + } } } } @@ -1551,6 +1716,7 @@ DB_SHOW_COMMAND(crypto, db_show_crypto) DB_SHOW_COMMAND(kcrypto, db_show_kcrypto) { struct cryptkop *krp; + struct crypto_ret_worker *ret_worker; db_show_drivers(); db_printf("\n"); @@ -1566,10 +1732,12 @@ DB_SHOW_COMMAND(kcrypto, db_show_kcrypto) , krp->krp_callback ); } - if (!TAILQ_EMPTY(&crp_ret_q)) { + + ret_worker = CRYPTO_RETW(0); + if (!TAILQ_EMPTY(&ret_worker->crp_ret_q)) { db_printf("%4s %5s %8s %4s %8s\n", "Op", "Status", "CRID", "HID", "Callback"); - TAILQ_FOREACH(krp, &crp_ret_kq, krp_next) { + TAILQ_FOREACH(krp, &ret_worker->crp_ret_kq, krp_next) { db_printf("%4u %5u %08x %4u %8p\n" , krp->krp_op , krp->krp_status Modified: head/sys/opencrypto/cryptodev.h ============================================================================== --- head/sys/opencrypto/cryptodev.h Fri Nov 3 07:30:54 2017 (r325353) +++ head/sys/opencrypto/cryptodev.h Fri Nov 3 10:27:22 2017 (r325354) @@ -63,6 +63,7 @@ #define _CRYPTO_CRYPTO_H_ #include +#include /* Some initial values */ #define CRYPTO_DRIVERS_INITIAL 4 @@ -391,6 +392,8 @@ struct cryptodesc { struct cryptop { TAILQ_ENTRY(cryptop) crp_next; + struct task crp_task; + u_int64_t crp_sid; /* Session ID */ int crp_ilen; /* Input data total length */ int crp_olen; /* Result total length */ @@ -413,6 +416,14 @@ struct cryptop { #define CRYPTO_F_CBIMM 0x0010 /* Do callback immediately */ #define CRYPTO_F_DONE 0x0020 /* Operation completed */ #define CRYPTO_F_CBIFSYNC 0x0040 /* Do CBIMM if op is synchronous */ +#define CRYPTO_F_ASYNC 0x0080 /* Dispatch crypto jobs on several threads + * if op is synchronous + */ +#define CRYPTO_F_ASYNC_KEEPORDER 0x0100 /* + * Dispatch the crypto jobs in the same + * order there are submitted. Applied only + * if CRYPTO_F_ASYNC flags is set + */ caddr_t crp_buf; /* Data to be processed */ caddr_t crp_opaque; /* Opaque pointer, passed along */ @@ -421,7 +432,19 @@ struct cryptop { int (*crp_callback)(struct cryptop *); /* Callback function */ struct bintime crp_tstamp; /* performance time stamp */ + uint32_t crp_seq; /* used for ordered dispatch */ + uint32_t crp_retw_id; /* + * the return worker to be used, + * used for ordered dispatch + */ }; + +#define CRYPTOP_ASYNC(crp) \ + (((crp)->crp_flags & CRYPTO_F_ASYNC) && \ + CRYPTO_SESID2CAPS((crp)->crp_sid) & CRYPTOCAP_F_SYNC) +#define CRYPTOP_ASYNC_KEEPORDER(crp) \ + (CRYPTOP_ASYNC(crp) && \ + (crp)->crp_flags & CRYPTO_F_ASYNC_KEEPORDER) #define CRYPTO_BUF_CONTIG 0x0 #define CRYPTO_BUF_IOV 0x1 From owner-svn-src-all@freebsd.org Fri Nov 3 11:33:14 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 BB645E4FB2D; Fri, 3 Nov 2017 11:33:14 +0000 (UTC) (envelope-from ae@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 891FC1A34; Fri, 3 Nov 2017 11:33:14 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA3BXDFm014153; Fri, 3 Nov 2017 11:33:13 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA3BXDBT014152; Fri, 3 Nov 2017 11:33:13 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201711031133.vA3BXDBT014152@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Fri, 3 Nov 2017 11:33:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325355 - head/sys/netipsec X-SVN-Group: head X-SVN-Commit-Author: ae X-SVN-Commit-Paths: head/sys/netipsec X-SVN-Commit-Revision: 325355 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: Fri, 03 Nov 2017 11:33:14 -0000 Author: ae Date: Fri Nov 3 11:33:13 2017 New Revision: 325355 URL: https://svnweb.freebsd.org/changeset/base/325355 Log: Use correct pointer in key_updateaddresses() when updating NAT-T config. key_updateaddresses() is used to update SA addresses and NAT-T configuration in SADB_UPDATE message. This is done using cloning SA content from old SA into new one. But addresses and NAT-T configuration are taking from SADB_UPDATE message. Use newsa pointer to set NAT-T properties into cloned SA. PR: 223382 MFC after: 1 week Modified: head/sys/netipsec/key.c Modified: head/sys/netipsec/key.c ============================================================================== --- head/sys/netipsec/key.c Fri Nov 3 10:27:22 2017 (r325354) +++ head/sys/netipsec/key.c Fri Nov 3 11:33:13 2017 (r325355) @@ -5100,7 +5100,7 @@ key_updateaddresses(struct socket *so, struct mbuf *m, newsav->natt = NULL; newsav->sah = sah; newsav->state = SADB_SASTATE_MATURE; - error = key_setnatt(sav, mhp); + error = key_setnatt(newsav, mhp); if (error != 0) goto fail; From owner-svn-src-all@freebsd.org Fri Nov 3 12:53: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 90A8EE518C1; Fri, 3 Nov 2017 12:53:00 +0000 (UTC) (envelope-from arichardson@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 5DEE93FA9; Fri, 3 Nov 2017 12:53:00 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA3CqxDf047091; Fri, 3 Nov 2017 12:52:59 GMT (envelope-from arichardson@FreeBSD.org) Received: (from arichardson@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA3Cqxim047090; Fri, 3 Nov 2017 12:52:59 GMT (envelope-from arichardson@FreeBSD.org) Message-Id: <201711031252.vA3Cqxim047090@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: arichardson set sender to arichardson@FreeBSD.org using -f From: Alex Richardson Date: Fri, 3 Nov 2017 12:52:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325356 - head/lib/libcxxrt X-SVN-Group: head X-SVN-Commit-Author: arichardson X-SVN-Commit-Paths: head/lib/libcxxrt X-SVN-Commit-Revision: 325356 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: Fri, 03 Nov 2017 12:53:00 -0000 Author: arichardson Date: Fri Nov 3 12:52:59 2017 New Revision: 325356 URL: https://svnweb.freebsd.org/changeset/base/325356 Log: Export std::get_new_handler() from libcxxrt.so When trying to build world for MIPS64 with clang I was getting linker errors because of a missing reference to std::get_new_handler(). It turns out std::get_new_handler() was not listed in Version.map so it was marked as a local symbol in libcxxrt.so. Reviewed by: theraven, brooks (mentor), emaste Approved by: trasz Obtained from: CheriBSD Differential Revision: https://reviews.freebsd.org/D11925 Modified: head/lib/libcxxrt/Version.map Modified: head/lib/libcxxrt/Version.map ============================================================================== --- head/lib/libcxxrt/Version.map Fri Nov 3 11:33:13 2017 (r325355) +++ head/lib/libcxxrt/Version.map Fri Nov 3 12:52:59 2017 (r325356) @@ -377,9 +377,15 @@ GLIBCXX_3.4.9 { }; } GLIBCXX_3.4; +GLIBCXX_3.4.20 { + extern "C++" { + "std::get_new_handler()"; + }; +} GLIBCXX_3.4.9; + GLIBCXX_3.4.22 { extern "C++" { "std::uncaught_exceptions()"; }; -} GLIBCXX_3.4.9; +} GLIBCXX_3.4.20; From owner-svn-src-all@freebsd.org Fri Nov 3 13:08: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 826E0E51F4C; Fri, 3 Nov 2017 13:08:30 +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 5066563AF0; Fri, 3 Nov 2017 13:08:30 +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 vA3D8TuL051560; Fri, 3 Nov 2017 13:08:29 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA3D8Tj1051559; Fri, 3 Nov 2017 13:08:29 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201711031308.vA3D8Tj1051559@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Fri, 3 Nov 2017 13:08:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325357 - head/lib/libc/stdio X-SVN-Group: head X-SVN-Commit-Author: cy X-SVN-Commit-Paths: head/lib/libc/stdio X-SVN-Commit-Revision: 325357 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: Fri, 03 Nov 2017 13:08:30 -0000 Author: cy Date: Fri Nov 3 13:08:29 2017 New Revision: 325357 URL: https://svnweb.freebsd.org/changeset/base/325357 Log: While discussing the new gets_s.c in D12785, ed@ suggested putting {}'s around the if (c == EOF) block to prevent potential 'trailing else' issues from being introduced when refactoring. As my gets_s() code is based on this, it makes sense to fix the same issue here first here and now, then do an svn copy again to capture this history). Suggested by: ed@ in D12785 Modified: head/lib/libc/stdio/gets.c Modified: head/lib/libc/stdio/gets.c ============================================================================== --- head/lib/libc/stdio/gets.c Fri Nov 3 12:52:59 2017 (r325356) +++ head/lib/libc/stdio/gets.c Fri Nov 3 13:08:29 2017 (r325357) @@ -61,13 +61,13 @@ gets(char *buf) warned = 1; } for (s = buf; (c = __sgetc(stdin)) != '\n'; ) { - if (c == EOF) + if (c == EOF) { if (s == buf) { ret = NULL; goto end; } else break; - else + } else *s++ = c; } *s = 0; From owner-svn-src-all@freebsd.org Fri Nov 3 13:15:16 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 4B026E521A7; Fri, 3 Nov 2017 13:15:16 +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 003C46401A; Fri, 3 Nov 2017 13:15:15 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from spqr.komquats.com ([96.50.22.10]) by shaw.ca with SMTP id AboQeYgI98LPZAboReiNCd; Fri, 03 Nov 2017 07:15:08 -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=sC3jslCIGhcA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=Qf9cLlZmb_5xpU_xI4UA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTPS id 5D58736C; Fri, 3 Nov 2017 06:15:06 -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 vA3DF6Oc041175; Fri, 3 Nov 2017 06:15:06 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <201711031315.vA3DF6Oc041175@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: Cy Schubert cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r325357 - head/lib/libc/stdio In-Reply-To: Message from Cy Schubert of "Fri, 03 Nov 2017 13:08:29 -0000." <201711031308.vA3D8Tj1051559@repo.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Fri, 03 Nov 2017 06:15:06 -0700 X-CMAE-Envelope: MS4wfD8Zh2wJaYrosL8ZccvuTnDJLq+Mn2dw1d99FjkehY3aUMvGpGGGHMpLEIhnsvYlFhGW7WnKunlN8pXn9csVwwOMGbFBVgmpDDhU2K4Xk204NpggwcSJ FMaCgJbeuWhTKXa9u+Es2Omhf44NFjUwp4DCWAyA7xScyHv+8mP1tYb3sySUwtPE07giy5ZZ2LzKunQYSMM+3BHExE6GplQsnnHsJFUvrwJzlRHu76qWM96v R+2r2/Zq/oistE+ht3xOL/NteAZd7ZkflILumHssqYINSxb5ZTNvYhxfEta9kxGN 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: Fri, 03 Nov 2017 13:15:16 -0000 In message <201711031308.vA3D8Tj1051559@repo.freebsd.org>, Cy Schubert writes: > Author: cy > Date: Fri Nov 3 13:08:29 2017 > New Revision: 325357 > URL: https://svnweb.freebsd.org/changeset/base/325357 > > Log: > While discussing the new gets_s.c in D12785, ed@ suggested putting > {}'s around the if (c == EOF) block to prevent potential 'trailing else' > issues from being introduced when refactoring. As my gets_s() code > is based on this, it makes sense to fix the same issue here first > here and now, then do an svn copy again to capture this history). > > Suggested by: ed@ in D12785 > > Modified: > head/lib/libc/stdio/gets.c > > Modified: head/lib/libc/stdio/gets.c > ============================================================================= > = > --- head/lib/libc/stdio/gets.c Fri Nov 3 12:52:59 2017 (r32535 > 6) > +++ head/lib/libc/stdio/gets.c Fri Nov 3 13:08:29 2017 (r32535 > 7) > @@ -61,13 +61,13 @@ gets(char *buf) > warned = 1; > } > for (s = buf; (c = __sgetc(stdin)) != '\n'; ) { > - if (c == EOF) > + if (c == EOF) { > if (s == buf) { > ret = NULL; > goto end; > } else > break; > - else > + } else > *s++ = c; > } > *s = 0; This should probably be MFCed too. MFC after: 2 weeks -- 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 Fri Nov 3 13:38: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 80D3CE527A2; Fri, 3 Nov 2017 13:38:46 +0000 (UTC) (envelope-from bapt@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 4E4C864B77; Fri, 3 Nov 2017 13:38:46 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA3DcjNG064552; Fri, 3 Nov 2017 13:38:45 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA3Dcj9W064551; Fri, 3 Nov 2017 13:38:45 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201711031338.vA3Dcj9W064551@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Fri, 3 Nov 2017 13:38:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325358 - head/tools/tools/locale/etc X-SVN-Group: head X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: head/tools/tools/locale/etc X-SVN-Commit-Revision: 325358 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: Fri, 03 Nov 2017 13:38:46 -0000 Author: bapt Date: Fri Nov 3 13:38:45 2017 New Revision: 325358 URL: https://svnweb.freebsd.org/changeset/base/325358 Log: In preparation for update of cldr to version 32 and unicode to version 10 Add a character mapping for a missing character in ISO8859-2 Modified: head/tools/tools/locale/etc/charmaps.xml Modified: head/tools/tools/locale/etc/charmaps.xml ============================================================================== --- head/tools/tools/locale/etc/charmaps.xml Fri Nov 3 13:08:29 2017 (r325357) +++ head/tools/tools/locale/etc/charmaps.xml Fri Nov 3 13:38:45 2017 (r325358) @@ -200,7 +200,7 @@ - From owner-svn-src-all@freebsd.org Fri Nov 3 13:42: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 82E9AE52979; Fri, 3 Nov 2017 13:42:06 +0000 (UTC) (envelope-from bapt@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 3972F64F3C; Fri, 3 Nov 2017 13:42:06 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA3Dg5IX065475; Fri, 3 Nov 2017 13:42:05 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA3Dg57i065472; Fri, 3 Nov 2017 13:42:05 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201711031342.vA3Dg57i065472@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Fri, 3 Nov 2017 13:42:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325359 - in head/tools/tools/locale/etc: . final-maps X-SVN-Group: head X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: in head/tools/tools/locale/etc: . final-maps X-SVN-Commit-Revision: 325359 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: Fri, 03 Nov 2017 13:42:06 -0000 Author: bapt Date: Fri Nov 3 13:42:04 2017 New Revision: 325359 URL: https://svnweb.freebsd.org/changeset/base/325359 Log: Upgrade to Unicode 10.0.0 Modified: head/tools/tools/locale/etc/common.UTF-8.src head/tools/tools/locale/etc/final-maps/map.UTF-8 Modified: head/tools/tools/locale/etc/common.UTF-8.src ============================================================================== --- head/tools/tools/locale/etc/common.UTF-8.src Fri Nov 3 13:38:45 2017 (r325358) +++ head/tools/tools/locale/etc/common.UTF-8.src Fri Nov 3 13:42:04 2017 (r325359) @@ -3162,7 +3162,8 @@ alpha ;...;;/ ;/ ;...;;/ ;/ - + ;/ + graph ;...;;/ ;...;;/ ;/ @@ -3180,7 +3181,8 @@ graph ;...;;/ ;/ ;/ ;...;;/ - ;...; + ;...; +punct ********************************************************************** * 0x0A00 - 0x0A7F Gurmukhi @@ -3250,7 +3252,7 @@ alpha ;...;;/ ;/ ;...;;/ - + ;...; graph ;...;;/ ;...;;/ ;...;;/ @@ -3266,7 +3268,7 @@ graph ;...;;/ ;...;;/ ;...;;/ - + ;...; punct ********************************************************************** @@ -3433,7 +3435,7 @@ graph ;...;;...;;/ +alpha ;...;;/ ;...;;/ ;...;;/ ;...;;/ @@ -3445,11 +3447,10 @@ alpha ;...;;...;;/ ;...;;/ ;...; -graph ;...;;/ +graph ;...;;/ ;...;;/ ;...;;/ - ;...;;/ - ;...;;/ + ;...;;/ ;...;;/ ;...;;/ ;...;;/ Modified: head/tools/tools/locale/etc/final-maps/map.UTF-8 ============================================================================== --- head/tools/tools/locale/etc/final-maps/map.UTF-8 Fri Nov 3 13:38:45 2017 (r325358) +++ head/tools/tools/locale/etc/final-maps/map.UTF-8 Fri Nov 3 13:42:04 2017 (r325359) @@ -2232,6 +2232,17 @@ CHARMAP \xE0\xA1\x9A \xE0\xA1\x9B \xE0\xA1\x9E + \xE0\xA1\xA0 + \xE0\xA1\xA1 + \xE0\xA1\xA2 + \xE0\xA1\xA3 + \xE0\xA1\xA4 + \xE0\xA1\xA5 + \xE0\xA1\xA6 + \xE0\xA1\xA7 + \xE0\xA1\xA8 + \xE0\xA1\xA9 + \xE0\xA1\xAA \xE0\xA2\xA0 \xE0\xA2\xA1 \xE0\xA2\xA2 @@ -2526,6 +2537,8 @@ CHARMAP \xE0\xA7\xB9 \xE0\xA7\xBA \xE0\xA7\xBB + \xE0\xA7\xBC + \xE0\xA7\xBD \xE0\xA8\x81 \xE0\xA8\x82 \xE0\xA8\x83 @@ -2690,6 +2703,12 @@ CHARMAP \xE0\xAB\xB0 \xE0\xAB\xB1 \xE0\xAB\xB9 + \xE0\xAB\xBA + \xE0\xAB\xBB + \xE0\xAB\xBC + \xE0\xAB\xBD + \xE0\xAB\xBE + \xE0\xAB\xBF \xE0\xAC\x81 \xE0\xAC\x82 \xE0\xAC\x83 @@ -3036,6 +3055,7 @@ CHARMAP \xE0\xB3\xAF \xE0\xB3\xB1 \xE0\xB3\xB2 + \xE0\xB4\x80 \xE0\xB4\x81 \xE0\xB4\x82 \xE0\xB4\x83 @@ -3091,6 +3111,8 @@ CHARMAP \xE0\xB4\xB8 \xE0\xB4\xB9 \xE0\xB4\xBA + \xE0\xB4\xBB + \xE0\xB4\xBC \xE0\xB4\xBD \xE0\xB4\xBE \xE0\xB4\xBF @@ -6573,6 +6595,7 @@ CHARMAP \xE1\xB3\xB4 \xE1\xB3\xB5 \xE1\xB3\xB6 + \xE1\xB3\xB7 \xE1\xB3\xB8 \xE1\xB3\xB9 \xE1\xB4\x80 @@ -6821,6 +6844,10 @@ CHARMAP \xE1\xB7\xB3 \xE1\xB7\xB4 \xE1\xB7\xB5 + \xE1\xB7\xB6 + \xE1\xB7\xB7 + \xE1\xB7\xB8 + \xE1\xB7\xB9 \xE1\xB7\xBB \xE1\xB7\xBC \xE1\xB7\xBD @@ -7499,6 +7526,7 @@ CHARMAP \xE2\x82\xBC \xE2\x82\xBD \xE2\x82\xBE + \xE2\x82\xBF \xE2\x83\x90 \xE2\x83\x91 \xE2\x83\x92 @@ -8295,6 +8323,7 @@ CHARMAP \xE2\x8F\xBC \xE2\x8F\xBD \xE2\x8F\xBE + \xE2\x8F\xBF \xE2\x90\x80 \xE2\x90\x81 \xE2\x90\x82 @@ -10243,6 +10272,7 @@ CHARMAP \xE2\xAF\x8F \xE2\xAF\x90 \xE2\xAF\x91 + \xE2\xAF\x92 \xE2\xAF\xAC \xE2\xAF\xAD \xE2\xAF\xAE @@ -10775,6 +10805,11 @@ CHARMAP \xE2\xB9\x82 \xE2\xB9\x83 \xE2\xB9\x84 + \xE2\xB9\x85 + \xE2\xB9\x86 + \xE2\xB9\x87 + \xE2\xB9\x88 + \xE2\xB9\x89 \xE2\xBA\x80 \xE2\xBA\x81 \xE2\xBA\x82 @@ -11410,6 +11445,7 @@ CHARMAP \xE3\x84\xAB \xE3\x84\xAC \xE3\x84\xAD + \xE3\x84\xAE \xE3\x84\xB1 \xE3\x84\xB2 \xE3\x84\xB3 @@ -39705,6 +39741,27 @@ CHARMAP \xE9\xBF\x93 \xE9\xBF\x94 \xE9\xBF\x95 + \xE9\xBF\x96 + \xE9\xBF\x97 + \xE9\xBF\x98 + \xE9\xBF\x99 + \xE9\xBF\x9A + \xE9\xBF\x9B + \xE9\xBF\x9C + \xE9\xBF\x9D + \xE9\xBF\x9E + \xE9\xBF\x9F + \xE9\xBF\xA0 + \xE9\xBF\xA1 + \xE9\xBF\xA2 + \xE9\xBF\xA3 + \xE9\xBF\xA4 + \xE9\xBF\xA5 + \xE9\xBF\xA6 + \xE9\xBF\xA7 + \xE9\xBF\xA8 + \xE9\xBF\xA9 + \xE9\xBF\xAA \xEA\x80\x80 \xEA\x80\x81 \xEA\x80\x82 @@ -62343,6 +62400,9 @@ CHARMAP \xF0\x90\x8C\xA1 \xF0\x90\x8C\xA2 \xF0\x90\x8C\xA3 + \xF0\x90\x8C\xAD + \xF0\x90\x8C\xAE + \xF0\x90\x8C\xAF \xF0\x90\x8C\xB0 \xF0\x90\x8C\xB1 \xF0\x90\x8C\xB2 @@ -65318,6 +65378,158 @@ CHARMAP \xF0\x91\xA3\xB1 \xF0\x91\xA3\xB2 \xF0\x91\xA3\xBF + \xF0\x91\xA8\x80 + \xF0\x91\xA8\x81 + \xF0\x91\xA8\x82 + \xF0\x91\xA8\x83 + \xF0\x91\xA8\x84 + \xF0\x91\xA8\x85 + \xF0\x91\xA8\x86 + \xF0\x91\xA8\x87 + \xF0\x91\xA8\x88 + \xF0\x91\xA8\x89 + \xF0\x91\xA8\x8A + \xF0\x91\xA8\x8B + \xF0\x91\xA8\x8C + \xF0\x91\xA8\x8D + \xF0\x91\xA8\x8E + \xF0\x91\xA8\x8F + \xF0\x91\xA8\x90 + \xF0\x91\xA8\x91 + \xF0\x91\xA8\x92 + \xF0\x91\xA8\x93 + \xF0\x91\xA8\x94 + \xF0\x91\xA8\x95 + \xF0\x91\xA8\x96 + \xF0\x91\xA8\x97 + \xF0\x91\xA8\x98 + \xF0\x91\xA8\x99 + \xF0\x91\xA8\x9A + \xF0\x91\xA8\x9B + \xF0\x91\xA8\x9C + \xF0\x91\xA8\x9D + \xF0\x91\xA8\x9E + \xF0\x91\xA8\x9F + \xF0\x91\xA8\xA0 + \xF0\x91\xA8\xA1 + \xF0\x91\xA8\xA2 + \xF0\x91\xA8\xA3 + \xF0\x91\xA8\xA4 + \xF0\x91\xA8\xA5 + \xF0\x91\xA8\xA6 + \xF0\x91\xA8\xA7 + \xF0\x91\xA8\xA8 + \xF0\x91\xA8\xA9 + \xF0\x91\xA8\xAA + \xF0\x91\xA8\xAB + \xF0\x91\xA8\xAC + \xF0\x91\xA8\xAD + \xF0\x91\xA8\xAE + \xF0\x91\xA8\xAF + \xF0\x91\xA8\xB0 + \xF0\x91\xA8\xB1 + \xF0\x91\xA8\xB2 + \xF0\x91\xA8\xB3 + \xF0\x91\xA8\xB4 + \xF0\x91\xA8\xB5 + \xF0\x91\xA8\xB6 + \xF0\x91\xA8\xB7 + \xF0\x91\xA8\xB8 + \xF0\x91\xA8\xB9 + \xF0\x91\xA8\xBA + \xF0\x91\xA8\xBB + \xF0\x91\xA8\xBC + \xF0\x91\xA8\xBD + \xF0\x91\xA8\xBE + \xF0\x91\xA8\xBF + \xF0\x91\xA9\x80 + \xF0\x91\xA9\x81 + \xF0\x91\xA9\x82 + \xF0\x91\xA9\x83 + \xF0\x91\xA9\x84 + \xF0\x91\xA9\x85 + \xF0\x91\xA9\x86 + \xF0\x91\xA9\x87 + \xF0\x91\xA9\x90 + \xF0\x91\xA9\x91 + \xF0\x91\xA9\x92 + \xF0\x91\xA9\x93 + \xF0\x91\xA9\x94 + \xF0\x91\xA9\x95 + \xF0\x91\xA9\x96 + \xF0\x91\xA9\x97 + \xF0\x91\xA9\x98 + \xF0\x91\xA9\x99 + \xF0\x91\xA9\x9A + \xF0\x91\xA9\x9B + \xF0\x91\xA9\x9C + \xF0\x91\xA9\x9D + \xF0\x91\xA9\x9E + \xF0\x91\xA9\x9F + \xF0\x91\xA9\xA0 + \xF0\x91\xA9\xA1 + \xF0\x91\xA9\xA2 + \xF0\x91\xA9\xA3 + \xF0\x91\xA9\xA4 + \xF0\x91\xA9\xA5 + \xF0\x91\xA9\xA6 + \xF0\x91\xA9\xA7 + \xF0\x91\xA9\xA8 + \xF0\x91\xA9\xA9 + \xF0\x91\xA9\xAA + \xF0\x91\xA9\xAB + \xF0\x91\xA9\xAC + \xF0\x91\xA9\xAD + \xF0\x91\xA9\xAE + \xF0\x91\xA9\xAF + \xF0\x91\xA9\xB0 + \xF0\x91\xA9\xB1 + \xF0\x91\xA9\xB2 + \xF0\x91\xA9\xB3 + \xF0\x91\xA9\xB4 + \xF0\x91\xA9\xB5 + \xF0\x91\xA9\xB6 + \xF0\x91\xA9\xB7 + \xF0\x91\xA9\xB8 + \xF0\x91\xA9\xB9 + \xF0\x91\xA9\xBA + \xF0\x91\xA9\xBB + \xF0\x91\xA9\xBC + \xF0\x91\xA9\xBD + \xF0\x91\xA9\xBE + \xF0\x91\xA9\xBF + \xF0\x91\xAA\x80 + \xF0\x91\xAA\x81 + \xF0\x91\xAA\x82 + \xF0\x91\xAA\x83 + \xF0\x91\xAA\x86 + \xF0\x91\xAA\x87 + \xF0\x91\xAA\x88 + \xF0\x91\xAA\x89 + \xF0\x91\xAA\x8A + \xF0\x91\xAA\x8B + \xF0\x91\xAA\x8C + \xF0\x91\xAA\x8D + \xF0\x91\xAA\x8E + \xF0\x91\xAA\x8F + \xF0\x91\xAA\x90 + \xF0\x91\xAA\x91 + \xF0\x91\xAA\x92 + \xF0\x91\xAA\x93 + \xF0\x91\xAA\x94 + \xF0\x91\xAA\x95 + \xF0\x91\xAA\x96 + \xF0\x91\xAA\x97 + \xF0\x91\xAA\x98 + \xF0\x91\xAA\x99 + \xF0\x91\xAA\x9A + \xF0\x91\xAA\x9B + \xF0\x91\xAA\x9C + \xF0\x91\xAA\x9E + \xF0\x91\xAA\x9F + \xF0\x91\xAA\xA0 + \xF0\x91\xAA\xA1 + \xF0\x91\xAA\xA2 \xF0\x91\xAB\x80 \xF0\x91\xAB\x81 \xF0\x91\xAB\x82 @@ -65540,6 +65752,81 @@ CHARMAP \xF0\x91\xB2\xB4 \xF0\x91\xB2\xB5 \xF0\x91\xB2\xB6 + \xF0\x91\xB4\x80 + \xF0\x91\xB4\x81 + \xF0\x91\xB4\x82 + \xF0\x91\xB4\x83 + \xF0\x91\xB4\x84 + \xF0\x91\xB4\x85 + \xF0\x91\xB4\x86 + \xF0\x91\xB4\x88 + \xF0\x91\xB4\x89 + \xF0\x91\xB4\x8B + \xF0\x91\xB4\x8C + \xF0\x91\xB4\x8D + \xF0\x91\xB4\x8E + \xF0\x91\xB4\x8F + \xF0\x91\xB4\x90 + \xF0\x91\xB4\x91 + \xF0\x91\xB4\x92 + \xF0\x91\xB4\x93 + \xF0\x91\xB4\x94 + \xF0\x91\xB4\x95 + \xF0\x91\xB4\x96 + \xF0\x91\xB4\x97 + \xF0\x91\xB4\x98 + \xF0\x91\xB4\x99 + \xF0\x91\xB4\x9A + \xF0\x91\xB4\x9B + \xF0\x91\xB4\x9C + \xF0\x91\xB4\x9D + \xF0\x91\xB4\x9E + \xF0\x91\xB4\x9F + \xF0\x91\xB4\xA0 + \xF0\x91\xB4\xA1 + \xF0\x91\xB4\xA2 + \xF0\x91\xB4\xA3 + \xF0\x91\xB4\xA4 + \xF0\x91\xB4\xA5 + \xF0\x91\xB4\xA6 + \xF0\x91\xB4\xA7 + \xF0\x91\xB4\xA8 + \xF0\x91\xB4\xA9 + \xF0\x91\xB4\xAA + \xF0\x91\xB4\xAB + \xF0\x91\xB4\xAC + \xF0\x91\xB4\xAD + \xF0\x91\xB4\xAE + \xF0\x91\xB4\xAF + \xF0\x91\xB4\xB0 + \xF0\x91\xB4\xB1 + \xF0\x91\xB4\xB2 + \xF0\x91\xB4\xB3 + \xF0\x91\xB4\xB4 + \xF0\x91\xB4\xB5 + \xF0\x91\xB4\xB6 + \xF0\x91\xB4\xBA + \xF0\x91\xB4\xBC + \xF0\x91\xB4\xBD + \xF0\x91\xB4\xBF + \xF0\x91\xB5\x80 + \xF0\x91\xB5\x81 + \xF0\x91\xB5\x82 + \xF0\x91\xB5\x83 + \xF0\x91\xB5\x84 + \xF0\x91\xB5\x85 + \xF0\x91\xB5\x86 + \xF0\x91\xB5\x87 + \xF0\x91\xB5\x90 + \xF0\x91\xB5\x91 + \xF0\x91\xB5\x92 + \xF0\x91\xB5\x93 + \xF0\x91\xB5\x94 + \xF0\x91\xB5\x95 + \xF0\x91\xB5\x96 + \xF0\x91\xB5\x97 + \xF0\x91\xB5\x98 + \xF0\x91\xB5\x99 \xF0\x92\x80\x80 \xF0\x92\x80\x81 \xF0\x92\x80\x82 @@ -69337,6 +69624,7 @@ CHARMAP \xF0\x96\xBE\x9E \xF0\x96\xBE\x9F \xF0\x96\xBF\xA0 + \xF0\x96\xBF\xA1 \xF0\x97\x80\x80 \xF0\x97\x80\x81 \xF0\x97\x80\x82 @@ -76219,6 +76507,687 @@ CHARMAP \xF0\x98\xAB\xB2 \xF0\x9B\x80\x80 \xF0\x9B\x80\x81 + \xF0\x9B\x80\x82 + \xF0\x9B\x80\x83 + \xF0\x9B\x80\x84 + \xF0\x9B\x80\x85 + \xF0\x9B\x80\x86 + \xF0\x9B\x80\x87 + \xF0\x9B\x80\x88 + \xF0\x9B\x80\x89 + \xF0\x9B\x80\x8A + \xF0\x9B\x80\x8B + \xF0\x9B\x80\x8C + \xF0\x9B\x80\x8D + \xF0\x9B\x80\x8E + \xF0\x9B\x80\x8F + \xF0\x9B\x80\x90 + \xF0\x9B\x80\x91 + \xF0\x9B\x80\x92 + \xF0\x9B\x80\x93 + \xF0\x9B\x80\x94 + \xF0\x9B\x80\x95 + \xF0\x9B\x80\x96 + \xF0\x9B\x80\x97 + \xF0\x9B\x80\x98 + \xF0\x9B\x80\x99 + \xF0\x9B\x80\x9A + \xF0\x9B\x80\x9B + \xF0\x9B\x80\x9C + \xF0\x9B\x80\x9D + \xF0\x9B\x80\x9E + \xF0\x9B\x80\x9F + \xF0\x9B\x80\xA0 + \xF0\x9B\x80\xA1 + \xF0\x9B\x80\xA2 + \xF0\x9B\x80\xA3 + \xF0\x9B\x80\xA4 + \xF0\x9B\x80\xA5 + \xF0\x9B\x80\xA6 + \xF0\x9B\x80\xA7 + \xF0\x9B\x80\xA8 + \xF0\x9B\x80\xA9 + \xF0\x9B\x80\xAA + \xF0\x9B\x80\xAB + \xF0\x9B\x80\xAC + \xF0\x9B\x80\xAD + \xF0\x9B\x80\xAE + \xF0\x9B\x80\xAF + \xF0\x9B\x80\xB0 + \xF0\x9B\x80\xB1 + \xF0\x9B\x80\xB2 + \xF0\x9B\x80\xB3 + \xF0\x9B\x80\xB4 + \xF0\x9B\x80\xB5 + \xF0\x9B\x80\xB6 + \xF0\x9B\x80\xB7 + \xF0\x9B\x80\xB8 + \xF0\x9B\x80\xB9 + \xF0\x9B\x80\xBA + \xF0\x9B\x80\xBB + \xF0\x9B\x80\xBC + \xF0\x9B\x80\xBD + \xF0\x9B\x80\xBE + \xF0\x9B\x80\xBF + \xF0\x9B\x81\x80 + \xF0\x9B\x81\x81 + \xF0\x9B\x81\x82 + \xF0\x9B\x81\x83 + \xF0\x9B\x81\x84 + \xF0\x9B\x81\x85 + \xF0\x9B\x81\x86 + \xF0\x9B\x81\x87 + \xF0\x9B\x81\x88 + \xF0\x9B\x81\x89 + \xF0\x9B\x81\x8A + \xF0\x9B\x81\x8B + \xF0\x9B\x81\x8C + \xF0\x9B\x81\x8D + \xF0\x9B\x81\x8E + \xF0\x9B\x81\x8F + \xF0\x9B\x81\x90 + \xF0\x9B\x81\x91 + \xF0\x9B\x81\x92 + \xF0\x9B\x81\x93 + \xF0\x9B\x81\x94 + \xF0\x9B\x81\x95 + \xF0\x9B\x81\x96 + \xF0\x9B\x81\x97 + \xF0\x9B\x81\x98 + \xF0\x9B\x81\x99 + \xF0\x9B\x81\x9A + \xF0\x9B\x81\x9B + \xF0\x9B\x81\x9C + \xF0\x9B\x81\x9D + \xF0\x9B\x81\x9E + \xF0\x9B\x81\x9F + \xF0\x9B\x81\xA0 + \xF0\x9B\x81\xA1 + \xF0\x9B\x81\xA2 + \xF0\x9B\x81\xA3 + \xF0\x9B\x81\xA4 + \xF0\x9B\x81\xA5 + \xF0\x9B\x81\xA6 + \xF0\x9B\x81\xA7 + \xF0\x9B\x81\xA8 + \xF0\x9B\x81\xA9 + \xF0\x9B\x81\xAA + \xF0\x9B\x81\xAB + \xF0\x9B\x81\xAC + \xF0\x9B\x81\xAD + \xF0\x9B\x81\xAE + \xF0\x9B\x81\xAF + \xF0\x9B\x81\xB0 + \xF0\x9B\x81\xB1 + \xF0\x9B\x81\xB2 + \xF0\x9B\x81\xB3 + \xF0\x9B\x81\xB4 + \xF0\x9B\x81\xB5 + \xF0\x9B\x81\xB6 + \xF0\x9B\x81\xB7 + \xF0\x9B\x81\xB8 + \xF0\x9B\x81\xB9 + \xF0\x9B\x81\xBA + \xF0\x9B\x81\xBB + \xF0\x9B\x81\xBC + \xF0\x9B\x81\xBD + \xF0\x9B\x81\xBE + \xF0\x9B\x81\xBF + \xF0\x9B\x82\x80 + \xF0\x9B\x82\x81 + \xF0\x9B\x82\x82 + \xF0\x9B\x82\x83 + \xF0\x9B\x82\x84 + \xF0\x9B\x82\x85 + \xF0\x9B\x82\x86 + \xF0\x9B\x82\x87 + \xF0\x9B\x82\x88 + \xF0\x9B\x82\x89 + \xF0\x9B\x82\x8A + \xF0\x9B\x82\x8B + \xF0\x9B\x82\x8C + \xF0\x9B\x82\x8D + \xF0\x9B\x82\x8E + \xF0\x9B\x82\x8F + \xF0\x9B\x82\x90 + \xF0\x9B\x82\x91 + \xF0\x9B\x82\x92 + \xF0\x9B\x82\x93 + \xF0\x9B\x82\x94 + \xF0\x9B\x82\x95 + \xF0\x9B\x82\x96 + \xF0\x9B\x82\x97 + \xF0\x9B\x82\x98 + \xF0\x9B\x82\x99 + \xF0\x9B\x82\x9A + \xF0\x9B\x82\x9B + \xF0\x9B\x82\x9C + \xF0\x9B\x82\x9D + \xF0\x9B\x82\x9E + \xF0\x9B\x82\x9F + \xF0\x9B\x82\xA0 + \xF0\x9B\x82\xA1 + \xF0\x9B\x82\xA2 + \xF0\x9B\x82\xA3 + \xF0\x9B\x82\xA4 + \xF0\x9B\x82\xA5 + \xF0\x9B\x82\xA6 + \xF0\x9B\x82\xA7 + \xF0\x9B\x82\xA8 + \xF0\x9B\x82\xA9 + \xF0\x9B\x82\xAA + \xF0\x9B\x82\xAB + \xF0\x9B\x82\xAC + \xF0\x9B\x82\xAD + \xF0\x9B\x82\xAE + \xF0\x9B\x82\xAF + \xF0\x9B\x82\xB0 + \xF0\x9B\x82\xB1 + \xF0\x9B\x82\xB2 + \xF0\x9B\x82\xB3 + \xF0\x9B\x82\xB4 + \xF0\x9B\x82\xB5 + \xF0\x9B\x82\xB6 + \xF0\x9B\x82\xB7 + \xF0\x9B\x82\xB8 + \xF0\x9B\x82\xB9 + \xF0\x9B\x82\xBA + \xF0\x9B\x82\xBB + \xF0\x9B\x82\xBC + \xF0\x9B\x82\xBD + \xF0\x9B\x82\xBE + \xF0\x9B\x82\xBF + \xF0\x9B\x83\x80 + \xF0\x9B\x83\x81 + \xF0\x9B\x83\x82 + \xF0\x9B\x83\x83 + \xF0\x9B\x83\x84 + \xF0\x9B\x83\x85 + \xF0\x9B\x83\x86 + \xF0\x9B\x83\x87 + \xF0\x9B\x83\x88 + \xF0\x9B\x83\x89 + \xF0\x9B\x83\x8A + \xF0\x9B\x83\x8B + \xF0\x9B\x83\x8C + \xF0\x9B\x83\x8D + \xF0\x9B\x83\x8E + \xF0\x9B\x83\x8F + \xF0\x9B\x83\x90 + \xF0\x9B\x83\x91 + \xF0\x9B\x83\x92 + \xF0\x9B\x83\x93 + \xF0\x9B\x83\x94 + \xF0\x9B\x83\x95 + \xF0\x9B\x83\x96 + \xF0\x9B\x83\x97 + \xF0\x9B\x83\x98 + \xF0\x9B\x83\x99 + \xF0\x9B\x83\x9A + \xF0\x9B\x83\x9B + \xF0\x9B\x83\x9C + \xF0\x9B\x83\x9D + \xF0\x9B\x83\x9E + \xF0\x9B\x83\x9F + \xF0\x9B\x83\xA0 + \xF0\x9B\x83\xA1 + \xF0\x9B\x83\xA2 + \xF0\x9B\x83\xA3 + \xF0\x9B\x83\xA4 + \xF0\x9B\x83\xA5 + \xF0\x9B\x83\xA6 + \xF0\x9B\x83\xA7 + \xF0\x9B\x83\xA8 + \xF0\x9B\x83\xA9 + \xF0\x9B\x83\xAA + \xF0\x9B\x83\xAB + \xF0\x9B\x83\xAC + \xF0\x9B\x83\xAD + \xF0\x9B\x83\xAE + \xF0\x9B\x83\xAF + \xF0\x9B\x83\xB0 + \xF0\x9B\x83\xB1 + \xF0\x9B\x83\xB2 + \xF0\x9B\x83\xB3 + \xF0\x9B\x83\xB4 + \xF0\x9B\x83\xB5 + \xF0\x9B\x83\xB6 + \xF0\x9B\x83\xB7 + \xF0\x9B\x83\xB8 + \xF0\x9B\x83\xB9 + \xF0\x9B\x83\xBA + \xF0\x9B\x83\xBB + \xF0\x9B\x83\xBC + \xF0\x9B\x83\xBD + \xF0\x9B\x83\xBE + \xF0\x9B\x83\xBF + \xF0\x9B\x84\x80 + \xF0\x9B\x84\x81 + \xF0\x9B\x84\x82 + \xF0\x9B\x84\x83 + \xF0\x9B\x84\x84 + \xF0\x9B\x84\x85 + \xF0\x9B\x84\x86 + \xF0\x9B\x84\x87 + \xF0\x9B\x84\x88 + \xF0\x9B\x84\x89 + \xF0\x9B\x84\x8A + \xF0\x9B\x84\x8B + \xF0\x9B\x84\x8C + \xF0\x9B\x84\x8D + \xF0\x9B\x84\x8E + \xF0\x9B\x84\x8F + \xF0\x9B\x84\x90 + \xF0\x9B\x84\x91 + \xF0\x9B\x84\x92 + \xF0\x9B\x84\x93 + \xF0\x9B\x84\x94 + \xF0\x9B\x84\x95 + \xF0\x9B\x84\x96 + \xF0\x9B\x84\x97 + \xF0\x9B\x84\x98 + \xF0\x9B\x84\x99 + \xF0\x9B\x84\x9A + \xF0\x9B\x84\x9B + \xF0\x9B\x84\x9C + \xF0\x9B\x84\x9D + \xF0\x9B\x84\x9E + \xF0\x9B\x85\xB0 + \xF0\x9B\x85\xB1 + \xF0\x9B\x85\xB2 + \xF0\x9B\x85\xB3 + \xF0\x9B\x85\xB4 + \xF0\x9B\x85\xB5 + \xF0\x9B\x85\xB6 + \xF0\x9B\x85\xB7 + \xF0\x9B\x85\xB8 + \xF0\x9B\x85\xB9 + \xF0\x9B\x85\xBA + \xF0\x9B\x85\xBB + \xF0\x9B\x85\xBC + \xF0\x9B\x85\xBD + \xF0\x9B\x85\xBE + \xF0\x9B\x85\xBF + \xF0\x9B\x86\x80 + \xF0\x9B\x86\x81 + \xF0\x9B\x86\x82 + \xF0\x9B\x86\x83 + \xF0\x9B\x86\x84 + \xF0\x9B\x86\x85 + \xF0\x9B\x86\x86 + \xF0\x9B\x86\x87 + \xF0\x9B\x86\x88 + \xF0\x9B\x86\x89 + \xF0\x9B\x86\x8A + \xF0\x9B\x86\x8B + \xF0\x9B\x86\x8C + \xF0\x9B\x86\x8D + \xF0\x9B\x86\x8E + \xF0\x9B\x86\x8F + \xF0\x9B\x86\x90 + \xF0\x9B\x86\x91 + \xF0\x9B\x86\x92 + \xF0\x9B\x86\x93 + \xF0\x9B\x86\x94 + \xF0\x9B\x86\x95 + \xF0\x9B\x86\x96 + \xF0\x9B\x86\x97 + \xF0\x9B\x86\x98 + \xF0\x9B\x86\x99 + \xF0\x9B\x86\x9A + \xF0\x9B\x86\x9B + \xF0\x9B\x86\x9C + \xF0\x9B\x86\x9D + \xF0\x9B\x86\x9E + \xF0\x9B\x86\x9F + \xF0\x9B\x86\xA0 + \xF0\x9B\x86\xA1 + \xF0\x9B\x86\xA2 + \xF0\x9B\x86\xA3 + \xF0\x9B\x86\xA4 + \xF0\x9B\x86\xA5 + \xF0\x9B\x86\xA6 + \xF0\x9B\x86\xA7 + \xF0\x9B\x86\xA8 + \xF0\x9B\x86\xA9 + \xF0\x9B\x86\xAA + \xF0\x9B\x86\xAB + \xF0\x9B\x86\xAC + \xF0\x9B\x86\xAD + \xF0\x9B\x86\xAE + \xF0\x9B\x86\xAF + \xF0\x9B\x86\xB0 + \xF0\x9B\x86\xB1 + \xF0\x9B\x86\xB2 + \xF0\x9B\x86\xB3 + \xF0\x9B\x86\xB4 + \xF0\x9B\x86\xB5 + \xF0\x9B\x86\xB6 + \xF0\x9B\x86\xB7 + \xF0\x9B\x86\xB8 + \xF0\x9B\x86\xB9 + \xF0\x9B\x86\xBA + \xF0\x9B\x86\xBB + \xF0\x9B\x86\xBC + \xF0\x9B\x86\xBD + \xF0\x9B\x86\xBE + \xF0\x9B\x86\xBF + \xF0\x9B\x87\x80 + \xF0\x9B\x87\x81 + \xF0\x9B\x87\x82 + \xF0\x9B\x87\x83 + \xF0\x9B\x87\x84 + \xF0\x9B\x87\x85 + \xF0\x9B\x87\x86 + \xF0\x9B\x87\x87 + \xF0\x9B\x87\x88 + \xF0\x9B\x87\x89 + \xF0\x9B\x87\x8A + \xF0\x9B\x87\x8B + \xF0\x9B\x87\x8C + \xF0\x9B\x87\x8D + \xF0\x9B\x87\x8E + \xF0\x9B\x87\x8F + \xF0\x9B\x87\x90 + \xF0\x9B\x87\x91 + \xF0\x9B\x87\x92 + \xF0\x9B\x87\x93 + \xF0\x9B\x87\x94 + \xF0\x9B\x87\x95 + \xF0\x9B\x87\x96 + \xF0\x9B\x87\x97 + \xF0\x9B\x87\x98 + \xF0\x9B\x87\x99 + \xF0\x9B\x87\x9A + \xF0\x9B\x87\x9B + \xF0\x9B\x87\x9C + \xF0\x9B\x87\x9D + \xF0\x9B\x87\x9E + \xF0\x9B\x87\x9F + \xF0\x9B\x87\xA0 + \xF0\x9B\x87\xA1 + \xF0\x9B\x87\xA2 + \xF0\x9B\x87\xA3 + \xF0\x9B\x87\xA4 + \xF0\x9B\x87\xA5 + \xF0\x9B\x87\xA6 + \xF0\x9B\x87\xA7 + \xF0\x9B\x87\xA8 + \xF0\x9B\x87\xA9 + \xF0\x9B\x87\xAA + \xF0\x9B\x87\xAB + \xF0\x9B\x87\xAC + \xF0\x9B\x87\xAD + \xF0\x9B\x87\xAE + \xF0\x9B\x87\xAF + \xF0\x9B\x87\xB0 + \xF0\x9B\x87\xB1 + \xF0\x9B\x87\xB2 + \xF0\x9B\x87\xB3 + \xF0\x9B\x87\xB4 + \xF0\x9B\x87\xB5 + \xF0\x9B\x87\xB6 + \xF0\x9B\x87\xB7 + \xF0\x9B\x87\xB8 + \xF0\x9B\x87\xB9 + \xF0\x9B\x87\xBA + \xF0\x9B\x87\xBB + \xF0\x9B\x87\xBC + \xF0\x9B\x87\xBD + \xF0\x9B\x87\xBE + \xF0\x9B\x87\xBF + \xF0\x9B\x88\x80 + \xF0\x9B\x88\x81 + \xF0\x9B\x88\x82 + \xF0\x9B\x88\x83 + \xF0\x9B\x88\x84 + \xF0\x9B\x88\x85 + \xF0\x9B\x88\x86 + \xF0\x9B\x88\x87 + \xF0\x9B\x88\x88 + \xF0\x9B\x88\x89 + \xF0\x9B\x88\x8A + \xF0\x9B\x88\x8B + \xF0\x9B\x88\x8C + \xF0\x9B\x88\x8D + \xF0\x9B\x88\x8E + \xF0\x9B\x88\x8F + \xF0\x9B\x88\x90 + \xF0\x9B\x88\x91 + \xF0\x9B\x88\x92 + \xF0\x9B\x88\x93 + \xF0\x9B\x88\x94 + \xF0\x9B\x88\x95 + \xF0\x9B\x88\x96 + \xF0\x9B\x88\x97 + \xF0\x9B\x88\x98 + \xF0\x9B\x88\x99 + \xF0\x9B\x88\x9A + \xF0\x9B\x88\x9B + \xF0\x9B\x88\x9C + \xF0\x9B\x88\x9D + \xF0\x9B\x88\x9E + \xF0\x9B\x88\x9F + \xF0\x9B\x88\xA0 + \xF0\x9B\x88\xA1 + \xF0\x9B\x88\xA2 + \xF0\x9B\x88\xA3 + \xF0\x9B\x88\xA4 + \xF0\x9B\x88\xA5 + \xF0\x9B\x88\xA6 + \xF0\x9B\x88\xA7 + \xF0\x9B\x88\xA8 + \xF0\x9B\x88\xA9 + \xF0\x9B\x88\xAA + \xF0\x9B\x88\xAB + \xF0\x9B\x88\xAC + \xF0\x9B\x88\xAD + \xF0\x9B\x88\xAE + \xF0\x9B\x88\xAF + \xF0\x9B\x88\xB0 + \xF0\x9B\x88\xB1 + \xF0\x9B\x88\xB2 + \xF0\x9B\x88\xB3 + \xF0\x9B\x88\xB4 + \xF0\x9B\x88\xB5 + \xF0\x9B\x88\xB6 + \xF0\x9B\x88\xB7 + \xF0\x9B\x88\xB8 + \xF0\x9B\x88\xB9 + \xF0\x9B\x88\xBA + \xF0\x9B\x88\xBB + \xF0\x9B\x88\xBC + \xF0\x9B\x88\xBD + \xF0\x9B\x88\xBE + \xF0\x9B\x88\xBF + \xF0\x9B\x89\x80 + \xF0\x9B\x89\x81 + \xF0\x9B\x89\x82 + \xF0\x9B\x89\x83 + \xF0\x9B\x89\x84 + \xF0\x9B\x89\x85 + \xF0\x9B\x89\x86 + \xF0\x9B\x89\x87 + \xF0\x9B\x89\x88 + \xF0\x9B\x89\x89 + \xF0\x9B\x89\x8A + \xF0\x9B\x89\x8B + \xF0\x9B\x89\x8C + \xF0\x9B\x89\x8D + \xF0\x9B\x89\x8E + \xF0\x9B\x89\x8F + \xF0\x9B\x89\x90 + \xF0\x9B\x89\x91 + \xF0\x9B\x89\x92 + \xF0\x9B\x89\x93 + \xF0\x9B\x89\x94 + \xF0\x9B\x89\x95 + \xF0\x9B\x89\x96 + \xF0\x9B\x89\x97 + \xF0\x9B\x89\x98 + \xF0\x9B\x89\x99 + \xF0\x9B\x89\x9A + \xF0\x9B\x89\x9B + \xF0\x9B\x89\x9C + \xF0\x9B\x89\x9D + \xF0\x9B\x89\x9E *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Fri Nov 3 13:43: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 D0A50E529E6; Fri, 3 Nov 2017 13:43:06 +0000 (UTC) (envelope-from hselasky@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 AA8CE650D4; Fri, 3 Nov 2017 13:43:06 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA3Dh5BQ068387; Fri, 3 Nov 2017 13:43:05 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA3Dh5KR068386; Fri, 3 Nov 2017 13:43:05 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201711031343.vA3Dh5KR068386@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Fri, 3 Nov 2017 13:43:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325360 - head/sys/compat/linuxkpi/common/src X-SVN-Group: head X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: head/sys/compat/linuxkpi/common/src X-SVN-Commit-Revision: 325360 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: Fri, 03 Nov 2017 13:43:06 -0000 Author: hselasky Date: Fri Nov 3 13:43:05 2017 New Revision: 325360 URL: https://svnweb.freebsd.org/changeset/base/325360 Log: Remove redundant dev->si_drv1 NULL checks in the LinuxKPI. This pointer is checked during the linux_dev_open() callback and does not need to be NULL checked again. It should always be set for character devices belonging to the "linuxcdevsw" and technically there is no need to NULL check this pointer at all. Suggested by: kib @ MFC after: 1 week Sponsored by: Mellanox Technologies Modified: head/sys/compat/linuxkpi/common/src/linux_compat.c Modified: head/sys/compat/linuxkpi/common/src/linux_compat.c ============================================================================== --- head/sys/compat/linuxkpi/common/src/linux_compat.c Fri Nov 3 13:42:04 2017 (r325359) +++ head/sys/compat/linuxkpi/common/src/linux_compat.c Fri Nov 3 13:43:05 2017 (r325360) @@ -745,8 +745,6 @@ linux_dev_close(struct cdev *dev, int fflag, int devty int error; file = td->td_fpop; - if (dev->si_drv1 == NULL) - return (0); if ((error = devfs_get_cdevpriv((void **)&filp)) != 0) return (error); filp->f_flags = file->f_flag; @@ -879,8 +877,6 @@ linux_dev_ioctl(struct cdev *dev, u_long cmd, caddr_t int error; file = td->td_fpop; - if (dev->si_drv1 == NULL) - return (ENXIO); if ((error = devfs_get_cdevpriv((void **)&filp)) != 0) return (error); filp->f_flags = file->f_flag; @@ -948,8 +944,6 @@ linux_dev_read(struct cdev *dev, struct uio *uio, int td = curthread; file = td->td_fpop; - if (dev->si_drv1 == NULL) - return (ENXIO); if ((error = devfs_get_cdevpriv((void **)&filp)) != 0) return (error); filp->f_flags = file->f_flag; @@ -990,8 +984,6 @@ linux_dev_write(struct cdev *dev, struct uio *uio, int td = curthread; file = td->td_fpop; - if (dev->si_drv1 == NULL) - return (ENXIO); if ((error = devfs_get_cdevpriv((void **)&filp)) != 0) return (error); filp->f_flags = file->f_flag; @@ -1030,8 +1022,6 @@ linux_dev_poll(struct cdev *dev, int events, struct th struct file *file; int revents; - if (dev->si_drv1 == NULL) - goto error; if (devfs_get_cdevpriv((void **)&filp) != 0) goto error; @@ -1233,8 +1223,6 @@ linux_dev_kqfilter(struct cdev *dev, struct knote *kn) td = curthread; file = td->td_fpop; - if (dev->si_drv1 == NULL) - return (ENXIO); if ((error = devfs_get_cdevpriv((void **)&filp)) != 0) return (error); filp->f_flags = file->f_flag; @@ -1285,8 +1273,6 @@ linux_dev_mmap_single(struct cdev *dev, vm_ooffset_t * td = curthread; file = td->td_fpop; - if (dev->si_drv1 == NULL) - return (ENODEV); if ((error = devfs_get_cdevpriv((void **)&filp)) != 0) return (error); filp->f_flags = file->f_flag; From owner-svn-src-all@freebsd.org Fri Nov 3 13:45: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 9EAD5E52AD5; Fri, 3 Nov 2017 13:45:20 +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 55371652B4; Fri, 3 Nov 2017 13:45:19 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from spqr.komquats.com ([96.50.22.10]) by shaw.ca with SMTP id AcHWexbLGI8mCAcHXeI0Z1; Fri, 03 Nov 2017 07:45:12 -0600 X-Authority-Analysis: v=2.2 cv=HahkdmM8 c=1 sm=1 tr=0 a=jvE2nwUzI0ECrNeyr98KWA==:117 a=jvE2nwUzI0ECrNeyr98KWA==:17 a=kj9zAlcOel0A:10 a=xqWC_Br6kY4A:10 a=sC3jslCIGhcA:10 a=VxmjJ2MpAAAA:8 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=6qytifEUq2CPgH63iQ8A:9 a=CjuIK1q_8ugA:10 a=7gXAzLPJhVmCkEl4_tsf:22 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTPS id 6326B3B4; Fri, 3 Nov 2017 06:45:10 -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 vA3DjAPC041708; Fri, 3 Nov 2017 06:45:10 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <201711031345.vA3DjAPC041708@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: Cy Schubert cc: Cy Schubert , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r325357 - head/lib/libc/stdio In-Reply-To: Message from Cy Schubert of "Fri, 03 Nov 2017 06:15:06 -0700." <201711031315.vA3DF6Oc041175@slippy.cwsent.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Fri, 03 Nov 2017 06:45:10 -0700 X-CMAE-Envelope: MS4wfEnJ388x4Layxm04SZYeHzSpAhW+lCCdBSv8+8JGdCrwYlbcV7bercWquHyGLeEU+n+Dz0TiJWW7poy30NvF02EkOXanQUbLDvt+p1A5NrWtEzN9C0zB j/NJrO0R9dMYt4+klwV3qjjNW+XutZz9PTG6E/bj4xFUWB4J4pca5ovIA7CsG6xLE4vV7UlZzv3DeDlU0rQHBC8frA1OY7UAZCxQYLipvH/+a23S3ynMtML6 D4KeckXUFrzphDdxiFHFNPmiLYZLdL9CtfyB2vDxUUM23jKrRDuUJOwPa//zFSd+ 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: Fri, 03 Nov 2017 13:45:20 -0000 In message <201711031315.vA3DF6Oc041175@slippy.cwsent.com>, Cy Schubert writes: > In message <201711031308.vA3D8Tj1051559@repo.freebsd.org>, Cy Schubert > writes: > > Author: cy > > Date: Fri Nov 3 13:08:29 2017 > > New Revision: 325357 > > URL: https://svnweb.freebsd.org/changeset/base/325357 > > > > Log: > > While discussing the new gets_s.c in D12785, ed@ suggested putting > > {}'s around the if (c == EOF) block to prevent potential 'trailing else' > > issues from being introduced when refactoring. As my gets_s() code > > is based on this, it makes sense to fix the same issue here first > > here and now, then do an svn copy again to capture this history). > > > > Suggested by: ed@ in D12785 > > > > Modified: > > head/lib/libc/stdio/gets.c > > > > Modified: head/lib/libc/stdio/gets.c > > =========================================================================== > == > > = > > --- head/lib/libc/stdio/gets.c Fri Nov 3 12:52:59 2017 (r32535 > > 6) > > +++ head/lib/libc/stdio/gets.c Fri Nov 3 13:08:29 2017 (r32535 > > 7) > > @@ -61,13 +61,13 @@ gets(char *buf) > > warned = 1; > > } > > for (s = buf; (c = __sgetc(stdin)) != '\n'; ) { > > - if (c == EOF) > > + if (c == EOF) { > > if (s == buf) { > > ret = NULL; > > goto end; > > } else > > break; > > - else > > + } else > > *s++ = c; > > } > > *s = 0; > > This should probably be MFCed too. > > MFC after: 2 weeks Also, apologies to Ed Maste. Credit should go to emaste@ instead of ed@ (both listed as reviewers on D12785). -- 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 Fri Nov 3 13:52:36 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 A15E6E52DDF; Fri, 3 Nov 2017 13:52:36 +0000 (UTC) (envelope-from bapt@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 57FCC657DC; Fri, 3 Nov 2017 13:52:36 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA3DqZYl072391; Fri, 3 Nov 2017 13:52:35 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA3DqYgk072378; Fri, 3 Nov 2017 13:52:34 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201711031352.vA3DqYgk072378@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Fri, 3 Nov 2017 13:52:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325361 - in head/share: colldef ctypedef monetdef msgdef numericdef X-SVN-Group: head X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: in head/share: colldef ctypedef monetdef msgdef numericdef X-SVN-Commit-Revision: 325361 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: Fri, 03 Nov 2017 13:52:36 -0000 Author: bapt Date: Fri Nov 3 13:52:34 2017 New Revision: 325361 URL: https://svnweb.freebsd.org/changeset/base/325361 Log: Update to CLDR 32 and Unicode 10 MFC after: 2 weeks Relnotes: yes Added: head/share/monetdef/it_CH.ISO8859-15.src (contents, props changed) head/share/msgdef/he_IL.UTF-8.src (contents, props changed) head/share/numericdef/it_CH.ISO8859-15.src (contents, props changed) Deleted: head/share/numericdef/fr_CH.ISO8859-15.src head/share/numericdef/fr_CH.UTF-8.src Modified: head/share/colldef/Makefile head/share/colldef/af_ZA.UTF-8.src head/share/colldef/am_ET.UTF-8.src head/share/colldef/ar_SA.UTF-8.src head/share/colldef/be_BY.UTF-8.src head/share/colldef/ca_AD.UTF-8.src head/share/colldef/cs_CZ.ISO8859-2.src head/share/colldef/cs_CZ.UTF-8.src head/share/colldef/da_DK.ISO8859-1.src head/share/colldef/da_DK.ISO8859-15.src head/share/colldef/da_DK.UTF-8.src head/share/colldef/el_GR.UTF-8.src head/share/colldef/en_US.UTF-8.src head/share/colldef/es_MX.UTF-8.src head/share/colldef/et_EE.UTF-8.src head/share/colldef/fi_FI.UTF-8.src head/share/colldef/fr_CA.UTF-8.src head/share/colldef/he_IL.UTF-8.src head/share/colldef/hi_IN.UTF-8.src head/share/colldef/hr_HR.ISO8859-2.src head/share/colldef/hu_HU.ISO8859-2.src head/share/colldef/hu_HU.UTF-8.src head/share/colldef/hy_AM.UTF-8.src head/share/colldef/is_IS.UTF-8.src head/share/colldef/ja_JP.UTF-8.src head/share/colldef/ja_JP.eucJP.src head/share/colldef/kk_KZ.UTF-8.src head/share/colldef/ko_KR.UTF-8.src head/share/colldef/lt_LT.UTF-8.src head/share/colldef/lv_LV.UTF-8.src head/share/colldef/nb_NO.ISO8859-1.src head/share/colldef/nb_NO.ISO8859-15.src head/share/colldef/nn_NO.ISO8859-1.src head/share/colldef/nn_NO.ISO8859-15.src head/share/colldef/nn_NO.UTF-8.src head/share/colldef/pl_PL.UTF-8.src head/share/colldef/ro_RO.UTF-8.src head/share/colldef/ru_RU.UTF-8.src head/share/colldef/se_NO.UTF-8.src head/share/colldef/sk_SK.ISO8859-2.src head/share/colldef/sk_SK.UTF-8.src head/share/colldef/sl_SI.UTF-8.src head/share/colldef/sr_RS.ISO8859-2.src head/share/colldef/sr_RS.ISO8859-5.src head/share/colldef/sr_RS.UTF-8.src head/share/colldef/sr_RS.UTF-8@latin.src head/share/colldef/sv_SE.UTF-8.src head/share/colldef/tr_TR.UTF-8.src head/share/colldef/uk_UA.UTF-8.src head/share/colldef/zh_CN.GB18030.src head/share/colldef/zh_CN.GB2312.src head/share/colldef/zh_CN.GBK.src head/share/colldef/zh_CN.UTF-8.src head/share/colldef/zh_CN.eucCN.src head/share/colldef/zh_TW.Big5.src head/share/colldef/zh_TW.UTF-8.src head/share/ctypedef/Makefile head/share/ctypedef/en_US.UTF-8.src head/share/ctypedef/ja_JP.eucJP.src head/share/monetdef/Makefile head/share/monetdef/fr_CH.ISO8859-15.src head/share/monetdef/fr_CH.UTF-8.src head/share/monetdef/hy_AM.ARMSCII-8.src head/share/monetdef/hy_AM.UTF-8.src head/share/monetdef/it_CH.UTF-8.src head/share/monetdef/pt_BR.UTF-8.src head/share/monetdef/sl_SI.UTF-8.src head/share/msgdef/Makefile head/share/numericdef/Makefile head/share/numericdef/it_CH.UTF-8.src Modified: head/share/colldef/Makefile ============================================================================== --- head/share/colldef/Makefile Fri Nov 3 13:43:05 2017 (r325360) +++ head/share/colldef/Makefile Fri Nov 3 13:52:34 2017 (r325361) @@ -5,7 +5,7 @@ LOCALEDIR= ${SHAREDIR}/locale FILESNAME= LC_COLLATE .SUFFIXES: .src .LC_COLLATE -MAPLOC= ${SRCTOP}/tools/tools/locale/etc/final-maps +MAPLOC= ${.CURDIR}/../../tools/tools/locale/etc/final-maps .src.LC_COLLATE: localedef -D -U -i ${.IMPSRC} \ Modified: head/share/colldef/af_ZA.UTF-8.src ============================================================================== --- head/share/colldef/af_ZA.UTF-8.src Fri Nov 3 13:43:05 2017 (r325360) +++ head/share/colldef/af_ZA.UTF-8.src Fri Nov 3 13:52:34 2017 (r325361) @@ -71,9 +71,9 @@ collating-symbol collating-symbol collating-symbol collating-symbol -collating-symbol -collating-symbol -collating-symbol +collating-symbol +collating-symbol +collating-symbol collating-symbol collating-symbol collating-symbol @@ -98,7 +98,7 @@ collating-symbol collating-symbol collating-symbol collating-symbol -collating-symbol +collating-symbol collating-symbol collating-symbol collating-symbol @@ -561,9 +561,9 @@ order_start forward;forward;forward;forward - - - + + + @@ -588,7 +588,7 @@ order_start forward;forward;forward;forward - + @@ -1026,9 +1026,9 @@ order_start forward;forward;forward;forward ;;; ;;; ;;; - ;;; - ;;; - ;;; + ;;; + ;;; + ;;; ;;; ;;; ;;; @@ -1053,7 +1053,7 @@ order_start forward;forward;forward;forward ;;; ;;; ;;; - ;;; + ;;; ;;; ;;; ;;; @@ -1637,8 +1637,8 @@ order_start forward;forward;forward;forward ;"";""; ;"";""; ;"";""; - ;"";""; - ;"";""; + ;"";""; + ;"";""; "";"";""; "";"";""; "";"";""; Modified: head/share/colldef/am_ET.UTF-8.src ============================================================================== --- head/share/colldef/am_ET.UTF-8.src Fri Nov 3 13:43:05 2017 (r325360) +++ head/share/colldef/am_ET.UTF-8.src Fri Nov 3 13:52:34 2017 (r325361) @@ -34,15 +34,15 @@ collating-symbol collating-symbol collating-symbol collating-symbol -collating-symbol -collating-symbol +collating-symbol collating-symbol collating-symbol collating-symbol collating-symbol -collating-symbol -collating-symbol -collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol collating-symbol collating-symbol collating-symbol @@ -76,7 +76,7 @@ collating-symbol collating-symbol collating-symbol collating-symbol -collating-symbol +collating-symbol collating-symbol collating-symbol collating-symbol @@ -372,15 +372,15 @@ order_start forward;forward;forward;forward - - + - - - + + + + @@ -414,7 +414,7 @@ order_start forward;forward;forward;forward - + @@ -725,15 +725,15 @@ order_start forward;forward;forward;forward ;;; ;;; ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; ;;; ;;; ;;; @@ -771,7 +771,7 @@ order_start forward;forward;forward;forward ;;; ;;; ;;; - ;;; + ;;; ;;; ;;; ;;; Modified: head/share/colldef/ar_SA.UTF-8.src ============================================================================== --- head/share/colldef/ar_SA.UTF-8.src Fri Nov 3 13:43:05 2017 (r325360) +++ head/share/colldef/ar_SA.UTF-8.src Fri Nov 3 13:52:34 2017 (r325361) @@ -162,10 +162,10 @@ collating-symbol collating-symbol collating-symbol collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol collating-symbol collating-symbol collating-symbol @@ -198,8 +198,8 @@ collating-symbol collating-symbol collating-symbol collating-symbol -collating-symbol -collating-symbol +collating-symbol +collating-symbol collating-symbol collating-symbol collating-symbol @@ -487,10 +487,10 @@ order_start forward;forward;forward;forward - - - - + + + + @@ -523,8 +523,8 @@ order_start forward;forward;forward;forward - - + + @@ -745,6 +745,7 @@ order_start forward;forward;forward;forward IGNORE;IGNORE;IGNORE; IGNORE;IGNORE;IGNORE; IGNORE;IGNORE;IGNORE; + IGNORE;IGNORE;IGNORE; IGNORE;IGNORE;IGNORE; IGNORE;IGNORE;IGNORE; IGNORE;IGNORE;IGNORE; @@ -906,10 +907,10 @@ order_start forward;forward;forward;forward ;;; ;;; ;;; - ;;; - ;;; - ;;; - ;;; + ;;; + ;;; + ;;; + ;;; ;;; ;;; ;;; @@ -962,8 +963,8 @@ order_start forward;forward;forward;forward ;;; "";;""; "";;""; - ;;; - ;;; + ;;; + ;;; ;;; ;;; ;;; Modified: head/share/colldef/be_BY.UTF-8.src ============================================================================== --- head/share/colldef/be_BY.UTF-8.src Fri Nov 3 13:43:05 2017 (r325360) +++ head/share/colldef/be_BY.UTF-8.src Fri Nov 3 13:52:34 2017 (r325361) @@ -46,9 +46,9 @@ collating-symbol collating-symbol collating-symbol collating-symbol -collating-symbol -collating-symbol -collating-symbol +collating-symbol +collating-symbol +collating-symbol collating-symbol collating-symbol collating-symbol @@ -67,7 +67,7 @@ collating-symbol collating-symbol collating-symbol collating-symbol -collating-symbol +collating-symbol collating-symbol collating-symbol collating-symbol @@ -77,7 +77,7 @@ collating-symbol collating-symbol collating-symbol collating-symbol -collating-symbol +collating-symbol collating-symbol collating-symbol collating-symbol @@ -289,9 +289,9 @@ order_start forward;forward;forward;forward - - - + + + @@ -310,7 +310,7 @@ order_start forward;forward;forward;forward - + @@ -320,7 +320,7 @@ order_start forward;forward;forward;forward - + @@ -545,9 +545,9 @@ order_start forward;forward;forward;forward ;;; ;;; ;;; - ;;; - ;;; - ;;; + ;;; + ;;; + ;;; ;;; ;;; ;;; @@ -565,7 +565,7 @@ order_start forward;forward;forward;forward ;;; ;;; ;;; - ;;; + ;;; ;;; ;;; "";;""; @@ -575,7 +575,7 @@ order_start forward;forward;forward;forward ;;; ;;; ;;; - ;;; + ;;; ;;; ;;; ;;; Modified: head/share/colldef/ca_AD.UTF-8.src ============================================================================== --- head/share/colldef/ca_AD.UTF-8.src Fri Nov 3 13:43:05 2017 (r325360) +++ head/share/colldef/ca_AD.UTF-8.src Fri Nov 3 13:52:34 2017 (r325361) @@ -70,9 +70,9 @@ collating-symbol collating-symbol collating-symbol collating-symbol -collating-symbol -collating-symbol -collating-symbol +collating-symbol +collating-symbol +collating-symbol collating-symbol collating-symbol collating-symbol @@ -98,7 +98,7 @@ collating-symbol collating-symbol collating-symbol collating-symbol -collating-symbol +collating-symbol collating-symbol collating-symbol collating-symbol @@ -561,9 +561,9 @@ order_start forward;forward;forward;forward - - - + + + @@ -589,7 +589,7 @@ order_start forward;forward;forward;forward - + @@ -1028,9 +1028,9 @@ order_start forward;forward;forward;forward ;;; ;;; ;;; - ;;; - ;;; - ;;; + ;;; + ;;; + ;;; ;;; ;;; ;;; @@ -1056,7 +1056,7 @@ order_start forward;forward;forward;forward ;;; ;;; ;;; - ;;; + ;;; ;;; ;;; ;;; @@ -1640,8 +1640,8 @@ order_start forward;forward;forward;forward ;"";""; ;"";""; ;"";""; - ;"";""; - ;"";""; + ;"";""; + ;"";""; "";"";""; "";"";""; "";"";""; Modified: head/share/colldef/cs_CZ.ISO8859-2.src ============================================================================== --- head/share/colldef/cs_CZ.ISO8859-2.src Fri Nov 3 13:43:05 2017 (r325360) +++ head/share/colldef/cs_CZ.ISO8859-2.src Fri Nov 3 13:52:34 2017 (r325361) @@ -46,9 +46,9 @@ collating-symbol collating-symbol collating-symbol collating-symbol -collating-symbol -collating-symbol -collating-symbol +collating-symbol +collating-symbol +collating-symbol collating-symbol collating-symbol collating-symbol @@ -85,8 +85,8 @@ collating-symbol collating-symbol collating-symbol collating-symbol -collating-symbol -collating-symbol +collating-symbol +collating-symbol collating-symbol collating-symbol collating-symbol @@ -166,9 +166,9 @@ order_start forward;forward;forward;forward - - - + + + @@ -205,8 +205,8 @@ order_start forward;forward;forward;forward - - + + @@ -323,9 +323,9 @@ order_start forward;forward;forward;forward ;;; ;;; ;;; - ;;; - ;;; - ;;; + ;;; + ;;; + ;;; ;;; ;;; ;;; @@ -362,8 +362,8 @@ order_start forward;forward;forward;forward ;;; ;;; ;;; - ;;; - ;;; + ;;; + ;;; ;;; ;;; ;;; Modified: head/share/colldef/cs_CZ.UTF-8.src ============================================================================== --- head/share/colldef/cs_CZ.UTF-8.src Fri Nov 3 13:43:05 2017 (r325360) +++ head/share/colldef/cs_CZ.UTF-8.src Fri Nov 3 13:52:34 2017 (r325361) @@ -107,9 +107,9 @@ collating-symbol collating-symbol collating-symbol collating-symbol -collating-symbol -collating-symbol -collating-symbol +collating-symbol +collating-symbol +collating-symbol collating-symbol collating-symbol collating-symbol @@ -134,7 +134,7 @@ collating-symbol collating-symbol collating-symbol collating-symbol -collating-symbol +collating-symbol collating-symbol collating-symbol collating-symbol @@ -605,9 +605,9 @@ order_start forward;forward;forward;forward - - - + + + @@ -632,7 +632,7 @@ order_start forward;forward;forward;forward - + @@ -1076,9 +1076,9 @@ order_start forward;forward;forward;forward ;;; ;;; ;;; - ;;; - ;;; - ;;; + ;;; + ;;; + ;;; ;;; ;;; ;;; @@ -1103,7 +1103,7 @@ order_start forward;forward;forward;forward ;;; ;;; ;;; - ;;; + ;;; ;;; ;;; ;;; @@ -1721,8 +1721,8 @@ order_start forward;forward;forward;forward ;"";""; ;"";""; ;"";""; - ;"";""; - ;"";""; + ;"";""; + ;"";""; "";"";""; "";"";""; "";"";""; Modified: head/share/colldef/da_DK.ISO8859-1.src ============================================================================== --- head/share/colldef/da_DK.ISO8859-1.src Fri Nov 3 13:43:05 2017 (r325360) +++ head/share/colldef/da_DK.ISO8859-1.src Fri Nov 3 13:52:34 2017 (r325361) @@ -37,6 +37,7 @@ collating-symbol collating-symbol collating-symbol collating-symbol +collating-symbol collating-symbol collating-symbol collating-symbol @@ -55,7 +56,6 @@ collating-symbol collating-symbol collating-symbol collating-symbol -collating-symbol collating-symbol collating-symbol collating-symbol @@ -71,11 +71,11 @@ collating-symbol collating-symbol collating-symbol collating-symbol -collating-symbol -collating-symbol +collating-symbol collating-symbol -collating-symbol +collating-symbol collating-symbol +collating-symbol collating-symbol collating-symbol collating-symbol @@ -118,11 +118,11 @@ collating-symbol collating-symbol collating-symbol collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol collating-symbol collating-symbol collating-symbol @@ -173,6 +173,7 @@ order_start forward;forward;forward;forward + @@ -191,7 +192,6 @@ order_start forward;forward;forward;forward - @@ -207,11 +207,11 @@ order_start forward;forward;forward;forward - - + - + + @@ -254,11 +254,11 @@ order_start forward;forward;forward;forward - - - - - + + + + + @@ -372,11 +372,11 @@ order_start forward;forward;forward;forward ;;; ;;; ;;; - ;;; - ;;; - ;;; - ;;; - ;;; + ;;; + ;;; + ;;; + ;;; + ;;; ;;; ;;; ;;; @@ -418,11 +418,11 @@ order_start forward;forward;forward;forward ;;; ;;; ;;; - ;;; - ;;; - ;;; - ;;; - ;;; + ;;; + ;;; + ;;; + ;;; + ;;; ;;; ;;; ;;; @@ -520,8 +520,8 @@ order_start forward;forward;forward;forward "";"";""; ;;; ;;; - "";"";""; - "";"";""; + "";"";""; + "";"";""; ;;; ;;; ;"";""; Modified: head/share/colldef/da_DK.ISO8859-15.src ============================================================================== --- head/share/colldef/da_DK.ISO8859-15.src Fri Nov 3 13:43:05 2017 (r325360) +++ head/share/colldef/da_DK.ISO8859-15.src Fri Nov 3 13:52:34 2017 (r325361) @@ -37,6 +37,7 @@ collating-symbol collating-symbol collating-symbol collating-symbol +collating-symbol collating-symbol collating-symbol collating-symbol @@ -44,6 +45,7 @@ collating-symbol collating-symbol collating-symbol collating-symbol +collating-symbol collating-symbol collating-symbol collating-symbol @@ -54,7 +56,6 @@ collating-symbol collating-symbol collating-symbol collating-symbol -collating-symbol collating-symbol collating-symbol collating-symbol @@ -70,11 +71,11 @@ collating-symbol collating-symbol collating-symbol collating-symbol -collating-symbol -collating-symbol +collating-symbol collating-symbol -collating-symbol +collating-symbol collating-symbol +collating-symbol collating-symbol collating-symbol collating-symbol @@ -112,11 +113,11 @@ collating-symbol collating-symbol collating-symbol collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol collating-symbol collating-symbol collating-symbol @@ -167,6 +168,7 @@ order_start forward;forward;forward;forward + @@ -174,6 +176,7 @@ order_start forward;forward;forward;forward + @@ -184,7 +187,6 @@ order_start forward;forward;forward;forward - @@ -200,11 +202,11 @@ order_start forward;forward;forward;forward - - + - + + @@ -242,11 +244,11 @@ order_start forward;forward;forward;forward - - - - - + + + + + @@ -360,11 +362,11 @@ order_start forward;forward;forward;forward ;;; ;;; ;;; - ;;; - ;;; - ;;; - ;;; - ;;; + ;;; + ;;; + ;;; + ;;; + ;;; ;;; ;;; ;;; @@ -402,11 +404,11 @@ order_start forward;forward;forward;forward ;;; ;;; ;;; - ;;; - ;;; - ;;; - ;;; - ;;; + ;;; + ;;; + ;;; + ;;; + ;;; ;;; ;;; ;;; @@ -490,6 +492,8 @@ order_start forward;forward;forward;forward ;"";""; ;"";""; ;"";""; + "";"";""; + "";"";"";

;;;

;;;

;;; @@ -503,8 +507,8 @@ order_start forward;forward;forward;forward "";"";""; ;;; ;;; - "";"";""; - "";"";""; + "";"";""; + "";"";""; ;;; ;;; ;"";""; @@ -539,8 +543,6 @@ order_start forward;forward;forward;forward "";;""; "";;""; "";;""; - "";;""; - "";;""; "";;""; "";;""; "";;""; Modified: head/share/colldef/da_DK.UTF-8.src ============================================================================== --- head/share/colldef/da_DK.UTF-8.src Fri Nov 3 13:43:05 2017 (r325360) +++ head/share/colldef/da_DK.UTF-8.src Fri Nov 3 13:52:34 2017 (r325361) @@ -108,6 +108,7 @@ collating-symbol collating-symbol collating-symbol collating-symbol +collating-symbol collating-symbol collating-symbol collating-symbol @@ -120,6 +121,7 @@ collating-symbol collating-symbol collating-symbol collating-symbol +collating-symbol collating-symbol collating-symbol collating-symbol @@ -132,7 +134,6 @@ collating-symbol collating-symbol collating-symbol collating-symbol -collating-symbol collating-symbol collating-symbol collating-symbol @@ -169,9 +170,9 @@ collating-symbol collating-symbol collating-symbol collating-symbol -collating-symbol -collating-symbol -collating-symbol +collating-symbol +collating-symbol +collating-symbol collating-symbol collating-symbol collating-symbol @@ -196,7 +197,7 @@ collating-symbol collating-symbol collating-symbol collating-symbol -collating-symbol +collating-symbol collating-symbol collating-symbol collating-symbol @@ -607,6 +608,7 @@ order_start forward;forward;forward;forward + @@ -619,6 +621,7 @@ order_start forward;forward;forward;forward + @@ -631,7 +634,6 @@ order_start forward;forward;forward;forward - @@ -668,9 +670,9 @@ order_start forward;forward;forward;forward - - - *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Fri Nov 3 14:10: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 C8F6FE531F6; Fri, 3 Nov 2017 14:10:58 +0000 (UTC) (envelope-from hselasky@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 97B0D65E75; Fri, 3 Nov 2017 14:10:58 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA3EAvxZ080226; Fri, 3 Nov 2017 14:10:57 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA3EAvPS080224; Fri, 3 Nov 2017 14:10:57 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201711031410.vA3EAvPS080224@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Fri, 3 Nov 2017 14:10:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325362 - head/sys/fs/cuse X-SVN-Group: head X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: head/sys/fs/cuse X-SVN-Commit-Revision: 325362 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: Fri, 03 Nov 2017 14:10:58 -0000 Author: hselasky Date: Fri Nov 3 14:10:57 2017 New Revision: 325362 URL: https://svnweb.freebsd.org/changeset/base/325362 Log: Allow CUSE(3) to free all memory mapped memory by using regular SWAP objects instead of malloc(). The SWAP objects are automagically freed when there are no more consumers. This greatly simplifies the mmap logic inside CUSE(3) in the kernel. This change fixes an issue where mmapped memory can accumulate and never get freed, if many different mmap sizes are needed over time. Further this change fixes memory leaks when the CUSE(3) kernel module is unloaded. While at it make sure the CUSE_ALLOC_PAGES_MAX limit is treated as an exclusive limit. CUSE(3) memory maps must be less than CUSE_ALLOC_PAGES_MAX number of pages. Reviewed by: kib @ Differential Revision: https://reviews.freebsd.org/D11392 Sponsored by: Mellanox Technologies MFC after: 1 week Modified: head/sys/fs/cuse/cuse.c head/sys/fs/cuse/cuse_ioctl.h Modified: head/sys/fs/cuse/cuse.c ============================================================================== --- head/sys/fs/cuse/cuse.c Fri Nov 3 13:52:34 2017 (r325361) +++ head/sys/fs/cuse/cuse.c Fri Nov 3 14:10:57 2017 (r325362) @@ -1,6 +1,6 @@ /* $FreeBSD$ */ /*- - * Copyright (c) 2010-2013 Hans Petter Selasky. All rights reserved. + * Copyright (c) 2010-2017 Hans Petter Selasky. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -46,6 +46,7 @@ #include #include #include +#include #include #include #include @@ -57,6 +58,9 @@ #include #include +#include +#include +#include #include #include @@ -69,8 +73,6 @@ MODULE_VERSION(cuse, 1); */ MODULE_VERSION(cuse4bsd, 1); -#define NBUSY ((uint8_t *)1) - #ifdef FEATURE FEATURE(cuse, "Userspace character devices"); #endif @@ -94,10 +96,10 @@ struct cuse_client_command { }; struct cuse_memory { - struct cuse_server *owner; - uint8_t *virtaddr; + TAILQ_ENTRY(cuse_memory) entry; + vm_object_t object; uint32_t page_count; - uint32_t is_allocated; + uint32_t alloc_nr; }; struct cuse_server_dev { @@ -112,6 +114,7 @@ struct cuse_server { TAILQ_HEAD(, cuse_client_command) head; TAILQ_HEAD(, cuse_server_dev) hdev; TAILQ_HEAD(, cuse_client) hcli; + TAILQ_HEAD(, cuse_memory) hmem; struct cv cv; struct selinfo selinfo; pid_t pid; @@ -128,8 +131,8 @@ struct cuse_client { uint8_t ioctl_buffer[CUSE_BUFFER_MAX] __aligned(4); - int fflags; /* file flags */ - int cflags; /* client flags */ + int fflags; /* file flags */ + int cflags; /* client flags */ #define CUSE_CLI_IS_CLOSING 0x01 #define CUSE_CLI_KNOTE_NEED_READ 0x02 #define CUSE_CLI_KNOTE_NEED_WRITE 0x04 @@ -140,14 +143,13 @@ struct cuse_client { #define CUSE_CLIENT_CLOSING(pcc) \ ((pcc)->cflags & CUSE_CLI_IS_CLOSING) -static MALLOC_DEFINE(M_CUSE, "cuse", "CUSE memory"); +static MALLOC_DEFINE(M_CUSE, "cuse", "CUSE memory"); static TAILQ_HEAD(, cuse_server) cuse_server_head; static struct mtx cuse_mtx; static struct cdev *cuse_dev; static struct cuse_server *cuse_alloc_unit[CUSE_DEVICES_MAX]; static int cuse_alloc_unit_id[CUSE_DEVICES_MAX]; -static struct cuse_memory cuse_mem[CUSE_ALLOC_UNIT_MAX]; static void cuse_server_wakeup_all_client_locked(struct cuse_server *pcs); static void cuse_client_kqfilter_read_detach(struct knote *kn); @@ -173,7 +175,7 @@ static d_ioctl_t cuse_client_ioctl; static d_read_t cuse_client_read; static d_write_t cuse_client_write; static d_poll_t cuse_client_poll; -static d_mmap_t cuse_client_mmap; +static d_mmap_single_t cuse_client_mmap_single; static d_kqfilter_t cuse_client_kqfilter; static struct cdevsw cuse_client_devsw = { @@ -186,7 +188,7 @@ static struct cdevsw cuse_client_devsw = { .d_read = cuse_client_read, .d_write = cuse_client_write, .d_poll = cuse_client_poll, - .d_mmap = cuse_client_mmap, + .d_mmap_single = cuse_client_mmap_single, .d_kqfilter = cuse_client_kqfilter, }; @@ -196,7 +198,7 @@ static d_ioctl_t cuse_server_ioctl; static d_read_t cuse_server_read; static d_write_t cuse_server_write; static d_poll_t cuse_server_poll; -static d_mmap_t cuse_server_mmap; +static d_mmap_single_t cuse_server_mmap_single; static struct cdevsw cuse_server_devsw = { .d_version = D_VERSION, @@ -208,7 +210,7 @@ static struct cdevsw cuse_server_devsw = { .d_read = cuse_server_read, .d_write = cuse_server_write, .d_poll = cuse_server_poll, - .d_mmap = cuse_server_mmap, + .d_mmap_single = cuse_server_mmap_single, }; static void cuse_client_is_closing(struct cuse_client *); @@ -252,7 +254,6 @@ cuse_kern_init(void *arg) (CUSE_VERSION >> 16) & 0xFF, (CUSE_VERSION >> 8) & 0xFF, (CUSE_VERSION >> 0) & 0xFF); } - SYSINIT(cuse_kern_init, SI_SUB_DEVFS, SI_ORDER_ANY, cuse_kern_init, 0); static void @@ -280,7 +281,6 @@ cuse_kern_uninit(void *arg) mtx_destroy(&cuse_mtx); } - SYSUNINIT(cuse_kern_uninit, SI_SUB_DEVFS, SI_ORDER_ANY, cuse_kern_uninit, 0); static int @@ -398,74 +398,80 @@ cuse_convert_error(int error) } static void -cuse_server_free_memory(struct cuse_server *pcs) +cuse_vm_memory_free(struct cuse_memory *mem) { - struct cuse_memory *mem; - uint32_t n; + /* last user is gone - free */ + vm_object_deallocate(mem->object); - for (n = 0; n != CUSE_ALLOC_UNIT_MAX; n++) { - mem = &cuse_mem[n]; - - /* this memory is never freed */ - if (mem->owner == pcs) { - mem->owner = NULL; - mem->is_allocated = 0; - } - } + /* free CUSE memory */ + free(mem, M_CUSE); } static int -cuse_server_alloc_memory(struct cuse_server *pcs, - struct cuse_memory *mem, uint32_t page_count) +cuse_server_alloc_memory(struct cuse_server *pcs, uint32_t alloc_nr, + uint32_t page_count) { - void *ptr; + struct cuse_memory *temp; + struct cuse_memory *mem; + vm_object_t object; int error; - cuse_lock(); + mem = malloc(sizeof(*mem), M_CUSE, M_WAITOK | M_ZERO); + if (mem == NULL) + return (ENOMEM); - if (mem->virtaddr == NBUSY) { - cuse_unlock(); - return (EBUSY); + object = vm_pager_allocate(OBJT_SWAP, NULL, PAGE_SIZE * page_count, + VM_PROT_DEFAULT, 0, curthread->td_ucred); + if (object == NULL) { + error = ENOMEM; + goto error_0; } - if (mem->virtaddr != NULL) { - if (mem->is_allocated != 0) { - cuse_unlock(); - return (EBUSY); - } - if (mem->page_count == page_count) { - mem->is_allocated = 1; - mem->owner = pcs; - cuse_unlock(); - return (0); - } + + cuse_lock(); + /* check if allocation number already exists */ + TAILQ_FOREACH(temp, &pcs->hmem, entry) { + if (temp->alloc_nr == alloc_nr) + break; + } + if (temp != NULL) { cuse_unlock(); - return (EBUSY); + error = EBUSY; + goto error_1; } - memset(mem, 0, sizeof(*mem)); + mem->object = object; + mem->page_count = page_count; + mem->alloc_nr = alloc_nr; + TAILQ_INSERT_TAIL(&pcs->hmem, mem, entry); + cuse_unlock(); - mem->virtaddr = NBUSY; + return (0); - cuse_unlock(); +error_1: + vm_object_deallocate(object); +error_0: + free(mem, M_CUSE); + return (error); +} - ptr = malloc(page_count * PAGE_SIZE, M_CUSE, M_WAITOK | M_ZERO); - if (ptr == NULL) - error = ENOMEM; - else - error = 0; +static int +cuse_server_free_memory(struct cuse_server *pcs, uint32_t alloc_nr) +{ + struct cuse_memory *mem; cuse_lock(); - - if (error) { - mem->virtaddr = NULL; + TAILQ_FOREACH(mem, &pcs->hmem, entry) { + if (mem->alloc_nr == alloc_nr) + break; + } + if (mem == NULL) { cuse_unlock(); - return (error); + return (EINVAL); } - mem->virtaddr = ptr; - mem->page_count = page_count; - mem->is_allocated = 1; - mem->owner = pcs; + TAILQ_REMOVE(&pcs->hmem, mem, entry); cuse_unlock(); + cuse_vm_memory_free(mem); + return (0); } @@ -646,10 +652,10 @@ cuse_server_free_dev(struct cuse_server_dev *pcsd) } static void -cuse_server_free(void *arg) +cuse_server_unref(struct cuse_server *pcs) { - struct cuse_server *pcs = arg; struct cuse_server_dev *pcsd; + struct cuse_memory *mem; cuse_lock(); pcs->refs--; @@ -672,7 +678,12 @@ cuse_server_free(void *arg) cuse_lock(); } - cuse_server_free_memory(pcs); + while ((mem = TAILQ_FIRST(&pcs->hmem)) != NULL) { + TAILQ_REMOVE(&pcs->hmem, mem, entry); + cuse_unlock(); + cuse_vm_memory_free(mem); + cuse_lock(); + } knlist_clear(&pcs->selinfo.si_note, 1); knlist_destroy(&pcs->selinfo.si_note); @@ -686,6 +697,15 @@ cuse_server_free(void *arg) free(pcs, M_CUSE); } +static void +cuse_server_free(void *arg) +{ + struct cuse_server *pcs = arg; + + /* drop refcount */ + cuse_server_unref(pcs); +} + static int cuse_server_open(struct cdev *dev, int fflags, int devtype, struct thread *td) { @@ -700,13 +720,13 @@ cuse_server_open(struct cdev *dev, int fflags, int dev free(pcs, M_CUSE); return (ENOMEM); } - /* store current process ID */ pcs->pid = curproc->p_pid; TAILQ_INIT(&pcs->head); TAILQ_INIT(&pcs->hdev); TAILQ_INIT(&pcs->hcli); + TAILQ_INIT(&pcs->hmem); cv_init(&pcs->cv, "cuse-server-cv"); @@ -1093,12 +1113,12 @@ cuse_server_ioctl(struct cdev *dev, unsigned long cmd, error = ENOMEM; break; } - if (pai->page_count > CUSE_ALLOC_PAGES_MAX) { + if (pai->page_count >= CUSE_ALLOC_PAGES_MAX) { error = ENOMEM; break; } error = cuse_server_alloc_memory(pcs, - &cuse_mem[pai->alloc_nr], pai->page_count); + pai->alloc_nr, pai->page_count); break; case CUSE_IOCTL_FREE_MEMORY: @@ -1108,16 +1128,7 @@ cuse_server_ioctl(struct cdev *dev, unsigned long cmd, error = ENOMEM; break; } - /* we trust the character device driver in this case */ - - cuse_lock(); - if (cuse_mem[pai->alloc_nr].owner == pcs) { - cuse_mem[pai->alloc_nr].is_allocated = 0; - cuse_mem[pai->alloc_nr].owner = NULL; - } else { - error = EINVAL; - } - cuse_unlock(); + error = cuse_server_free_memory(pcs, pai->alloc_nr); break; case CUSE_IOCTL_GET_SIG: @@ -1276,49 +1287,49 @@ cuse_server_poll(struct cdev *dev, int events, struct } static int -cuse_server_mmap(struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr, int nprot, vm_memattr_t *memattr) +cuse_server_mmap_single(struct cdev *dev, vm_ooffset_t *offset, + vm_size_t size, struct vm_object **object, int nprot) { - uint32_t page_nr = offset / PAGE_SIZE; + uint32_t page_nr = *offset / PAGE_SIZE; uint32_t alloc_nr = page_nr / CUSE_ALLOC_PAGES_MAX; struct cuse_memory *mem; struct cuse_server *pcs; - uint8_t *ptr; int error; - if (alloc_nr >= CUSE_ALLOC_UNIT_MAX) - return (ENOMEM); - error = cuse_server_get(&pcs); if (error != 0) - pcs = NULL; + return (error); cuse_lock(); - mem = &cuse_mem[alloc_nr]; - - /* try to enforce slight ownership */ - if ((pcs != NULL) && (mem->owner != pcs)) { - cuse_unlock(); - return (EINVAL); + /* lookup memory structure */ + TAILQ_FOREACH(mem, &pcs->hmem, entry) { + if (mem->alloc_nr == alloc_nr) + break; } - if (mem->virtaddr == NULL) { + if (mem == NULL) { cuse_unlock(); return (ENOMEM); } - if (mem->virtaddr == NBUSY) { - cuse_unlock(); - return (ENOMEM); - } + /* verify page offset */ page_nr %= CUSE_ALLOC_PAGES_MAX; - if (page_nr >= mem->page_count) { cuse_unlock(); return (ENXIO); } - ptr = mem->virtaddr + (page_nr * PAGE_SIZE); + /* verify mmap size */ + if ((size % PAGE_SIZE) != 0 || (size < PAGE_SIZE) || + (size > ((mem->page_count - page_nr) * PAGE_SIZE))) { + cuse_unlock(); + return (EINVAL); + } + vm_object_reference(mem->object); + *object = mem->object; cuse_unlock(); - *paddr = vtophys(ptr); + /* set new VM object offset to use */ + *offset = page_nr * PAGE_SIZE; + /* success */ return (0); } @@ -1351,7 +1362,7 @@ cuse_client_free(void *arg) free(pcc, M_CUSE); /* drop reference on server */ - cuse_server_free(pcs); + cuse_server_unref(pcs); } static int @@ -1394,13 +1405,13 @@ cuse_client_open(struct cdev *dev, int fflags, int dev pcc = malloc(sizeof(*pcc), M_CUSE, M_WAITOK | M_ZERO); if (pcc == NULL) { /* drop reference on server */ - cuse_server_free(pcs); + cuse_server_unref(pcs); return (ENOMEM); } if (devfs_set_cdevpriv(pcc, &cuse_client_free)) { printf("Cuse: Cannot set cdevpriv.\n"); /* drop reference on server */ - cuse_server_free(pcs); + cuse_server_unref(pcs); free(pcc, M_CUSE); return (ENOMEM); } @@ -1550,7 +1561,6 @@ cuse_client_read(struct cdev *dev, struct uio *uio, in error = ENOMEM; break; } - len = uio->uio_iov->iov_len; cuse_lock(); @@ -1610,7 +1620,6 @@ cuse_client_write(struct cdev *dev, struct uio *uio, i error = ENOMEM; break; } - len = uio->uio_iov->iov_len; cuse_lock(); @@ -1753,59 +1762,56 @@ cuse_client_poll(struct cdev *dev, int events, struct } return (revents); - pollnval: +pollnval: /* XXX many clients don't understand POLLNVAL */ return (events & (POLLHUP | POLLPRI | POLLIN | POLLRDNORM | POLLOUT | POLLWRNORM)); } static int -cuse_client_mmap(struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr, int nprot, vm_memattr_t *memattr) +cuse_client_mmap_single(struct cdev *dev, vm_ooffset_t *offset, + vm_size_t size, struct vm_object **object, int nprot) { - uint32_t page_nr = offset / PAGE_SIZE; + uint32_t page_nr = *offset / PAGE_SIZE; uint32_t alloc_nr = page_nr / CUSE_ALLOC_PAGES_MAX; struct cuse_memory *mem; - struct cuse_server *pcs; struct cuse_client *pcc; - uint8_t *ptr; int error; - if (alloc_nr >= CUSE_ALLOC_UNIT_MAX) - return (ENOMEM); - error = cuse_client_get(&pcc); if (error != 0) - pcs = NULL; - else - pcs = pcc->server; + return (error); cuse_lock(); - mem = &cuse_mem[alloc_nr]; - - /* try to enforce slight ownership */ - if ((pcs != NULL) && (mem->owner != pcs)) { - cuse_unlock(); - return (EINVAL); + /* lookup memory structure */ + TAILQ_FOREACH(mem, &pcc->server->hmem, entry) { + if (mem->alloc_nr == alloc_nr) + break; } - if (mem->virtaddr == NULL) { + if (mem == NULL) { cuse_unlock(); return (ENOMEM); } - if (mem->virtaddr == NBUSY) { - cuse_unlock(); - return (ENOMEM); - } + /* verify page offset */ page_nr %= CUSE_ALLOC_PAGES_MAX; - if (page_nr >= mem->page_count) { cuse_unlock(); return (ENXIO); } - ptr = mem->virtaddr + (page_nr * PAGE_SIZE); + /* verify mmap size */ + if ((size % PAGE_SIZE) != 0 || (size < PAGE_SIZE) || + (size > ((mem->page_count - page_nr) * PAGE_SIZE))) { + cuse_unlock(); + return (EINVAL); + } + vm_object_reference(mem->object); + *object = mem->object; cuse_unlock(); - *paddr = vtophys(ptr); + /* set new VM object offset to use */ + *offset = page_nr * PAGE_SIZE; + /* success */ return (0); } Modified: head/sys/fs/cuse/cuse_ioctl.h ============================================================================== --- head/sys/fs/cuse/cuse_ioctl.h Fri Nov 3 13:52:34 2017 (r325361) +++ head/sys/fs/cuse/cuse_ioctl.h Fri Nov 3 14:10:57 2017 (r325362) @@ -35,6 +35,7 @@ #define CUSE_BUF_MIN_PTR 0x10000UL #define CUSE_BUF_MAX_PTR 0x20000UL #define CUSE_ALLOC_UNIT_MAX 128 /* units */ +/* All memory allocations must be less than the following limit */ #define CUSE_ALLOC_PAGES_MAX (((16UL * 1024UL * 1024UL) + PAGE_SIZE - 1) / PAGE_SIZE) struct cuse_dev; From owner-svn-src-all@freebsd.org Fri Nov 3 15:07: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 EED00E5431F; Fri, 3 Nov 2017 15:07:37 +0000 (UTC) (envelope-from asomers@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 BDFBF67974; Fri, 3 Nov 2017 15:07:37 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA3F7aJ7001876; Fri, 3 Nov 2017 15:07:36 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA3F7aZ3001875; Fri, 3 Nov 2017 15:07:36 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201711031507.vA3F7aZ3001875@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Fri, 3 Nov 2017 15:07:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325363 - head/sys/dev/mpr X-SVN-Group: head X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: head/sys/dev/mpr X-SVN-Commit-Revision: 325363 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: Fri, 03 Nov 2017 15:07:38 -0000 Author: asomers Date: Fri Nov 3 15:07:36 2017 New Revision: 325363 URL: https://svnweb.freebsd.org/changeset/base/325363 Log: Fix mpr(4) panics caused by bad drive mapping tables sys/dev/mpr/mpr_mapping.c If _mapping_process_dpm_pg0 detects inconsistencies in the drive mapping table (stored in the HBA's NVRAM), abort reading it and continue to boot as if the mapping table were blank. I observed such inconsistencies in several HBAs after upgrading firmware from 14.0.0.0 to 15.0.0.0. Reviewed by: slm MFC after: 3 weeks Sponsored by: Spectra Logic Corp Differential Revision: https://reviews.freebsd.org/D12901 Modified: head/sys/dev/mpr/mpr_mapping.c Modified: head/sys/dev/mpr/mpr_mapping.c ============================================================================== --- head/sys/dev/mpr/mpr_mapping.c Fri Nov 3 14:10:57 2017 (r325362) +++ head/sys/dev/mpr/mpr_mapping.c Fri Nov 3 15:07:36 2017 (r325363) @@ -2207,7 +2207,7 @@ mpr_mapping_free_memory(struct mpr_softc *sc) free(sc->dpm_pg0, M_MPR); } -static void +static bool _mapping_process_dpm_pg0(struct mpr_softc *sc) { u8 missing_cnt, enc_idx; @@ -2336,7 +2336,7 @@ _mapping_process_dpm_pg0(struct mpr_softc *sc) "%s: Conflict in mapping table for " " enclosure %d\n", __func__, enc_idx); - break; + goto fail; } physical_id = dpm_entry->PhysicalIdentifier.High; @@ -2363,7 +2363,7 @@ _mapping_process_dpm_pg0(struct mpr_softc *sc) mpr_dprint(sc, MPR_ERROR | MPR_MAPPING, "%s: " "Conflict in mapping table for device %d\n", __func__, map_idx); - break; + goto fail; } physical_id = dpm_entry->PhysicalIdentifier.High; mt_entry->physical_id = (physical_id << 32) | @@ -2375,6 +2375,18 @@ _mapping_process_dpm_pg0(struct mpr_softc *sc) mt_entry->device_info = MPR_DEV_RESERVED; } } /*close the loop for DPM table */ + return (true); + +fail: + for (entry_num = 0; entry_num < sc->max_dpm_entries; entry_num++) { + sc->dpm_entry_used[entry_num] = 0; + /* + * for IR firmware, it may be necessary to wipe out + * sc->mapping_table volumes tooi + */ + } + sc->num_enc_table_entries = 0; + return (false); } /* @@ -2614,9 +2626,11 @@ retry_read_dpm: } } - if (sc->is_dpm_enable) - _mapping_process_dpm_pg0(sc); - else { + if (sc->is_dpm_enable) { + if (!_mapping_process_dpm_pg0(sc)) + sc->is_dpm_enable = 0; + } + if (! sc->is_dpm_enable) { mpr_dprint(sc, MPR_MAPPING, "%s: DPM processing is disabled. " "Device mappings will not persist across reboots or " "resets.\n", __func__); From owner-svn-src-all@freebsd.org Fri Nov 3 15:57: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 E2C00E55434; Fri, 3 Nov 2017 15:57:28 +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 BB92F69B74; Fri, 3 Nov 2017 15:57:28 +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 vA3FvRoE022791; Fri, 3 Nov 2017 15:57:27 GMT (envelope-from mmel@FreeBSD.org) Received: (from mmel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA3FvRiG022790; Fri, 3 Nov 2017 15:57:27 GMT (envelope-from mmel@FreeBSD.org) Message-Id: <201711031557.vA3FvRiG022790@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmel set sender to mmel@FreeBSD.org using -f From: Michal Meloun Date: Fri, 3 Nov 2017 15:57:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325364 - head/lib/libc/gen X-SVN-Group: head X-SVN-Commit-Author: mmel X-SVN-Commit-Paths: head/lib/libc/gen X-SVN-Commit-Revision: 325364 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: Fri, 03 Nov 2017 15:57:29 -0000 Author: mmel Date: Fri Nov 3 15:57:27 2017 New Revision: 325364 URL: https://svnweb.freebsd.org/changeset/base/325364 Log: Add alignment support to __libc_allocate_tls(). For statically linked binaries, where all relocation are solved by static linker, the linker expect that offset to TLS section is aligned. Additionaly, to maintain absolute alignment, TLS TCB should by also aligned. Obtained from: CheriBSD (initial version) MFC after: 1 month Reviewed by: brooks (previous version), kib Differential Revision: https://reviews.freebsd.org/D12907 Modified: head/lib/libc/gen/tls.c Modified: head/lib/libc/gen/tls.c ============================================================================== --- head/lib/libc/gen/tls.c Fri Nov 3 15:07:36 2017 (r325363) +++ head/lib/libc/gen/tls.c Fri Nov 3 15:57:27 2017 (r325364) @@ -37,9 +37,15 @@ #include #include #include +#include #include "libc_private.h" +#define tls_assert(cond) ((cond) ? (void) 0 : \ + (tls_msg(#cond ": assert failed: " __FILE__ ":" \ + __XSTRING(__LINE__) "\n"), abort())) +#define tls_msg(s) write(STDOUT_FILENO, s, strlen(s)) + /* Provided by jemalloc to avoid bootstrapping issues. */ void *__je_bootstrap_malloc(size_t size); void *__je_bootstrap_calloc(size_t num, size_t size); @@ -85,6 +91,7 @@ void __libc_free_tls(void *tls, size_t tcbsize, size_t static size_t tls_static_space; static size_t tls_init_size; +static size_t tls_init_align; static void *tls_init; #endif @@ -109,6 +116,35 @@ __libc_tls_get_addr(void *ti __unused) #ifndef PIC +static void * +malloc_aligned(size_t size, size_t align) +{ + void *mem, *res; + + if (align < sizeof(void *)) + align = sizeof(void *); + + mem = __je_bootstrap_malloc(size + sizeof(void *) + align - 1); + res = (void *)roundup2((uintptr_t)mem + sizeof(void *), align); + *(void **)((uintptr_t)res - sizeof(void *)) = mem; + return (res); +} + +static void +free_aligned(void *ptr) +{ + void *mem; + uintptr_t x; + + if (ptr == NULL) + return; + + x = (uintptr_t)ptr; + x -= sizeof(void *); + mem = *(void **)x; + __je_bootstrap_free(mem); +} + #ifdef TLS_VARIANT_I #define TLS_TCB_SIZE (2 * sizeof(void *)) @@ -117,52 +153,63 @@ __libc_tls_get_addr(void *ti __unused) * Free Static TLS using the Variant I method. */ void -__libc_free_tls(void *tcb, size_t tcbsize, size_t tcbalign __unused) +__libc_free_tls(void *tcb, size_t tcbsize __unused, size_t tcbalign __unused) { Elf_Addr *dtv; Elf_Addr **tls; - tls = (Elf_Addr **)((Elf_Addr)tcb + tcbsize - TLS_TCB_SIZE); + tls = (Elf_Addr **)tcb; dtv = tls[0]; __je_bootstrap_free(dtv); - __je_bootstrap_free(tcb); + free_aligned(tls); } /* * Allocate Static TLS using the Variant I method. */ void * -__libc_allocate_tls(void *oldtcb, size_t tcbsize, size_t tcbalign __unused) +__libc_allocate_tls(void *oldtcb, size_t tcbsize, size_t tcbalign) { Elf_Addr *dtv; Elf_Addr **tls; - char *tcb; if (oldtcb != NULL && tcbsize == TLS_TCB_SIZE) return (oldtcb); - tcb = __je_bootstrap_calloc(1, tls_static_space + tcbsize - TLS_TCB_SIZE); - tls = (Elf_Addr **)(tcb + tcbsize - TLS_TCB_SIZE); + tls_assert(tcbalign >= TLS_TCB_ALIGN); + tls_assert(tcbsize == TLS_TCB_SIZE); + tcbsize = roundup2(tcbsize, tcbalign); + tls = malloc_aligned(tcbsize + tls_static_space, tcbalign); + if (tls == NULL) { + tls_msg("__libc_allocate_tls: Out of memory.\n"); + abort(); + } + memset(tls, 0, tcbsize + tls_static_space); + if (oldtcb != NULL) { - memcpy(tls, oldtcb, tls_static_space); + memcpy(tls, oldtcb, tcbsize + tls_static_space); __je_bootstrap_free(oldtcb); /* Adjust the DTV. */ dtv = tls[0]; - dtv[2] = (Elf_Addr)tls + TLS_TCB_SIZE; + dtv[2] = (Elf_Addr)tls + tcbsize; } else { dtv = __je_bootstrap_malloc(3 * sizeof(Elf_Addr)); + if (dtv == NULL) { + tls_msg("__libc_allocate_tls: Out of memory.\n"); + abort(); + } tls[0] = dtv; - dtv[0] = 1; - dtv[1] = 1; - dtv[2] = (Elf_Addr)tls + TLS_TCB_SIZE; + dtv[0] = 1; /* Generation. */ + dtv[1] = 1; /* Segments count. */ + dtv[2] = (Elf_Addr)tls + tcbsize; if (tls_init_size > 0) memcpy((void*)dtv[2], tls_init, tls_init_size); } - return(tcb); + return (tls); } #endif @@ -190,7 +237,7 @@ __libc_free_tls(void *tcb, size_t tcbsize __unused, si dtv = ((Elf_Addr**)tcb)[1]; tlsend = (Elf_Addr) tcb; tlsstart = tlsend - size; - __je_bootstrap_free((void*) tlsstart); + free_aligned((void*)tlsstart); __je_bootstrap_free(dtv); } @@ -209,8 +256,17 @@ __libc_allocate_tls(void *oldtls, size_t tcbsize, size if (tcbsize < 2 * sizeof(Elf_Addr)) tcbsize = 2 * sizeof(Elf_Addr); - tls = __je_bootstrap_calloc(1, size + tcbsize); + tls = malloc_aligned(size + tcbsize, tcbalign); + if (tls == NULL) { + tls_msg("__libc_allocate_tls: Out of memory.\n"); + abort(); + } + memset(tls, 0, size + tcbsize); dtv = __je_bootstrap_malloc(3 * sizeof(Elf_Addr)); + if (dtv == NULL) { + tls_msg("__libc_allocate_tls: Out of memory.\n"); + abort(); + } segbase = (Elf_Addr)(tls + size); ((Elf_Addr*)segbase)[0] = segbase; @@ -305,18 +361,14 @@ _init_tls(void) tls_static_space = roundup2(phdr[i].p_memsz, phdr[i].p_align); tls_init_size = phdr[i].p_filesz; + tls_init_align = phdr[i].p_align; tls_init = (void*) phdr[i].p_vaddr; + break; } } -#ifdef TLS_VARIANT_I - /* - * tls_static_space should include space for TLS structure - */ - tls_static_space += TLS_TCB_SIZE; -#endif - - tls = _rtld_allocate_tls(NULL, TLS_TCB_SIZE, TLS_TCB_ALIGN); + tls = _rtld_allocate_tls(NULL, TLS_TCB_SIZE, + MAX(TLS_TCB_ALIGN, tls_init_align)); _set_tp(tls); #endif From owner-svn-src-all@freebsd.org Fri Nov 3 16:51: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 29468E56745; Fri, 3 Nov 2017 16:51:47 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: from mail-io0-f178.google.com (mail-io0-f178.google.com [209.85.223.178]) (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 759D16B8D4; Fri, 3 Nov 2017 16:51:46 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: by mail-io0-f178.google.com with SMTP id i38so7625464iod.2; Fri, 03 Nov 2017 09:51:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:reply-to:in-reply-to:references :from:date:message-id:subject:to:cc; bh=ceb8Nn3MMzIdZ0Dk1Dr2JEu1dCxxB+2dAO8SYu2igek=; b=F1D3zsp1w0bOW10PsAy2UXeOm8+bSjPhBFI+fQosoDjGr1udHCAJtuudecmfiboFxA gjfu3fvqv5YDmBBfijcRuMFEm8s2ypHf8T27S613SjLjRrBYcXKwTOjdFRa9/HjFyuiz DsiBE1eKchkJMV+LA+Qtfww5PuXOdZ0HkA6QSMBwEbBphD4gSZalF1W6VOM2Zxg3hPTE JhOef1D0X6DMrrRPBo/MkFdlgZUv8gZ5mIPFWIC2j/4SnQg6KUVg5HeZTTA34eZvjUeA tqKauqppTPIrSF/Cj6YGBg4SzeEBiLkC221PDNd5QfVy8gNTAFwBaytIqzgDENBV3xJR DcXw== X-Gm-Message-State: AJaThX7gGxQOicQ58cPn7F8ZzbKBSl0yRuIbtvsNgaqO8eFIsfL/3YJg 9kelewIAIcpEbCgBMEg0CV+B7Rwn X-Google-Smtp-Source: ABhQp+SCLolz1h1cGO99mspK4WEByhs1Zqk+wUY9eTNnVdZrGKrf6fNgxMcLgXHjlCPX/oIJ/3mUIQ== X-Received: by 10.107.153.18 with SMTP id b18mr9782255ioe.231.1509727900355; Fri, 03 Nov 2017 09:51:40 -0700 (PDT) Received: from mail-io0-f171.google.com (mail-io0-f171.google.com. [209.85.223.171]) by smtp.gmail.com with ESMTPSA id w63sm2886306iof.7.2017.11.03.09.51.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Nov 2017 09:51:40 -0700 (PDT) Received: by mail-io0-f171.google.com with SMTP id b186so7599969iof.8; Fri, 03 Nov 2017 09:51:40 -0700 (PDT) X-Received: by 10.107.156.134 with SMTP id f128mr9350453ioe.226.1509727899891; Fri, 03 Nov 2017 09:51:39 -0700 (PDT) MIME-Version: 1.0 Reply-To: cem@freebsd.org Received: by 10.2.164.130 with HTTP; Fri, 3 Nov 2017 09:51:37 -0700 (PDT) In-Reply-To: <201711031338.vA3Dcj9W064551@repo.freebsd.org> References: <201711031338.vA3Dcj9W064551@repo.freebsd.org> From: Conrad Meyer Date: Fri, 3 Nov 2017 09:51:37 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r325358 - head/tools/tools/locale/etc To: Baptiste Daroussin Cc: src-committers , 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: Fri, 03 Nov 2017 16:51:47 -0000 On Fri, Nov 3, 2017 at 6:38 AM, Baptiste Daroussin wrote: > Author: bapt > Date: Fri Nov 3 13:38:45 2017 > New Revision: 325358 > URL: https://svnweb.freebsd.org/changeset/base/325358 > > Log: > In preparation for update of cldr to version 32 and unicode to version 10 > Add a character mapping for a missing character in ISO8859-2 > > Modified: > head/tools/tools/locale/etc/charmaps.xml > > Modified: head/tools/tools/locale/etc/charmaps.xml > ============================================================================== > --- head/tools/tools/locale/etc/charmaps.xml Fri Nov 3 13:08:29 2017 (r325357) > +++ head/tools/tools/locale/etc/charmaps.xml Fri Nov 3 13:38:45 2017 (r325358) > @@ -200,7 +200,7 @@ > > Are these distinct characters in ISO-8859-2 that both translate most closely to Unicode Hyphen-minus? > > - + cldr="MINUS SIGN" unicode="HYPHEN-MINUS" /> > cldr="EN DASH" unicode="HYPHEN-MINUS" /> Best, Conrad From owner-svn-src-all@freebsd.org Fri Nov 3 17:04: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 2AAC4E56AF4; Fri, 3 Nov 2017 17:04:32 +0000 (UTC) (envelope-from kevans@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 EC7176BDEA; Fri, 3 Nov 2017 17:04:31 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA3H4VSx052390; Fri, 3 Nov 2017 17:04:31 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA3H4VIj052389; Fri, 3 Nov 2017 17:04:31 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201711031704.vA3H4VIj052389@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Fri, 3 Nov 2017 17:04:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325365 - head/usr.bin/patch X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/usr.bin/patch X-SVN-Commit-Revision: 325365 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: Fri, 03 Nov 2017 17:04:32 -0000 Author: kevans Date: Fri Nov 3 17:04:30 2017 New Revision: 325365 URL: https://svnweb.freebsd.org/changeset/base/325365 Log: patch(1): don't assume a match if we run out of context to check Patches with very little context (-U0 and -U1) could get misapplied if the file to be patched changes and a hunk is no longer applicable. Matching with fuzz would be attempted and default to a match when we unexpectedly ran out of context. PR: 74127 Reviewed by: emaste, pfg Approved by: emaste (mentor) Differential Revision: https://reviews.freebsd.org/D12631 Modified: head/usr.bin/patch/patch.c Modified: head/usr.bin/patch/patch.c ============================================================================== --- head/usr.bin/patch/patch.c Fri Nov 3 15:57:27 2017 (r325364) +++ head/usr.bin/patch/patch.c Fri Nov 3 17:04:30 2017 (r325365) @@ -1026,6 +1026,9 @@ patch_match(LINENUM base, LINENUM offset, LINENUM fuzz const char *plineptr; unsigned short plinelen; + /* Patch does not match if we don't have anymore context to use */ + if (pline > pat_lines) + return false; for (iline = base + offset + fuzz; pline <= pat_lines; pline++, iline++) { ilineptr = ifetch(iline, offset >= 0); if (ilineptr == NULL) From owner-svn-src-all@freebsd.org Fri Nov 3 18:54:26 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 F29F4E5889A; Fri, 3 Nov 2017 18:54:26 +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 C07C36EF48; Fri, 3 Nov 2017 18:54:26 +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 vA3IsPLv098222; Fri, 3 Nov 2017 18:54:25 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA3IsPGd098221; Fri, 3 Nov 2017 18:54:25 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201711031854.vA3IsPGd098221@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 3 Nov 2017 18:54:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325366 - head/release X-SVN-Group: head X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: head/release X-SVN-Commit-Revision: 325366 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: Fri, 03 Nov 2017 18:54:27 -0000 Author: gjb Date: Fri Nov 3 18:54:25 2017 New Revision: 325366 URL: https://svnweb.freebsd.org/changeset/base/325366 Log: Include TARGET and TARGET_ARCH in chroot_arm_build_release() make(1) invocations following the OBJDIR restructuring to ensure the output arm SoC image is in the correct directory. Sponsored by: The FreeBSD Foundation Modified: head/release/release.sh Modified: head/release/release.sh ============================================================================== --- head/release/release.sh Fri Nov 3 17:04:30 2017 (r325365) +++ head/release/release.sh Fri Nov 3 18:54:25 2017 (r325366) @@ -350,7 +350,9 @@ chroot_build_release() { # chroot_arm_build_release(): Create arm SD card image. chroot_arm_build_release() { load_target_env - eval chroot ${CHROOTDIR} make -C /usr/src/release obj + MAKE_FLAGS="${MAKE_FLAGS} TARGET=${EMBEDDED_TARGET}" + MAKE_FLAGS="${MAKE_FLAGS} TARGET_ARCH=${EMBEDDED_TARGET_ARCH}" + eval chroot ${CHROOTDIR} make ${MAKE_FLAGS} -C /usr/src/release obj case ${EMBEDDED_TARGET} in arm|arm64) if [ -e "${RELENGDIR}/tools/arm.subr" ]; then @@ -361,11 +363,11 @@ chroot_arm_build_release() { ;; esac [ ! -z "${RELEASECONF}" ] && . "${RELEASECONF}" - WORLDDIR="$(eval chroot ${CHROOTDIR} make -C /usr/src/release -V WORLDDIR)" - OBJDIR="$(eval chroot ${CHROOTDIR} make -C /usr/src/release -V .OBJDIR)" + WORLDDIR="$(eval chroot ${CHROOTDIR} make ${MAKE_FLAGS} -C /usr/src/release -V WORLDDIR)" + OBJDIR="$(eval chroot ${CHROOTDIR} make ${MAKE_FLAGS} -C /usr/src/release -V .OBJDIR)" DESTDIR="${OBJDIR}/${KERNEL}" IMGBASE="${CHROOTDIR}/${OBJDIR}/${KERNEL}.img" - OSRELEASE="$(eval chroot ${CHROOTDIR} make -C /usr/src/release \ + OSRELEASE="$(eval chroot ${CHROOTDIR} make ${MAKE_FLAGS} -C /usr/src/release \ TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \ -V OSRELEASE)" chroot ${CHROOTDIR} mkdir -p ${DESTDIR} From owner-svn-src-all@freebsd.org Fri Nov 3 19:09: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 DEAE7E58CF9; Fri, 3 Nov 2017 19:09:00 +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 AC7E66F5ED; Fri, 3 Nov 2017 19:09:00 +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 vA3J8xek002508; Fri, 3 Nov 2017 19:08:59 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA3J8xj8002507; Fri, 3 Nov 2017 19:08:59 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201711031908.vA3J8xj8002507@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 3 Nov 2017 19:08:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325367 - head/release/arm64 X-SVN-Group: head X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: head/release/arm64 X-SVN-Commit-Revision: 325367 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: Fri, 03 Nov 2017 19:09:01 -0000 Author: gjb Date: Fri Nov 3 19:08:59 2017 New Revision: 325367 URL: https://svnweb.freebsd.org/changeset/base/325367 Log: Add a configuration file for building pine64 SoC images. Parts obtained from: crochet Sponsored by: The FreeBSD Foundation Added: head/release/arm64/PINE64.conf (contents, props changed) Added: head/release/arm64/PINE64.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/release/arm64/PINE64.conf Fri Nov 3 19:08:59 2017 (r325367) @@ -0,0 +1,51 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +SRCBRANCH="base/head@rHEAD" +EMBEDDEDBUILD=1 +EMBEDDED_TARGET="arm64" +EMBEDDED_TARGET_ARCH="aarch64" +EMBEDDEDPORTS="sysutils/u-boot-pine64" +KERNEL="GENERIC" +WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x42000000" +IMAGE_SIZE="2560M" +PART_SCHEME="MBR" +FAT_SIZE="54m -b 1m" +FAT_TYPE="16" +MD_ARGS="-x 16384 -y 255" +NODOC=1 +export BOARDNAME="PINE64" + +arm_install_uboot() { + UBOOT_DIR="/usr/local/share/u-boot/u-boot-pine64" + UBOOT_FILES="u-boot-sunxi-with-spl.bin README" + FATMOUNT="${DESTDIR%${KERNEL}}fat" + UFSMOUNT="${DESTDIR%${KERNEL}}ufs" + chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" + chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} + chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} + for _UF in ${UBOOT_FILES}; do + chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/${_UF} \ + ${FATMOUNT}/${_UF} + done + + BOOTFILES="$(chroot ${CHROOTDIR} \ + env TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \ + WITH_UNIFIED_OBJDIR=yes \ + make -C ${WORLDDIR}/sys/boot -V .OBJDIR)" + BOOTFILES="$(realpath ${BOOTFILES})" + + chroot ${CHROOTDIR} mkdir -p ${FATMOUNT}/EFI/BOOT + chroot ${CHROOTDIR} cp -p ${BOOTFILES}/efi/boot1/boot1.efi \ + ${FATMOUNT}/EFI/BOOT/bootaa64.efi + chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot + sync + umount_loop ${CHROOTDIR}/${FATMOUNT} + umount_loop ${CHROOTDIR}/${UFSMOUNT} + chroot ${CHROOTDIR} rmdir ${FATMOUNT} + chroot ${CHROOTDIR} rmdir ${UFSMOUNT} + + return 0 +} From owner-svn-src-all@freebsd.org Fri Nov 3 19:21: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 92A2BE590F9; Fri, 3 Nov 2017 19:21:37 +0000 (UTC) (envelope-from mjg@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 60ED66FC12; Fri, 3 Nov 2017 19:21:37 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA3JLaZw010002; Fri, 3 Nov 2017 19:21:36 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA3JLakQ010001; Fri, 3 Nov 2017 19:21:36 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201711031921.vA3JLakQ010001@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Fri, 3 Nov 2017 19:21:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325368 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 325368 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: Fri, 03 Nov 2017 19:21:37 -0000 Author: mjg Date: Fri Nov 3 19:21:36 2017 New Revision: 325368 URL: https://svnweb.freebsd.org/changeset/base/325368 Log: Special-case pget lookups where pid == curproc->pid Saves on allproc_lock acquires during buildworld, poudriere etc. Submitted by: Pawel Biernacki Sponsored by: Mysterious Code Ltd. Differential Revision: D12929 Modified: head/sys/kern/kern_proc.c Modified: head/sys/kern/kern_proc.c ============================================================================== --- head/sys/kern/kern_proc.c Fri Nov 3 19:08:59 2017 (r325367) +++ head/sys/kern/kern_proc.c Fri Nov 3 19:21:36 2017 (r325368) @@ -389,23 +389,28 @@ pget(pid_t pid, int flags, struct proc **pp) struct proc *p; int error; - sx_slock(&allproc_lock); - if (pid <= PID_MAX) { - p = pfind_locked(pid); - if (p == NULL && (flags & PGET_NOTWEXIT) == 0) - p = zpfind_locked(pid); - } else if ((flags & PGET_NOTID) == 0) { - p = pfind_tid_locked(pid); + p = curproc; + if (p->p_pid == pid) { + PROC_LOCK(p); } else { - p = NULL; - } - sx_sunlock(&allproc_lock); - if (p == NULL) - return (ESRCH); - if ((flags & PGET_CANSEE) != 0) { - error = p_cansee(curthread, p); - if (error != 0) - goto errout; + sx_slock(&allproc_lock); + if (pid <= PID_MAX) { + p = pfind_locked(pid); + if (p == NULL && (flags & PGET_NOTWEXIT) == 0) + p = zpfind_locked(pid); + } else if ((flags & PGET_NOTID) == 0) { + p = pfind_tid_locked(pid); + } else { + p = NULL; + } + sx_sunlock(&allproc_lock); + if (p == NULL) + return (ESRCH); + if ((flags & PGET_CANSEE) != 0) { + error = p_cansee(curthread, p); + if (error != 0) + goto errout; + } } if ((flags & PGET_CANDEBUG) != 0) { error = p_candebug(curthread, p); From owner-svn-src-all@freebsd.org Fri Nov 3 19:32: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 3F949E594C1; Fri, 3 Nov 2017 19:32:11 +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 0DB477024D; Fri, 3 Nov 2017 19:32:10 +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 vA3JWAq1013952; Fri, 3 Nov 2017 19:32:10 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA3JWA3m013951; Fri, 3 Nov 2017 19:32:10 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201711031932.vA3JWA3m013951@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 3 Nov 2017 19:32:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325369 - head/release/arm64 X-SVN-Group: head X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: head/release/arm64 X-SVN-Commit-Revision: 325369 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: Fri, 03 Nov 2017 19:32:11 -0000 Author: gjb Date: Fri Nov 3 19:32:10 2017 New Revision: 325369 URL: https://svnweb.freebsd.org/changeset/base/325369 Log: Fix an error in the PINE64.conf, where the ubldr is not needed and the u-boot needs to be written to the partition with dd(1). Reported by: manu Sponsored by: The FreeBSD Foundation Modified: head/release/arm64/PINE64.conf Modified: head/release/arm64/PINE64.conf ============================================================================== --- head/release/arm64/PINE64.conf Fri Nov 3 19:21:36 2017 (r325368) +++ head/release/arm64/PINE64.conf Fri Nov 3 19:32:10 2017 (r325369) @@ -9,7 +9,6 @@ EMBEDDED_TARGET="arm64" EMBEDDED_TARGET_ARCH="aarch64" EMBEDDEDPORTS="sysutils/u-boot-pine64" KERNEL="GENERIC" -WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x42000000" IMAGE_SIZE="2560M" PART_SCHEME="MBR" FAT_SIZE="54m -b 1m" @@ -20,16 +19,14 @@ export BOARDNAME="PINE64" arm_install_uboot() { UBOOT_DIR="/usr/local/share/u-boot/u-boot-pine64" - UBOOT_FILES="u-boot-sunxi-with-spl.bin README" + UBOOT_FILES="u-boot-sunxi-with-spl.bin" FATMOUNT="${DESTDIR%${KERNEL}}fat" UFSMOUNT="${DESTDIR%${KERNEL}}ufs" + chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \ + of=/dev/${mddev} bs=1k seek=8 conv=sync chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} - for _UF in ${UBOOT_FILES}; do - chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/${_UF} \ - ${FATMOUNT}/${_UF} - done BOOTFILES="$(chroot ${CHROOTDIR} \ env TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \ From owner-svn-src-all@freebsd.org Fri Nov 3 20:42: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 5F067E5B118; Fri, 3 Nov 2017 20:42:51 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 3131D73383; Fri, 3 Nov 2017 20:42:51 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (unknown [127.0.1.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id 5A50A2160; Fri, 3 Nov 2017 20:42:50 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id 45FE52ABA; Fri, 3 Nov 2017 20:42:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id 5_molHLUFZvQ; Fri, 3 Nov 2017 20:42:46 +0000 (UTC) Subject: Re: svn commit: r325368 - head/sys/kern DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com 283632AB5 To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201711031921.vA3JLakQ010001@repo.freebsd.org> From: Bryan Drewery Openpgp: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Organization: FreeBSD Message-ID: <15dc8575-c699-1101-c846-b4fbdef3d1d1@FreeBSD.org> Date: Fri, 3 Nov 2017 13:42:46 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <201711031921.vA3JLakQ010001@repo.freebsd.org> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="JBf53F6MkUWQi6VwI00CO2sr9kbFmitMC" 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: Fri, 03 Nov 2017 20:42:51 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --JBf53F6MkUWQi6VwI00CO2sr9kbFmitMC Content-Type: multipart/mixed; boundary="jb0uOX79g9jpCIEbW0JWx8K4Jbb81kCWG"; protected-headers="v1" From: Bryan Drewery To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <15dc8575-c699-1101-c846-b4fbdef3d1d1@FreeBSD.org> Subject: Re: svn commit: r325368 - head/sys/kern References: <201711031921.vA3JLakQ010001@repo.freebsd.org> In-Reply-To: <201711031921.vA3JLakQ010001@repo.freebsd.org> --jb0uOX79g9jpCIEbW0JWx8K4Jbb81kCWG Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 11/3/2017 12:21 PM, Mateusz Guzik wrote: > Author: mjg > Date: Fri Nov 3 19:21:36 2017 > New Revision: 325368 > URL: https://svnweb.freebsd.org/changeset/base/325368 >=20 > Log: > Special-case pget lookups where pid =3D=3D curproc->pid > =20 > Saves on allproc_lock acquires during buildworld, poudriere etc. > =20 > Submitted by: Pawel Biernacki > Sponsored by: Mysterious Code Ltd. =2E.. > Differential Revision: D12929 Apparently this format closes the review now? I thought we needed a full URL? --=20 Regards, Bryan Drewery --jb0uOX79g9jpCIEbW0JWx8K4Jbb81kCWG-- --JBf53F6MkUWQi6VwI00CO2sr9kbFmitMC Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJZ/NTGAAoJEDXXcbtuRpfPGz0H/2AVUf69ywlTTg+uaR0dxQ8I VESCPtgcxE3xfxRPMdWf5UyV15iAm+Z476ZnJDxl0OHvQGzShAe7TfWsMtjJog2F l5zIHm2X6YvKr+FQbNbChTIpURyAEfFAkZiCQ6KfpvrOHzSTgHcMri6n6Y2j7rcJ ZojMSNO8mVWWn44VdlxJybYwHZSCblHl6OpRmJb5mGzXBeNhu7xgYr+zEbGDyx/z TlDJgPVRJm/a/lR7iEvn+QpxDjkjaSZIdErgH3z6cAhvRtDujPFl2Y3w3wkBA4tC TKviW7OiRYbu1RNQJtXfsHFfDuTSjHXna2Pw0y3+zvLRY9/lydMWfJ8Sc87+CsY= =RRk7 -----END PGP SIGNATURE----- --JBf53F6MkUWQi6VwI00CO2sr9kbFmitMC-- From owner-svn-src-all@freebsd.org Fri Nov 3 20:46:14 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 6F08BE5B1CE; Fri, 3 Nov 2017 20:46:14 +0000 (UTC) (envelope-from tuexen@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 43242734FC; Fri, 3 Nov 2017 20:46:14 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA3KkDmX046124; Fri, 3 Nov 2017 20:46:13 GMT (envelope-from tuexen@FreeBSD.org) Received: (from tuexen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA3KkCBb046117; Fri, 3 Nov 2017 20:46:12 GMT (envelope-from tuexen@FreeBSD.org) Message-Id: <201711032046.vA3KkCBb046117@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tuexen set sender to tuexen@FreeBSD.org using -f From: Michael Tuexen Date: Fri, 3 Nov 2017 20:46:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325370 - in head/sys: netinet netinet6 X-SVN-Group: head X-SVN-Commit-Author: tuexen X-SVN-Commit-Paths: in head/sys: netinet netinet6 X-SVN-Commit-Revision: 325370 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: Fri, 03 Nov 2017 20:46:14 -0000 Author: tuexen Date: Fri Nov 3 20:46:12 2017 New Revision: 325370 URL: https://svnweb.freebsd.org/changeset/base/325370 Log: Allow the setting of the MTU for future paths using an SCTP socket option. This functionality was missing. MFC after: 1 week Modified: head/sys/netinet/sctp_output.c head/sys/netinet/sctp_pcb.c head/sys/netinet/sctp_pcb.h head/sys/netinet/sctp_structs.h head/sys/netinet/sctp_usrreq.c head/sys/netinet/sctputil.c head/sys/netinet6/sctp6_usrreq.c Modified: head/sys/netinet/sctp_output.c ============================================================================== --- head/sys/netinet/sctp_output.c Fri Nov 3 19:32:10 2017 (r325369) +++ head/sys/netinet/sctp_output.c Fri Nov 3 20:46:12 2017 (r325370) @@ -4273,12 +4273,8 @@ sctp_lowlevel_chunk_output(struct sctp_inpcb *inp, /* free tempy routes */ RO_RTFREE(ro); } else { - /* - * PMTU check versus smallest asoc MTU goes - * here - */ - if ((ro->ro_rt != NULL) && - (net->ro._s_addr)) { + if ((ro->ro_rt != NULL) && (net->ro._s_addr) && + ((net->dest_state & SCTP_ADDR_NO_PMTUD) == 0)) { uint32_t mtu; mtu = SCTP_GATHER_MTU_FROM_ROUTE(net->ro._s_addr, &net->ro._l_addr.sa, ro->ro_rt); @@ -4635,8 +4631,8 @@ sctp_lowlevel_chunk_output(struct sctp_inpcb *inp, } net->src_addr_selected = 0; } - if ((ro->ro_rt != NULL) && - (net->ro._s_addr)) { + if ((ro->ro_rt != NULL) && (net->ro._s_addr) && + ((net->dest_state & SCTP_ADDR_NO_PMTUD) == 0)) { uint32_t mtu; mtu = SCTP_GATHER_MTU_FROM_ROUTE(net->ro._s_addr, &net->ro._l_addr.sa, ro->ro_rt); Modified: head/sys/netinet/sctp_pcb.c ============================================================================== --- head/sys/netinet/sctp_pcb.c Fri Nov 3 19:32:10 2017 (r325369) +++ head/sys/netinet/sctp_pcb.c Fri Nov 3 20:46:12 2017 (r325370) @@ -2577,6 +2577,7 @@ sctp_inpcb_alloc(struct socket *so, uint32_t vrf_id) /* number of streams to pre-open on a association */ m->pre_open_stream_count = SCTP_BASE_SYSCTL(sctp_nr_outgoing_streams_default); + m->default_mtu = 0; /* Add adaptation cookie */ m->adaptation_layer_indicator = 0; m->adaptation_layer_indicator_provided = 0; @@ -3942,7 +3943,28 @@ sctp_add_remote_addr(struct sctp_tcb *stcb, struct soc net, 0, stcb->asoc.vrf_id); - if (net->ro._s_addr != NULL) { + if (stcb->asoc.default_mtu > 0) { + net->mtu = stcb->asoc.default_mtu; + switch (net->ro._l_addr.sa.sa_family) { +#ifdef INET + case AF_INET: + net->mtu += SCTP_MIN_V4_OVERHEAD; + break; +#endif +#ifdef INET6 + case AF_INET6: + net->mtu += SCTP_MIN_OVERHEAD; + break; +#endif + default: + break; + } +#if defined(INET) || defined(INET6) + if (net->port) { + net->mtu += (uint32_t)sizeof(struct udphdr); + } +#endif + } else if (net->ro._s_addr != NULL) { uint32_t imtu, rmtu, hcmtu; net->src_addr_selected = 1; @@ -3966,19 +3988,42 @@ sctp_add_remote_addr(struct sctp_tcb *stcb, struct soc } } if (net->mtu == 0) { - switch (newaddr->sa_family) { + if (stcb->asoc.default_mtu > 0) { + net->mtu = stcb->asoc.default_mtu; + switch (net->ro._l_addr.sa.sa_family) { #ifdef INET - case AF_INET: - net->mtu = SCTP_DEFAULT_MTU; - break; + case AF_INET: + net->mtu += SCTP_MIN_V4_OVERHEAD; + break; #endif #ifdef INET6 - case AF_INET6: - net->mtu = 1280; - break; + case AF_INET6: + net->mtu += SCTP_MIN_OVERHEAD; + break; #endif - default: - break; + default: + break; + } +#if defined(INET) || defined(INET6) + if (net->port) { + net->mtu += (uint32_t)sizeof(struct udphdr); + } +#endif + } else { + switch (newaddr->sa_family) { +#ifdef INET + case AF_INET: + net->mtu = SCTP_DEFAULT_MTU; + break; +#endif +#ifdef INET6 + case AF_INET6: + net->mtu = 1280; + break; +#endif + default: + break; + } } } #if defined(INET) || defined(INET6) Modified: head/sys/netinet/sctp_pcb.h ============================================================================== --- head/sys/netinet/sctp_pcb.h Fri Nov 3 19:32:10 2017 (r325369) +++ head/sys/netinet/sctp_pcb.h Fri Nov 3 20:46:12 2017 (r325370) @@ -287,6 +287,7 @@ struct sctp_pcb { sctp_auth_chklist_t *local_auth_chunks; sctp_hmaclist_t *local_hmacs; uint16_t default_keyid; + uint32_t default_mtu; /* various thresholds */ /* Max times I will init at a guy */ Modified: head/sys/netinet/sctp_structs.h ============================================================================== --- head/sys/netinet/sctp_structs.h Fri Nov 3 19:32:10 2017 (r325369) +++ head/sys/netinet/sctp_structs.h Fri Nov 3 20:46:12 2017 (r325370) @@ -1098,6 +1098,7 @@ struct sctp_association { uint32_t chunks_on_out_queue; /* total chunks floating around, * locked by send socket buffer */ uint32_t peers_adaptation; + uint32_t default_mtu; uint16_t peer_hmac_id; /* peer HMAC id to send */ /* Modified: head/sys/netinet/sctp_usrreq.c ============================================================================== --- head/sys/netinet/sctp_usrreq.c Fri Nov 3 19:32:10 2017 (r325369) +++ head/sys/netinet/sctp_usrreq.c Fri Nov 3 20:46:12 2017 (r325370) @@ -202,6 +202,10 @@ sctp_notify(struct sctp_inpcb *inp, #endif /* no need to unlock here, since the TCB is gone */ } else if (icmp_code == ICMP_UNREACH_NEEDFRAG) { + if ((net->dest_state & SCTP_ADDR_NO_PMTUD) == 0) { + SCTP_TCB_UNLOCK(stcb); + return; + } /* Find the next (smaller) MTU */ if (next_mtu == 0) { /* @@ -2447,7 +2451,7 @@ flags_out: * value */ paddrp->spp_pathmaxrxt = stcb->asoc.def_net_failure; - paddrp->spp_pathmtu = 0; + paddrp->spp_pathmtu = stcb->asoc.default_mtu; if (stcb->asoc.default_dscp & 0x01) { paddrp->spp_dscp = stcb->asoc.default_dscp & 0xfc; paddrp->spp_flags |= SPP_DSCP; @@ -2494,8 +2498,7 @@ flags_out: paddrp->spp_flags |= SPP_IPV6_FLOWLABEL; } #endif - /* can't return this */ - paddrp->spp_pathmtu = 0; + paddrp->spp_pathmtu = inp->sctp_ep.default_mtu; if (sctp_is_feature_off(inp, SCTP_PCB_FLAGS_DONOT_HEARTBEAT)) { paddrp->spp_flags |= SPP_HB_ENABLE; @@ -5479,6 +5482,7 @@ sctp_setopt(struct socket *so, int optname, void *optv sctp_pathmtu_adjustment(stcb, net->mtu); } } + stcb->asoc.default_mtu = paddrp->spp_pathmtu; sctp_stcb_feature_on(inp, stcb, SCTP_PCB_FLAGS_DO_NOT_PMTUD); } if (paddrp->spp_flags & SPP_PMTUD_ENABLE) { @@ -5488,6 +5492,7 @@ sctp_setopt(struct socket *so, int optname, void *optv } net->dest_state &= ~SCTP_ADDR_NO_PMTUD; } + stcb->asoc.default_mtu = 0; sctp_stcb_feature_off(inp, stcb, SCTP_PCB_FLAGS_DO_NOT_PMTUD); } if (paddrp->spp_flags & SPP_DSCP) { @@ -5544,8 +5549,12 @@ sctp_setopt(struct socket *so, int optname, void *optv sctp_feature_on(inp, SCTP_PCB_FLAGS_DONOT_HEARTBEAT); } if (paddrp->spp_flags & SPP_PMTUD_ENABLE) { + inp->sctp_ep.default_mtu = 0; sctp_feature_off(inp, SCTP_PCB_FLAGS_DO_NOT_PMTUD); } else if (paddrp->spp_flags & SPP_PMTUD_DISABLE) { + if (paddrp->spp_pathmtu >= SCTP_SMALLEST_PMTU) { + inp->sctp_ep.default_mtu = paddrp->spp_pathmtu; + } sctp_feature_on(inp, SCTP_PCB_FLAGS_DO_NOT_PMTUD); } if (paddrp->spp_flags & SPP_DSCP) { Modified: head/sys/netinet/sctputil.c ============================================================================== --- head/sys/netinet/sctputil.c Fri Nov 3 19:32:10 2017 (r325369) +++ head/sys/netinet/sctputil.c Fri Nov 3 20:46:12 2017 (r325370) @@ -1042,6 +1042,7 @@ sctp_init_asoc(struct sctp_inpcb *inp, struct sctp_tcb asoc->initial_init_rto_max = inp->sctp_ep.initial_init_rto_max; asoc->initial_rto = inp->sctp_ep.initial_rto; + asoc->default_mtu = inp->sctp_ep.default_mtu; asoc->max_init_times = inp->sctp_ep.max_init_times; asoc->max_send_times = inp->sctp_ep.max_send_times; asoc->def_net_failure = inp->sctp_ep.def_net_failure; Modified: head/sys/netinet6/sctp6_usrreq.c ============================================================================== --- head/sys/netinet6/sctp6_usrreq.c Fri Nov 3 19:32:10 2017 (r325369) +++ head/sys/netinet6/sctp6_usrreq.c Fri Nov 3 20:46:12 2017 (r325370) @@ -229,6 +229,10 @@ sctp6_notify(struct sctp_inpcb *inp, } break; case ICMP6_PACKET_TOO_BIG: + if ((net->dest_state & SCTP_ADDR_NO_PMTUD) == 0) { + SCTP_TCB_UNLOCK(stcb); + break; + } if (SCTP_OS_TIMER_PENDING(&net->pmtu_timer.timer)) { timer_stopped = 1; sctp_timer_stop(SCTP_TIMER_TYPE_PATHMTURAISE, inp, stcb, net, From owner-svn-src-all@freebsd.org Fri Nov 3 21:04: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 1973AE5B692; Fri, 3 Nov 2017 21:04:24 +0000 (UTC) (envelope-from ken@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 DC87A73D3F; Fri, 3 Nov 2017 21:04:23 +0000 (UTC) (envelope-from ken@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA3L4NTJ054233; Fri, 3 Nov 2017 21:04:23 GMT (envelope-from ken@FreeBSD.org) Received: (from ken@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA3L4N56054231; Fri, 3 Nov 2017 21:04:23 GMT (envelope-from ken@FreeBSD.org) Message-Id: <201711032104.vA3L4N56054231@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ken set sender to ken@FreeBSD.org using -f From: "Kenneth D. Merry" Date: Fri, 3 Nov 2017 21:04:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325371 - in head: lib/libmt usr.bin/mt X-SVN-Group: head X-SVN-Commit-Author: ken X-SVN-Commit-Paths: in head: lib/libmt usr.bin/mt X-SVN-Commit-Revision: 325371 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: Fri, 03 Nov 2017 21:04:24 -0000 Author: ken Date: Fri Nov 3 21:04:22 2017 New Revision: 325371 URL: https://svnweb.freebsd.org/changeset/base/325371 Log: Add the LTO-8 Type M density code (0x5d, LTO-8M) to libmt and the mt(1) man page. LTO-8 Type M (also known as M8) is a pristine LTO-7 cartridge formatted in a LTO-8 drive in a new, higher density format. It has a separate density code, and is only readable in an LTO-8 drive. lib/libmt/mtlib.c: Add the LTO-8 Type M density code to the density table in libmt. usr.bin/mt/mt.1: Add the LTO-8 Type M density code to the density table in the mt(1) man page. MFC after: 3 days Sponsored by: Spectra Logic Modified: head/lib/libmt/mtlib.c head/usr.bin/mt/mt.1 Modified: head/lib/libmt/mtlib.c ============================================================================== --- head/lib/libmt/mtlib.c Fri Nov 3 20:46:12 2017 (r325370) +++ head/lib/libmt/mtlib.c Fri Nov 3 21:04:22 2017 (r325371) @@ -645,6 +645,7 @@ static struct densities { { 0x58, 15142, 384607, "LTO-5" }, { 0x5A, 15142, 384607, "LTO-6" }, { 0x5C, 19107, 485318, "LTO-7" }, + { 0x5D, 19107, 485318, "LTO-M8" }, { 0x5E, 20669, 524993, "LTO-8" }, { 0x71, 11800, 299720, "3592A1 (encrypted)" }, { 0x72, 11800, 299720, "3592A2 (encrypted)" }, Modified: head/usr.bin/mt/mt.1 ============================================================================== --- head/usr.bin/mt/mt.1 Fri Nov 3 20:46:12 2017 (r325370) +++ head/usr.bin/mt/mt.1 Fri Nov 3 21:04:22 2017 (r325371) @@ -29,7 +29,7 @@ .\" @(#)mt.1 8.1 (Berkeley) 6/6/93 .\" $FreeBSD$ .\" -.Dd August 11, 2017 +.Dd November 3, 2017 .Dt MT 1 .Os .Sh NAME @@ -522,6 +522,7 @@ Value Width Tracks Density Code Typ 0x58 12.7 (0.5) 1280 15,142 (384,607) C LTO-5 0x5A 12.7 (0.5) 2176 15,142 (384,607) C LTO-6 0x5C 12.7 (0.5) 3584 19,107 (485,318) C LTO-7 +0x5D 12.7 (0.5) 5376 19,107 (485,318) C LTO-M8 14 0x5E 12.7 (0.5) 6656 20,669 (524,993) C LTO-8 0x71 12.7 (0.5) 512 11,800 (299,720) C 3592A1 (encrypted) 0x72 12.7 (0.5) 896 11,800 (299,720) C 3592A2 (encrypted) @@ -565,6 +566,10 @@ NOTES 12. This is Exabyte 8500 uncompressed format. The compressed format density code is 0x8c. 13. This density code (0x48) was also used for DAT-160. +14. Officially known as LTO-8 Type M, abbreviated M8. This is a pristine + LTO-7 cartridge initialized with a higher density format by an LTO-8 + drive. It cannot be read by an LTO-7 drive. Uncompressed capacity + is 9TB, compared to 6TB for LTO-7 and 12TB for LTO-8. .Ed .Bd -literal -offset 2n NOTE ON QIC STREAMERS From owner-svn-src-all@freebsd.org Fri Nov 3 21:23: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 D887FE5BC60; Fri, 3 Nov 2017 21:23:20 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io0-x22a.google.com (mail-io0-x22a.google.com [IPv6:2607:f8b0:4001:c06::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 9F1F474688; Fri, 3 Nov 2017 21:23:20 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io0-x22a.google.com with SMTP id h70so9163186ioi.4; Fri, 03 Nov 2017 14:23:20 -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=QXlYIuSCqrjjz8RTtxupvuzP/OE43OBJDmMZdBCUpZs=; b=ibttPNIH/ci/jm7shXFXdb0wsG0yAUCQhhbv6oyWEcHzDe9fgFLNEdr/Mw8sKjgX+h zn/HVBjQ0FsV966CQLRQ+YYTg0t/mhc9uDKtPUddgQtLwRPt2mhaU8MctYW7O4h70wB9 K+saeN+qUz9YsxhNcgv3+hR1vIy0qrBRiUXJC8efyfkdmazyjC5+5HeMWe+9pRQbyXty gwTqrlnhckqyCR8hn/7Tpbsw2TYru/bm/Xx0+AYR1KUJrpwMmkRl9dPAK3SS4HlZBmLy c5kTJcL82VRoO3HkJ8cpMbCFUKI4YmlXnPj+rgElKKLSRgVjgx0wRZ6T+x91Nr5NtNSU C7cA== 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=QXlYIuSCqrjjz8RTtxupvuzP/OE43OBJDmMZdBCUpZs=; b=CETfeUFFuqlb86uhfzosTlqGjlkDDGrYJs8Q7/rcz/IsjnmxWdlzIY9FDGoXV/0nzd wPVLG/AzPVmLvAnmU48z2YaakHtD/NA2mwjDhH1wTcT+THu9A1ik1HCT1rI9akq4aGd3 bXPoB2l2dSoJjCFZt/Y0KxiWOEOylQefRO4ApaRgjJnuFEYFk6FMNBkUgc+jRHjZN4Qn fNYY2sbVhKgNftlRPaW5PRxuyvSDa3UWKgMmDtGJScZ2BWjw3prLwsfugy7OXxzAu39p tM8pBqZaCW+Fm62SbOgkqZt/0KrvEuHbe6YJwUGNh7DVS9PN2Kjz9LjZ0Rl6CxRnS1YE bQqQ== X-Gm-Message-State: AJaThX76Z9O09N+9J5UPn6Pp6+sDcuCr/ssHzQKFrBHaswL+NXnQhxVc 4IS7naUTU6zwjY5pMbxeEzqKNNPKqnxKosZyZrDdAK6w X-Google-Smtp-Source: ABhQp+SW6ouxS3AH7wfqzNHeBKR5URtcnULaaCVuy8kJgaL1X7CzG6Lv0as0FIEA5LnRI66JtyiD0I+t/dKbZSlTy88= X-Received: by 10.36.22.13 with SMTP id a13mr461077ita.69.1509744199816; Fri, 03 Nov 2017 14:23:19 -0700 (PDT) MIME-Version: 1.0 Sender: carpeddiem@gmail.com Received: by 10.107.14.208 with HTTP; Fri, 3 Nov 2017 14:22:59 -0700 (PDT) In-Reply-To: <15dc8575-c699-1101-c846-b4fbdef3d1d1@FreeBSD.org> References: <201711031921.vA3JLakQ010001@repo.freebsd.org> <15dc8575-c699-1101-c846-b4fbdef3d1d1@FreeBSD.org> From: Ed Maste Date: Fri, 3 Nov 2017 17:22:59 -0400 X-Google-Sender-Auth: O6Nnv1YaUYmUC5BC95q3Abqg924 Message-ID: Subject: Re: svn commit: r325368 - head/sys/kern To: Bryan Drewery 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: Fri, 03 Nov 2017 21:23:21 -0000 "On 3 November 2017 at 16:42, Bryan Drewery wrote: > >> Differential Revision: D12929 > > Apparently this format closes the review now? I thought we needed a full > URL? Interesting, Phabricator reports "We found a "Differential Revision" field with value "12929" in the commit message, and the domain on the URI matches this install, so we linked this commit to D12929." It looks like Phabricator was changed to accept only the D##### tag, but not the "Explain why" text. From owner-svn-src-all@freebsd.org Fri Nov 3 21:25: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 8FB9FE5BD45; Fri, 3 Nov 2017 21:25:45 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 5B414748F7; Fri, 3 Nov 2017 21:25:45 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (unknown [127.0.1.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id 83EFF2B58; Fri, 3 Nov 2017 21:25:44 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id B61C82CDC; Fri, 3 Nov 2017 21:25:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id lw58QZ_p_MIa; Fri, 3 Nov 2017 21:25:40 +0000 (UTC) Subject: Re: svn commit: r325368 - head/sys/kern DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com C8DE82CD6 To: Ed Maste Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" References: <201711031921.vA3JLakQ010001@repo.freebsd.org> <15dc8575-c699-1101-c846-b4fbdef3d1d1@FreeBSD.org> From: Bryan Drewery Openpgp: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Organization: FreeBSD Message-ID: <9c760915-5896-afe2-d317-410f2d3852b9@FreeBSD.org> Date: Fri, 3 Nov 2017 14:25:25 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="LFKSVqkPDaP1w6cSSc7i96lbtu2hU4Vrh" 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: Fri, 03 Nov 2017 21:25:45 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --LFKSVqkPDaP1w6cSSc7i96lbtu2hU4Vrh Content-Type: multipart/mixed; boundary="U3WPtOLp080GUXvqhpm5kPUnOHbfwJ9S0"; protected-headers="v1" From: Bryan Drewery To: Ed Maste Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Message-ID: <9c760915-5896-afe2-d317-410f2d3852b9@FreeBSD.org> Subject: Re: svn commit: r325368 - head/sys/kern References: <201711031921.vA3JLakQ010001@repo.freebsd.org> <15dc8575-c699-1101-c846-b4fbdef3d1d1@FreeBSD.org> In-Reply-To: --U3WPtOLp080GUXvqhpm5kPUnOHbfwJ9S0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 11/3/2017 2:22 PM, Ed Maste wrote: > "On 3 November 2017 at 16:42, Bryan Drewery wrot= e: >> >>> Differential Revision: D12929 >> >> Apparently this format closes the review now? I thought we needed a fu= ll >> URL? >=20 > Interesting, Phabricator reports "We found a "Differential Revision" > field with value "12929" in the commit message, and the domain on the > URI matches this install, so we linked this commit to D12929." It > looks like Phabricator was changed to accept only the D##### tag, but > not the "Explain why" text. >=20 \o/ --=20 Regards, Bryan Drewery --U3WPtOLp080GUXvqhpm5kPUnOHbfwJ9S0-- --LFKSVqkPDaP1w6cSSc7i96lbtu2hU4Vrh Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJZ/N7FAAoJEDXXcbtuRpfPfD8IAM2apIHVOos7p6H7iZHe04cS DjdZydLCFtKnsYmbAPnJaAtQCBsoEEkAvC33kV9PKAnatiImRpLnSM71E2sCwx4k wPsbk+msn0VPTsWnzPIKzYCcodRR4wIa51E+QvrsiRBEt0bahfh6PG/BFADPZHHs 8AGyb1ecDCLl1MmjT3JVTacWD3R8nEivEJnZPTHbmrbKUNSTdguC+IUDpvKQSA+p w9rPftvGZGapbqPlMp5FbjJ5omX//QDb4ZHg2n2KDi0yYhtiN6ggDW1F4i3GnZ/Z ZaAHEv9ujpqMrozP3Tqpu17fwc5m4yOuJxvzH05Ybymy3EADz9KNqD4W8yzshzo= =1Fc3 -----END PGP SIGNATURE----- --LFKSVqkPDaP1w6cSSc7i96lbtu2hU4Vrh-- From owner-svn-src-all@freebsd.org Fri Nov 3 22:28:36 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 9B99DE5CA63; Fri, 3 Nov 2017 22:28:36 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 6D0AE760D9; Fri, 3 Nov 2017 22:28:36 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (unknown [127.0.1.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id 9FA5233BA; Fri, 3 Nov 2017 22:28:35 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id 89D9D2E02; Fri, 3 Nov 2017 22:28:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id i5Y-F1YL72fW; Fri, 3 Nov 2017 22:28:26 +0000 (UTC) Subject: Re: svn commit: r325116 - head DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com 87E852DFD To: Warner Losh , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201710300312.v9U3CcCT021416@repo.freebsd.org> From: Bryan Drewery Openpgp: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Organization: FreeBSD Message-ID: <8d9e9f50-035c-403c-3bc5-6788b7a94dea@FreeBSD.org> Date: Fri, 3 Nov 2017 15:28:25 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <201710300312.v9U3CcCT021416@repo.freebsd.org> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="pgPP7DPs5xF97Lq8QmsdmDWa12bhLKJJ9" 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: Fri, 03 Nov 2017 22:28:36 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --pgPP7DPs5xF97Lq8QmsdmDWa12bhLKJJ9 Content-Type: multipart/mixed; boundary="SpU4G7rf55SnwvJPEs3FlO9GkhgR0f2an"; protected-headers="v1" From: Bryan Drewery To: Warner Losh , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <8d9e9f50-035c-403c-3bc5-6788b7a94dea@FreeBSD.org> Subject: Re: svn commit: r325116 - head References: <201710300312.v9U3CcCT021416@repo.freebsd.org> In-Reply-To: <201710300312.v9U3CcCT021416@repo.freebsd.org> --SpU4G7rf55SnwvJPEs3FlO9GkhgR0f2an Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 10/29/2017 8:12 PM, Warner Losh wrote: > Author: imp > Date: Mon Oct 30 03:12:38 2017 > New Revision: 325116 > URL: https://svnweb.freebsd.org/changeset/base/325116 >=20 > Log: > Return proper status from buildenv. > =20 > make buildenv BUILDENV_SHELL=3D 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@. > =20 > Sponsored by: Netflix Now simply running 'make buildenv' and 'exit' throws a make error. Perhaps we need a BUILDENV_CMDS that does what you want and we otherwise leave the ${BUILDENV_SHELL} || true handling. >=20 > Modified: > head/Makefile.inc1 >=20 > Modified: head/Makefile.inc1 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=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/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=3D${TARGET_CPUTYPE} > .endif > - @cd ${BUILDENV_DIR} && env ${WMAKEENV} BUILDENV=3D1 ${BUILDENV_SHELL}= \ > - || true > + @cd ${BUILDENV_DIR} && env ${WMAKEENV} BUILDENV=3D1 ${BUILDENV_SHELL}= > =20 > TOOLCHAIN_TGTS=3D ${WMAKE_TGTS:Neverything:Nbuild${libcompat}} > toolchain: ${TOOLCHAIN_TGTS} .PHONY >=20 --=20 Regards, Bryan Drewery --SpU4G7rf55SnwvJPEs3FlO9GkhgR0f2an-- --pgPP7DPs5xF97Lq8QmsdmDWa12bhLKJJ9 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJZ/O2KAAoJEDXXcbtuRpfPp44H/0gqCh0jaPTYRDX0b+wLXEWK +Jk3y2GaUIaYGr9TyJPdkzj4aVdIhOet6GCFxPVEuvM/tGUtSz0bFblZ5yZGvEUr rkv+ivTfio/uSIRVgQPDjZ//3wWbY98XzWnVFWfkHccbFpB/+/+LMSpzdWhcyrsF 3mcRlIJsFZT9gd0lcHFiughNin40VmK4/YOnP5jtOsJA42Hm1ILwywPTHbHhrXzW 1UgGAK24U94qvBTSCkgUmOp3Ke2u3FuEnfFQL6xFFOHyIwXddu/BgOgdU7/w/GCd vxjW4+Q13CpLO9VxpNnjOwBfRtIsS4NLgRGb5S2lSG787ARHjhJXTCqD8pXP7KE= =sq8y -----END PGP SIGNATURE----- --pgPP7DPs5xF97Lq8QmsdmDWa12bhLKJJ9-- From owner-svn-src-all@freebsd.org Fri Nov 3 22:32: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 B2A6DE5CC86 for ; Fri, 3 Nov 2017 22:32:23 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-io0-x22b.google.com (mail-io0-x22b.google.com [IPv6:2607:f8b0:4001:c06::22b]) (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 76C23764E8 for ; Fri, 3 Nov 2017 22:32:23 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-io0-x22b.google.com with SMTP id b186so9415394iof.8 for ; Fri, 03 Nov 2017 15:32:23 -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=2Yq2Bs2+B7f0BiTtoU2Wn1jUuTX65r+5pZ6SYR9ZbSc=; b=IY4TRdtSEkasoH6EqvjHNDbQP6L2fyuYy8Q7JcN2sA2Ru2FBxJpS8JxOK0EWcGlaH2 grRiVx/ku/oI79yBgbqZDQ9xhjeiRirzkErtNTeP4GXCXuI0BtI2ClKCZwdtMhTteQUY mP9UJ/YUzbVEMTtXCDI9+rcwV+m2FUiZ7E3DwrzSIV0WEByEVl7/MS/jsqj1mLcst6HS 1+b6DNFPd2+XmawjM0dbwnM5ZeVyu7yyQlIl0QRgIKXbc/SYWDT5TsmJgRFBg+Eh04n8 7aYnbN6PvvLx+XuuI/4c13LmzBAQ6u/BNxPhYk3IYtIZ9grGHZ+hkTT6w3FrUXk2dheB N8Kg== 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=2Yq2Bs2+B7f0BiTtoU2Wn1jUuTX65r+5pZ6SYR9ZbSc=; b=F2UbAxqbde+0OTAuDSuqPeatJy6muvnkiNf83vdfTQR653W7IYm4L89ET7euRVs+3l oGKhVCKYtwN5XjP8718wuNj3+F/wC5ZZF24jlXdWMmSSryuM4gttUpamuf3t/gvrPcjR k223JpEI1hqsi3DS48j2TXpk9sNnlsx+PAJP7O2howCV0yg96jRWNNtdDFk2foA6kizh 0LJJt/9P4hieG1x2miAwu4IcEQaBCXaFZEA44Y6tsnzP5lDI1QHvrVaIPXmBGzX6I/Oq sGxTCeHyOTQWfZdDidNzsWMRTD8ls+AtMv8UvBQbvztzcaig4xeVtJo+VF3RHkvA/xGT EK4A== X-Gm-Message-State: AJaThX6hyuKIcqQii7mtJv5s+hv9h+llUgQdQzbUEkQa9yfiDYHWcG/L EptxeRiaCUvwJOIqqVP/G2DM7wIAsv2kzi8aV+MsLQ== X-Google-Smtp-Source: ABhQp+R6ZYx7ftG5hbefxuQ0r1FT+YcEoKfZx5bJnRsNayKP7GhWmrdkOP/QTeExgWfCvsTIwo9Q38c5MuMCNl91RLw= X-Received: by 10.36.64.145 with SMTP id n139mr647719ita.115.1509748342869; Fri, 03 Nov 2017 15:32:22 -0700 (PDT) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.79.57.22 with HTTP; Fri, 3 Nov 2017 15:32:22 -0700 (PDT) X-Originating-IP: [2603:300b:6:5100:4daf:1291:4f1b:d2ea] In-Reply-To: <8d9e9f50-035c-403c-3bc5-6788b7a94dea@FreeBSD.org> References: <201710300312.v9U3CcCT021416@repo.freebsd.org> <8d9e9f50-035c-403c-3bc5-6788b7a94dea@FreeBSD.org> From: Warner Losh Date: Fri, 3 Nov 2017 16:32:22 -0600 X-Google-Sender-Auth: vn4hy64haGmES-VfNqJT7i-IuZM Message-ID: Subject: Re: svn commit: r325116 - head To: Bryan Drewery Cc: Warner Losh , 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: Fri, 03 Nov 2017 22:32:23 -0000 On Fri, Nov 3, 2017 at 4:28 PM, Bryan Drewery wrote: > On 10/29/2017 8:12 PM, Warner Losh wrote: > > 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 > > Now simply running 'make buildenv' and 'exit' throws a make error. > > Perhaps we need a BUILDENV_CMDS that does what you want and we otherwise > leave the ${BUILDENV_SHELL} || true handling. Are you sure? 4:29pm zooty:[242]> make buildenv Entering world for amd64:amd64 $ exit 4:29pm zooty:[243]> Perhaps you can give me an example that causes that? This was the very first thing I checked before committing the fix... Warner > > > > 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 > > > > > -- > Regards, > Bryan Drewery > > From owner-svn-src-all@freebsd.org Fri Nov 3 22:41:16 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 9F7D7E5CF89; Fri, 3 Nov 2017 22:41:16 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 6B203768EB; Fri, 3 Nov 2017 22:41:16 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (unknown [127.0.1.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id 873B23792; Fri, 3 Nov 2017 22:41:15 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id C353A2E55; Fri, 3 Nov 2017 22:41:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id PlhwTWg3LfU3; Fri, 3 Nov 2017 22:41:12 +0000 (UTC) Subject: Re: svn commit: r325116 - head DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com A5B362E50 To: Warner Losh Cc: Warner Losh , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" References: <201710300312.v9U3CcCT021416@repo.freebsd.org> <8d9e9f50-035c-403c-3bc5-6788b7a94dea@FreeBSD.org> From: Bryan Drewery Openpgp: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Organization: FreeBSD Message-ID: <72ee6c6d-0d9a-ebe9-8e15-c278fc91ded2@FreeBSD.org> Date: Fri, 3 Nov 2017 15:40:57 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="8atGHB3OAANrBLIH0Vxcn7POljN0jWmap" 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: Fri, 03 Nov 2017 22:41:16 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --8atGHB3OAANrBLIH0Vxcn7POljN0jWmap Content-Type: multipart/mixed; boundary="F0thaUpI3tD43cS3KRQhVjs8FWFsX3N0f"; protected-headers="v1" From: Bryan Drewery To: Warner Losh Cc: Warner Losh , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Message-ID: <72ee6c6d-0d9a-ebe9-8e15-c278fc91ded2@FreeBSD.org> Subject: Re: svn commit: r325116 - head References: <201710300312.v9U3CcCT021416@repo.freebsd.org> <8d9e9f50-035c-403c-3bc5-6788b7a94dea@FreeBSD.org> In-Reply-To: --F0thaUpI3tD43cS3KRQhVjs8FWFsX3N0f Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 11/3/2017 3:32 PM, Warner Losh wrote: >=20 >=20 > On Fri, Nov 3, 2017 at 4:28 PM, Bryan Drewery > wrote: >=20 > On 10/29/2017 8:12 PM, Warner Losh wrote: > > Author: imp > > Date: Mon Oct 30 03:12:38 2017 > > New Revision: 325116 > > URL: https://svnweb.freebsd.org/changeset/base/325116 > > > > > Log: > >=C2=A0 =C2=A0Return proper status from buildenv. > > > >=C2=A0 =C2=A0make buildenv BUILDENV_SHELL=3D more us= eful. Remove '|| > >=C2=A0 =C2=A0true' from the command line so that errors are proper= ly > >=C2=A0 =C2=A0returned. There appears to be no reason for it, and i= t dates back to > >=C2=A0 =C2=A0the original commit by ru@. > > > >=C2=A0 =C2=A0Sponsored by: Netflix >=20 > Now simply running 'make buildenv' and 'exit' throws a make error. >=20 > Perhaps we need a BUILDENV_CMDS that does what you want and we othe= rwise > leave the ${BUILDENV_SHELL} || true handling. >=20 >=20 > Are you sure? >=20 > 4:29pm zooty:[242]> make buildenv > Entering world for amd64:amd64 > $ exit > 4:29pm zooty:[243]> >=20 > Perhaps you can give me an example that causes that? This was the very > first thing I checked before committing the fix... >=20 Only happens with zsh. > [root@c1100-1][pts/8][zsh/2][Fri 11/03/2017 15:40:10 PDT][0?2&] (git-sv= n)-[master]- > ~/git/freebsd # BUILDENV_SHELL=3Dcsh make buildenv > Entering world for amd64:amd64 > root@c1100-1:~/git/freebsd # exit > exit > ~/git/freebsd # BUILDENV_SHELL=3D/usr/local/bin/zsh make buildenv > Entering world for amd64:amd64 > For ZSH you must run: export CPUTYPE=3D > (buildenv) [root@c1100-1][pts/8][zsh/3][Fri 11/03/2017 15:40:23 PDT][1?= 0&] (git-svn)-[master]- > ~/git/freebsd # exit > *** Error code 1 >=20 > Stop. > make[1]: stopped in /root/git/freebsd > *** Error code 1 >=20 > Stop. > make: stopped in /root/git/freebsd --=20 Regards, Bryan Drewery --F0thaUpI3tD43cS3KRQhVjs8FWFsX3N0f-- --8atGHB3OAANrBLIH0Vxcn7POljN0jWmap Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJZ/PB5AAoJEDXXcbtuRpfPpMcH/j6gmqnAORotHtqWXIRQfyjL 2gPfNg0EO+IQ7Z9chohZUfwMDaHGwzMhVi/sXJD1Voq3gtnftDSL8unxDd7Y7tRf vV/H57lSZnfnRvZfL1YnE30N2Sc4ZGnqQcAiDEFdpkTxuC2ZbC4uMwJkW9AWpLiD DGLFg1om4gyJblu8VZz0tI10Am7Jc+y4N0XB3SfkTRdD+wscPJpTBC0hbf1La5mZ dKEYpjIGnRU3WITXFRsr0+If9S4ifdaqIXI5P+dI5if6xiSLw8Fk9Ab99iIRALty CU9ztvauyawBUDS+T+l8DfU+mimnZ+5xa/G4uqaaf3HoZAys44DhjHxlZxnLPm0= =B5Ua -----END PGP SIGNATURE----- --8atGHB3OAANrBLIH0Vxcn7POljN0jWmap-- From owner-svn-src-all@freebsd.org Fri Nov 3 22:41: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 17349E5CFD9; Fri, 3 Nov 2017 22:41:33 +0000 (UTC) (envelope-from jilles@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 E538D76A17; Fri, 3 Nov 2017 22:41:32 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA3MfVC4094892; Fri, 3 Nov 2017 22:41:31 GMT (envelope-from jilles@FreeBSD.org) Received: (from jilles@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA3MfVk0094891; Fri, 3 Nov 2017 22:41:31 GMT (envelope-from jilles@FreeBSD.org) Message-Id: <201711032241.vA3MfVk0094891@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jilles set sender to jilles@FreeBSD.org using -f From: Jilles Tjoelker Date: Fri, 3 Nov 2017 22:41:31 +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: r325372 - stable/11/sys/contrib/libnv X-SVN-Group: stable-11 X-SVN-Commit-Author: jilles X-SVN-Commit-Paths: stable/11/sys/contrib/libnv X-SVN-Commit-Revision: 325372 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: Fri, 03 Nov 2017 22:41:33 -0000 Author: jilles Date: Fri Nov 3 22:41:31 2017 New Revision: 325372 URL: https://svnweb.freebsd.org/changeset/base/325372 Log: MFC r325017: libnv: Fix strict-aliasing violation with cookie In r323851 (MFC'ed to stable/11 as r324831), some casts were adjusted in calls to nvlist_next() and nvlist_get_pararr() in order to make scan-build happy. I think these changes just confused scan-build into not reporting the strict-aliasing violation. For example, nvlist_xdescriptors() is causing nvlist_next() to write to its local variable nvp of type nvpair_t * using the lvalue *cookiep of type void *, which is not allowed. Given the APIs of nvlist_next(), nvlist_get_parent() and nvlist_get_pararr(), one possible fix is to create a local void *cookie in nvlist_xdescriptors() and other places, and to convert the value to nvpair_t * when necessary. This patch implements that fix. Modified: stable/11/sys/contrib/libnv/nvlist.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/contrib/libnv/nvlist.c ============================================================================== --- stable/11/sys/contrib/libnv/nvlist.c Fri Nov 3 21:04:22 2017 (r325371) +++ stable/11/sys/contrib/libnv/nvlist.c Fri Nov 3 22:41:31 2017 (r325372) @@ -708,15 +708,17 @@ out: static int * nvlist_xdescriptors(const nvlist_t *nvl, int *descs) { + void *cookie; nvpair_t *nvp; int type; NVLIST_ASSERT(nvl); PJDLOG_ASSERT(nvl->nvl_error == 0); - nvp = NULL; + cookie = NULL; do { - while (nvlist_next(nvl, &type, (void *)&nvp) != NULL) { + while (nvlist_next(nvl, &type, &cookie) != NULL) { + nvp = cookie; switch (type) { case NV_TYPE_DESCRIPTOR: *descs = nvpair_get_descriptor(nvp); @@ -738,7 +740,7 @@ nvlist_xdescriptors(const nvlist_t *nvl, int *descs) } case NV_TYPE_NVLIST: nvl = nvpair_get_nvlist(nvp); - nvp = NULL; + cookie = NULL; break; case NV_TYPE_NVLIST_ARRAY: { @@ -750,12 +752,12 @@ nvlist_xdescriptors(const nvlist_t *nvl, int *descs) PJDLOG_ASSERT(nitems > 0); nvl = value[0]; - nvp = NULL; + cookie = NULL; break; } } } - } while ((nvl = nvlist_get_pararr(nvl, (void *)&nvp)) != NULL); + } while ((nvl = nvlist_get_pararr(nvl, &cookie)) != NULL); return (descs); } @@ -785,6 +787,7 @@ size_t nvlist_ndescriptors(const nvlist_t *nvl) { #ifndef _KERNEL + void *cookie; nvpair_t *nvp; size_t ndescs; int type; @@ -793,16 +796,17 @@ nvlist_ndescriptors(const nvlist_t *nvl) PJDLOG_ASSERT(nvl->nvl_error == 0); ndescs = 0; - nvp = NULL; + cookie = NULL; do { - while (nvlist_next(nvl, &type, (void *)&nvp) != NULL) { + while (nvlist_next(nvl, &type, &cookie) != NULL) { + nvp = cookie; switch (type) { case NV_TYPE_DESCRIPTOR: ndescs++; break; case NV_TYPE_NVLIST: nvl = nvpair_get_nvlist(nvp); - nvp = NULL; + cookie = NULL; break; case NV_TYPE_NVLIST_ARRAY: { @@ -814,7 +818,7 @@ nvlist_ndescriptors(const nvlist_t *nvl) PJDLOG_ASSERT(nitems > 0); nvl = value[0]; - nvp = NULL; + cookie = NULL; break; } case NV_TYPE_DESCRIPTOR_ARRAY: @@ -828,7 +832,7 @@ nvlist_ndescriptors(const nvlist_t *nvl) } } } - } while ((nvl = nvlist_get_pararr(nvl, (void *)&nvp)) != NULL); + } while ((nvl = nvlist_get_pararr(nvl, &cookie)) != NULL); return (ndescs); #else From owner-svn-src-all@freebsd.org Fri Nov 3 22:45:19 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 82BCDE5D200 for ; Fri, 3 Nov 2017 22:45:19 +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 44CB976D84 for ; Fri, 3 Nov 2017 22:45:19 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-io0-x22f.google.com with SMTP id d66so9493764ioe.5 for ; Fri, 03 Nov 2017 15:45:19 -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=5td0B1W8HAU7cJJpiMATrgfmnK7EI17leec5q7mjaOY=; b=PyU/rfo0xkAKRCe5a2Mq4bzOR0iVM/zzN2w1cpST+Bwo/6lHL9IbI6anezO4bd+BCV SW8MBiVHHpkzcYOeZfpN/D4Yl9n5acntnl+pbcAMDQMP7Q7gzXTAfJQ/aBxTJt/CH9/m Pt2Pj/h72bDlf0Uh5jiBxGG+OKESwG5rBRyn7i+Uns3DwWUFP7rFQPzv70n2rHZsAl4X 9aHR0cHhsDgpbYYTqXdrksbrxPzFmvDwp2r8dfLacaGv0BFROTNK5r/U4WOSU0nYyWfF u77pvjtlqEna9sf4aetHJkPPHMbfhLV4kjXLuJixXla8qjUJqUuaNiYxP6Bbe5c5fVB6 ypdg== 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=5td0B1W8HAU7cJJpiMATrgfmnK7EI17leec5q7mjaOY=; b=ELHwF/45Eqrkk6MR19nhPmSeEDz5ibtcM0Fbvydw5DvW44BSCLR2xxfQpbR1M09Z3a 0bW9UDKWLQTjMHEbpTyff9tcRPm8ucr5HsGkxVMu6C6vCUWrcQlkmZBYN9AvzJ0CFa7W aia//fmU5rYO5+WGUb3eJqzUhFMzhAlAicbU4kD+UxdKyq1ayyvysJS7CPhNrCspak6j mBo49MdPmO/mqe6gm8ZNZzrZAzRKFXu1vGaezX34a70AlU78IlPB4BoLvrRTGCN3iR3i D1f2DR5C0c02qpcXrd7cZhxEeL9XYBrtZwAWejPlnpMw9a9gCed6hdNOqf6hYuYJTniw lZ+A== X-Gm-Message-State: AJaThX7t1eY9bjceboqpGmq2PVxYMINRX5xOcGsUo5vfVq4aKH4YEaWu y0URE60W8m0ng4wFGypIjQEe9rtdOyq5xj9PWaB+Rw== X-Google-Smtp-Source: ABhQp+TxwIMaSdRKBjpjxZ6UJfhZ7b7sVWkYR2de4YUPU4xqcB/yP/Fy1EV/dOSnqyWq0bIVm10HW0cnb212PbdRD0M= X-Received: by 10.107.48.76 with SMTP id w73mr11249773iow.301.1509749118571; Fri, 03 Nov 2017 15:45:18 -0700 (PDT) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.79.57.22 with HTTP; Fri, 3 Nov 2017 15:45:17 -0700 (PDT) X-Originating-IP: [2603:300b:6:5100:4daf:1291:4f1b:d2ea] In-Reply-To: <72ee6c6d-0d9a-ebe9-8e15-c278fc91ded2@FreeBSD.org> References: <201710300312.v9U3CcCT021416@repo.freebsd.org> <8d9e9f50-035c-403c-3bc5-6788b7a94dea@FreeBSD.org> <72ee6c6d-0d9a-ebe9-8e15-c278fc91ded2@FreeBSD.org> From: Warner Losh Date: Fri, 3 Nov 2017 16:45:17 -0600 X-Google-Sender-Auth: k8k7ID0t20WgwFv6it-k0zuZqRo Message-ID: Subject: Re: svn commit: r325116 - head To: Bryan Drewery Cc: Warner Losh , 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: Fri, 03 Nov 2017 22:45:19 -0000 On Fri, Nov 3, 2017 at 4:40 PM, Bryan Drewery wrote: > On 11/3/2017 3:32 PM, Warner Losh wrote: > > > > > > On Fri, Nov 3, 2017 at 4:28 PM, Bryan Drewery > > wrote: > > > > On 10/29/2017 8:12 PM, Warner Losh wrote: > > > 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 > > > > Now simply running 'make buildenv' and 'exit' throws a make error. > > > > Perhaps we need a BUILDENV_CMDS that does what you want and we > otherwise > > leave the ${BUILDENV_SHELL} || true handling. > > > > > > Are you sure? > > > > 4:29pm zooty:[242]> make buildenv > > Entering world for amd64:amd64 > > $ exit > > 4:29pm zooty:[243]> > > > > Perhaps you can give me an example that causes that? This was the very > > first thing I checked before committing the fix... > > > > Only happens with zsh. > > > [root@c1100-1][pts/8][zsh/2][Fri 11/03/2017 15:40:10 PDT][0?2&] > (git-svn)-[master]- > > ~/git/freebsd # BUILDENV_SHELL=csh make buildenv > > Entering world for amd64:amd64 > > root@c1100-1:~/git/freebsd # exit > > exit > > ~/git/freebsd # BUILDENV_SHELL=/usr/local/bin/zsh make buildenv > > Entering world for amd64:amd64 > > For ZSH you must run: export CPUTYPE= > > (buildenv) [root@c1100-1][pts/8][zsh/3][Fri 11/03/2017 15:40:23 > PDT][1?0&] (git-svn)-[master]- > > ~/git/freebsd # exit > > *** Error code 1 > > > > Stop. > > make[1]: stopped in /root/git/freebsd > > *** Error code 1 > > > > Stop. > > make: stopped in /root/git/freebsd > Shouldn't this be fixed in upstream zsh rather than yet another ZSH wart in the buildsystem that literally has another ZSH wart in the same line? Warner From owner-svn-src-all@freebsd.org Fri Nov 3 23:02: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 6258CE5D59A; Fri, 3 Nov 2017 23:02:59 +0000 (UTC) (envelope-from manu@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 1E15777486; Fri, 3 Nov 2017 23:02:59 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA3N2wxM004219; Fri, 3 Nov 2017 23:02:58 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA3N2viC004209; Fri, 3 Nov 2017 23:02:57 GMT (envelope-from manu@FreeBSD.org) Message-Id: <201711032302.vA3N2viC004209@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Fri, 3 Nov 2017 23:02:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325373 - head/release/arm X-SVN-Group: head X-SVN-Commit-Author: manu X-SVN-Commit-Paths: head/release/arm X-SVN-Commit-Revision: 325373 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: Fri, 03 Nov 2017 23:02:59 -0000 Author: manu Date: Fri Nov 3 23:02:57 2017 New Revision: 325373 URL: https://svnweb.freebsd.org/changeset/base/325373 Log: release/arm: Do not install ubldr ubldr is the non-pie version of ubldr.bin, do not install two copies of the same binary. This will allow us to remove ubldr in the future. All the u-boot ports know how to load ubldr.bin Reviewed by: gjb (earlier version) Modified: head/release/arm/BANANAPI.conf head/release/arm/BEAGLEBONE.conf head/release/arm/CUBIEBOARD.conf head/release/arm/CUBIEBOARD2.conf head/release/arm/CUBOX-HUMMINGBOARD.conf head/release/arm/GUMSTIX.conf head/release/arm/PANDABOARD.conf head/release/arm/RPI-B.conf head/release/arm/RPI2.conf head/release/arm/WANDBOARD.conf Modified: head/release/arm/BANANAPI.conf ============================================================================== --- head/release/arm/BANANAPI.conf Fri Nov 3 22:41:31 2017 (r325372) +++ head/release/arm/BANANAPI.conf Fri Nov 3 23:02:57 2017 (r325373) @@ -8,7 +8,6 @@ EMBEDDED_TARGET="arm" EMBEDDED_TARGET_ARCH="armv7" EMBEDDEDPORTS="sysutils/u-boot-bananapi" KERNEL="GENERIC" -WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x42000000" IMAGE_SIZE="3072M" PART_SCHEME="MBR" FAT_SIZE="32m -b 1m" @@ -27,7 +26,6 @@ arm_install_uboot() { chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} - chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ ${FATMOUNT}/ubldr.bin chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot Modified: head/release/arm/BEAGLEBONE.conf ============================================================================== --- head/release/arm/BEAGLEBONE.conf Fri Nov 3 22:41:31 2017 (r325372) +++ head/release/arm/BEAGLEBONE.conf Fri Nov 3 23:02:57 2017 (r325373) @@ -8,7 +8,6 @@ EMBEDDED_TARGET="arm" EMBEDDED_TARGET_ARCH="armv7" EMBEDDEDPORTS="sysutils/u-boot-beaglebone" KERNEL="GENERIC" -WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000" IMAGE_SIZE="3072M" PART_SCHEME="MBR" FAT_SIZE="2m" @@ -26,7 +25,6 @@ arm_install_uboot() { chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/MLO ${FATMOUNT}/MLO chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/u-boot.img ${FATMOUNT}/u-boot.img - chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ ${FATMOUNT}/ubldr.bin chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot Modified: head/release/arm/CUBIEBOARD.conf ============================================================================== --- head/release/arm/CUBIEBOARD.conf Fri Nov 3 22:41:31 2017 (r325372) +++ head/release/arm/CUBIEBOARD.conf Fri Nov 3 23:02:57 2017 (r325373) @@ -8,7 +8,6 @@ EMBEDDED_TARGET="arm" EMBEDDED_TARGET_ARCH="armv7" EMBEDDEDPORTS="sysutils/u-boot-cubieboard" KERNEL="GENERIC" -WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x42000000" IMAGE_SIZE="3072M" PART_SCHEME="MBR" FAT_SIZE="32m -b 1m" @@ -27,7 +26,6 @@ arm_install_uboot() { chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} - chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ ${FATMOUNT}/ubldr.bin chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot Modified: head/release/arm/CUBIEBOARD2.conf ============================================================================== --- head/release/arm/CUBIEBOARD2.conf Fri Nov 3 22:41:31 2017 (r325372) +++ head/release/arm/CUBIEBOARD2.conf Fri Nov 3 23:02:57 2017 (r325373) @@ -8,7 +8,6 @@ EMBEDDED_TARGET="arm" EMBEDDED_TARGET_ARCH="armv7" EMBEDDEDPORTS="sysutils/u-boot-cubieboard2" KERNEL="GENERIC" -WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x42000000" IMAGE_SIZE="3072M" PART_SCHEME="MBR" FAT_SIZE="32m -b 1m" @@ -27,7 +26,6 @@ arm_install_uboot() { chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} - chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ ${FATMOUNT}/ubldr.bin chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot Modified: head/release/arm/CUBOX-HUMMINGBOARD.conf ============================================================================== --- head/release/arm/CUBOX-HUMMINGBOARD.conf Fri Nov 3 22:41:31 2017 (r325372) +++ head/release/arm/CUBOX-HUMMINGBOARD.conf Fri Nov 3 23:02:57 2017 (r325373) @@ -8,7 +8,6 @@ EMBEDDED_TARGET="arm" EMBEDDED_TARGET_ARCH="armv7" EMBEDDEDPORTS="sysutils/u-boot-cubox-hummingboard" KERNEL="IMX6" -WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x12000000" IMAGE_SIZE="3072M" PART_SCHEME="MBR" FAT_SIZE="50m -b 16384" @@ -27,7 +26,6 @@ arm_install_uboot() { chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} - chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ ${FATMOUNT}/ubldr.bin chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot Modified: head/release/arm/GUMSTIX.conf ============================================================================== --- head/release/arm/GUMSTIX.conf Fri Nov 3 22:41:31 2017 (r325372) +++ head/release/arm/GUMSTIX.conf Fri Nov 3 23:02:57 2017 (r325373) @@ -8,7 +8,6 @@ EMBEDDED_TARGET="arm" EMBEDDED_TARGET_ARCH="armv6" EMBEDDEDPORTS="sysutils/u-boot-duovero" KERNEL="GUMSTIX" -WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000" IMAGE_SIZE="3072M" PART_SCHEME="MBR" FAT_SIZE="2m" @@ -25,7 +24,6 @@ arm_install_uboot() { chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/MLO ${FATMOUNT}/MLO chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/u-boot.img ${FATMOUNT}/u-boot.img - chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ ${FATMOUNT}/ubldr.bin chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot Modified: head/release/arm/PANDABOARD.conf ============================================================================== --- head/release/arm/PANDABOARD.conf Fri Nov 3 22:41:31 2017 (r325372) +++ head/release/arm/PANDABOARD.conf Fri Nov 3 23:02:57 2017 (r325373) @@ -8,7 +8,6 @@ EMBEDDED_TARGET="arm" EMBEDDED_TARGET_ARCH="armv7" EMBEDDEDPORTS="sysutils/u-boot-pandaboard" KERNEL="GENERIC" -WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000" IMAGE_SIZE="3072M" PART_SCHEME="MBR" FAT_SIZE="2m" @@ -26,7 +25,6 @@ arm_install_uboot() { chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/MLO ${FATMOUNT}/MLO chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/u-boot.img ${FATMOUNT}/u-boot.img - chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ ${FATMOUNT}/ubldr.bin chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot Modified: head/release/arm/RPI-B.conf ============================================================================== --- head/release/arm/RPI-B.conf Fri Nov 3 22:41:31 2017 (r325372) +++ head/release/arm/RPI-B.conf Fri Nov 3 23:02:57 2017 (r325373) @@ -8,7 +8,6 @@ EMBEDDED_TARGET="arm" EMBEDDED_TARGET_ARCH="armv6" EMBEDDEDPORTS="sysutils/u-boot-rpi" KERNEL="RPI-B" -WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x2000000" IMAGE_SIZE="3072M" PART_SCHEME="MBR" FAT_SIZE="17m" @@ -29,7 +28,6 @@ arm_install_uboot() { chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/${_UF} \ ${FATMOUNT}/${_UF} done - chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ ${FATMOUNT}/ubldr.bin chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/dtb/rpi.dtb \ Modified: head/release/arm/RPI2.conf ============================================================================== --- head/release/arm/RPI2.conf Fri Nov 3 22:41:31 2017 (r325372) +++ head/release/arm/RPI2.conf Fri Nov 3 23:02:57 2017 (r325373) @@ -8,7 +8,6 @@ EMBEDDED_TARGET="arm" EMBEDDED_TARGET_ARCH="armv7" EMBEDDEDPORTS="sysutils/u-boot-rpi2" KERNEL="GENERIC" -WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x2000000" IMAGE_SIZE="3072M" PART_SCHEME="MBR" FAT_SIZE="50m" @@ -30,7 +29,6 @@ arm_install_uboot() { chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/${_UF} \ ${FATMOUNT}/${_UF} done - chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ ${FATMOUNT}/ubldr.bin chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/dtb/rpi2.dtb \ Modified: head/release/arm/WANDBOARD.conf ============================================================================== --- head/release/arm/WANDBOARD.conf Fri Nov 3 22:41:31 2017 (r325372) +++ head/release/arm/WANDBOARD.conf Fri Nov 3 23:02:57 2017 (r325373) @@ -8,7 +8,6 @@ EMBEDDED_TARGET="arm" EMBEDDED_TARGET_ARCH="armv7" EMBEDDEDPORTS="sysutils/u-boot-wandboard" KERNEL="IMX6" -WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x12000000" IMAGE_SIZE="3072M" PART_SCHEME="MBR" FAT_SIZE="50m -b 16384" @@ -27,7 +26,6 @@ arm_install_uboot() { chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} - chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ ${FATMOUNT}/ubldr.bin chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot From owner-svn-src-all@freebsd.org Fri Nov 3 23:04: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 2D4C5E5D61F; Fri, 3 Nov 2017 23:04:27 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 ED647775E7; Fri, 3 Nov 2017 23:04:26 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (unknown [127.0.1.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id 25ABD3D7C; Fri, 3 Nov 2017 23:04:26 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id 697B82F52; Fri, 3 Nov 2017 23:04:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id jXiQnl-dK-hh; Fri, 3 Nov 2017 23:04:23 +0000 (UTC) Subject: Re: svn commit: r325116 - head DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com BBA922F4B Cc: Warner Losh , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" References: <201710300312.v9U3CcCT021416@repo.freebsd.org> <8d9e9f50-035c-403c-3bc5-6788b7a94dea@FreeBSD.org> <72ee6c6d-0d9a-ebe9-8e15-c278fc91ded2@FreeBSD.org> From: Bryan Drewery Openpgp: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Organization: FreeBSD Message-ID: Date: Fri, 3 Nov 2017 16:04:23 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="eA8s7LR5c9A9FMgd2d807p7aox4ugBLJG" 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: Fri, 03 Nov 2017 23:04:27 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --eA8s7LR5c9A9FMgd2d807p7aox4ugBLJG Content-Type: multipart/mixed; boundary="caENqGobbUAEm2AOSdoFb3X1Wq6DVF8gW"; protected-headers="v1" From: Bryan Drewery Cc: Warner Losh , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Message-ID: Subject: Re: svn commit: r325116 - head References: <201710300312.v9U3CcCT021416@repo.freebsd.org> <8d9e9f50-035c-403c-3bc5-6788b7a94dea@FreeBSD.org> <72ee6c6d-0d9a-ebe9-8e15-c278fc91ded2@FreeBSD.org> In-Reply-To: --caENqGobbUAEm2AOSdoFb3X1Wq6DVF8gW Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 11/3/2017 3:45 PM, Warner Losh wrote: >=20 >=20 > On Fri, Nov 3, 2017 at 4:40 PM, Bryan Drewery > wrote: >=20 > On 11/3/2017 3:32 PM, Warner Losh wrote: > > > > > > On Fri, Nov 3, 2017 at 4:28 PM, Bryan Drewery > > >> wrot= e: > > > >=C2=A0 =C2=A0 =C2=A0On 10/29/2017 8:12 PM, Warner Losh wrote: > >=C2=A0 =C2=A0 =C2=A0> Author: imp > >=C2=A0 =C2=A0 =C2=A0> Date: Mon Oct 30 03:12:38 2017 > >=C2=A0 =C2=A0 =C2=A0> New Revision: 325116 > >=C2=A0 =C2=A0 =C2=A0> URL: https://svnweb.freebsd.org/changeset/ba= se/325116 > > >=C2=A0 =C2=A0 =C2=A0 > > >=C2=A0 =C2=A0 =C2=A0> > >=C2=A0 =C2=A0 =C2=A0> Log: > >=C2=A0 =C2=A0 =C2=A0>=C2=A0 =C2=A0Return proper status from builde= nv. > >=C2=A0 =C2=A0 =C2=A0> > >=C2=A0 =C2=A0 =C2=A0>=C2=A0 =C2=A0make buildenv BUILDENV_SHELL=3D<= some command> more useful. > Remove '|| > >=C2=A0 =C2=A0 =C2=A0>=C2=A0 =C2=A0true' from the command line so t= hat errors are properly > >=C2=A0 =C2=A0 =C2=A0>=C2=A0 =C2=A0returned. There appears to be no= reason for it, and it > dates back to > >=C2=A0 =C2=A0 =C2=A0>=C2=A0 =C2=A0the original commit by ru@. > >=C2=A0 =C2=A0 =C2=A0> > >=C2=A0 =C2=A0 =C2=A0>=C2=A0 =C2=A0Sponsored by: Netflix > > > >=C2=A0 =C2=A0 =C2=A0Now simply running 'make buildenv' and 'exit' = throws a make error. > > > >=C2=A0 =C2=A0 =C2=A0Perhaps we need a BUILDENV_CMDS that does what= you want and we > otherwise > >=C2=A0 =C2=A0 =C2=A0leave the ${BUILDENV_SHELL} || true handling. > > > > > > Are you sure? > > > > 4:29pm zooty:[242]> make buildenv > > Entering world for amd64:amd64 > > $ exit > > 4:29pm zooty:[243]> > > > > Perhaps you can give me an example that causes that? This was the= very > > first thing I checked before committing the fix... > > >=20 > Only happens with zsh. >=20 > > [root@c1100-1][pts/8][zsh/2][Fri 11/03/2017 15:40:10 PDT][0?2&] > (git-svn)-[master]- > > ~/git/freebsd # BUILDENV_SHELL=3Dcsh make buildenv > > Entering world for amd64:amd64 > > root@c1100-1:~/git/freebsd # exit > > exit > > ~/git/freebsd # BUILDENV_SHELL=3D/usr/local/bin/zsh make buildenv= > > Entering world for amd64:amd64 > > For ZSH you must run: export CPUTYPE=3D > > (buildenv) [root@c1100-1][pts/8][zsh/3][Fri 11/03/2017 15:40:23 > PDT][1?0&] (git-svn)-[master]- The 1? above means the last command returned 1. Hmm, I wonder why. > > ~/git/freebsd # exit > > *** Error code 1 > > > > Stop. > > make[1]: stopped in /root/git/freebsd > > *** Error code 1 > > > > Stop. > > make: stopped in /root/git/freebsd >=20 >=20 > Shouldn't this be fixed in upstream zsh rather than yet another ZSH war= t > in the buildsystem that literally has another ZSH wart in the same line= ? >=20 > Warner --=20 Regards, Bryan Drewery --caENqGobbUAEm2AOSdoFb3X1Wq6DVF8gW-- --eA8s7LR5c9A9FMgd2d807p7aox4ugBLJG Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJZ/PX3AAoJEDXXcbtuRpfPjQUH/3vFpQZHjfToyl1KGQaw/acz J+5oQxoqownrEo1/dQnhUNmTsA1xqZ3LYHqSCOMlP6qI7/omVjlbTE62D7H1Ig0a vbO9WnPUmgvRCN6X91L79S10JDBivC56VZIIIZbTGvGKIDWn6q7DWQZdi8riJPtU z1kFiyQuhLSP7cJYHCB5gxv6uiJUM68bTp+kI780HC/cWgXMjsTL/h14Vt2IHdgv IsHfPttVAPptgegw+2iVZGOCLso2mUcK+9+9UAijC51cG93+RYclkxmjFoNvU5dP qjr07Ua2fKKs3kcNeD6t4r/rS+qOltFAj7V08/MtalMYkR3dfIbNOShNXzDFyWo= =mWmd -----END PGP SIGNATURE----- --eA8s7LR5c9A9FMgd2d807p7aox4ugBLJG-- From owner-svn-src-all@freebsd.org Fri Nov 3 23:07: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 2BD11E5D6C7; Fri, 3 Nov 2017 23:07:53 +0000 (UTC) (envelope-from bdrewery@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 D93DD7778D; Fri, 3 Nov 2017 23:07:52 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (unknown [127.0.1.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id DD8213EEC; Fri, 3 Nov 2017 23:07:51 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id 176852FA9; Fri, 3 Nov 2017 23:07:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id omBc6i_E4nRS; Fri, 3 Nov 2017 23:07:48 +0000 (UTC) Subject: Re: svn commit: r325116 - head DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com 056222F9F From: Bryan Drewery Cc: src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" References: <201710300312.v9U3CcCT021416@repo.freebsd.org> <8d9e9f50-035c-403c-3bc5-6788b7a94dea@FreeBSD.org> <72ee6c6d-0d9a-ebe9-8e15-c278fc91ded2@FreeBSD.org> To: Warner Losh Openpgp: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Organization: FreeBSD Message-ID: <3a0a92dd-19fc-2ee3-dcbf-224e4c2e8eec@FreeBSD.org> Date: Fri, 3 Nov 2017 16:07:48 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="RT9PpvcCdeKiAuuOEmEuJfv0g5WAKc1oW" 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: Fri, 03 Nov 2017 23:07:53 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --RT9PpvcCdeKiAuuOEmEuJfv0g5WAKc1oW Content-Type: multipart/mixed; boundary="gr7fhuPW44ivwpOwfh6vEwx69rcmtKqlR"; protected-headers="v1" From: Bryan Drewery To: Warner Losh Cc: src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Message-ID: <3a0a92dd-19fc-2ee3-dcbf-224e4c2e8eec@FreeBSD.org> Subject: Re: svn commit: r325116 - head References: <201710300312.v9U3CcCT021416@repo.freebsd.org> <8d9e9f50-035c-403c-3bc5-6788b7a94dea@FreeBSD.org> <72ee6c6d-0d9a-ebe9-8e15-c278fc91ded2@FreeBSD.org> In-Reply-To: --gr7fhuPW44ivwpOwfh6vEwx69rcmtKqlR Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 11/3/2017 4:04 PM, Bryan Drewery wrote: > On 11/3/2017 3:45 PM, Warner Losh wrote: >> >> >> On Fri, Nov 3, 2017 at 4:40 PM, Bryan Drewery > > wrote: >> >> On 11/3/2017 3:32 PM, Warner Losh wrote: >> > >> > >> > On Fri, Nov 3, 2017 at 4:28 PM, Bryan Drewery >> > >> wro= te: >> > >> >=C2=A0 =C2=A0 =C2=A0On 10/29/2017 8:12 PM, Warner Losh wrote: >> >=C2=A0 =C2=A0 =C2=A0> Author: imp >> >=C2=A0 =C2=A0 =C2=A0> Date: Mon Oct 30 03:12:38 2017 >> >=C2=A0 =C2=A0 =C2=A0> New Revision: 325116 >> >=C2=A0 =C2=A0 =C2=A0> URL: https://svnweb.freebsd.org/changeset/b= ase/325116 >> >> >=C2=A0 =C2=A0 =C2=A0> > >> >=C2=A0 =C2=A0 =C2=A0> >> >=C2=A0 =C2=A0 =C2=A0> Log: >> >=C2=A0 =C2=A0 =C2=A0>=C2=A0 =C2=A0Return proper status from build= env. >> >=C2=A0 =C2=A0 =C2=A0> >> >=C2=A0 =C2=A0 =C2=A0>=C2=A0 =C2=A0make buildenv BUILDENV_SHELL=3D= more useful. >> Remove '|| >> >=C2=A0 =C2=A0 =C2=A0>=C2=A0 =C2=A0true' from the command line so = that errors are properly >> >=C2=A0 =C2=A0 =C2=A0>=C2=A0 =C2=A0returned. There appears to be n= o reason for it, and it >> dates back to >> >=C2=A0 =C2=A0 =C2=A0>=C2=A0 =C2=A0the original commit by ru@. >> >=C2=A0 =C2=A0 =C2=A0> >> >=C2=A0 =C2=A0 =C2=A0>=C2=A0 =C2=A0Sponsored by: Netflix >> > >> >=C2=A0 =C2=A0 =C2=A0Now simply running 'make buildenv' and 'exit'= throws a make error. >> > >> >=C2=A0 =C2=A0 =C2=A0Perhaps we need a BUILDENV_CMDS that does wha= t you want and we >> otherwise >> >=C2=A0 =C2=A0 =C2=A0leave the ${BUILDENV_SHELL} || true handling.= >> > >> > >> > Are you sure? >> > >> > 4:29pm zooty:[242]> make buildenv >> > Entering world for amd64:amd64 >> > $ exit >> > 4:29pm zooty:[243]> >> > >> > Perhaps you can give me an example that causes that? This was th= e very >> > first thing I checked before committing the fix... >> > >> >> Only happens with zsh. >> >> > [root@c1100-1][pts/8][zsh/2][Fri 11/03/2017 15:40:10 PDT][0?2&] >> (git-svn)-[master]- >> > ~/git/freebsd # BUILDENV_SHELL=3Dcsh make buildenv >> > Entering world for amd64:amd64 >> > root@c1100-1:~/git/freebsd # exit >> > exit >> > ~/git/freebsd # BUILDENV_SHELL=3D/usr/local/bin/zsh make builden= v >> > Entering world for amd64:amd64 >> > For ZSH you must run: export CPUTYPE=3D >> > (buildenv) [root@c1100-1][pts/8][zsh/3][Fri 11/03/2017 15:40:23 >> PDT][1?0&] (git-svn)-[master]- >=20 > The 1? above means the last command returned 1. Hmm, I wonder why. It's my own .zshrc, ignore me. >=20 >> > ~/git/freebsd # exit >> > *** Error code 1 >> > >> > Stop. >> > make[1]: stopped in /root/git/freebsd >> > *** Error code 1 >> > >> > Stop. >> > make: stopped in /root/git/freebsd >> >> >> Shouldn't this be fixed in upstream zsh rather than yet another ZSH wa= rt >> in the buildsystem that literally has another ZSH wart in the same lin= e? >> >> Warner >=20 >=20 --=20 Regards, Bryan Drewery --gr7fhuPW44ivwpOwfh6vEwx69rcmtKqlR-- --RT9PpvcCdeKiAuuOEmEuJfv0g5WAKc1oW Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJZ/PbEAAoJEDXXcbtuRpfP9oMH/0FZVVNIIfirOusXZ7tdfIVT nLY9SExFG2WfGmBqvTreowfe4W12t2ndd2GL5bbYFurq9d/vtz1oQ+iggM4JzCQj C0Mm4BB/I22edHY5r4OIOVwU4jSvd2K0Si6ve7DLa3sQ4E9MPFh/3sOVpw7qsw2r 1C2ivOnIWLAj5NANVcZY9lQRL5bGXvjp1esy2SPB4BgusnuxVAc6Mb6dVI7cbyqG ZF42HycG1sbDCQgfiYHgeCvH9BzMzpJkoc0lsfaw1rcDMYzy5Tb4xPFkxjSWseLt 4peMP/GvtDdXv6Y7UA1ahuCFNUIircHxtKVhzZz+0J6GFY6S28Rnyf8BB4Oaqx4= =CNo9 -----END PGP SIGNATURE----- --RT9PpvcCdeKiAuuOEmEuJfv0g5WAKc1oW-- From owner-svn-src-all@freebsd.org Fri Nov 3 23:22: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 D6E22E5DB30; Fri, 3 Nov 2017 23:22: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 AD5C27C014; Fri, 3 Nov 2017 23:22:04 +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 vA3NM30O011610; Fri, 3 Nov 2017 23:22:03 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA3NM35S011607; Fri, 3 Nov 2017 23:22:03 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201711032322.vA3NM35S011607@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Fri, 3 Nov 2017 23:22:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325374 - in head: . share/man/man7 sys/conf X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: in head: . share/man/man7 sys/conf X-SVN-Commit-Revision: 325374 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: Fri, 03 Nov 2017 23:22:05 -0000 Author: bdrewery Date: Fri Nov 3 23:22:03 2017 New Revision: 325374 URL: https://svnweb.freebsd.org/changeset/base/325374 Log: Follow-up r318105: Don't use NO_OBJ at top-level, use NO_OBJWALK. NO_OBJ has a very specific meaning in sub-directories in that no object directory will be made. If a user wanted to skip the 'make obj' phase then passing -DNO_OBJ would break all sub-directories from building properly. Using NO_OBJ internally also causes issue with NO_OBJ handling being added in share/mk/bsd.init.mk soon. Sponsored by: Dell EMC Isilon Modified: head/Makefile.inc1 head/share/man/man7/build.7 head/sys/conf/kern.pre.mk Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Fri Nov 3 23:02:57 2017 (r325373) +++ head/Makefile.inc1 Fri Nov 3 23:22:03 2017 (r325374) @@ -301,7 +301,7 @@ CLEANDIR= cleandir .if defined(WORLDFAST) NO_CLEAN= t -NO_OBJ= t +NO_OBJWALK= t .endif .if ${MK_META_MODE} == "yes" @@ -312,11 +312,11 @@ NO_OBJ= t NO_CLEAN= t .endif .endif -.if defined(NO_OBJ) || ${MK_AUTO_OBJ} == "yes" -NO_OBJ= t +.if defined(NO_OBJWALK) || ${MK_AUTO_OBJ} == "yes" +NO_OBJWALK= t NO_KERNELOBJ= t .endif -.if !defined(NO_OBJ) +.if !defined(NO_OBJWALK) _obj= obj .endif @@ -942,7 +942,7 @@ WMAKE_TGTS+= _sanity_check _worldtmp _legacy WMAKE_TGTS+= _bootstrap-tools .endif WMAKE_TGTS+= _cleanobj -.if !defined(NO_OBJ) +.if !defined(NO_OBJWALK) WMAKE_TGTS+= _obj .endif WMAKE_TGTS+= _build-tools _cross-tools @@ -1804,7 +1804,7 @@ legacy: .PHONY .for _tool in tools/build ${_elftoolchain_libs} ${_+_}@${ECHODIR} "===> ${_tool} (obj,includes,all,install)"; \ cd ${.CURDIR}/${_tool}; \ - if [ -z "${NO_OBJ}" ]; then ${MAKE} DIRPRFX=${_tool}/ obj; fi; \ + if [ -z "${NO_OBJWALK}" ]; then ${MAKE} DIRPRFX=${_tool}/ obj; fi; \ ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${WORLDTMP}/legacy includes; \ ${MAKE} DIRPRFX=${_tool}/ MK_INCLUDES=no all; \ ${MAKE} DIRPRFX=${_tool}/ MK_INCLUDES=no \ @@ -1950,7 +1950,7 @@ bootstrap-tools: .PHONY ${_bt}-${_tool}: .PHONY .MAKE ${_+_}@${ECHODIR} "===> ${_tool} (obj,all,install)"; \ cd ${.CURDIR}/${_tool}; \ - if [ -z "${NO_OBJ}" ]; then ${MAKE} DIRPRFX=${_tool}/ obj; fi; \ + if [ -z "${NO_OBJWALK}" ]; then ${MAKE} DIRPRFX=${_tool}/ obj; fi; \ ${MAKE} DIRPRFX=${_tool}/ all; \ ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${WORLDTMP}/legacy install @@ -2001,7 +2001,7 @@ build-tools_${_tool}: .PHONY ${_+_}@${ECHODIR} "===> ${_tool} (${_bt_clean:D${_bt_clean},}obj,build-tools)"; \ cd ${.CURDIR}/${_tool}; \ if [ -n "${_bt_clean}" ]; then ${MAKE} DIRPRFX=${_tool}/ ${_bt_clean}; fi; \ - if [ -z "${NO_OBJ}" ]; then ${MAKE} DIRPRFX=${_tool}/ obj; fi; \ + if [ -z "${NO_OBJWALK}" ]; then ${MAKE} DIRPRFX=${_tool}/ obj; fi; \ ${MAKE} DIRPRFX=${_tool}/ build-tools build-tools: build-tools_${_tool} .endfor @@ -2086,7 +2086,7 @@ cross-tools: .MAKE .PHONY ${_usb_tools} ${_+_}@${ECHODIR} "===> ${_tool} (obj,all,install)"; \ cd ${.CURDIR}/${_tool}; \ - if [ -z "${NO_OBJ}" ]; then ${MAKE} DIRPRFX=${_tool}/ obj; fi; \ + if [ -z "${NO_OBJWALK}" ]; then ${MAKE} DIRPRFX=${_tool}/ obj; fi; \ ${MAKE} DIRPRFX=${_tool}/ all; \ ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${WORLDTMP} install .endfor @@ -2227,7 +2227,7 @@ native-xtools: .PHONY # needed build tools are built. ${_+_}cd ${.CURDIR}; ${NXBTMAKE} _includes MK_CLANG=no MK_GCC=no ${_+_}cd ${.CURDIR}; ${NXBTMAKE} _libraries MK_CLANG=no MK_GCC=no -.if !defined(NO_OBJ) +.if !defined(NO_OBJWALK) ${_+_}cd ${.CURDIR}; ${NXBMAKE} SUBDIR_OVERRIDE="${NXBDIRS:M*}" _obj .endif ${_+_}cd ${.CURDIR}; ${NXBMAKE} SUBDIR_OVERRIDE="${NXBDIRS:M*}" \ @@ -2504,7 +2504,7 @@ ${_lib}__PL: .PHONY .MAKE .if exists(${.CURDIR}/${_lib}) ${_+_}@${ECHODIR} "===> ${_lib} (obj,all,install)"; \ cd ${.CURDIR}/${_lib}; \ - if [ -z "${NO_OBJ}" ]; then ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ obj; fi; \ + if [ -z "${NO_OBJWALK}" ]; then ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ obj; fi; \ ${MAKE} MK_TESTS=no MK_PROFILE=no -DNO_PIC \ DIRPRFX=${_lib}/ all; \ ${MAKE} MK_TESTS=no MK_PROFILE=no -DNO_PIC \ @@ -2517,7 +2517,7 @@ ${_lib}__L: .PHONY .MAKE .if exists(${.CURDIR}/${_lib}) ${_+_}@${ECHODIR} "===> ${_lib} (obj,all,install)"; \ cd ${.CURDIR}/${_lib}; \ - if [ -z "${NO_OBJ}" ]; then ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ obj; fi; \ + if [ -z "${NO_OBJWALK}" ]; then ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ obj; fi; \ ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ all; \ ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ install .endif @@ -2855,7 +2855,7 @@ _xb-bootstrap-tools: .PHONY ${_yacc} ${_+_}@${ECHODIR} "===> ${_tool} (obj,all,install)"; \ cd ${.CURDIR}/${_tool}; \ - if [ -z "${NO_OBJ}" ]; then ${CDMAKE} DIRPRFX=${_tool}/ obj; fi; \ + if [ -z "${NO_OBJWALK}" ]; then ${CDMAKE} DIRPRFX=${_tool}/ obj; fi; \ ${CDMAKE} DIRPRFX=${_tool}/ all; \ ${CDMAKE} DIRPRFX=${_tool}/ DESTDIR=${CDTMP} install .endfor @@ -2877,7 +2877,7 @@ _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; \ + if [ -z "${NO_OBJWALK}" ]; then ${CDMAKE} DIRPRFX=${_tool}/ obj; fi; \ ${CDMAKE} DIRPRFX=${_tool}/ all .endfor @@ -2912,7 +2912,7 @@ _xi-cross-tools: .PHONY .endfor _xi-includes: .PHONY -.if !defined(NO_OBJ) +.if !defined(NO_OBJWALK) ${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 _obj \ DESTDIR=${XDDESTDIR} .endif Modified: head/share/man/man7/build.7 ============================================================================== --- head/share/man/man7/build.7 Fri Nov 3 23:02:57 2017 (r325373) +++ head/share/man/man7/build.7 Fri Nov 3 23:22:03 2017 (r325374) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 26, 2017 +.Dd November 3, 2017 .Dt BUILD 7 .Os .Sh NAME @@ -683,7 +683,7 @@ documentation as part of the target. .It Va NO_LIBS If set, the libraries phase will be skipped. -.It Va NO_OBJ +.It Va NO_OBJWALK If set, no object directories will be created. This should only be used if object directories were created in a previous build and no new directories are connected. @@ -700,7 +700,7 @@ If set, the build target .Cm buildworld defaults to setting .Va NO_CLEAN , -.Va NO_OBJ , +.Va NO_OBJWALK , and will skip most bootstrap phases. It will only bootstrap libraries and build all of userland. This option should be used only when it is known that none of the bootstrap Modified: head/sys/conf/kern.pre.mk ============================================================================== --- head/sys/conf/kern.pre.mk Fri Nov 3 23:02:57 2017 (r325373) +++ head/sys/conf/kern.pre.mk Fri Nov 3 23:22:03 2017 (r325374) @@ -24,11 +24,11 @@ _srcconf_included_: .MAKE.MODE+= curdirOk=yes .endif -.if defined(NO_OBJ) || ${MK_AUTO_OBJ} == "yes" -NO_OBJ= t +.if defined(NO_OBJWALK) || ${MK_AUTO_OBJ} == "yes" +NO_OBJWALK= t NO_MODULES_OBJ= t .endif -.if !defined(NO_OBJ) +.if !defined(NO_OBJWALK) _obj= obj .endif From owner-svn-src-all@freebsd.org Sat Nov 4 00:47: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 A1257E5ED1B; Sat, 4 Nov 2017 00:47:22 +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 6D81A7DD52; Sat, 4 Nov 2017 00:47:22 +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 vA40lLtI046139; Sat, 4 Nov 2017 00:47:21 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA40lLi7046136; Sat, 4 Nov 2017 00:47:21 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201711040047.vA40lLi7046136@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Sat, 4 Nov 2017 00:47:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325375 - head/sys/powerpc/conf X-SVN-Group: head X-SVN-Commit-Author: jhibbits X-SVN-Commit-Paths: head/sys/powerpc/conf X-SVN-Commit-Revision: 325375 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: Sat, 04 Nov 2017 00:47:22 -0000 Author: jhibbits Date: Sat Nov 4 00:47:21 2017 New Revision: 325375 URL: https://svnweb.freebsd.org/changeset/base/325375 Log: Stop passing -me500 to the assembler for Book-E kernels We already pass -many to the assembler, and -me500 drops 64-bit instruction handling, for some reason only breaking module building for 64-bit kernels. Additionally, build with CTF for dtrace. Modified: head/sys/powerpc/conf/MPC85XX head/sys/powerpc/conf/MPC85XXSPE head/sys/powerpc/conf/QORIQ64 Modified: head/sys/powerpc/conf/MPC85XX ============================================================================== --- head/sys/powerpc/conf/MPC85XX Fri Nov 3 23:22:03 2017 (r325374) +++ head/sys/powerpc/conf/MPC85XX Sat Nov 4 00:47:21 2017 (r325375) @@ -11,7 +11,8 @@ ident MPC85XX machine powerpc powerpc include "dpaa/config.dpaa" -makeoptions DEBUG="-Wa,-me500 -g" +makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols +makeoptions WITH_CTF=1 makeoptions WERROR="-Werror -Wno-format -Wno-redundant-decls" makeoptions NO_MODULES=yes Modified: head/sys/powerpc/conf/MPC85XXSPE ============================================================================== --- head/sys/powerpc/conf/MPC85XXSPE Fri Nov 3 23:22:03 2017 (r325374) +++ head/sys/powerpc/conf/MPC85XXSPE Sat Nov 4 00:47:21 2017 (r325375) @@ -11,7 +11,8 @@ ident MPC85XX machine powerpc powerpcspe include "dpaa/config.dpaa" -makeoptions DEBUG="-Wa,-me500 -g" +makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols +makeoptions WITH_CTF=1 makeoptions WERROR="-Werror -Wno-format -Wno-redundant-decls" makeoptions NO_MODULES=yes Modified: head/sys/powerpc/conf/QORIQ64 ============================================================================== --- head/sys/powerpc/conf/QORIQ64 Fri Nov 3 23:22:03 2017 (r325374) +++ head/sys/powerpc/conf/QORIQ64 Sat Nov 4 00:47:21 2017 (r325375) @@ -12,7 +12,8 @@ ident MPC85XX machine powerpc powerpc64 include "dpaa/config.dpaa" -makeoptions DEBUG="-Wa,-me500 -g" +makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols +makeoptions WITH_CTF=1 makeoptions WERROR="-Werror -Wno-format -Wno-redundant-decls" makeoptions NO_MODULES=yes From owner-svn-src-all@freebsd.org Sat Nov 4 02:33: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 DF5CCE6183F; Sat, 4 Nov 2017 02:33:30 +0000 (UTC) (envelope-from peter@wemm.org) Received: from smtp2.wemm.org (smtp2.wemm.org [192.203.228.78]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "smtp2.wemm.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CA06B80A0A; Sat, 4 Nov 2017 02:33:30 +0000 (UTC) (envelope-from peter@wemm.org) Received: from overcee.wemm.org (canning.wemm.org [192.203.228.65]) by smtp2.wemm.org (Postfix) with ESMTP id C1C8210A; Fri, 3 Nov 2017 19:33:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wemm.org; s=m20140428; t=1509762809; bh=HOTv+mJqvnU5+Wb0fJD/YlbV1qY6mBdWHks3E8fWxs8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=vBVwhoDXNcfjncDEJ/9rYvwKAjpHPWH4MIhslEyQ9ZbI0uOBWlZoNlFNUm8YHbXDv MOdB3lHuANxcOP3/R00YSn8Et435987++pmJadCIeuquzovoE9AePNYtjzJdyKUBEn epUqwKiWV9QPjkwIa8fxFFLalETtKHPAZGGHSPrQ= From: Peter Wemm To: svn-src-head@freebsd.org Cc: Warner Losh , src-committers@freebsd.org, svn-src-all@freebsd.org Subject: Re: svn commit: r325024 - in head/sys: dev/ipmi sys Date: Fri, 03 Nov 2017 19:33:24 -0700 Message-ID: <4607020.19GRM1RsjL@overcee.wemm.org> User-Agent: KMail/4.14.10 (FreeBSD/12.0-CURRENT; KDE/4.14.30; amd64; ; ) In-Reply-To: <201710262252.v9QMqpvL009359@repo.freebsd.org> References: <201710262252.v9QMqpvL009359@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart1886594.0CVDo5nPVs"; micalg="pgp-sha256"; protocol="application/pgp-signature" 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: Sat, 04 Nov 2017 02:33:31 -0000 --nextPart1886594.0CVDo5nPVs Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="us-ascii" On Thursday, October 26, 2017 10:52:51 PM Warner Losh wrote: > Log: > Various IPMI watchdog timer improvements How is this supposed to work? Every 12.x machine in the freebsd.org cl= uster=20 with ipmi on the motherboard now soft-reboots after exactly 420 seconds= of=20 uptime, without giving any clue as to why. Setting hw.ipmi.on=3D"0" in loader.conf 'solves' it, but that's not exa= ctly=20 ideal. What are existing machines supposed to do? =2D-=20 Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com; KI= 6FJV UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246 --nextPart1886594.0CVDo5nPVs Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEBgrA0Vr/vfNVuPoUNdaXCeyAngQFAln9JvQACgkQNdaXCeyA ngSdIggAwFk/Q/vyku2IeGYpLmpQYPHSFg29qd4aq07B++oU6tmgpMoVe2no4XDw iHvpMGk7EDx/Dy1CGJBNtxsVzXHCuU4ItDkaOiQ4hLQH5fYwXw98VAglKK7GY5NY cp1X0TJVgL9N21RCHlMdk1LZUyKibBE6s7f6O96RO5pfmzhKaU/+qnhweY1GAqqT TpZWy3LUf19HiNultACWfRQrMOox5T2VOD/utMFwdobE23MOI2VKHgJX/MKiRkPl Et78CJ6TxxLfqNf+KxNOgpYU9whiDcwDwbHLeJh1cveIu9fB92JVg/jKNBPWwL5c NXgS3VM6XY5x9w3fHSQUkczxo6gHEw== =4G5D -----END PGP SIGNATURE----- --nextPart1886594.0CVDo5nPVs-- From owner-svn-src-all@freebsd.org Sat Nov 4 02:53:19 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 5DBB8E61F8A for ; Sat, 4 Nov 2017 02:53:19 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-io0-x236.google.com (mail-io0-x236.google.com [IPv6:2607:f8b0:4001:c06::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 235F48123E for ; Sat, 4 Nov 2017 02:53:19 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-io0-x236.google.com with SMTP id 97so10169501iok.7 for ; Fri, 03 Nov 2017 19:53:19 -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=mCset9NCXs2/xFGcsoX0/eLT8L44xTlLJsuhPFYUANg=; b=UZ10G8DUYe2SMqDOXm/Gc3p5twn2ICl4el9tQofrcLm7qk82KR3V1A5+fFfz64HFl1 1yp+8ma02oDXmjOkIieb1cnAiVyro4gG9Kio0EHLC7smzqWznOYcH/F25MJSGA7FOx7+ bo9xQKut3Sfy/ALL2ev8w8nx1yNWIa7RrY61+OrIk5vlsjkuYZu0GveprDfHixrQbgQX RNzc0VhPSaGrS1pAjFI9r21XZIJpOfhRTmrlx3Hg7VDhBojJt5zgqS9WckGfW6mjAiqq 4bk15Z3kj5nb5CK+S+ZXhJrTuxcl0T8qjPz6nFJJL0xL8fcAylPWIglL2dz2TL/yGl/x ruLA== 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=mCset9NCXs2/xFGcsoX0/eLT8L44xTlLJsuhPFYUANg=; b=HLVF4cFg/5bICeS+Bktd526dKoXXeqjVujBMqPxtPfk56j0fiYjjBVAznSmatSR/Pj 9OGwuWghzL/jnDokpizxrTGu5kTbVM+0BbffsfdTXl3wQfp9irU8b5etBCICNne//L5g vlqQ52fLUJ81lZn7lsbjut2Liho1rIXZcAoDL4t+v4cs5XAx8KPxy55JVHbfgIe+/u0p 7ony0OoG3MsYXIINqqX6pE0jHfIKeC+4a/9pbm3ogeBvThfUwtpIlII+rWJ04h+fKJ51 Mfr0WaGohqz5zckyMBH+ptPJzMsJrA4HYb5PXWfohWusu3AMtALlf2ZJNjmjFBiKoDsP w+2Q== X-Gm-Message-State: AJaThX6srJe7c1Xtp2NGuC3iag7RLFOAilgFfRWKvuY8crT8sez6UAyO I2Cbz378dB0uCTsl6f4uy9wk85bcu79kBee0LPIYPg== X-Google-Smtp-Source: ABhQp+TK5dNSsJ0yeHu8QlcDzvrLiQ7ziUrHPfyd7UYTrtMrKUlnwzFBInBgtbSN9QCD6ADpS797ZozpNte7lfUG5yQ= X-Received: by 10.36.184.5 with SMTP id m5mr1316521ite.69.1509763998202; Fri, 03 Nov 2017 19:53:18 -0700 (PDT) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.79.57.22 with HTTP; Fri, 3 Nov 2017 19:53:17 -0700 (PDT) X-Originating-IP: [2603:300b:6:5100:4daf:1291:4f1b:d2ea] In-Reply-To: <4607020.19GRM1RsjL@overcee.wemm.org> References: <201710262252.v9QMqpvL009359@repo.freebsd.org> <4607020.19GRM1RsjL@overcee.wemm.org> From: Warner Losh Date: Fri, 3 Nov 2017 20:53:17 -0600 X-Google-Sender-Auth: i1gupsYIZ7uPOdRNU1iwycHPxAk Message-ID: Subject: Re: svn commit: r325024 - in head/sys: dev/ipmi sys To: Peter Wemm Cc: "svn-src-head@freebsd.org" , Warner Losh , src-committers , "svn-src-all@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: Sat, 04 Nov 2017 02:53:19 -0000 On Fri, Nov 3, 2017 at 8:33 PM, Peter Wemm wrote: > On Thursday, October 26, 2017 10:52:51 PM Warner Losh wrote: > > > Log: > > Various IPMI watchdog timer improvements > > How is this supposed to work? Every 12.x machine in the freebsd.org > cluster > with ipmi on the motherboard now soft-reboots after exactly 420 seconds of > uptime, without giving any clue as to why. > > Setting hw.ipmi.on="0" in loader.conf 'solves' it, but that's not exactly > ideal. What are existing machines supposed to do? > It should have been a nop unless specifically enabled.... Looks like there's a default that's wrong... Warner From owner-svn-src-all@freebsd.org Sat Nov 4 03:01:12 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 CF0E6E62264; Sat, 4 Nov 2017 03:01:12 +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 9CE93815B7; Sat, 4 Nov 2017 03:01:12 +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 vA431BHL001951; Sat, 4 Nov 2017 03:01:11 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA431BRA001950; Sat, 4 Nov 2017 03:01:11 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201711040301.vA431BRA001950@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sat, 4 Nov 2017 03:01:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325376 - head/sys/boot X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/sys/boot X-SVN-Commit-Revision: 325376 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: Sat, 04 Nov 2017 03:01:12 -0000 Author: imp Date: Sat Nov 4 03:01:11 2017 New Revision: 325376 URL: https://svnweb.freebsd.org/changeset/base/325376 Log: WIP: centralize machine links Modified: head/sys/boot/defs.mk Modified: head/sys/boot/defs.mk ============================================================================== --- head/sys/boot/defs.mk Sat Nov 4 00:47:21 2017 (r325375) +++ head/sys/boot/defs.mk Sat Nov 4 03:01:11 2017 (r325376) @@ -84,6 +84,40 @@ CFLAGS+= -DLOADER_MBR_SUPPORT .if ${LOADER_GELI_SUPPORT:Uyes} == "yes" CFLAGS+= -DLOADER_GELI_SUPPORT .endif + +_ILINKS=machine +.if ${MACHINE} != ${MACHINE_CPUARCH} && ${MACHINE} != "arm64" +_ILINKS+=${MACHINE_CPUARCH} .endif +.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" +_ILINKS+=x86 +.endif +CLEANFILES+=${_ILINKS} + +all: ${PROG} + +beforedepend: ${_ILINKS} +beforebuild: ${_ILINKS} + +# Ensure that the links exist without depending on it when it exists which +# causes all the modules to be rebuilt when the directory pointed to changes. +.for _link in ${_ILINKS} +.if !exists(${.OBJDIR}/${_link}) +${OBJS}: ${_link} +.endif +.endfor + +.NOPATH: ${_ILINKS} + +${_ILINKS}: + @case ${.TARGET} in \ + machine) \ + path=${SYSDIR}/${MACHINE}/include ;; \ + *) \ + path=${SYSDIR}/${.TARGET:T}/include ;; \ + esac ; \ + path=`(cd $$path && /bin/pwd)` ; \ + ${ECHO} ${.TARGET:T} "->" $$path ; \ + ln -fhs $$path ${.TARGET:T} .endif # __BOOT_DEFS_MK__ From owner-svn-src-all@freebsd.org Sat Nov 4 03: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 87043E622F7; Sat, 4 Nov 2017 03:01:54 +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 5156B81A87; Sat, 4 Nov 2017 03:01:54 +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 vA431rJM002704; Sat, 4 Nov 2017 03:01:53 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA431rx8002701; Sat, 4 Nov 2017 03:01:53 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201711040301.vA431rx8002701@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sat, 4 Nov 2017 03:01:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325377 - in head/sys/boot: . libsa libsa32 X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head/sys/boot: . libsa libsa32 X-SVN-Commit-Revision: 325377 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: Sat, 04 Nov 2017 03:01:54 -0000 Author: imp Date: Sat Nov 4 03:01:52 2017 New Revision: 325377 URL: https://svnweb.freebsd.org/changeset/base/325377 Log: mostly libsa Modified: head/sys/boot/defs.mk head/sys/boot/libsa/Makefile head/sys/boot/libsa32/Makefile Modified: head/sys/boot/defs.mk ============================================================================== --- head/sys/boot/defs.mk Sat Nov 4 03:01:11 2017 (r325376) +++ head/sys/boot/defs.mk Sat Nov 4 03:01:52 2017 (r325377) @@ -84,6 +84,7 @@ CFLAGS+= -DLOADER_MBR_SUPPORT .if ${LOADER_GELI_SUPPORT:Uyes} == "yes" CFLAGS+= -DLOADER_GELI_SUPPORT .endif +.endif _ILINKS=machine .if ${MACHINE} != ${MACHINE_CPUARCH} && ${MACHINE} != "arm64" Modified: head/sys/boot/libsa/Makefile ============================================================================== --- head/sys/boot/libsa/Makefile Sat Nov 4 03:01:11 2017 (r325376) +++ head/sys/boot/libsa/Makefile Sat Nov 4 03:01:52 2017 (r325377) @@ -14,7 +14,7 @@ MK_SSP= no .include "../Makefile.inc" INTERNALLIB= -LIBSTAND_CPUARCH?=${MACHINE_CPUARCH} +LIBSA_CPUARCH?=${MACHINE_CPUARCH} LIBC_SRC= ${SRCTOP}/lib/libc LIB?= sa @@ -83,7 +83,7 @@ SRCS+= syncicache.c SRCS+= uuid_create_nil.c uuid_equal.c uuid_from_string.c uuid_is_nil.c uuid_to_string.c # _setjmp/_longjmp -.PATH: ${SASRC}/${LIBSTAND_CPUARCH} +.PATH: ${SASRC}/${LIBSA_CPUARCH} SRCS+= _setjmp.S # decompression functionality from libbz2 Modified: head/sys/boot/libsa32/Makefile ============================================================================== --- head/sys/boot/libsa32/Makefile Sat Nov 4 03:01:11 2017 (r325376) +++ head/sys/boot/libsa32/Makefile Sat Nov 4 03:01:52 2017 (r325377) @@ -4,9 +4,9 @@ LIB=sa32 .if ${MACHINE_CPUARCH} == "amd64" -LIBSTAND_CPUARCH=i386 +LIBSA_CPUARCH=i386 .else -LIBSTAND_CPUARCH=${MACHINE_CPUARCH} +LIBSA_CPUARCH=${MACHINE_CPUARCH} .endif .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "powerpc64" From owner-svn-src-all@freebsd.org Sat Nov 4 03:01: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 471A5E6232F; Sat, 4 Nov 2017 03:01:59 +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 15DB081AE2; Sat, 4 Nov 2017 03:01:59 +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 vA431wSf002758; Sat, 4 Nov 2017 03:01:58 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA431wdY002757; Sat, 4 Nov 2017 03:01:58 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201711040301.vA431wdY002757@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sat, 4 Nov 2017 03:01:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325378 - head/sys/dev/ipmi X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/sys/dev/ipmi X-SVN-Commit-Revision: 325378 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: Sat, 04 Nov 2017 03:01:59 -0000 Author: imp Date: Sat Nov 4 03:01:58 2017 New Revision: 325378 URL: https://svnweb.freebsd.org/changeset/base/325378 Log: Make the startup timeout 0 seconds by default rathern than 420s. This makes the default fail safe when watchdogd is disabled (which is also the default). Sponsored by Modified: head/sys/dev/ipmi/ipmi.c Modified: head/sys/dev/ipmi/ipmi.c ============================================================================== --- head/sys/dev/ipmi/ipmi.c Sat Nov 4 03:01:52 2017 (r325377) +++ head/sys/dev/ipmi/ipmi.c Sat Nov 4 03:01:58 2017 (r325378) @@ -84,7 +84,7 @@ static int on = 1; static bool wd_in_shutdown = false; static int wd_timer_actions = IPMI_SET_WD_ACTION_POWER_CYCLE; static int wd_shutdown_countdown = 420; /* sec */ -static int wd_startup_countdown = 420; /* sec */ +static int wd_startup_countdown = 0; /* sec */ static int wd_pretimeout_countdown = 120; /* sec */ static int cycle_wait = 10; /* sec */ From owner-svn-src-all@freebsd.org Sat Nov 4 03:07: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 A07C1E625F2; Sat, 4 Nov 2017 03:07:59 +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 6A87381EF1; Sat, 4 Nov 2017 03:07:59 +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 vA437wJk005169; Sat, 4 Nov 2017 03:07:58 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA437w5n005166; Sat, 4 Nov 2017 03:07:58 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201711040307.vA437w5n005166@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sat, 4 Nov 2017 03:07:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325379 - in head/sys/boot: . libsa libsa32 X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head/sys/boot: . libsa libsa32 X-SVN-Commit-Revision: 325379 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: Sat, 04 Nov 2017 03:07:59 -0000 Author: imp Date: Sat Nov 4 03:07:58 2017 New Revision: 325379 URL: https://svnweb.freebsd.org/changeset/base/325379 Log: Revert "mostly libsa" This reverts accidentally pushed r325377. Modified: head/sys/boot/defs.mk head/sys/boot/libsa/Makefile head/sys/boot/libsa32/Makefile Modified: head/sys/boot/defs.mk ============================================================================== --- head/sys/boot/defs.mk Sat Nov 4 03:01:58 2017 (r325378) +++ head/sys/boot/defs.mk Sat Nov 4 03:07:58 2017 (r325379) @@ -84,7 +84,6 @@ CFLAGS+= -DLOADER_MBR_SUPPORT .if ${LOADER_GELI_SUPPORT:Uyes} == "yes" CFLAGS+= -DLOADER_GELI_SUPPORT .endif -.endif _ILINKS=machine .if ${MACHINE} != ${MACHINE_CPUARCH} && ${MACHINE} != "arm64" Modified: head/sys/boot/libsa/Makefile ============================================================================== --- head/sys/boot/libsa/Makefile Sat Nov 4 03:01:58 2017 (r325378) +++ head/sys/boot/libsa/Makefile Sat Nov 4 03:07:58 2017 (r325379) @@ -14,7 +14,7 @@ MK_SSP= no .include "../Makefile.inc" INTERNALLIB= -LIBSA_CPUARCH?=${MACHINE_CPUARCH} +LIBSTAND_CPUARCH?=${MACHINE_CPUARCH} LIBC_SRC= ${SRCTOP}/lib/libc LIB?= sa @@ -83,7 +83,7 @@ SRCS+= syncicache.c SRCS+= uuid_create_nil.c uuid_equal.c uuid_from_string.c uuid_is_nil.c uuid_to_string.c # _setjmp/_longjmp -.PATH: ${SASRC}/${LIBSA_CPUARCH} +.PATH: ${SASRC}/${LIBSTAND_CPUARCH} SRCS+= _setjmp.S # decompression functionality from libbz2 Modified: head/sys/boot/libsa32/Makefile ============================================================================== --- head/sys/boot/libsa32/Makefile Sat Nov 4 03:01:58 2017 (r325378) +++ head/sys/boot/libsa32/Makefile Sat Nov 4 03:07:58 2017 (r325379) @@ -4,9 +4,9 @@ LIB=sa32 .if ${MACHINE_CPUARCH} == "amd64" -LIBSA_CPUARCH=i386 +LIBSTAND_CPUARCH=i386 .else -LIBSA_CPUARCH=${MACHINE_CPUARCH} +LIBSTAND_CPUARCH=${MACHINE_CPUARCH} .endif .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "powerpc64" From owner-svn-src-all@freebsd.org Sat Nov 4 03:08: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 4486BE62614; Sat, 4 Nov 2017 03:08:07 +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 C25AF81F04; Sat, 4 Nov 2017 03:08:04 +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 vA4383LQ005224; Sat, 4 Nov 2017 03:08:03 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA4383ru005223; Sat, 4 Nov 2017 03:08:03 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201711040308.vA4383ru005223@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sat, 4 Nov 2017 03:08:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325380 - head/sys/boot X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/sys/boot X-SVN-Commit-Revision: 325380 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: Sat, 04 Nov 2017 03:08:07 -0000 Author: imp Date: Sat Nov 4 03:08:03 2017 New Revision: 325380 URL: https://svnweb.freebsd.org/changeset/base/325380 Log: Revert "WIP: centralize machine links" This reverts commit accidentally pushed r325376 Modified: head/sys/boot/defs.mk Modified: head/sys/boot/defs.mk ============================================================================== --- head/sys/boot/defs.mk Sat Nov 4 03:07:58 2017 (r325379) +++ head/sys/boot/defs.mk Sat Nov 4 03:08:03 2017 (r325380) @@ -84,40 +84,6 @@ CFLAGS+= -DLOADER_MBR_SUPPORT .if ${LOADER_GELI_SUPPORT:Uyes} == "yes" CFLAGS+= -DLOADER_GELI_SUPPORT .endif - -_ILINKS=machine -.if ${MACHINE} != ${MACHINE_CPUARCH} && ${MACHINE} != "arm64" -_ILINKS+=${MACHINE_CPUARCH} .endif -.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" -_ILINKS+=x86 -.endif -CLEANFILES+=${_ILINKS} - -all: ${PROG} - -beforedepend: ${_ILINKS} -beforebuild: ${_ILINKS} - -# Ensure that the links exist without depending on it when it exists which -# causes all the modules to be rebuilt when the directory pointed to changes. -.for _link in ${_ILINKS} -.if !exists(${.OBJDIR}/${_link}) -${OBJS}: ${_link} -.endif -.endfor - -.NOPATH: ${_ILINKS} - -${_ILINKS}: - @case ${.TARGET} in \ - machine) \ - path=${SYSDIR}/${MACHINE}/include ;; \ - *) \ - path=${SYSDIR}/${.TARGET:T}/include ;; \ - esac ; \ - path=`(cd $$path && /bin/pwd)` ; \ - ${ECHO} ${.TARGET:T} "->" $$path ; \ - ln -fhs $$path ${.TARGET:T} .endif # __BOOT_DEFS_MK__ From owner-svn-src-all@freebsd.org Sat Nov 4 03:13: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 C4A3CE628B0 for ; Sat, 4 Nov 2017 03:13:01 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-io0-x22c.google.com (mail-io0-x22c.google.com [IPv6:2607:f8b0:4001:c06::22c]) (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 78D7A8249C for ; Sat, 4 Nov 2017 03:13:01 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-io0-x22c.google.com with SMTP id m81so10167482ioi.13 for ; Fri, 03 Nov 2017 20:13:01 -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=77+zd5oqAKlKM4nSIabsI/jPHU5qgJpf5k8iH6ZYLKA=; b=Ja1D+/GWnkaw5KUQQ/zxP/513ilSPfNoHb/tQxgDipMpC0g9WbNundD0tN76gcy1ZS kpe9DAxCm4giB53czSobceuKL5cQ7SJo/v71ktIaaD49rPCvbVkfEJQitcZ/5eweoUDG WFUONADqMjHyB8uX8m/iHbf4z7QWLhOPhqS6jnyL+LjC8jKGXMecMnh/ovKN7qXQP3Dg v2UCDSdu0kh+XQs/qxZG6+Biki2+14kIbZkB55bty9Y/uEMvOPEKGHTUgS6xe5xu5nc+ BHdepFG+BGNts0NkodcmNWrH2rzFxt6SF9jtdvZhZY+uR/LSxpJt2vu+YxPAQjkHe+Vx 3lcA== 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=77+zd5oqAKlKM4nSIabsI/jPHU5qgJpf5k8iH6ZYLKA=; b=X+wA6sQ8+8er9NxkYsQfIewe+7+ppEXF+d7dbtWLiILV/muLASxqhMgg3wS3hZORJP R6Y49MwyIso+MgNz00Xp8hP+MqAZZJvBIIx2zAfroZ6mnITMGI11YBVCgM7VtpqseSRV wZepGRzrv1kPvAhghNAhUrdWcOe7qpT4NChjaETW7Gzgh9z6R/Cb2tsBEsNW2HnCX5U+ KKC5QMR3s7dJYWgp7EPPDjRMDhW2pmxSzQDsCyiptDGTQlPZzhKJKbG3BTPY9agkIwEo iu5Ox4L4+jxxo/pG64HvXwtlW0vZgc25tx1yPWMRCpFooY787i7wkkcRggr0jtKSdyyM buEg== X-Gm-Message-State: AJaThX6vwsT0CmN0XdYMN64QjrNHgcdLUohSveuMN4pefKbXslXXnY9D rvw2mQka2WzXksRou8jNrC3IkQnkLJS3iI78jqKdxQ== X-Google-Smtp-Source: ABhQp+QmCxtOQitwHvdf+I47IGOcKjYOItVl8Vd3gN8zBJJgKicoPT5kPVURbDPeEsT15Q/Wh6tQu3I/Y1q/R254pJk= X-Received: by 10.107.52.134 with SMTP id b128mr11756489ioa.291.1509765180824; Fri, 03 Nov 2017 20:13:00 -0700 (PDT) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.79.57.22 with HTTP; Fri, 3 Nov 2017 20:13:00 -0700 (PDT) X-Originating-IP: [2603:300b:6:5100:4daf:1291:4f1b:d2ea] In-Reply-To: <4607020.19GRM1RsjL@overcee.wemm.org> References: <201710262252.v9QMqpvL009359@repo.freebsd.org> <4607020.19GRM1RsjL@overcee.wemm.org> From: Warner Losh Date: Fri, 3 Nov 2017 21:13:00 -0600 X-Google-Sender-Auth: ZsPLX0MeJkDo_cjXACP5r43D2b8 Message-ID: Subject: Re: svn commit: r325024 - in head/sys: dev/ipmi sys To: Peter Wemm Cc: "svn-src-head@freebsd.org" , Warner Losh , src-committers , "svn-src-all@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: Sat, 04 Nov 2017 03:13:01 -0000 On Fri, Nov 3, 2017 at 8:33 PM, Peter Wemm wrote: > On Thursday, October 26, 2017 10:52:51 PM Warner Losh wrote: > > > Log: > > Various IPMI watchdog timer improvements > > How is this supposed to work? Every 12.x machine in the freebsd.org > cluster > with ipmi on the motherboard now soft-reboots after exactly 420 seconds of > uptime, without giving any clue as to why. > > Setting hw.ipmi.on="0" in loader.conf 'solves' it, but that's not exactly > ideal. What are existing machines supposed to do? > Yea, this was fixed in r325378. The problem is r325024 introduced pre-boot protection, but we defaulted to having it on rather than off. r325378 turns it off by default. Warner From owner-svn-src-all@freebsd.org Sat Nov 4 05:17:05 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 38F12E65180; Sat, 4 Nov 2017 05:17:05 +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 0641FDBE; Sat, 4 Nov 2017 05:17:04 +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 vA45H4oF059302; Sat, 4 Nov 2017 05:17:04 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA45H4ii059301; Sat, 4 Nov 2017 05:17:04 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201711040517.vA45H4ii059301@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Sat, 4 Nov 2017 05:17:04 +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: r325381 - in stable: 10/lib/libc/stdio 11/lib/libc/stdio X-SVN-Group: stable-11 X-SVN-Commit-Author: cy X-SVN-Commit-Paths: in stable: 10/lib/libc/stdio 11/lib/libc/stdio X-SVN-Commit-Revision: 325381 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: Sat, 04 Nov 2017 05:17:05 -0000 Author: cy Date: Sat Nov 4 05:17:03 2017 New Revision: 325381 URL: https://svnweb.freebsd.org/changeset/base/325381 Log: MFC r325030: Remove redundant sys/cdefs.h include. Modified: stable/11/lib/libc/stdio/gets.c Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Modified: stable/10/lib/libc/stdio/gets.c Directory Properties: stable/10/ (props changed) Modified: stable/11/lib/libc/stdio/gets.c ============================================================================== --- stable/11/lib/libc/stdio/gets.c Sat Nov 4 03:08:03 2017 (r325380) +++ stable/11/lib/libc/stdio/gets.c Sat Nov 4 05:17:03 2017 (r325381) @@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$"); #include "namespace.h" #include #include -#include #include "un-namespace.h" #include "libc_private.h" #include "local.h" From owner-svn-src-all@freebsd.org Sat Nov 4 05:17:05 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 5A41EE65182; Sat, 4 Nov 2017 05:17:05 +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 28B21DBF; Sat, 4 Nov 2017 05:17:05 +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 vA45H40q059309; Sat, 4 Nov 2017 05:17:04 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA45H4uu059308; Sat, 4 Nov 2017 05:17:04 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201711040517.vA45H4uu059308@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Sat, 4 Nov 2017 05:17:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r325381 - in stable: 10/lib/libc/stdio 11/lib/libc/stdio X-SVN-Group: stable-10 X-SVN-Commit-Author: cy X-SVN-Commit-Paths: in stable: 10/lib/libc/stdio 11/lib/libc/stdio X-SVN-Commit-Revision: 325381 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: Sat, 04 Nov 2017 05:17:05 -0000 Author: cy Date: Sat Nov 4 05:17:03 2017 New Revision: 325381 URL: https://svnweb.freebsd.org/changeset/base/325381 Log: MFC r325030: Remove redundant sys/cdefs.h include. Modified: stable/10/lib/libc/stdio/gets.c Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Modified: stable/11/lib/libc/stdio/gets.c Directory Properties: stable/11/ (props changed) Modified: stable/10/lib/libc/stdio/gets.c ============================================================================== --- stable/10/lib/libc/stdio/gets.c Sat Nov 4 03:08:03 2017 (r325380) +++ stable/10/lib/libc/stdio/gets.c Sat Nov 4 05:17:03 2017 (r325381) @@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$"); #include "namespace.h" #include #include -#include #include "un-namespace.h" #include "libc_private.h" #include "local.h" From owner-svn-src-all@freebsd.org Sat Nov 4 05:29: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 0D483E65696; Sat, 4 Nov 2017 05:29:29 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from anubis.delphij.net (anubis.delphij.net [64.62.153.212]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "anubis.delphij.net", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E298F14C0; Sat, 4 Nov 2017 05:29:28 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from Xins-MBP.ut.rhv.delphij.net (unknown [IPv6:2601:646:8882:37a:11a7:9b92:f2ee:fbfb]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by anubis.delphij.net (Postfix) with ESMTPSA id 6B26926954; Fri, 3 Nov 2017 22:29:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=delphij.net; s=anubis; t=1509773367; x=1509787767; bh=TMQzmJMAoBvR3GvTxAFrzcEijAYhh3UUzSi0l/1NMFQ=; h=Cc:Subject:To:References:From:Date:In-Reply-To; b=0kH4EH9CFV3icSg6h3f5wkh3m1fmI7vP2WZgySgE5ISmNQ0LebgeYYLWCw3d3oxVL AkKnJm8CGb2TKT44lVy4CqcOR5kTOlkCBoV/et5n73E1WVB1DN6xyhF5jahWbLc+b5 m3MIujRinZkUAi43zEKugCW4VpjRy9qrKgbfWauc= Cc: d@delphij.net Subject: Re: svn commit: r325378 - head/sys/dev/ipmi To: Warner Losh , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201711040301.vA431wdY002757@repo.freebsd.org> From: Xin Li Message-ID: <39aedfe2-da6c-8f21-75bb-334a9d8389bd@delphij.net> Date: Fri, 3 Nov 2017 22:29:22 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <201711040301.vA431wdY002757@repo.freebsd.org> Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="V2k6dFox45DBdn1Da5xrE8gpdoQa0m3CA" 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: Sat, 04 Nov 2017 05:29:29 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --V2k6dFox45DBdn1Da5xrE8gpdoQa0m3CA Content-Type: multipart/mixed; boundary="ijIBwJ3Dfu8cuCDgnbTvMgDF8oNVe5GCQ"; protected-headers="v1" From: Xin Li To: Warner Losh , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Cc: d@delphij.net Message-ID: <39aedfe2-da6c-8f21-75bb-334a9d8389bd@delphij.net> Subject: Re: svn commit: r325378 - head/sys/dev/ipmi References: <201711040301.vA431wdY002757@repo.freebsd.org> In-Reply-To: <201711040301.vA431wdY002757@repo.freebsd.org> --ijIBwJ3Dfu8cuCDgnbTvMgDF8oNVe5GCQ Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 11/3/17 20:01, Warner Losh wrote: > Author: imp > Date: Sat Nov 4 03:01:58 2017 > New Revision: 325378 > URL: https://svnweb.freebsd.org/changeset/base/325378 >=20 > Log: > Make the startup timeout 0 seconds by default rathern than 420s. Thi= s > makes the default fail safe when watchdogd is disabled (which is also= > the default). I'm not sure if this is good: what if watchdogd is enabled, but the system get stuck before watchdogd starts? Cheers, --ijIBwJ3Dfu8cuCDgnbTvMgDF8oNVe5GCQ-- --V2k6dFox45DBdn1Da5xrE8gpdoQa0m3CA Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQIcBAEBCgAGBQJZ/VA3AAoJEJW2GBstM+nsV3gP/iAhsYy/iYmuO9H953WXBujp Em/BH0icHvcbUjMNg7Zi70rn0ww1//pXSoNtKpldYVL/mP6kN26/3xNF10OuDwl4 6/4DMrmr0hYi5YT35Va6ST2ldbrixaW2PFCIcgi81Tpz43hRVbDcYfy3+45WrRL7 3gZpYdWq261FrfK1a2JkSOylp489US708JTfvY/pTMqh8xbbYJMEBhOHvyJXYNkX tihAbS8+CgnYT3rGh1ADac/n/NcekE58wNk6caWHRbdda6tCNLrAw0Kp/mL5aBZ/ 0RXjyYu4W0SOeLOKUHXu7PQD0NSuzKkqSlwxmmTJOV+U6is1fc70i5dBqa4VPOCI 60RdUg55ILcKY8nKqDtdYJ3nSxSlZ2vUCAWjSWzBE+WnCBj2ScX5IGvtAoqyrnvI QQahJ2yE6eSvi+UmdDUDlKHHAMqlPoKyRuK19ZssCD50o0wg5RXMzNFemvZGlZ5B TZMiDPCVbi2id3O2x1zuBlSIafHvB3qV/UCB2/5aRb8RY/W64G4NL6u+2dJa+wLm dT9lmE+P6ZFe1IWpgK2ozEikZM2mL1zBnmg2yyhW2SeMyPqPbv9zIlXNZi9gOyO0 AaZAP/d5298Came3vhka09WHE5jTz3mLjOm1/Wp6cBaBsp6Q/dvSry0rF319QQk2 qv52LAc8E6N32uD1borh =wbDW -----END PGP SIGNATURE----- --V2k6dFox45DBdn1Da5xrE8gpdoQa0m3CA-- From owner-svn-src-all@freebsd.org Sat Nov 4 05:53: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 A7470E65F2C for ; Sat, 4 Nov 2017 05:53:40 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-io0-x236.google.com (mail-io0-x236.google.com [IPv6:2607:f8b0:4001:c06::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 5E29321E8 for ; Sat, 4 Nov 2017 05:53:40 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-io0-x236.google.com with SMTP id h70so10612370ioi.4 for ; Fri, 03 Nov 2017 22:53:40 -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=BbRk6cbJEcpfyZqwyx6amlfacgknWSbGm3Q0f1zcVBo=; b=rD4pvVIwF6arNZB/HCBILAno1vvkQtMgLHxnN+JnyAdyMWXQPnd0HASj3XLBc9uBfH TaRuAQwxwhExROUNn4Tv3MEGZcyJzTzH03geSvlmkp92ysShMmsFn3kC8mnbfmHePOmJ 4Wbd30MLeFzO7rw8EcDSszW18zf4C88zVCf5OMw/R1iEWjFSpL9782IxFSJFauMv8MR3 vFIFxbrn7VPUYbQAHkM0NgIV79GGwvx/cxlwC04T6b9cECLm72GUrLYMneSgp87GkuzE jd3bfVWRXRNn8Su9qf7rnIp581k8joCdcAy07N+kEeunBXyhu0gp19BFs42emWUCRbL2 vBQg== 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=BbRk6cbJEcpfyZqwyx6amlfacgknWSbGm3Q0f1zcVBo=; b=fXmJIX+QajcyHAhgCSklMoXV7a3m7NdkK20awbF0nakfi+cp6kmT1BKow30guU/S1v s+4houT5RkDNmjc2VQ6XMEFlE/mCZpKQcIR3RIwexXQRvg+ut9vxzZhPk6ecCJSw+FP1 wzGqmpmvMXREBdH3ot3sDFu3sM9ZHwLk5iIbz7he8fEzXw5i5Qzju+Y/8MZCrrmRLLdQ S3NpYbdmZBPWUlJQpw6cI6DbNfhGs0dHtVuD2h5X6Vb0RpALfY02/fj35520AWj0HVe9 1dk/E3DhZbe9FRrjp9ZCfSRv6/dD+GJ8E7UW0mqcAUW5ytvGmVI4qbuSX2E0HILJ8gSG 1YEg== X-Gm-Message-State: AMCzsaWWuEObJB/IGXqnjm26XPaz2oNkxOgmby3ta6UtS+pY0G41A/46 iyrPOgukUB778PqDcC37IFAUqenI0Ck2YfGoazzHrg== X-Google-Smtp-Source: ABhQp+QD6/j8yJCN9ttGBwboBNHH6wbgTuFsbWRcu0+GzbBKEPk2lci9tJTJiXf2hi54bJ2MIH/c8jq9hytiqOjofmQ= X-Received: by 10.107.30.73 with SMTP id e70mr11588018ioe.130.1509774819756; Fri, 03 Nov 2017 22:53:39 -0700 (PDT) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.79.57.22 with HTTP; Fri, 3 Nov 2017 22:53:39 -0700 (PDT) X-Originating-IP: [2603:300b:6:5100:4daf:1291:4f1b:d2ea] In-Reply-To: <39aedfe2-da6c-8f21-75bb-334a9d8389bd@delphij.net> References: <201711040301.vA431wdY002757@repo.freebsd.org> <39aedfe2-da6c-8f21-75bb-334a9d8389bd@delphij.net> From: Warner Losh Date: Fri, 3 Nov 2017 23:53:39 -0600 X-Google-Sender-Auth: XgKeDYd6bpPQA9Nml_AXkigZNJg Message-ID: Subject: Re: svn commit: r325378 - head/sys/dev/ipmi To: Xin Li Cc: Warner Losh , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" , Xin LI 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: Sat, 04 Nov 2017 05:53:40 -0000 On Fri, Nov 3, 2017 at 11:29 PM, Xin Li wrote: > > > On 11/3/17 20:01, Warner Losh wrote: > > Author: imp > > Date: Sat Nov 4 03:01:58 2017 > > New Revision: 325378 > > URL: https://svnweb.freebsd.org/changeset/base/325378 > > > > Log: > > Make the startup timeout 0 seconds by default rathern than 420s. This > > makes the default fail safe when watchdogd is disabled (which is also > > the default). > > I'm not sure if this is good: what if watchdogd is enabled, but the > system get stuck before watchdogd starts? > Correct. This feature has to be opt-in on top of watchdogd. If you don't add-in this feature, you won't have this new protection. You have to set hw.ipmi.wd_startup_countdown to activate it. More complicated logic may be possible, but the ipmi driver has no clue if watchdogd is enabled, so I'm not sure I see a path forward to automatically doing the right thing with sensible defaults. Have I overlooked something? Warner From owner-svn-src-all@freebsd.org Sat Nov 4 06:04:21 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 9687DE66180; Sat, 4 Nov 2017 06:04:21 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from anubis.delphij.net (anubis.delphij.net [IPv6:2001:470:1:117::25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "anubis.delphij.net", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6B9C826E7; Sat, 4 Nov 2017 06:04:21 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from Xins-MBP.ut.rhv.delphij.net (unknown [IPv6:2601:646:8882:37a:11a7:9b92:f2ee:fbfb]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by anubis.delphij.net (Postfix) with ESMTPSA id D48CE26A21; Fri, 3 Nov 2017 23:04:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=delphij.net; s=anubis; t=1509775460; x=1509789860; bh=IvmAUgFJRdYFScEiqGWglUFQciI3R2vggLsA6L8OLZE=; h=Cc:Subject:To:References:From:Date:In-Reply-To; b=fQy6c/5Qh8vxrxMvOmCzPTy1lHsLs0jcYaxxG4L2tt5HXq10ym5krNt13Rk54DkWs EAPqPBi12Vi3DljloRr5Xedq3Jk/To3glI2/w6nQr+q9GlRyA33/C8Cf5tPtDKeoQi ixURT5BcUdRufkEVhM2DOMisGRzOaYaix++JG/34= Cc: d@delphij.net, Warner Losh , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Subject: Re: svn commit: r325378 - head/sys/dev/ipmi To: Warner Losh References: <201711040301.vA431wdY002757@repo.freebsd.org> <39aedfe2-da6c-8f21-75bb-334a9d8389bd@delphij.net> From: Xin Li Message-ID: <04d2ee66-d19d-3aff-a30a-c87045fc884a@delphij.net> Date: Fri, 3 Nov 2017 23:04:17 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="iv6N4gGOMnuHePPbCa1kXQxHoA61D5UIO" 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: Sat, 04 Nov 2017 06:04:21 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --iv6N4gGOMnuHePPbCa1kXQxHoA61D5UIO Content-Type: multipart/mixed; boundary="Nlf6FHllnGhXjapGNR1TRkS8idLeOiHhR"; protected-headers="v1" From: Xin Li To: Warner Losh Cc: d@delphij.net, Warner Losh , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Message-ID: <04d2ee66-d19d-3aff-a30a-c87045fc884a@delphij.net> Subject: Re: svn commit: r325378 - head/sys/dev/ipmi References: <201711040301.vA431wdY002757@repo.freebsd.org> <39aedfe2-da6c-8f21-75bb-334a9d8389bd@delphij.net> In-Reply-To: --Nlf6FHllnGhXjapGNR1TRkS8idLeOiHhR Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 11/3/17 22:53, Warner Losh wrote: >=20 >=20 > On Fri, Nov 3, 2017 at 11:29 PM, Xin Li > wrote: >=20 >=20 >=20 > On 11/3/17 20:01, Warner Losh wrote: > > Author: imp > > Date: Sat Nov=C2=A0 4 03:01:58 2017 > > New Revision: 325378 > > URL: https://svnweb.freebsd.org/changeset/base/325378 > > > > > Log: > >=C2=A0 =C2=A0Make the startup timeout 0 seconds by default rathern= than 420s.=C2=A0 This > >=C2=A0 =C2=A0makes the default fail safe when watchdogd is disable= d (which is also > >=C2=A0 =C2=A0the default). >=20 > I'm not sure if this is good: what if watchdogd is enabled, but the= > system get stuck before watchdogd starts? >=20 >=20 > Correct. This feature has to be opt-in on top of watchdogd. If you don'= t > add-in this feature, you won't have this new protection. You have to se= t > hw.ipmi.wd_startup_countdown to activate it. >=20 > More complicated logic may be possible, but the ipmi driver has no clue= > if watchdogd is enabled, so I'm not sure I see a path forward to > automatically doing the right thing with sensible defaults. Have I > overlooked something? No you didn't. I missed the fact that hw.ipmi.wd_startup_countdown can be set in loader. Sorry for the noise. Cheers, --Nlf6FHllnGhXjapGNR1TRkS8idLeOiHhR-- --iv6N4gGOMnuHePPbCa1kXQxHoA61D5UIO Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQIcBAEBCgAGBQJZ/VhkAAoJEJW2GBstM+nslVIQAJGJ21WP/KyHT3kh0sgrQtc0 D6B6aD646VK0MwzoLpk4xx6NxMoB0ninNKil8IZIm/h4seex3ZV0HPu/VEJj+7dS cTZsK8ojh2hoAsvQYW2BHYX8VeT6fI+84N8wKNIa/1IN+8EMjMvINzlgDFMHDiQE VmTnw5TaPn/KbUlP8XrmktFZ+YzzYT9U7wFcGBkriCSicGidr+aVtzyujajS3JdY i8Fu0sssS1BzFmEV1zxzQjrI0eiPuxpXL/9J1+KawFMt7Y/SZ13m4wa3p2JAMHn6 J+eE5Fa38He20RcDSPaXfFXlowyDigBSI+qFdlQSd87BQiDD9FL79aS5Wv0Hi2Y9 17L+/iiB7hI5RSl3KIJM0FmaJRq3Iel9biMrj2cjYFc3uauv0YvQeTZnRCjQ04JY HSJQRSgxSef2OCCWMLtPIDW1u4RMdUeVuHNATWwCkWxZ7gdpthLiL0RadeR7yubx /N9ahnygJ4XEmQ0Tfx1LPmLt3CwUP6tBznYmoF412AmNa44gkHD+bNtrCoPRVzxP BF/QuHigAOsXu5sPPqhrawnpyKL9mVLwdS3o+AeADCORKfoay6yuLRXM7SOIh2JH g2DYHQir3faBJ/y+ShVFDF/LiKlqxfMaaCSSRuNQVlWbpQrBEdb83M0uXF2Te7qB /3RnlYNPHhakp/0V6yjd =o/uD -----END PGP SIGNATURE----- --iv6N4gGOMnuHePPbCa1kXQxHoA61D5UIO-- From owner-svn-src-all@freebsd.org Sat Nov 4 06:15: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 1844AE663A5; Sat, 4 Nov 2017 06:15:22 +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 DA32D2B32; Sat, 4 Nov 2017 06:15:21 +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 vA46FL50084107; Sat, 4 Nov 2017 06:15:21 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA46FKXV084105; Sat, 4 Nov 2017 06:15:20 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201711040615.vA46FKXV084105@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sat, 4 Nov 2017 06:15:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325382 - in head/sys/boot: libsa libsa32 X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head/sys/boot: libsa libsa32 X-SVN-Commit-Revision: 325382 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: Sat, 04 Nov 2017 06:15:22 -0000 Author: imp Date: Sat Nov 4 06:15:20 2017 New Revision: 325382 URL: https://svnweb.freebsd.org/changeset/base/325382 Log: Cleanup stray libstand names to be libsa names. Sponsored by: Netflix Modified: head/sys/boot/libsa/Makefile head/sys/boot/libsa32/Makefile Modified: head/sys/boot/libsa/Makefile ============================================================================== --- head/sys/boot/libsa/Makefile Sat Nov 4 05:17:03 2017 (r325381) +++ head/sys/boot/libsa/Makefile Sat Nov 4 06:15:20 2017 (r325382) @@ -14,7 +14,7 @@ MK_SSP= no .include "../Makefile.inc" INTERNALLIB= -LIBSTAND_CPUARCH?=${MACHINE_CPUARCH} +LIBSA_CPUARCH?=${MACHINE_CPUARCH} LIBC_SRC= ${SRCTOP}/lib/libc LIB?= sa @@ -83,7 +83,7 @@ SRCS+= syncicache.c SRCS+= uuid_create_nil.c uuid_equal.c uuid_from_string.c uuid_is_nil.c uuid_to_string.c # _setjmp/_longjmp -.PATH: ${SASRC}/${LIBSTAND_CPUARCH} +.PATH: ${SASRC}/${LIBSA_CPUARCH} SRCS+= _setjmp.S # decompression functionality from libbz2 @@ -91,41 +91,41 @@ SRCS+= _setjmp.S # loader(8) with LOADER_BZIP2_SUPPORT defined .PATH: ${SRCTOP}/contrib/bzip2 CFLAGS+= -DBZ_NO_STDIO -DBZ_NO_COMPRESS -SRCS+= libstand_bzlib_private.h +SRCS+= libsa_bzlib_private.h .for file in bzlib.c crctable.c decompress.c huffman.c randtable.c SRCS+= _${file} CLEANFILES+= _${file} _${file}: ${file} - sed "s|bzlib_private\.h|libstand_bzlib_private.h|" \ + sed "s|bzlib_private\.h|libsa_bzlib_private.h|" \ ${.ALLSRC} > ${.TARGET} .endfor -CLEANFILES+= libstand_bzlib_private.h -libstand_bzlib_private.h: bzlib_private.h +CLEANFILES+= libsa_bzlib_private.h +libsa_bzlib_private.h: bzlib_private.h sed -e 's||"stand.h"|' \ ${.ALLSRC} > ${.TARGET} # decompression functionality from zlib .PATH: ${SRCTOP}/contrib/zlib CFLAGS+=-DHAVE_MEMCPY -I${SRCTOP}/contrib/zlib -SRCS+= adler32.c crc32.c libstand_zutil.h libstand_gzguts.h +SRCS+= adler32.c crc32.c libsa_zutil.h libsa_gzguts.h .for file in infback.c inffast.c inflate.c inftrees.c zutil.c SRCS+= _${file} CLEANFILES+= _${file} _${file}: ${file} - sed -e "s|zutil\.h|libstand_zutil.h|" \ - -e "s|gzguts\.h|libstand_gzguts.h|" \ + sed -e "s|zutil\.h|libsa_zutil.h|" \ + -e "s|gzguts\.h|libsa_gzguts.h|" \ ${.ALLSRC} > ${.TARGET} .endfor # depend on stand.h being able to be included multiple times .for file in zutil.h gzguts.h -CLEANFILES+= libstand_${file} -libstand_${file}: ${file} +CLEANFILES+= libsa_${file} +libsa_${file}: ${file} sed -e 's||"stand.h"|' \ -e 's||"stand.h"|' \ -e 's||"stand.h"|' \ Modified: head/sys/boot/libsa32/Makefile ============================================================================== --- head/sys/boot/libsa32/Makefile Sat Nov 4 05:17:03 2017 (r325381) +++ head/sys/boot/libsa32/Makefile Sat Nov 4 06:15:20 2017 (r325382) @@ -4,9 +4,9 @@ LIB=sa32 .if ${MACHINE_CPUARCH} == "amd64" -LIBSTAND_CPUARCH=i386 +LIBSA_CPUARCH=i386 .else -LIBSTAND_CPUARCH=${MACHINE_CPUARCH} +LIBSA_CPUARCH=${MACHINE_CPUARCH} .endif .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "powerpc64" From owner-svn-src-all@freebsd.org Sat Nov 4 06:19: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 27D1BE664C2; Sat, 4 Nov 2017 06:19:48 +0000 (UTC) (envelope-from delphij@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 01C132D55; Sat, 4 Nov 2017 06:19:47 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA46JlnD084377; Sat, 4 Nov 2017 06:19:47 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA46JkBx084373; Sat, 4 Nov 2017 06:19:46 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201711040619.vA46JkBx084373@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Sat, 4 Nov 2017 06:19:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325383 - in head/sys/dev: hpt27xx hptnr X-SVN-Group: head X-SVN-Commit-Author: delphij X-SVN-Commit-Paths: in head/sys/dev: hpt27xx hptnr X-SVN-Commit-Revision: 325383 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: Sat, 04 Nov 2017 06:19:48 -0000 Author: delphij Date: Sat Nov 4 06:19:46 2017 New Revision: 325383 URL: https://svnweb.freebsd.org/changeset/base/325383 Log: Avoid calling get_controller_count() until attaching, this would avoid costly PCI config space operations that slows down systems without the hardware. Many thanks to HighPoint for continued support of FreeBSD! Submitted by: Steve Chang Reported by: cperciva MFC after: 2 weeks Modified: head/sys/dev/hpt27xx/hpt27xx_config.c head/sys/dev/hpt27xx/hpt27xx_osm_bsd.c head/sys/dev/hptnr/hptnr_config.c head/sys/dev/hptnr/hptnr_osm_bsd.c Modified: head/sys/dev/hpt27xx/hpt27xx_config.c ============================================================================== --- head/sys/dev/hpt27xx/hpt27xx_config.c Sat Nov 4 06:15:20 2017 (r325382) +++ head/sys/dev/hpt27xx/hpt27xx_config.c Sat Nov 4 06:19:46 2017 (r325383) @@ -60,7 +60,7 @@ int init_config(void) const char driver_name[] = "hpt27xx"; const char driver_name_long[] = "RocketRAID 27xx controller driver"; -const char driver_ver[] = "v1.2.7"; +const char driver_ver[] = "v1.2.8"; int osm_max_targets = 0xff; Modified: head/sys/dev/hpt27xx/hpt27xx_osm_bsd.c ============================================================================== --- head/sys/dev/hpt27xx/hpt27xx_osm_bsd.c Sat Nov 4 06:15:20 2017 (r325382) +++ head/sys/dev/hpt27xx/hpt27xx_osm_bsd.c Sat Nov 4 06:19:46 2017 (r325383) @@ -31,7 +31,7 @@ #include #include -static HIM *hpt_match(device_t dev) +static HIM *hpt_match(device_t dev, int scan) { PCI_ID pci_id; HIM *him; @@ -39,7 +39,7 @@ static HIM *hpt_match(device_t dev) for (him = him_list; him; him = him->next) { for (i=0; him->get_supported_device_id(i, &pci_id); i++) { - if (him->get_controller_count) + if (scan && him->get_controller_count) him->get_controller_count(&pci_id,0,0); if ((pci_get_vendor(dev) == pci_id.vid) && (pci_get_device(dev) == pci_id.did)){ @@ -54,7 +54,7 @@ static int hpt_probe(device_t dev) { HIM *him; - him = hpt_match(dev); + him = hpt_match(dev, 0); if (him != NULL) { KdPrint(("hpt_probe: adapter at PCI %d:%d:%d, IRQ %d", pci_get_bus(dev), pci_get_slot(dev), pci_get_function(dev), pci_get_irq(dev) @@ -77,7 +77,7 @@ static int hpt_attach(device_t dev) KdPrint(("hpt_attach(%d/%d/%d)", pci_get_bus(dev), pci_get_slot(dev), pci_get_function(dev))); - him = hpt_match(dev); + him = hpt_match(dev, 1); hba->ext_type = EXT_TYPE_HBA; hba->ldm_adapter.him = him; pci_enable_busmaster(dev); Modified: head/sys/dev/hptnr/hptnr_config.c ============================================================================== --- head/sys/dev/hptnr/hptnr_config.c Sat Nov 4 06:15:20 2017 (r325382) +++ head/sys/dev/hptnr/hptnr_config.c Sat Nov 4 06:19:46 2017 (r325383) @@ -46,7 +46,7 @@ int init_config(void) const char driver_name[] = "hptnr"; const char driver_name_long[] = "R750/DC7280 controller driver"; -const char driver_ver[] = "v1.1.4"; +const char driver_ver[] = "v1.1.5"; int osm_max_targets = 0xff; Modified: head/sys/dev/hptnr/hptnr_osm_bsd.c ============================================================================== --- head/sys/dev/hptnr/hptnr_osm_bsd.c Sat Nov 4 06:15:20 2017 (r325382) +++ head/sys/dev/hptnr/hptnr_osm_bsd.c Sat Nov 4 06:19:46 2017 (r325383) @@ -32,7 +32,7 @@ #include int msi = 0; int debug_flag = 0; -static HIM *hpt_match(device_t dev) +static HIM *hpt_match(device_t dev, int scan) { PCI_ID pci_id; HIM *him; @@ -40,7 +40,7 @@ static HIM *hpt_match(device_t dev) for (him = him_list; him; him = him->next) { for (i=0; him->get_supported_device_id(i, &pci_id); i++) { - if (him->get_controller_count) + if (scan && him->get_controller_count) him->get_controller_count(&pci_id,0,0); if ((pci_get_vendor(dev) == pci_id.vid) && (pci_get_device(dev) == pci_id.did)){ @@ -56,7 +56,7 @@ static int hpt_probe(device_t dev) { HIM *him; - him = hpt_match(dev); + him = hpt_match(dev, 0); if (him != NULL) { KdPrint(("hpt_probe: adapter at PCI %d:%d:%d, IRQ %d", pci_get_bus(dev), pci_get_slot(dev), pci_get_function(dev), pci_get_irq(dev) @@ -79,7 +79,7 @@ static int hpt_attach(device_t dev) KdPrint(("hpt_attach(%d/%d/%d)", pci_get_bus(dev), pci_get_slot(dev), pci_get_function(dev))); - him = hpt_match(dev); + him = hpt_match(dev, 1); hba->ext_type = EXT_TYPE_HBA; hba->ldm_adapter.him = him; From owner-svn-src-all@freebsd.org Sat Nov 4 07:08: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 D7467E66E7A; Sat, 4 Nov 2017 07:08:22 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pg0-x236.google.com (mail-pg0-x236.google.com [IPv6:2607:f8b0:400e: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 9D7CE3F76; Sat, 4 Nov 2017 07:08:22 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pg0-x236.google.com with SMTP id m18so4246461pgd.13; Sat, 04 Nov 2017 00:08:22 -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=Wofwcun4Nx5rHGqinXxVNVb82yn1dekNeD/DvCIN/Nc=; b=C7mQkcZ6LTf2KkiFzc1M55CHPKtiZPxkIjb/NumWurbT/x8SM9sLqussgfd0qG9PCQ mb2uL4Dw096WS1KNtHFdCKZxAYcqsBTJ1z8OPfIzVxjycDT7tCdw2pNU9SiPqUk1zuAn ONLZXwAE/GU286iteogDy/bWBZgmNTtlPGMaG4JT77/dmhGlJPRu0H6+WTU63oWEgMSM UoJFp7PkagdmMxr0xHeRjjK+veUSmLAfvrY2GeV/1wk4JeO4NKjnjEtDyA8VXSQy33hs XzOy+/jR7zW/jJfzFyEPXxLm5TNeSITRJCmyQwpVEMnmOVNhzVUjRmFgTdlkx7g4xnmA fCrg== 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=Wofwcun4Nx5rHGqinXxVNVb82yn1dekNeD/DvCIN/Nc=; b=FM2nXNRDjMJNu9j7bYtCF6yHKW29KMiFaa9tLikEIXHyP8fAf8qcvHcQcHDgQoPrxV +7ch3nqumJFhuxwe4kZjfjh+Bb/FHu9vhIn2JUidcx21tNk1rMEObj+vcdT1z9UCPpPj 4ApOezt6sT9hi0iSYbEm8Lu4YpKo3/DY4l02xuRmK+fEk7sOzih2HbREmyHIF3/xpjlG Yiw6s6tnz0ZEWXq8XiARHpB7EOheZ2oyfQ/wxggsZkKVxQ420yErsOpmFcJJElbpk87g 9jLwya8HuYSBVCbeDKa8EElB7V0Xg46M3/o7G+jJNJxxcvstH2Yk65m53RTgOaI+lMkV 8FGQ== X-Gm-Message-State: AMCzsaVulTbiDnM5Si0rfTLbXZt389f49fc+SizBCB6Gt5NqwdMzyb97 NknBbwmLDsOxSXMJfgWqBYrurX2G X-Google-Smtp-Source: ABhQp+TkXAoOfsR1M7IUs9In0Wtb3lHnmw3gniWKGKZIOQCqs9jn0dV1YZSBuA3OdyFL5OzR0vQiwA== X-Received: by 10.159.216.140 with SMTP id s12mr9157261plp.318.1509779301712; Sat, 04 Nov 2017 00:08:21 -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 76sm14562808pfq.4.2017.11.04.00.08.20 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 04 Nov 2017 00:08:20 -0700 (PDT) Content-Type: multipart/signed; boundary="Apple-Mail=_858F818D-E17C-492F-9CDC-B9748FA79BF4"; protocol="application/pgp-signature"; micalg=pgp-sha512 Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\)) Subject: Re: svn commit: r325116 - head From: "Ngie Cooper (yaneurabeya)" In-Reply-To: <3a0a92dd-19fc-2ee3-dcbf-224e4c2e8eec@FreeBSD.org> Date: Sat, 4 Nov 2017 00:08:19 -0700 Cc: Warner Losh , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Message-Id: References: <201710300312.v9U3CcCT021416@repo.freebsd.org> <8d9e9f50-035c-403c-3bc5-6788b7a94dea@FreeBSD.org> <72ee6c6d-0d9a-ebe9-8e15-c278fc91ded2@FreeBSD.org> <3a0a92dd-19fc-2ee3-dcbf-224e4c2e8eec@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: Sat, 04 Nov 2017 07:08:23 -0000 --Apple-Mail=_858F818D-E17C-492F-9CDC-B9748FA79BF4 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii I just ran into this with bash on universe12a.freebsd.org by = doing ^d. I think the change should be reverted. Thanks, -Ngie $ exit *** Error code 130 Stop. make[1]: stopped in /scratch/tmp/ngie/svn *** Error code 1 Stop. make: stopped in /scratch/tmp/ngie/svn --Apple-Mail=_858F818D-E17C-492F-9CDC-B9748FA79BF4 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----- iQIzBAEBCgAdFiEE5bk3FaGcY5rvqmb79YOpJmkwhhUFAln9Z2MACgkQ9YOpJmkw hhURPxAA1J2VBQGtzvpkpZEwtE/tNop7mrpUOeKxvtqdU4xqGhL1XkVCLzrm6fL0 JwOyDHJFlySAS9nmPIn2uCqoWlyZiIhFNkRw1HvcQzFUwEtEqs95JgoBQrqvEM4S DZtD/5uHWqt4Wssw0aozHj1jeW9Wg7tEkP4Og8efEUBNkjiOGmZWm9LtVvQM+e5w WuFegxSCDXw6YNv2L5dYX9L27KNGNy6JbmvqeiSI3sTIyH2RBrIi4ZUqGBe4lRrj CFmhosbzycIVaTrAhN1XHzikji24EB/TM80JgUDdegYf1P2Zwf9w2Rtg9cIaCvhM unIesfTYqd+XLwWpqnuAwNFSJM4jZh+qbtwxA0sOvfoonZcYWVx9UzmbkgVkx40m jdjfveksGcRJfajDnXS9+zP/wKnELogz2qMtqfo+Mk45BsMhz35X5v14OSSzDSQz G23uW2ADD2m1gNSFtXkbQ67bi2wKbnu07mHF37bZ052fIcx1tugB3/cRHzS1Kh6c 8VIgsSUGsdQPWapyBo0UM4R9plqKoS0XJNwyjcZdoES2SEuOkUaRSL1gr9A9u85o 2fMi/Ty+HEsMkL+k7BAzifmgT9hczv9Qvli6TH7IOlosO0EXuYiT5Nyr0LE6TRfh 3LDpUFrLeuR+nUnFUBj3W0qM1r9TvNk3PmYfw1MQ8VBgnlivPKg= =cget -----END PGP SIGNATURE----- --Apple-Mail=_858F818D-E17C-492F-9CDC-B9748FA79BF4-- From owner-svn-src-all@freebsd.org Sat Nov 4 07:13:21 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 941E0E670A5; Sat, 4 Nov 2017 07:13:21 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 6FEAB636BE; Sat, 4 Nov 2017 07:13:21 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1235) id B991F8E20; Sat, 4 Nov 2017 07:13:20 +0000 (UTC) Date: Sat, 4 Nov 2017 08:13:20 +0100 From: Baptiste Daroussin To: Conrad Meyer Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r325358 - head/tools/tools/locale/etc Message-ID: <20171104071320.y26q24emxib3zmtb@ivaldir.net> References: <201711031338.vA3Dcj9W064551@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="6bt4dchhk5tvzd4n" Content-Disposition: inline In-Reply-To: User-Agent: NeoMutt/20171027 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: Sat, 04 Nov 2017 07:13:21 -0000 --6bt4dchhk5tvzd4n Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Nov 03, 2017 at 09:51:37AM -0700, Conrad Meyer wrote: > On Fri, Nov 3, 2017 at 6:38 AM, Baptiste Daroussin wro= te: > > Author: bapt > > Date: Fri Nov 3 13:38:45 2017 > > New Revision: 325358 > > URL: https://svnweb.freebsd.org/changeset/base/325358 > > > > Log: > > In preparation for update of cldr to version 32 and unicode to versio= n 10 > > Add a character mapping for a missing character in ISO8859-2 > > > > Modified: > > head/tools/tools/locale/etc/charmaps.xml > > > > Modified: head/tools/tools/locale/etc/charmaps.xml > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=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/tools/tools/locale/etc/charmaps.xml Fri Nov 3 13:08:29 201= 7 (r325357) > > +++ head/tools/tools/locale/etc/charmaps.xml Fri Nov 3 13:38:45 201= 7 (r325358) > > @@ -200,7 +200,7 @@ > > > > >=20 > Are these distinct characters in ISO-8859-2 that both translate most > closely to Unicode Hyphen-minus? >=20 Exactly. Actually those are "not" dictinct characters but different definit= ions which then should be converted to a character in each encoding. Those chara= cters could be the same but that dependens on the combinaison locale/encoding. The mapping continue to be extended for the unicode version, but not anymor= e for other encodings of a given locale. In this case we need to find a mapping to say "hey those 2 definitions actually mean the same character for this given encoding". Best regards, Bapt --6bt4dchhk5tvzd4n Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEgOTj3suS2urGXVU3Y4mL3PG3PloFAln9aJAACgkQY4mL3PG3 PlqLjBAA4XRy+uymBURQ4W+MryIYa9TzDsgeRS29AP2vdRFRxz1uSQzmmPyX4VfX Bzr0ny2T4agjNlfIm3Qwyjh3+XjNgb9ZTbUpDQEXIUKtA6t0Yv/R9m9KXfNW1wPq mcgNQKEzlqFh0nV1ksUJ7PasKwtfdc5/rOh4wSPpj1M6Ak5dObiF23wOfMM2JFY1 AQ6v3hu02/DQaMZELCXXilFjYteTZKmuY84TBDoCXfCCsT+nWm2NNr+U1flZrA89 98V4DYo2MbpRvzDHvqPIJfp1pSeC02N45IyTj65QctuHbTzNUr9EhnLRgW6/NHaS WY0ResBPqo9G/JR8f46iIn9CTRhSYz25yTyUmgKilcF8NicM+QEe1YdiFZsS4v0y eBegZLFpNcXCmXYNpwApZ0FVklLSJLPi6rs7qqOk0sUB7pe/3d/6QpbkhdeClvba 2JQeQDj0Gzn8hsuulWWrnsqWjQAAZLudolC7xjv8sL9JHKQYF7DK8YaGe77OGwgL 4lpq/DCb9vlEP+RYl1PAkvzhXkIy+vIgEeccLQt4QPzSdmGo9CN1b13hvG/Q0e+1 rKkaeYAOpakI9+8lqA1cmDUuLnAuG/XKJzpo8a08nLLyyr6VNUyoOj9MYZ5RZONY 3/fwwoiLEi50oS8aE+LOuW6fSgOSq5JQdqcpQBDsSR40Fx7DBhE= =CoAf -----END PGP SIGNATURE----- --6bt4dchhk5tvzd4n-- From owner-svn-src-all@freebsd.org Sat Nov 4 10:10: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 E3DF0E69FBE; Sat, 4 Nov 2017 10:10:35 +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 B2F9C6757C; Sat, 4 Nov 2017 10:10:35 +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 vA4AAY8j080278; Sat, 4 Nov 2017 10:10:34 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA4AAYsj080277; Sat, 4 Nov 2017 10:10:34 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201711041010.vA4AAYsj080277@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sat, 4 Nov 2017 10:10:34 +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: r325385 - stable/11/sys/vm X-SVN-Group: stable-11 X-SVN-Commit-Author: kib X-SVN-Commit-Paths: stable/11/sys/vm X-SVN-Commit-Revision: 325385 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: Sat, 04 Nov 2017 10:10:36 -0000 Author: kib Date: Sat Nov 4 10:10:34 2017 New Revision: 325385 URL: https://svnweb.freebsd.org/changeset/base/325385 Log: MFC r324824: Check that the page which is freed as zeroed, indeed has all-zero content. Modified: stable/11/sys/vm/vm_page.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/vm/vm_page.c ============================================================================== --- stable/11/sys/vm/vm_page.c Sat Nov 4 07:05:21 2017 (r325384) +++ stable/11/sys/vm/vm_page.c Sat Nov 4 10:10:34 2017 (r325385) @@ -2767,6 +2767,16 @@ bool vm_page_free_prep(vm_page_t m, bool pagequeue_locked) { +#if defined(DIAGNOSTIC) && defined(PHYS_TO_DMAP) + if ((m->flags & PG_ZERO) != 0) { + uint64_t *p; + int i; + p = (uint64_t *)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(m)); + for (i = 0; i < PAGE_SIZE / sizeof(uint64_t); i++, p++) + KASSERT(*p == 0, ("vm_page_free_prep %p PG_ZERO %d %jx", + m, i, (uintmax_t)*p)); + } +#endif if ((m->oflags & VPO_UNMANAGED) == 0) { vm_page_lock_assert(m, MA_OWNED); KASSERT(!pmap_page_is_mapped(m), From owner-svn-src-all@freebsd.org Sat Nov 4 10:49:36 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 0CF30E6AC9F; Sat, 4 Nov 2017 10:49:36 +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 CE9BA688BD; Sat, 4 Nov 2017 10:49:35 +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 vA4AnZwq096710; Sat, 4 Nov 2017 10:49:35 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA4AnZUE096709; Sat, 4 Nov 2017 10:49:35 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201711041049.vA4AnZUE096709@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sat, 4 Nov 2017 10:49:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325386 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 325386 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: Sat, 04 Nov 2017 10:49:36 -0000 Author: kib Date: Sat Nov 4 10:49:34 2017 New Revision: 325386 URL: https://svnweb.freebsd.org/changeset/base/325386 Log: Convert explicit panic() call to assert. Based on github pull request: #113 Submitted by: pmarillo@github MFC after: 1 week Modified: head/sys/kern/kern_umtx.c Modified: head/sys/kern/kern_umtx.c ============================================================================== --- head/sys/kern/kern_umtx.c Sat Nov 4 10:10:34 2017 (r325385) +++ head/sys/kern/kern_umtx.c Sat Nov 4 10:49:34 2017 (r325386) @@ -1579,8 +1579,7 @@ umtx_pi_setowner(struct umtx_pi *pi, struct thread *ow uq_owner = owner->td_umtxq; mtx_assert(&umtx_lock, MA_OWNED); - if (pi->pi_owner != NULL) - panic("pi_owner != NULL"); + MPASS(pi->pi_owner == NULL); pi->pi_owner = owner; TAILQ_INSERT_TAIL(&uq_owner->uq_pi_contested, pi, pi_link); } From owner-svn-src-all@freebsd.org Sat Nov 4 10:50: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 3B9A3E6AD2A; Sat, 4 Nov 2017 10:50:48 +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 0B43768A32; Sat, 4 Nov 2017 10:50:47 +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 vA4Aol1o096824; Sat, 4 Nov 2017 10:50:47 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA4Aolet096823; Sat, 4 Nov 2017 10:50:47 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201711041050.vA4Aolet096823@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sat, 4 Nov 2017 10:50:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325387 - head/sys/i386/i386 X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/sys/i386/i386 X-SVN-Commit-Revision: 325387 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: Sat, 04 Nov 2017 10:50:48 -0000 Author: kib Date: Sat Nov 4 10:50:47 2017 New Revision: 325387 URL: https://svnweb.freebsd.org/changeset/base/325387 Log: Eliminate unused load. Based on github pull request: #117 Submitted by: Wuyang-Chung@github MFC after: 1 week Modified: head/sys/i386/i386/swtch.s Modified: head/sys/i386/i386/swtch.s ============================================================================== --- head/sys/i386/i386/swtch.s Sat Nov 4 10:49:34 2017 (r325386) +++ head/sys/i386/i386/swtch.s Sat Nov 4 10:50:47 2017 (r325387) @@ -258,7 +258,6 @@ sw1: movl %eax,(%esp) movl %edx, PCPU(CURPCB) - movl TD_TID(%ecx),%eax movl %ecx, PCPU(CURTHREAD) /* into next thread */ /* From owner-svn-src-all@freebsd.org Sat Nov 4 10:51: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 A722DE6AEC3; Sat, 4 Nov 2017 10:51:53 +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 7503C6912F; Sat, 4 Nov 2017 10:51:53 +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 vA4ApqMc000588; Sat, 4 Nov 2017 10:51:52 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA4Apqq7000586; Sat, 4 Nov 2017 10:51:52 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201711041051.vA4Apqq7000586@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sat, 4 Nov 2017 10:51:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325388 - in head/sys: amd64/amd64 i386/i386 X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: in head/sys: amd64/amd64 i386/i386 X-SVN-Commit-Revision: 325388 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: Sat, 04 Nov 2017 10:51:53 -0000 Author: kib Date: Sat Nov 4 10:51:52 2017 New Revision: 325388 URL: https://svnweb.freebsd.org/changeset/base/325388 Log: x86: Do not emit unused TD_TID symbols. Sponsored by: The FreeBSD Foundation MFC after: 1 week Modified: head/sys/amd64/amd64/genassym.c head/sys/i386/i386/genassym.c Modified: head/sys/amd64/amd64/genassym.c ============================================================================== --- head/sys/amd64/amd64/genassym.c Sat Nov 4 10:50:47 2017 (r325387) +++ head/sys/amd64/amd64/genassym.c Sat Nov 4 10:51:52 2017 (r325388) @@ -81,7 +81,6 @@ ASSYM(TD_FLAGS, offsetof(struct thread, td_flags)); ASSYM(TD_PCB, offsetof(struct thread, td_pcb)); ASSYM(TD_PFLAGS, offsetof(struct thread, td_pflags)); ASSYM(TD_PROC, offsetof(struct thread, td_proc)); -ASSYM(TD_TID, offsetof(struct thread, td_tid)); ASSYM(TD_FRAME, offsetof(struct thread, td_frame)); ASSYM(TDF_ASTPENDING, TDF_ASTPENDING); Modified: head/sys/i386/i386/genassym.c ============================================================================== --- head/sys/i386/i386/genassym.c Sat Nov 4 10:50:47 2017 (r325387) +++ head/sys/i386/i386/genassym.c Sat Nov 4 10:51:52 2017 (r325388) @@ -88,7 +88,6 @@ ASSYM(TD_PCB, offsetof(struct thread, td_pcb)); ASSYM(TD_PFLAGS, offsetof(struct thread, td_pflags)); ASSYM(TD_PROC, offsetof(struct thread, td_proc)); ASSYM(TD_MD, offsetof(struct thread, td_md)); -ASSYM(TD_TID, offsetof(struct thread, td_tid)); ASSYM(TDP_CALLCHAIN, TDP_CALLCHAIN); From owner-svn-src-all@freebsd.org Sat Nov 4 10:53: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 05A5FE6AF99; Sat, 4 Nov 2017 10:53:00 +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 C75AE6944A; Sat, 4 Nov 2017 10:52:59 +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 vA4Aqwu5000673; Sat, 4 Nov 2017 10:52:58 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA4AqwaE000671; Sat, 4 Nov 2017 10:52:58 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201711041052.vA4AqwaE000671@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sat, 4 Nov 2017 10:52:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325389 - head/lib/libc/stdlib X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/lib/libc/stdlib X-SVN-Commit-Revision: 325389 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: Sat, 04 Nov 2017 10:53:00 -0000 Author: kib Date: Sat Nov 4 10:52:58 2017 New Revision: 325389 URL: https://svnweb.freebsd.org/changeset/base/325389 Log: C++17 requires quick_exit(3) to be async-signal safe. Make it safe, and update man page with the useful information. Sponsored by: The FreeBSD Foundation MFC after: 1 week Modified: head/lib/libc/stdlib/quick_exit.3 head/lib/libc/stdlib/quick_exit.c Modified: head/lib/libc/stdlib/quick_exit.3 ============================================================================== --- head/lib/libc/stdlib/quick_exit.3 Sat Nov 4 10:51:52 2017 (r325388) +++ head/lib/libc/stdlib/quick_exit.3 Sat Nov 4 10:52:58 2017 (r325389) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 13, 2014 +.Dd November 4, 2017 .Dt QUICK_EXIT 3 .Os .Sh NAME @@ -44,6 +44,17 @@ with .Xr at_quick_exit 3 but not any C++ destructors or cleanup code registered with .Xr atexit 3 . +The +.Xr stdio 3 +file buffers are not flushed. +.Pp +The function +.Fn quick_exit +is +.Em async-signal safe +when the functions registered with +.Xr at_quick_exit 3 +are. .Sh RETURN VALUES The .Fn quick_exit Modified: head/lib/libc/stdlib/quick_exit.c ============================================================================== --- head/lib/libc/stdlib/quick_exit.c Sat Nov 4 10:51:52 2017 (r325388) +++ head/lib/libc/stdlib/quick_exit.c Sat Nov 4 10:52:58 2017 (r325389) @@ -26,6 +26,8 @@ * $FreeBSD$ */ +#include +#include #include #include @@ -60,6 +62,7 @@ at_quick_exit(void (*func)(void)) h->cleanup = func; pthread_mutex_lock(&atexit_mutex); h->next = handlers; + __compiler_membar(); handlers = h; pthread_mutex_unlock(&atexit_mutex); return (0); @@ -74,7 +77,9 @@ quick_exit(int status) * XXX: The C++ spec requires us to call std::terminate if there is an * exception here. */ - for (h = handlers; NULL != h; h = h->next) + for (h = handlers; NULL != h; h = h->next) { + __compiler_membar(); h->cleanup(); + } _Exit(status); } From owner-svn-src-all@freebsd.org Sat Nov 4 12:20: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 3D0EAE6D4F5 for ; Sat, 4 Nov 2017 12:20:47 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: from mail-wm0-x22b.google.com (mail-wm0-x22b.google.com [IPv6:2a00:1450:400c:c09::22b]) (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 C15E76C5E2 for ; Sat, 4 Nov 2017 12:20:46 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: by mail-wm0-x22b.google.com with SMTP id p75so5922832wmg.3 for ; Sat, 04 Nov 2017 05:20:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd-org.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=WC9ImoKacYDPbWfKi6OWvZ79E38NVEEDxxAkPccCzqI=; b=oC+/4c3MTid2uHUsbM1d7E4HznzB7ocZDkcjIgB2sf3gtLI2FV1qshiCk3ZYoS65ZS cSkAl6auMr8CLQbvNe5W01bXjXWpwy9oVIqekIkQ+eUiBt46m6LsH9Din1LoFrQNUhk0 ZL1GxwIHqkXPdRcrIy6CAa+VCxwM7Ay7VNgmbfwdMONQj3ssxWVomIE1DGc3APHrOR1C lCLBUXlH4XxcJQ89DQW8KdyXNeja04DvvGTlANEceUSmaJyMuLs6LctntWRKDrr0V+br jDMc1wvGzFxAuV1KIu1dkil30N+sw09OuRBw7orRXOaCEILg4zuErd79tEeayLUtXmPP MtOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=WC9ImoKacYDPbWfKi6OWvZ79E38NVEEDxxAkPccCzqI=; b=Bx3jO8ONN5BzvIT5+LVii/DktUWQsDIAsBKHD4UNJYI+H+wrdqV49QcrQGUD35bgyx T1D4dXu2dIyjMD3IbXPBPfVr27GKHxOzqNTFORbFqIuYqBFliFCdxOvo8qBLYOK+w3tr lnKhzrc/zV+3tgaxCsDqXZvSROHrIdXuxQZGgqSDjF7F8mJ1fnNbkh6OPXdFYpYCZfT1 kihh3ObeKUa9qINYbSbbI8p0aPp/AqFdPnmxBIVu0U8QRW9i7U0rDiHPvLGhZQ9cQCmR 99yX82bdNjP68MFoNi27/zlbrdmFvOCIV2ELBvqZn0OCJy0jGbh2SgeHAVQtmzOItxK/ HPkQ== X-Gm-Message-State: AMCzsaXse+vq3dXgnOBPhql18bAwgxn7/FGhDmmh7V028xfeVha34B8S EsnrU+vVuw4V6CiCg7kVnnaobChLR5kNOr2e9EMGbQ== X-Google-Smtp-Source: ABhQp+QlhgL2kNFWs1G0y//4d+a+wfc9Yrvbq4Dxk34QPnSA2TpOaQ07U7gMFbNA+wOUvxcwF5l/cxx93yuVDeEAnTg= X-Received: by 10.80.194.217 with SMTP id u25mr12709487edf.260.1509798045151; Sat, 04 Nov 2017 05:20:45 -0700 (PDT) MIME-Version: 1.0 Received: by 10.80.135.21 with HTTP; Sat, 4 Nov 2017 05:20:44 -0700 (PDT) In-Reply-To: <39aedfe2-da6c-8f21-75bb-334a9d8389bd@delphij.net> References: <201711040301.vA431wdY002757@repo.freebsd.org> <39aedfe2-da6c-8f21-75bb-334a9d8389bd@delphij.net> From: Oliver Pinter Date: Sat, 4 Nov 2017 13:20:44 +0100 Message-ID: Subject: Re: svn commit: r325378 - head/sys/dev/ipmi To: Xin Li Cc: Warner Losh , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org, d@delphij.net 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: Sat, 04 Nov 2017 12:20:47 -0000 On 11/4/17, Xin Li wrote: > > > On 11/3/17 20:01, Warner Losh wrote: >> Author: imp >> Date: Sat Nov 4 03:01:58 2017 >> New Revision: 325378 >> URL: https://svnweb.freebsd.org/changeset/base/325378 >> >> Log: >> Make the startup timeout 0 seconds by default rathern than 420s. This >> makes the default fail safe when watchdogd is disabled (which is also >> the default). > > I'm not sure if this is good: what if watchdogd is enabled, but the > system get stuck before watchdogd starts? Like boot into single user mode? ;) > > Cheers, > > From owner-svn-src-all@freebsd.org Sat Nov 4 14:13: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 AE1FEE4B415; Sat, 4 Nov 2017 14:13:59 +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 7D6376FA52; Sat, 4 Nov 2017 14:13:59 +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 vA4EDw8S088386; Sat, 4 Nov 2017 14:13:58 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA4EDwNW088385; Sat, 4 Nov 2017 14:13:58 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201711041413.vA4EDwNW088385@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Sat, 4 Nov 2017 14:13:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325390 - head/usr.sbin/ctld X-SVN-Group: head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: head/usr.sbin/ctld X-SVN-Commit-Revision: 325390 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: Sat, 04 Nov 2017 14:13:59 -0000 Author: trasz Date: Sat Nov 4 14:13:58 2017 New Revision: 325390 URL: https://svnweb.freebsd.org/changeset/base/325390 Log: Use proper naming in a debug message. MFC after: 2 weeks Modified: head/usr.sbin/ctld/login.c Modified: head/usr.sbin/ctld/login.c ============================================================================== --- head/usr.sbin/ctld/login.c Sat Nov 4 10:52:58 2017 (r325389) +++ head/usr.sbin/ctld/login.c Sat Nov 4 14:13:58 2017 (r325390) @@ -435,7 +435,7 @@ login_chap(struct connection *conn, struct auth_group * Yay, authentication succeeded! */ log_debugx("authentication succeeded for user \"%s\"; " - "transitioning to Negotiation Phase", auth->a_user); + "transitioning to operational parameter negotiation", auth->a_user); login_send_chap_success(request, auth); pdu_delete(request); From owner-svn-src-all@freebsd.org Sat Nov 4 14:35: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 70C98E4BB47; Sat, 4 Nov 2017 14:35:02 +0000 (UTC) (envelope-from pfg@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 3F605703FA; Sat, 4 Nov 2017 14:35:02 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA4EZ1dl097133; Sat, 4 Nov 2017 14:35:01 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA4EZ1Fo097131; Sat, 4 Nov 2017 14:35:01 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201711041435.vA4EZ1Fo097131@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Sat, 4 Nov 2017 14:35: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: r325391 - stable/11/lib/libedit X-SVN-Group: stable-11 X-SVN-Commit-Author: pfg X-SVN-Commit-Paths: stable/11/lib/libedit X-SVN-Commit-Revision: 325391 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: Sat, 04 Nov 2017 14:35:02 -0000 Author: pfg Date: Sat Nov 4 14:35:01 2017 New Revision: 325391 URL: https://svnweb.freebsd.org/changeset/base/325391 Log: MFC r323547, r323598: libedit: add missing bracket. We never hit this because we always build with widechar support. Raise the warning level to 3. Modified: stable/11/lib/libedit/Makefile stable/11/lib/libedit/chartype.c Directory Properties: stable/11/ (props changed) Modified: stable/11/lib/libedit/Makefile ============================================================================== --- stable/11/lib/libedit/Makefile Sat Nov 4 14:13:58 2017 (r325390) +++ stable/11/lib/libedit/Makefile Sat Nov 4 14:35:01 2017 (r325391) @@ -7,6 +7,8 @@ LIB= edit SHLIB_MAJOR= 7 SHLIBDIR?= /lib +WARNS?= 3 + OSRCS= chared.c common.c el.c eln.c emacs.c fcns.c filecomplete.c help.c \ hist.c keymacro.c map.c chartype.c \ parse.c prompt.c read.c refresh.c search.c sig.c terminal.c tty.c vi.c @@ -40,8 +42,6 @@ CLEANFILES+= tokenizern.c historyn.c CFLAGS+= -I. -I${.CURDIR} -I${.CURDIR}/edit -DWIDECHAR #CFLAGS+= -DDEBUG_TTY -DDEBUG_KEY -DDEBUG_READ -DDEBUG -DDEBUG_REFRESH #CFLAGS+= -DDEBUG_PASTE -DDEBUG_EDIT - -WARNS?= 1 SUBDIR= edit/readline Modified: stable/11/lib/libedit/chartype.c ============================================================================== --- stable/11/lib/libedit/chartype.c Sat Nov 4 14:13:58 2017 (r325390) +++ stable/11/lib/libedit/chartype.c Sat Nov 4 14:35:01 2017 (r325391) @@ -223,6 +223,7 @@ ct_mbrtowc(wchar_t *wc, const char *s, size_t n) size_t ct_mbrtowc(wchar_t *wc, const char *s, size_t n) +{ if (s == NULL) return 0; if (n == 0) From owner-svn-src-all@freebsd.org Sat Nov 4 14:35: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 2437AE4BBD8 for ; Sat, 4 Nov 2017 14:35:31 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-it0-x232.google.com (mail-it0-x232.google.com [IPv6:2607:f8b0:4001:c0b::232]) (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 D722370538 for ; Sat, 4 Nov 2017 14:35:30 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-it0-x232.google.com with SMTP id 72so595946itk.3 for ; Sat, 04 Nov 2017 07:35:30 -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=9Iu50Ed14FMRMX0AYBI5QD+ujw8VwjnsEOYcltashvk=; b=g32/4mo29IOcUOlK+Ki8RwoX/K/KqofCuiSH5qF4ad3IKKtaPEAeePbje/k4tdm/Vu GxGIkqRfjJI/teZymXK1VKwWMQENO2wEC9/pBF1rPuqHnhJq4L6l6rUtgHXq1ReebkRX KsSySmVm3EjD3cmnYWd2DSNGcxwnfq2ZM4oO0o04N8NL5ICjodP4d14uJRMJm3eGWwRz ITMgSlEXUhbWgCXNybZyHZPE2agyMiCwUOtigQKtS/BxZ9ZDu6/nUWId9GBzSFClE89R eZURkGRFNryk8YTxlHhQvfAGDMf39eZBpglTir7zJH4KcGdwrk05vHxh7sHZxobK5G+X be5g== 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=9Iu50Ed14FMRMX0AYBI5QD+ujw8VwjnsEOYcltashvk=; b=iZO1O803u64BeJ1qCnWubKcLMdP95KfZPusoyGV6mZ2OUHq5o040Y9H9byRFOx2Yvm f0/dV4khLxxevi9l7hMWhPS1uKoiick19GGzer+TxuEPfpXuAjDEQOWvaP/DcpxsfHQb 3pOMiODvLtaE2l6qZUchYkYLWmsuRq3J8sHIDAzSG8L3rSDhHjGWMvTg6bXm90bTtRLU dxpYWRvSDBiW0j9N6TqC8/jB4aaQ0dX8pKo/+Xgj1U3gfbNuayeIkpUu/0WMryFa2fnO v2unzXXLaRR9b0BY3jRUxs04BMwypEGyU88j7tffcv6NC4io2lPUqL4th0xgjUUyeCRH EL1Q== X-Gm-Message-State: AJaThX6qXeg6M7brmEkcKJQyhgnt67m/jbVTbXZ2ANAzxB44tNZCc1sM ioQ2ehKuwdsdJDEOgQb7/U0ekfv7piPAtugi3QDFXA== X-Google-Smtp-Source: ABhQp+RY5JjUrGJXiVih0SS0mwjexANFsm6xDTA/kw/SwMgiSoPmIM5JYaUwZ0A6uDx3qkPCr/y2ipsYcz84n8u38JI= X-Received: by 10.36.64.145 with SMTP id n139mr3018262ita.115.1509806130111; Sat, 04 Nov 2017 07:35:30 -0700 (PDT) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.79.57.22 with HTTP; Sat, 4 Nov 2017 07:35:29 -0700 (PDT) X-Originating-IP: [2603:300b:6:5100:24b5:dc56:59f9:4870] Received: by 10.79.57.22 with HTTP; Sat, 4 Nov 2017 07:35:29 -0700 (PDT) In-Reply-To: References: <201710300312.v9U3CcCT021416@repo.freebsd.org> <8d9e9f50-035c-403c-3bc5-6788b7a94dea@FreeBSD.org> <72ee6c6d-0d9a-ebe9-8e15-c278fc91ded2@FreeBSD.org> <3a0a92dd-19fc-2ee3-dcbf-224e4c2e8eec@FreeBSD.org> From: Warner Losh Date: Sat, 4 Nov 2017 08:35:29 -0600 X-Google-Sender-Auth: V8nyiGzno0DO4xaRqpfRnlxuPRQ Message-ID: Subject: Re: svn commit: r325116 - head To: Garrett Cooper Cc: Bryan Drewery , Warner Losh , 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: Sat, 04 Nov 2017 14:35:31 -0000 On Nov 4, 2017 1:08 AM, "Ngie Cooper (yaneurabeya)" wrote: I just ran into this with bash on universe12a.freebsd.org by doing ^d. I think the change should be reverted. Thanks, -Ngie $ exit *** Error code 130 Stop. make[1]: stopped in /scratch/tmp/ngie/svn *** Error code 1 Stop. make: stopped in /scratch/tmp/ngie/svn No. Figure out what is doing the bad exit and fix that. Without the change, buildenv is useless in scripts. I'm not backing it out over a vague "this looks bad" without a real root cause. This report is completely unactionable. Warner From owner-svn-src-all@freebsd.org Sat Nov 4 14:38: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 D93FEE4BCA3; Sat, 4 Nov 2017 14:38:01 +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 B525870692; Sat, 4 Nov 2017 14:38:01 +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 vA4Ec0O5097307; Sat, 4 Nov 2017 14:38:00 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA4Ec0vx097305; Sat, 4 Nov 2017 14:38:00 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201711041438.vA4Ec0vx097305@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Sat, 4 Nov 2017 14:38:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325392 - head/etc/autofs X-SVN-Group: head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: head/etc/autofs X-SVN-Commit-Revision: 325392 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: Sat, 04 Nov 2017 14:38:02 -0000 Author: trasz Date: Sat Nov 4 14:38:00 2017 New Revision: 325392 URL: https://svnweb.freebsd.org/changeset/base/325392 Log: Add NIS automounter map, which supports rewriting of self-hosted locations to make them nullfs. PR: 221010 Submitted by: G. Paul Ziemba MFC after: 2 weeks Added: head/etc/autofs/include_nis (contents, props changed) Modified: head/etc/autofs/Makefile Modified: head/etc/autofs/Makefile ============================================================================== --- head/etc/autofs/Makefile Sat Nov 4 14:35:01 2017 (r325391) +++ head/etc/autofs/Makefile Sat Nov 4 14:38:00 2017 (r325392) @@ -1,6 +1,6 @@ # $FreeBSD$ -FILES= include_ldap special_hosts special_media special_noauto special_null +FILES= include_ldap include_nis special_hosts special_media special_noauto special_null NO_OBJ= FILESDIR= /etc/autofs Added: head/etc/autofs/include_nis ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/etc/autofs/include_nis Sat Nov 4 14:38:00 2017 (r325392) @@ -0,0 +1,180 @@ +#!/usr/bin/awk -f +#- +# Copyright (c) 2017 G. Paul Ziemba +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# +# $FreeBSD$ +# + +# +# /etc/autofs/include_nis +# +# automountd Directory Services script for NIS +# +# SYNOPSIS +# include_nis +# +# include_nis +# +# DESCRIPTION +# +# This script provides a Directory Services map for automountd +# based on NIS. Please see auto_master(5) for general information. +# +# The first form, with one argument, emits the entire named NIS map. +# The second form, with two arguments, emits the map entry for the +# key given in the second argument. +# +# This script attempts to determine the names and IP addresses +# of the local host. Map entries matching the local host are +# rewritten to specify nullfs mounts (instead of the default +# NFS) to reduce access overhead in the kernel. +# +# If a map entry contains multiple location fields, it is not changed. +# + + +# Populate list of names and IP addrs thet mean "this host" +# into myhostnames array +BEGIN { + # + # Set self hostnames + # + + "hostname -s" | getline; + myhostnames[$0] = 1; + + "hostname -f" | getline; + myhostnames[$0] = 1; + + myhostnames["localhost"] = 1 + + "hostname -f" | getline; + localdomain=$0 + myhostnames["localhost."localdomain] = 1 + + while ("ifconfig" | getline) { + if ($1 == "inet") { + myhostnames[$2] = 1; + } + } + + # debug +# print "--- hostname list start ----" +# for (i in myhostnames) { +# print i +# } +# print "--- hostname list end ----" + + if (ARGC == 2) { + # mapname only + while ("ypcat -k " ARGV[1] | getline) { + proc_mapline(1) + } + } + if (ARGC == 3) { + # mapname and keyname + while ("ypmatch " ARGV[2] " " ARGV[1] | getline) { + proc_mapline(0) + } + } + exit 0 +} + +function is_self(hostname) +{ + if (myhostnames[hostname]) { + return 1 + } + return 0 +} + +# +# Lines are of the form [key] [-opts] location1 [... locationN] +# +# indicate index of key field with first positional parameter +# 1 means keyfield is the first field +# 0 means keyfield is not present +# +function proc_mapline(keyfield) +{ + optionsfield = 0 + locationfield = 0 + locationcount = 0 + + for (i=keyfield+1; i <= NF; ++i) { + if (!optionsfield) { + if ($i ~ /^-/) { + # the first options field found on the line + optionsfield = i; + continue + } + } + # Assumption: location contains colon (":") + if (optionsfield && ($i ~ /:/) && ($i !~ /^-/)) { + ++locationcount + if (!locationfield) { + # the first location field found on the line + locationfield = i + } + } + } + + # + # If location not found, do not modify. + # + # If there is more than one location, do not modify. Rationale: + # Options are applied to all locations. We ca not have "nullfs" + # for only some locations and "nfs" for others for a given + # map key (i.e., a line). The usual reason for multiple + # locations is for redundancy using replicated volumes on + # multiple hosts, so multiple hosts imply fstype=nfs (the + # FreeBSD default for automounter maps). + # + # Hypothetically there could be a map entry with multiple + # locations all with host parts matching "me". In that case, + # it would be safe to rewrite the locations and specify + # nullfs, but the code does not handle this case. + # + if (locationcount == 1) { + # + # We have a line with exactly one location field + # + # Assumption: location has no more than one colon (":") + # + n=split($locationfield,location,":") + if (is_self(location[1])) { + $locationfield = ":" location[2] + if (optionsfield) { + # append to existing options + $optionsfield = $optionsfield ",fstype=nullfs" + } else { + # sneak in ahead of location + $locationfield = "-fstype=nullfs " $locationfield + } + } + } + + print +} From owner-svn-src-all@freebsd.org Sat Nov 4 14:44: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 74984E4C1EB; Sat, 4 Nov 2017 14:44:08 +0000 (UTC) (envelope-from pfg@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 4192270B56; Sat, 4 Nov 2017 14:44:08 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA4Ei7o2001338; Sat, 4 Nov 2017 14:44:07 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA4Ei7Iu001337; Sat, 4 Nov 2017 14:44:07 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201711041444.vA4Ei7Iu001337@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Sat, 4 Nov 2017 14:44:07 +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: r325393 - stable/11/lib/libc/regex X-SVN-Group: stable-11 X-SVN-Commit-Author: pfg X-SVN-Commit-Paths: stable/11/lib/libc/regex X-SVN-Commit-Revision: 325393 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: Sat, 04 Nov 2017 14:44:08 -0000 Author: pfg Date: Sat Nov 4 14:44:07 2017 New Revision: 325393 URL: https://svnweb.freebsd.org/changeset/base/325393 Log: MFC r325066: Fix out-of-bounds read in libc/regex. The bug is an out-of-bounds read detected with address sanitizer that happens when 'sp' in p_b_coll_elems() includes NUL byte[s], e.g. if it's equal to "GS\x00". In that case len will be equal to 4, and the strncmp(cp->name, sp, len) call will succeed when cp->name is "GS" but the cp->name[len] == '\0' comparison will cause the read to go out-of-bounds. Checking the length using strlen() instead eliminates the issue. The bug was found in LLVM with oss-fuzz: https://reviews.llvm.org/D39380 Obtained from: Vlad Tsyrklevich through posting on openbsd-tech Modified: stable/11/lib/libc/regex/regcomp.c Directory Properties: stable/11/ (props changed) Modified: stable/11/lib/libc/regex/regcomp.c ============================================================================== --- stable/11/lib/libc/regex/regcomp.c Sat Nov 4 14:38:00 2017 (r325392) +++ stable/11/lib/libc/regex/regcomp.c Sat Nov 4 14:44:07 2017 (r325393) @@ -921,7 +921,7 @@ p_b_coll_elem(struct parse *p, } len = p->next - sp; for (cp = cnames; cp->name != NULL; cp++) - if (strncmp(cp->name, sp, len) == 0 && cp->name[len] == '\0') + if (strncmp(cp->name, sp, len) == 0 && strlen(cp->name) == len) return(cp->code); /* known name */ memset(&mbs, 0, sizeof(mbs)); if ((clen = mbrtowc(&wc, sp, len, &mbs)) == len) From owner-svn-src-all@freebsd.org Sat Nov 4 14:45: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 B7515E4C355; Sat, 4 Nov 2017 14:45:37 +0000 (UTC) (envelope-from pfg@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 85BEC70D31; Sat, 4 Nov 2017 14:45:37 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA4EjaOa001454; Sat, 4 Nov 2017 14:45:36 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA4Eja3h001453; Sat, 4 Nov 2017 14:45:36 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201711041445.vA4Eja3h001453@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Sat, 4 Nov 2017 14:45:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r325394 - stable/10/lib/libc/regex X-SVN-Group: stable-10 X-SVN-Commit-Author: pfg X-SVN-Commit-Paths: stable/10/lib/libc/regex X-SVN-Commit-Revision: 325394 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: Sat, 04 Nov 2017 14:45:37 -0000 Author: pfg Date: Sat Nov 4 14:45:36 2017 New Revision: 325394 URL: https://svnweb.freebsd.org/changeset/base/325394 Log: MFC r325066: Fix out-of-bounds read in libc/regex. The bug is an out-of-bounds read detected with address sanitizer that happens when 'sp' in p_b_coll_elems() includes NUL byte[s], e.g. if it's equal to "GS\x00". In that case len will be equal to 4, and the strncmp(cp->name, sp, len) call will succeed when cp->name is "GS" but the cp->name[len] == '\0' comparison will cause the read to go out-of-bounds. Checking the length using strlen() instead eliminates the issue. The bug was found in LLVM with oss-fuzz: https://reviews.llvm.org/D39380 Obtained from: Vlad Tsyrklevich through posting on openbsd-tech Modified: stable/10/lib/libc/regex/regcomp.c Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/libc/regex/regcomp.c ============================================================================== --- stable/10/lib/libc/regex/regcomp.c Sat Nov 4 14:44:07 2017 (r325393) +++ stable/10/lib/libc/regex/regcomp.c Sat Nov 4 14:45:36 2017 (r325394) @@ -922,7 +922,7 @@ p_b_coll_elem(struct parse *p, } len = p->next - sp; for (cp = cnames; cp->name != NULL; cp++) - if (strncmp(cp->name, sp, len) == 0 && cp->name[len] == '\0') + if (strncmp(cp->name, sp, len) == 0 && strlen(cp->name) == len) return(cp->code); /* known name */ memset(&mbs, 0, sizeof(mbs)); if ((clen = mbrtowc(&wc, sp, len, &mbs)) == len) From owner-svn-src-all@freebsd.org Sat Nov 4 14:49: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 9C6AAE4C49B; Sat, 4 Nov 2017 14:49:23 +0000 (UTC) (envelope-from pfg@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 6AE8170EB4; Sat, 4 Nov 2017 14:49:23 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA4EnMGP001633; Sat, 4 Nov 2017 14:49:22 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA4EnMBr001632; Sat, 4 Nov 2017 14:49:22 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201711041449.vA4EnMBr001632@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Sat, 4 Nov 2017 14:49: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: r325395 - stable/11/usr.sbin/bsnmpd/modules/snmp_hostres X-SVN-Group: stable-11 X-SVN-Commit-Author: pfg X-SVN-Commit-Paths: stable/11/usr.sbin/bsnmpd/modules/snmp_hostres X-SVN-Commit-Revision: 325395 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: Sat, 04 Nov 2017 14:49:23 -0000 Author: pfg Date: Sat Nov 4 14:49:22 2017 New Revision: 325395 URL: https://svnweb.freebsd.org/changeset/base/325395 Log: MFC r325067: bsnmpd: Only refresh devtree if devd event is a new or removed device. It makes sense to refresh the tree only when a device is inserted or removed, otherwise bsnmpd needlessly wastes lots of CPU. PR: 209368 Modified: stable/11/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c ============================================================================== --- stable/11/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c Sat Nov 4 14:45:36 2017 (r325394) +++ stable/11/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c Sat Nov 4 14:49:22 2017 (r325395) @@ -479,7 +479,9 @@ again: } else { if (read_len == sizeof(buf)) goto again; - refresh_device_tbl(1); + /* Only refresh device table on a device add or remove event. */ + if (buf[0] == '+' || buf[0] == '-') + refresh_device_tbl(1); } } From owner-svn-src-all@freebsd.org Sat Nov 4 14:50:15 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 AB7E2E4C52B for ; Sat, 4 Nov 2017 14:50:15 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-it0-x234.google.com (mail-it0-x234.google.com [IPv6:2607:f8b0:4001:c0b::234]) (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 63DF470FF2 for ; Sat, 4 Nov 2017 14:50:15 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-it0-x234.google.com with SMTP id c3so646880itc.3 for ; Sat, 04 Nov 2017 07:50:15 -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=T/vEeXd00ijV13EFhJ/GvdDmqZsEKcCh28XiP3iCxkA=; b=N4OIqyEF2rouQ+536ltQBAZ3WNxqw9dpRtt6uGUDLxXDPSWHVqWsbnq/DBpT5xc4Lg 9GL3PoBjFFBxG4Rd4cvAOUExIBjZVKp4UhVqaMkYVdzvprqVdUCCNSUR87E9YPpZdMtl 9GQStdpS1+/fqR4KS3M8M4EECWwG0SXviEjtlhYWFUHG3TxJoeJhf+PkuyQMAgjekTZi DIVy5Yu9h4PUi9l6xsury/yDAhI3EKaPcSe/CiO9ZbFm2DkKBzfiYubmI0R0VzNwgOtb A/l7jw8tuHj3WWmbfOBAWBEKO42nyJuCVX3L9zwcN+fCRl5fNxyk+VgqX1OEcGM0ynBF VwCw== 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=T/vEeXd00ijV13EFhJ/GvdDmqZsEKcCh28XiP3iCxkA=; b=jcQsZP80P/0vQ5+1s8RObTsTiolahy7lAHEeb0JypczYnNp43XlonQJaxgSqRDfbkF d2jtdZ2+uCR+rP7CuLqQBvSIb6Iv6kvOqMue+XpdPAM50f9g65SJd3kHl9PGHzcC8nzg +x+lhWqEdGusHTQkR+aNoqeoRYWYIL6ape+M6hvfEIaNzT2BF10T8GvdRkgZDpp04pGo S/NQPwTf8fEYReuwvZl5pK62aGk7FHqZJWLnF3Kv2xFKXUItLt13im1mYxJbUBIWFwkk /98jmjJdQxjI/wVue/ZPVsXRF1RxL4macpTLGy7tvtk0zMIPHJ1Fd7rPKS1cpommZjse Kh3A== X-Gm-Message-State: AJaThX403jrrq9KJbGCFncpSsoBJIP0KAS7acYJpGEF6I1alXFsbLsxU JgAr6LoTHd/ZEsrXmDTgupeCHrN1wTjc/k5zRo0kPw== X-Google-Smtp-Source: ABhQp+QgUea4aJPC/ZKdu/3lBPfdxqWdbWGLuWu1BeyAMYLzAV/jZZpTKCyVsmJrrKtF+PCSKim77bG8nzKlAGiTZS4= X-Received: by 10.36.118.81 with SMTP id z78mr2911783itb.97.1509807014434; Sat, 04 Nov 2017 07:50:14 -0700 (PDT) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.79.57.22 with HTTP; Sat, 4 Nov 2017 07:50:13 -0700 (PDT) X-Originating-IP: [2603:300b:6:5100:c96d:b7be:45de:c872] In-Reply-To: References: <201710300312.v9U3CcCT021416@repo.freebsd.org> <8d9e9f50-035c-403c-3bc5-6788b7a94dea@FreeBSD.org> <72ee6c6d-0d9a-ebe9-8e15-c278fc91ded2@FreeBSD.org> <3a0a92dd-19fc-2ee3-dcbf-224e4c2e8eec@FreeBSD.org> From: Warner Losh Date: Sat, 4 Nov 2017 08:50:13 -0600 X-Google-Sender-Auth: Dk3bdxIGhHjSjDl3Kyyne303l-U Message-ID: Subject: Re: svn commit: r325116 - head To: Garrett Cooper Cc: Bryan Drewery , Warner Losh , 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: Sat, 04 Nov 2017 14:50:15 -0000 On Sat, Nov 4, 2017 at 8:35 AM, Warner Losh wrote: > > > On Nov 4, 2017 1:08 AM, "Ngie Cooper (yaneurabeya)" > wrote: > > I just ran into this with bash on universe12a.freebsd.org by > doing ^d. I think the change should be reverted. > Thanks, > -Ngie > > $ exit > *** Error code 130 > > Stop. > make[1]: stopped in /scratch/tmp/ngie/svn > *** Error code 1 > > Stop. > make: stopped in /scratch/tmp/ngie/svn > > > No. Figure out what is doing the bad exit and fix that. Without the > change, buildenv is useless in scripts. I'm not backing it out over a vague > "this looks bad" without a real root cause. This report is completely > unactionable. > 8:45am zooty:[335]> make buildenv BUILDENV_SHELL=/usr/local/bin/bash Entering world for amd64:amd64 [imp@zooty /usr/home/imp/git/head/sys/boot]$ exit 8:45am zooty:[336]> So it's something in your setup, since bash works fine for me. Warner From owner-svn-src-all@freebsd.org Sat Nov 4 14:56: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 E6967E4C946; Sat, 4 Nov 2017 14:56:59 +0000 (UTC) (envelope-from pfg@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 B30E47151C; Sat, 4 Nov 2017 14:56:59 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA4Euw4N005618; Sat, 4 Nov 2017 14:56:58 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA4EuwCc005617; Sat, 4 Nov 2017 14:56:58 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201711041456.vA4EuwCc005617@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Sat, 4 Nov 2017 14:56:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r325396 - stable/10/usr.sbin/bsnmpd/modules/snmp_hostres X-SVN-Group: stable-10 X-SVN-Commit-Author: pfg X-SVN-Commit-Paths: stable/10/usr.sbin/bsnmpd/modules/snmp_hostres X-SVN-Commit-Revision: 325396 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: Sat, 04 Nov 2017 14:57:00 -0000 Author: pfg Date: Sat Nov 4 14:56:58 2017 New Revision: 325396 URL: https://svnweb.freebsd.org/changeset/base/325396 Log: MFC r325067: bsnmpd: Only refresh devtree if devd event is a new or removed device. It makes sense to refresh the tree only when a device is inserted or removed, otherwise bsnmpd needlessly wastes lots of CPU. PR: 209368 Modified: stable/10/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c ============================================================================== --- stable/10/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c Sat Nov 4 14:49:22 2017 (r325395) +++ stable/10/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c Sat Nov 4 14:56:58 2017 (r325396) @@ -479,7 +479,9 @@ again: } else { if (read_len == sizeof(buf)) goto again; - refresh_device_tbl(1); + /* Only refresh device table on a device add or remove event. */ + if (buf[0] == '+' || buf[0] == '-') + refresh_device_tbl(1); } } From owner-svn-src-all@freebsd.org Sat Nov 4 15:32: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 34078E4DB6F; Sat, 4 Nov 2017 15:32:24 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 F07737280A; Sat, 4 Nov 2017 15:32:23 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (unknown [127.0.1.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id 04EFEE498; Sat, 4 Nov 2017 15:32:23 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id 0300786A2; Sat, 4 Nov 2017 15:32:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id XuYIoTJP1s6U; Sat, 4 Nov 2017 15:32:19 +0000 (UTC) Subject: Re: svn commit: r325116 - head DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com 312A3869C To: "Ngie Cooper (yaneurabeya)" Cc: Warner Losh , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" References: <201710300312.v9U3CcCT021416@repo.freebsd.org> <8d9e9f50-035c-403c-3bc5-6788b7a94dea@FreeBSD.org> <72ee6c6d-0d9a-ebe9-8e15-c278fc91ded2@FreeBSD.org> <3a0a92dd-19fc-2ee3-dcbf-224e4c2e8eec@FreeBSD.org> From: Bryan Drewery Openpgp: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Organization: FreeBSD Message-ID: Date: Sat, 4 Nov 2017 08:31:55 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="TTEbXAvK7PGWenaoMUJl3Nx9wrld22txD" 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: Sat, 04 Nov 2017 15:32:24 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --TTEbXAvK7PGWenaoMUJl3Nx9wrld22txD Content-Type: multipart/mixed; boundary="7lLHx9hmShB5GFQhKuhloaiQmFSXn93wp"; protected-headers="v1" From: Bryan Drewery To: "Ngie Cooper (yaneurabeya)" Cc: Warner Losh , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Message-ID: Subject: Re: svn commit: r325116 - head References: <201710300312.v9U3CcCT021416@repo.freebsd.org> <8d9e9f50-035c-403c-3bc5-6788b7a94dea@FreeBSD.org> <72ee6c6d-0d9a-ebe9-8e15-c278fc91ded2@FreeBSD.org> <3a0a92dd-19fc-2ee3-dcbf-224e4c2e8eec@FreeBSD.org> In-Reply-To: --7lLHx9hmShB5GFQhKuhloaiQmFSXn93wp Content-Type: text/plain; charset=windows-1252 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 11/4/2017 12:08 AM, Ngie Cooper (yaneurabeya) wrote: > I just ran into this with bash on universe12a.freebsd.org by doing ^d.= I think the change should be reverted. > Thanks, > -Ngie >=20 > $ exit > *** Error code 130 >=20 > Stop. > make[1]: stopped in /scratch/tmp/ngie/svn > *** Error code 1 >=20 > Stop. > make: stopped in /scratch/tmp/ngie/svn >=20 When you first go into buildenv check 'echo $?'. My problem was a construct like '[ -f xxx ] && . xxx' at the end of one of my profile scripts. It needs to be 'if [ -f xxx ]; then . xxx; fi' to avoid the bad status. It's really unrelated to buildenv. --=20 Regards, Bryan Drewery --7lLHx9hmShB5GFQhKuhloaiQmFSXn93wp-- --TTEbXAvK7PGWenaoMUJl3Nx9wrld22txD Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJZ/d1rAAoJEDXXcbtuRpfPvLEH+wdA+W/1B7U4CV1cTghPP5LR YyZIEP0QpAZE1ftinx3OQa1STidV2foB84BRrQo3CgXEaLy2hN0EmLkn3u/l1llo alOjtGGjuWCQqBop7tfbpt4YV1L+9rCDHuHt3eZJmC0JP8o1xwmkSOrjWLv1SjBf aAsqbAR0/520HWo32mZIZc7kiMsPv3N6JA2ENxQNVHLrSt+qJOKoXVYeHI2AztBG ncbIEv5LPQN4A3jyTtSaR5NC1ZuJ4WJM7WliYQjJiX2sTmHUdUZCtnekK3RnuP/z m1YhoKqcdw7KvRJTjwCCD/USQtXyp8WDQUS0oMJN3ppZKDq1capwCNgVOZJqGbY= =3dCc -----END PGP SIGNATURE----- --TTEbXAvK7PGWenaoMUJl3Nx9wrld22txD-- From owner-svn-src-all@freebsd.org Sat Nov 4 15:41: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 95C57E4DE74; Sat, 4 Nov 2017 15:41:09 +0000 (UTC) (envelope-from pfg@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 651B272A56; Sat, 4 Nov 2017 15:41:09 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA4Ff8gR022631; Sat, 4 Nov 2017 15:41:08 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA4Ff86d022630; Sat, 4 Nov 2017 15:41:08 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201711041541.vA4Ff86d022630@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Sat, 4 Nov 2017 15:41:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325397 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: pfg X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 325397 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: Sat, 04 Nov 2017 15:41:09 -0000 Author: pfg Date: Sat Nov 4 15:41:08 2017 New Revision: 325397 URL: https://svnweb.freebsd.org/changeset/base/325397 Log: ANSI-fy exec_shell_imgact(). Fix a stray space while here. PR: 223317 MFC after: 3 days Modified: head/sys/kern/imgact_shell.c Modified: head/sys/kern/imgact_shell.c ============================================================================== --- head/sys/kern/imgact_shell.c Sat Nov 4 14:56:58 2017 (r325396) +++ head/sys/kern/imgact_shell.c Sat Nov 4 15:41:08 2017 (r325397) @@ -97,8 +97,7 @@ CTASSERT(MAXSHELLCMDLEN >= MAXINTERP + 3); * 6.x branch on May 28, 2005 (matching __FreeBSD_version 600029). */ int -exec_shell_imgact(imgp) - struct image_params *imgp; +exec_shell_imgact(struct image_params *imgp) { const char *image_header = imgp->image_header; const char *ihp, *interpb, *interpe, *maxp, *optb, *opte, *fname; @@ -125,7 +124,7 @@ exec_shell_imgact(imgp) * However, we don't know how far into the page the contents are * valid -- the actual file might be much shorter than the page. * So find out the file size. - */ + */ error = VOP_GETATTR(imgp->vp, &vattr, imgp->proc->p_ucred); if (error) return (error); From owner-svn-src-all@freebsd.org Sat Nov 4 15:47: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 2F09BE4E0BA; Sat, 4 Nov 2017 15:47:20 +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 0958D72EA7; Sat, 4 Nov 2017 15:47:19 +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 vA4FlJL6026489; Sat, 4 Nov 2017 15:47:19 GMT (envelope-from oshogbo@FreeBSD.org) Received: (from oshogbo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA4FlIj5026482; Sat, 4 Nov 2017 15:47:18 GMT (envelope-from oshogbo@FreeBSD.org) Message-Id: <201711041547.vA4FlIj5026482@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: oshogbo set sender to oshogbo@FreeBSD.org using -f From: Mariusz Zaborski Date: Sat, 4 Nov 2017 15:47:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325398 - in head: . lib/libcasper/libcasper lib/libcasper/services/cap_dns lib/libcasper/services/cap_grp lib/libcasper/services/cap_pwd lib/libcasper/services/cap_random lib/libcasper... X-SVN-Group: head X-SVN-Commit-Author: oshogbo X-SVN-Commit-Paths: in head: . lib/libcasper/libcasper lib/libcasper/services/cap_dns lib/libcasper/services/cap_grp lib/libcasper/services/cap_pwd lib/libcasper/services/cap_random lib/libcasper/services/cap_sysctl X-SVN-Commit-Revision: 325398 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: Sat, 04 Nov 2017 15:47:20 -0000 Author: oshogbo Date: Sat Nov 4 15:47:18 2017 New Revision: 325398 URL: https://svnweb.freebsd.org/changeset/base/325398 Log: Casper work's only as shared library - disable building static ones. Reviewed by: bdrewery@ Differential Revision: https://reviews.freebsd.org/D12917 Modified: head/ObsoleteFiles.inc head/lib/libcasper/libcasper/Makefile head/lib/libcasper/services/cap_dns/Makefile head/lib/libcasper/services/cap_grp/Makefile head/lib/libcasper/services/cap_pwd/Makefile head/lib/libcasper/services/cap_random/Makefile head/lib/libcasper/services/cap_sysctl/Makefile Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Sat Nov 4 15:41:08 2017 (r325397) +++ head/ObsoleteFiles.inc Sat Nov 4 15:47:18 2017 (r325398) @@ -38,6 +38,19 @@ # xargs -n1 | sort | uniq -d; # done +# 20171104: Casper can work only as shared library +OLD_FILES+=usr/lib/libcasper.a +OLD_FILES+=usr/lib/libcasper_p.a +OLD_FILES+=usr/lib/libcap_dns.a +OLD_FILES+=usr/lib/libcap_dns_p.a +OLD_FILES+=usr/lib/libcap_grp.a +OLD_FILES+=usr/lib/libcap_grp_p.a +OLD_FILES+=usr/lib/libcap_pwd.a +OLD_FILES+=usr/lib/libcap_pwd_p.a +OLD_FILES+=usr/lib/libcap_random.a +OLD_FILES+=usr/lib/libcap_random_p.a +OLD_FILES+=usr/lib/libcap_sysctl.a +OLD_FILES+=usr/lib/libcap_sysctl_p.a # 20171031: Removal of obsolete man files OLD_FILES+=usr/share/man/man7/adding_user.7.gz # 20171031: Disconnected libpathconv tests Modified: head/lib/libcasper/libcasper/Makefile ============================================================================== --- head/lib/libcasper/libcasper/Makefile Sat Nov 4 15:41:08 2017 (r325397) +++ head/lib/libcasper/libcasper/Makefile Sat Nov 4 15:47:18 2017 (r325398) @@ -8,7 +8,7 @@ SHLIB_MAJOR= 0 SHLIBDIR?= /lib .if ${MK_CASPER} != "no" -LIB= casper +SHLIB= casper SRCS= libcasper.c SRCS+= libcasper_impl.c Modified: head/lib/libcasper/services/cap_dns/Makefile ============================================================================== --- head/lib/libcasper/services/cap_dns/Makefile Sat Nov 4 15:41:08 2017 (r325397) +++ head/lib/libcasper/services/cap_dns/Makefile Sat Nov 4 15:47:18 2017 (r325398) @@ -10,7 +10,7 @@ SHLIB_MAJOR= 0 INCSDIR?= ${INCLUDEDIR}/casper .if ${MK_CASPER} != "no" -LIB= cap_dns +SHLIB= cap_dns SRCS= cap_dns.c .endif Modified: head/lib/libcasper/services/cap_grp/Makefile ============================================================================== --- head/lib/libcasper/services/cap_grp/Makefile Sat Nov 4 15:41:08 2017 (r325397) +++ head/lib/libcasper/services/cap_grp/Makefile Sat Nov 4 15:47:18 2017 (r325398) @@ -10,7 +10,7 @@ SHLIB_MAJOR= 0 INCSDIR?= ${INCLUDEDIR}/casper .if ${MK_CASPER} != "no" -LIB= cap_grp +SHLIB= cap_grp SRCS= cap_grp.c .endif Modified: head/lib/libcasper/services/cap_pwd/Makefile ============================================================================== --- head/lib/libcasper/services/cap_pwd/Makefile Sat Nov 4 15:41:08 2017 (r325397) +++ head/lib/libcasper/services/cap_pwd/Makefile Sat Nov 4 15:47:18 2017 (r325398) @@ -10,7 +10,7 @@ SHLIB_MAJOR= 0 INCSDIR?= ${INCLUDEDIR}/casper .if ${MK_CASPER} != "no" -LIB= cap_pwd +SHLIB= cap_pwd SRCS= cap_pwd.c .endif Modified: head/lib/libcasper/services/cap_random/Makefile ============================================================================== --- head/lib/libcasper/services/cap_random/Makefile Sat Nov 4 15:41:08 2017 (r325397) +++ head/lib/libcasper/services/cap_random/Makefile Sat Nov 4 15:47:18 2017 (r325398) @@ -9,7 +9,7 @@ SHLIBDIR?= /lib/casper INCSDIR?= ${INCLUDEDIR}/casper .if ${MK_CASPER} != "no" -LIB= cap_random +SHLIB= cap_random SRCS= cap_random.c .endif Modified: head/lib/libcasper/services/cap_sysctl/Makefile ============================================================================== --- head/lib/libcasper/services/cap_sysctl/Makefile Sat Nov 4 15:41:08 2017 (r325397) +++ head/lib/libcasper/services/cap_sysctl/Makefile Sat Nov 4 15:47:18 2017 (r325398) @@ -10,7 +10,7 @@ SHLIB_MAJOR= 0 INCSDIR?= ${INCLUDEDIR}/casper .if ${MK_CASPER} != "no" -LIB= cap_sysctl +SHLIB= cap_sysctl SRCS= cap_sysctl.c .endif From owner-svn-src-all@freebsd.org Sat Nov 4 15:50: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 BD147E4E192; Sat, 4 Nov 2017 15:50:06 +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 833A37306D; Sat, 4 Nov 2017 15:50:06 +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 vA4Fo5qH026643; Sat, 4 Nov 2017 15:50:05 GMT (envelope-from oshogbo@FreeBSD.org) Received: (from oshogbo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA4Fo583026640; Sat, 4 Nov 2017 15:50:05 GMT (envelope-from oshogbo@FreeBSD.org) Message-Id: <201711041550.vA4Fo583026640@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: oshogbo set sender to oshogbo@FreeBSD.org using -f From: Mariusz Zaborski Date: Sat, 4 Nov 2017 15:50:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325399 - in head: . lib/libcasper/libcasper lib/libcasper/services/cap_random X-SVN-Group: head X-SVN-Commit-Author: oshogbo X-SVN-Commit-Paths: in head: . lib/libcasper/libcasper lib/libcasper/services/cap_random X-SVN-Commit-Revision: 325399 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: Sat, 04 Nov 2017 15:50:06 -0000 Author: oshogbo Date: Sat Nov 4 15:50:05 2017 New Revision: 325399 URL: https://svnweb.freebsd.org/changeset/base/325399 Log: The src.opts.mk sets default value for the SHLIBDIR, so our set was not respected. Please notice that libcasper is already in ObsoleteFiles so we don't add it again. Reported by: Herbert J. Skuhra Reviewed by: bdrewery@ Differential Revision: https://reviews.freebsd.org/D12918 Modified: head/ObsoleteFiles.inc head/lib/libcasper/libcasper/Makefile head/lib/libcasper/services/cap_random/Makefile Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Sat Nov 4 15:47:18 2017 (r325398) +++ head/ObsoleteFiles.inc Sat Nov 4 15:50:05 2017 (r325399) @@ -38,6 +38,8 @@ # xargs -n1 | sort | uniq -d; # done +# 20171104: libcap_random should be in /lib not in /usr/lib +OLD_LIBS+=usr/lib/libcap_random.so.0 # 20171104: Casper can work only as shared library OLD_FILES+=usr/lib/libcasper.a OLD_FILES+=usr/lib/libcasper_p.a Modified: head/lib/libcasper/libcasper/Makefile ============================================================================== --- head/lib/libcasper/libcasper/Makefile Sat Nov 4 15:47:18 2017 (r325398) +++ head/lib/libcasper/libcasper/Makefile Sat Nov 4 15:50:05 2017 (r325399) @@ -1,14 +1,14 @@ # $FreeBSD$ +SHLIBDIR?= /lib + .include PACKAGE=${LIB} -SHLIB_MAJOR= 0 -SHLIBDIR?= /lib - .if ${MK_CASPER} != "no" SHLIB= casper +SHLIB_MAJOR= 0 SRCS= libcasper.c SRCS+= libcasper_impl.c Modified: head/lib/libcasper/services/cap_random/Makefile ============================================================================== --- head/lib/libcasper/services/cap_random/Makefile Sat Nov 4 15:47:18 2017 (r325398) +++ head/lib/libcasper/services/cap_random/Makefile Sat Nov 4 15:50:05 2017 (r325399) @@ -1,11 +1,12 @@ # $FreeBSD$ +SHLIBDIR?= /lib/casper + .include PACKAGE=libcasper SHLIB_MAJOR= 0 -SHLIBDIR?= /lib/casper INCSDIR?= ${INCLUDEDIR}/casper .if ${MK_CASPER} != "no" From owner-svn-src-all@freebsd.org Sat Nov 4 15:52:18 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 1AB25E4E5CF; Sat, 4 Nov 2017 15:52:18 +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 DCD5E734A9; Sat, 4 Nov 2017 15:52:17 +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 vA4FqGCS029657; Sat, 4 Nov 2017 15:52:16 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA4FqGWR029654; Sat, 4 Nov 2017 15:52:16 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201711041552.vA4FqGWR029654@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Sat, 4 Nov 2017 15:52:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325400 - head/etc/rc.d X-SVN-Group: head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: head/etc/rc.d X-SVN-Commit-Revision: 325400 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: Sat, 04 Nov 2017 15:52:18 -0000 Author: trasz Date: Sat Nov 4 15:52:16 2017 New Revision: 325400 URL: https://svnweb.freebsd.org/changeset/base/325400 Log: Make autofs(5) rc scripts run earlier, matching those for amd(8). This helps when you have some daemons that need to access automounted shares. PR: 221011 MFC after: 2 weeks Modified: head/etc/rc.d/automount head/etc/rc.d/automountd head/etc/rc.d/autounmountd Modified: head/etc/rc.d/automount ============================================================================== --- head/etc/rc.d/automount Sat Nov 4 15:50:05 2017 (r325399) +++ head/etc/rc.d/automount Sat Nov 4 15:52:16 2017 (r325400) @@ -5,6 +5,7 @@ # PROVIDE: automount # REQUIRE: nfsclient automountd +# BEFORE: DAEMON # KEYWORD: nojail shutdown . /etc/rc.subr Modified: head/etc/rc.d/automountd ============================================================================== --- head/etc/rc.d/automountd Sat Nov 4 15:50:05 2017 (r325399) +++ head/etc/rc.d/automountd Sat Nov 4 15:52:16 2017 (r325400) @@ -4,7 +4,8 @@ # # PROVIDE: automountd -# REQUIRE: DAEMON +# REQUIRE: rpcbind ypset nfsclient FILESYSTEMS ldconfig +# BEFORE: DAEMON # KEYWORD: nojail . /etc/rc.subr Modified: head/etc/rc.d/autounmountd ============================================================================== --- head/etc/rc.d/autounmountd Sat Nov 4 15:50:05 2017 (r325399) +++ head/etc/rc.d/autounmountd Sat Nov 4 15:52:16 2017 (r325400) @@ -4,7 +4,8 @@ # # PROVIDE: autounmountd -# REQUIRE: DAEMON +# REQUIRE: FILESYSTEMS +# BEFORE: DAEMON # KEYWORD: nojail . /etc/rc.subr From owner-svn-src-all@freebsd.org Sat Nov 4 15:53: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 116C8E4E6A4; Sat, 4 Nov 2017 15:53:45 +0000 (UTC) (envelope-from oshogbo.vx@gmail.com) 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 843C173641; Sat, 4 Nov 2017 15:53:44 +0000 (UTC) (envelope-from oshogbo.vx@gmail.com) Received: by mail-lf0-x229.google.com with SMTP id 90so6202297lfs.13; Sat, 04 Nov 2017 08:53:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=JWABURkO1xtXy8Hv9tP5zdZg+MtijCinYdntIXPIfwg=; b=rasz81IXvt7v7uQpUKRl3Gp3sY9+h/GZ7CE307cG6GLDuVR7TFAeiGuIYA5CMcBeQo 1u1Xcw2mPT5VTZVXDDliztBKoyyhZkwistGqgpexux7YArZ5UnLZ/4W5UF4ZLiSajBv9 8REDX21i41/4H2LKkgqi01qCY+H8X9eGgm+2FKVJ9eX0wVvJSfJV8kELdydUYzHZLVoz fOic/D/17FU+Ka9kUMrj95Fgf4gWVqQG/YcynzPjtzKeguseryQqgOj6MXLTMWEt7oLW tRs0Z3CcTvbt7Qyk/lDxCxULzBurRNHiu1nVBKyz2VpttKmXhh9vla1Zjla8Hd423kxq v1xA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to:user-agent; bh=JWABURkO1xtXy8Hv9tP5zdZg+MtijCinYdntIXPIfwg=; b=XYaOeMvga4yi8uFfFpxfibz7Sw7mrX/blGEaQ9IDZ+jPnmGQsFcBy9F7/SdbVZ8EQ0 XLMF8PZJgZJp+f/Gn96mnRb49WH2Kh8x5333qJqbErxLReN4vZpAc4sy7hchTd3764nu 8VxY4pJDL4oaZ4dYw5oWbrc5fYWkd5+yi2goUrJ+okO6liaCNosJA9F8RjZKp9yN6RLh r6C6Mx1pCSPDzdzBPqQmHrxHn4WbHpPGdvMkIGweIY55HXRMNJ5ophuaru37ZD2KEl0D phCnzSECgwa+UND4GgSPtnxMrwvDO6Vcnj9X++xRzhfNadufT6URF4Bun1NpU7/ir0it tkAg== X-Gm-Message-State: AMCzsaXvyDy8f9YXKyCtLwvjDobTiwDm+wAJ0icSjuQHYzAYm1jXeWLU FYBLUr60VioEGnHQUm57OpE= X-Google-Smtp-Source: ABhQp+SPMHBbFYh2Fvi6qZzr9QGzt7w+mF6V2lbGUr0OMSeNLq1KGWbdaRxoZhv/v6mTL8GctVflGQ== X-Received: by 10.46.81.90 with SMTP id b26mr4157783lje.98.1509810822818; Sat, 04 Nov 2017 08:53:42 -0700 (PDT) Received: from x-wing (87-206-170-77.dynamic.chello.pl. [87.206.170.77]) by smtp.gmail.com with ESMTPSA id i66sm1767912lji.51.2017.11.04.08.53.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 04 Nov 2017 08:53:40 -0700 (PDT) Sender: Mariusz Zaborski Date: Sat, 4 Nov 2017 16:55:03 +0100 From: Mariusz Zaborski To: "Herbert J. Skuhra" Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org 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... Message-ID: <20171104155503.GA10168@x-wing> References: <201710281923.v9SJNvE5021346@repo.freebsd.org> <87h8uexoix.wl-herbert@mailbox.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="envbJBWh7q8WU6mo" Content-Disposition: inline In-Reply-To: <87h8uexoix.wl-herbert@mailbox.org> 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: Sat, 04 Nov 2017 15:53:45 -0000 --envbJBWh7q8WU6mo Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Nov 01, 2017 at 11:48:54AM +0100, Herbert J. Skuhra wrote: > On Sat, 28 Oct 2017 21:23:57 +0200, > Mariusz Zaborski wrote: > >=20 > > Author: oshogbo > > Date: Sat Oct 28 19:23:57 2017 > > New Revision: 325062 > > URL: https://svnweb.freebsd.org/changeset/base/325062 > >=20 > > Log: > > Introduce caspermocks. > > =20 > > 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 a= dditional > > libraries. Unfortunately there are also some disadvantages for exampl= e it is > > easy to get library out of sync between two versions of functions or = that 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 = simplify > > capsicumizing programs. This also doesn't close us any other ways to = do those > > mocks and this should evolve in time. > > =20 > > Discussed with: pjd, emaste, ed, rwatson, bapt, cem, bdrewery > > Differential Revision: https://reviews.freebsd.org/D8753 >=20 > Again, after this commit libcasper.so.0 is installed to /usr/lib and not > /lib: >=20 > % ls -l /usr/lib/libcasper.so* > lrwxr-xr-x 1 root wheel 14 Oct 29 10:51 /usr/lib/libcasper.so -> li= bcasper.so.0 > -r--r--r-- 1 root wheel 22424 Oct 29 10:51 /usr/lib/libcasper.so.0 >=20 > But usr/lib/libcasper.so.0 is listed in ObsoleteFiles.inc: >=20 > % grep -B 2 libcasper.so /usr/src/ObsoleteFiles.inc > # 20131202: libcapsicum and libcasper moved to /lib/ > OLD_LIBS+=3Dusr/lib/libcapsicum.so.0 > OLD_LIBS+=3Dusr/lib/libcasper.so.0 Thank you for reporting. Should be fixed in the r325399. Thanks, --=20 Mariusz Zaborski oshogbo//vx | http://oshogbo.vexillium.org FreeBSD commiter | https://freebsd.org Software developer | http://wheelsystems.com If it's not broken, let's fix it till it is!!1 --envbJBWh7q8WU6mo Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEkD1x0xkJXVVY1Gwf38KEGuLGxWQFAln94tQACgkQ38KEGuLG xWSs/A//ZGbrkmrU587d+dUAK+EhSou3RHj/hjzK3VFnzuc5nwvRPeAqC+ghFjeR 85t5anB5LvLxyq33Utw9xiL4ymYtH3QjYK3Dw7DNXlr1ZO7cyqGqsS9lTB/abqby 4qFQZCZBrOdipFzeCg480azyn+vit7Wcbxj7pZgItIeaeUK0ipXWe02Q9pd0IrVy iQKNqWePiJcdDvmr9NUMY6Q+mvUGdzPXI5ooas+CiKAhU4RaJbrBbK+Wml9wv0mG gdrzTpGF6RPbtq6JH8hxqNU75NmpJkZSCVvzK5/UA9j9P7SfkF3PLuWGvVZFXNB0 vUrjFN7Ap0LEeG8GObsraXdXQRi1vKdSEulc5Su6csQI3zzAF5LvTLmu0qhkDG6C SopLn6JUOjkoh2fOK6MucMb3UuR4N28L2PZUunu8HdjHbFlxSrEAWcLhSq3NOTqK WUMroPedd6WjyeUJHn+AYwpeWBLl28fFlVomShR4eFEsOaX7LLyo1EuRf+ZMaJxg 6D655bxOIMbPP9BslLlr/1F4ayjCI37+cvOy/zVySqVkauKxCg2lIFi8L/17G3lA AAZ4aFp2Wd2jOz+ws4XEPfjIuFxhJc+26Z4Cw9MdDdMlc6JQ/0R8MJMfhMlE23hM IAuWU31Upkq2Zk1uDSLe7QiKeyDs7VF7TV/06r0bTWMR2nbCp1E= =mWfb -----END PGP SIGNATURE----- --envbJBWh7q8WU6mo-- From owner-svn-src-all@freebsd.org Sat Nov 4 16:03: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 27882E4EAAA; Sat, 4 Nov 2017 16:03:08 +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 E8CB173B50; Sat, 4 Nov 2017 16:03:07 +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 vA4G3747034798; Sat, 4 Nov 2017 16:03:07 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA4G37tf034797; Sat, 4 Nov 2017 16:03:07 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201711041603.vA4G37tf034797@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Sat, 4 Nov 2017 16:03:07 +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: r325401 - stable/11/sys/ufs/ffs X-SVN-Group: stable-11 X-SVN-Commit-Author: markj X-SVN-Commit-Paths: stable/11/sys/ufs/ffs X-SVN-Commit-Revision: 325401 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: Sat, 04 Nov 2017 16:03:08 -0000 Author: markj Date: Sat Nov 4 16:03:06 2017 New Revision: 325401 URL: https://svnweb.freebsd.org/changeset/base/325401 Log: MFC r325050: Remove workqueue items after updating the workqueue tail pointer. Modified: stable/11/sys/ufs/ffs/ffs_softdep.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/ufs/ffs/ffs_softdep.c ============================================================================== --- stable/11/sys/ufs/ffs/ffs_softdep.c Sat Nov 4 15:52:16 2017 (r325400) +++ stable/11/sys/ufs/ffs/ffs_softdep.c Sat Nov 4 16:03:06 2017 (r325401) @@ -1535,10 +1535,10 @@ remove_from_worklist(wk) struct ufsmount *ump; ump = VFSTOUFS(wk->wk_mp); - WORKLIST_REMOVE(wk); if (ump->softdep_worklist_tail == wk) ump->softdep_worklist_tail = (struct worklist *)wk->wk_list.le_prev; + WORKLIST_REMOVE(wk); ump->softdep_on_worklist -= 1; } @@ -1836,11 +1836,11 @@ process_worklist_item(mp, target, flags) wake_worklist(wk); add_to_worklist(wk, WK_HEAD); } - LIST_REMOVE(&sentinel, wk_list); /* Sentinal could've become the tail from remove_from_worklist. */ if (ump->softdep_worklist_tail == &sentinel) ump->softdep_worklist_tail = (struct worklist *)sentinel.wk_list.le_prev; + LIST_REMOVE(&sentinel, wk_list); PRELE(curproc); return (matchcnt); } @@ -2894,7 +2894,6 @@ remove_from_journal(wk) if (ump->softdep_journal_tail == wk) ump->softdep_journal_tail = (struct worklist *)wk->wk_list.le_prev; - WORKLIST_REMOVE(wk); ump->softdep_on_journal -= 1; } From owner-svn-src-all@freebsd.org Sat Nov 4 16:03:49 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 A2673E4EB5A; Sat, 4 Nov 2017 16:03:49 +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 6F07A73CCB; Sat, 4 Nov 2017 16:03:49 +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 vA4G3mwW034882; Sat, 4 Nov 2017 16:03:48 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA4G3mQn034881; Sat, 4 Nov 2017 16:03:48 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201711041603.vA4G3mQn034881@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Sat, 4 Nov 2017 16:03:48 +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: r325402 - stable/11/sys/ufs/ffs X-SVN-Group: stable-11 X-SVN-Commit-Author: markj X-SVN-Commit-Paths: stable/11/sys/ufs/ffs X-SVN-Commit-Revision: 325402 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: Sat, 04 Nov 2017 16:03:49 -0000 Author: markj Date: Sat Nov 4 16:03:48 2017 New Revision: 325402 URL: https://svnweb.freebsd.org/changeset/base/325402 Log: MFC r325051: Remove a stale and incorrect comment. Modified: stable/11/sys/ufs/ffs/ffs_softdep.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/ufs/ffs/ffs_softdep.c ============================================================================== --- stable/11/sys/ufs/ffs/ffs_softdep.c Sat Nov 4 16:03:06 2017 (r325401) +++ stable/11/sys/ufs/ffs/ffs_softdep.c Sat Nov 4 16:03:48 2017 (r325402) @@ -14119,11 +14119,7 @@ getdirtybuf(bp, lock, waitfor) BUF_UNLOCK(bp); if (waitfor != MNT_WAIT) return (NULL); - /* - * The lock argument must be bp->b_vp's mutex in - * this case. - */ -#ifdef DEBUG_VFS_LOCKS +#ifdef DEBUG_VFS_LOCKS if (bp->b_vp->v_type != VCHR) ASSERT_BO_WLOCKED(bp->b_bufobj); #endif From owner-svn-src-all@freebsd.org Sat Nov 4 16:23: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 A0216E4F3EF; Sat, 4 Nov 2017 16:23:35 +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 5E46C746D4; Sat, 4 Nov 2017 16:23:35 +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 vA4GNYWs042917; Sat, 4 Nov 2017 16:23:34 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA4GNYvK042916; Sat, 4 Nov 2017 16:23:34 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201711041623.vA4GNYvK042916@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Sat, 4 Nov 2017 16:23:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325403 - head/share/man/man9 X-SVN-Group: head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: head/share/man/man9 X-SVN-Commit-Revision: 325403 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: Sat, 04 Nov 2017 16:23:35 -0000 Author: trasz Date: Sat Nov 4 16:23:34 2017 New Revision: 325403 URL: https://svnweb.freebsd.org/changeset/base/325403 Log: Add missing MLINKS for disk_add_alias(9). MFC after: 2 weeks Modified: head/share/man/man9/Makefile Modified: head/share/man/man9/Makefile ============================================================================== --- head/share/man/man9/Makefile Sat Nov 4 16:03:48 2017 (r325402) +++ head/share/man/man9/Makefile Sat Nov 4 16:23:34 2017 (r325403) @@ -760,7 +760,8 @@ MLINKS+=devstat.9 devicestat.9 \ devstat.9 devstat_end_transaction.9 \ devstat.9 devstat_remove_entry.9 \ devstat.9 devstat_start_transaction.9 -MLINKS+=disk.9 disk_alloc.9 \ +MLINKS+=disk.9 disk_add_alias.9 \ + disk.9 disk_alloc.9 \ disk.9 disk_create.9 \ disk.9 disk_destroy.9 \ disk.9 disk_gone.9 \ From owner-svn-src-all@freebsd.org Sat Nov 4 16:31: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 23606E4F60F; Sat, 4 Nov 2017 16:31:33 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from mail108.syd.optusnet.com.au (mail108.syd.optusnet.com.au [211.29.132.59]) by mx1.freebsd.org (Postfix) with ESMTP id C1EC3749BF; Sat, 4 Nov 2017 16:31:32 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from [192.168.0.104] (c110-21-101-228.carlnfd1.nsw.optusnet.com.au [110.21.101.228]) by mail108.syd.optusnet.com.au (Postfix) with ESMTPS id D111C1A2A0C; Sun, 5 Nov 2017 03:06:22 +1100 (AEDT) Date: Sun, 5 Nov 2017 03:06:22 +1100 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: Konstantin Belousov cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r324853 - in head/sys: kern sys In-Reply-To: <201710220811.v9M8Bjw5033551@repo.freebsd.org> Message-ID: <20171105014453.L1354@besplex.bde.org> References: <201710220811.v9M8Bjw5033551@repo.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Optus-CM-Score: 0 X-Optus-CM-Analysis: v=2.2 cv=KeqiiUQD c=1 sm=1 tr=0 a=PalzARQSbocsUSjMRkwAPg==:117 a=PalzARQSbocsUSjMRkwAPg==:17 a=kj9zAlcOel0A:10 a=6I5d2MoRAAAA:8 a=lKMIsOS6TuGiZv9FiCMA:9 a=F4zhM82Inb1fZsfk:21 a=WCaNRuQxLweJ5Awa:21 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 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: Sat, 04 Nov 2017 16:31:33 -0000 On Sun, 22 Oct 2017, Konstantin Belousov wrote: > Author: kib > Date: Sun Oct 22 08:11:45 2017 > New Revision: 324853 > URL: https://svnweb.freebsd.org/changeset/base/324853 > > Log: > Remove the support for mknod(S_IFMT), which created dummy vnodes with > VBAD type. > > FFS ffs_write() VOP catches such vnodes and panics, other VOPs do not > check for the type and their behaviour is really undefined. The > comment claims that this support was done for 'badsect' to flag bad > sectors, we do not have such facility in kernel anyway. badsect(8) is a utility and this commit breaks it by removing its kernel support. The panic for ffs is a user error (not running fsck after badsect, or not following the directions for using badsect, or using the privileged mknod(S_IFMT) operation in an unsafe way). The bugs for other file systems are not having a badsect utility and not even disallowing creation of the vnodes to support badsect. 64-bit dev_t made badsect work better than ever. It worked as well as possible (not very well) with at least old badsect and old fsck. Its man page has much more bitrot than its code, mostly due to removal of other utilities: X BADSECT(8) FreeBSD System Manager's Manual BADSECT(8) X X NAME X badsect - create files to contain bad sectors X X SYNOPSIS X badsect bbdir sector ... X X DESCRIPTION X The badsect utility makes a file to contain a bad sector. Normally, bad Thus has bad grammar and some technical bugs. "makes a file to contain a bad sector" should be something like "makes file[s] containing the specified bad sector[s]. "containing" needs further descripton. The containers are fragments which usually consist of multiple sectors. X sectors are made inaccessible by the standard formatter, which provides a X forwarding table for bad sectors to the driver. If a driver supports the Actually, bad sectors are normally made inaccessible by replacing the drive. The "standard" formatter was removed. X bad blocking standard it is much preferable to use that method to isolate X bad blocks, since the bad block forwarding makes the pack appear perfect, X and such packs can then be copied with dd(1). The technique used by this The bad blocking standard was bad144. It was removed, so using it is impossible. X program is also less general than bad block forwarding, as badsect cannot X make amends for bad blocks in the i-list of file systems or in swap X areas. badsect is much more primitive than bad144, but was usable for disks with just a few bad sectors. X X On some disks, adding a sector which is suddenly bad to the bad sector X table currently requires the running of the standard DEC formatter. Thus The standard DEC formatter never existed in FreeBSD. X to deal with a newly bad block or on disks where the drivers do not X support the bad-blocking standard badsect may be used to good effect. X X The badsect utility is used on a quiet file system in the following way: The file system must be quiet else you will get panics before fsck can be run to fix the file system. X First mount the file system, and change to its root directory. Make a X directory BAD there. Run badsect giving as argument the BAD directory X followed by all the bad sectors you wish to add. (The sector numbers X must be relative to the beginning of the file system, but this is not X hard as the system reports relative sector numbers in its console error X messages.) Then change back to the root directory, unmount the file This is now hard. Non-broken drivers in old versions of FreeBSD used diskerr(9) to report errors in a uniform way. This was dumbed down and renamed disk_err() which is only called by aac, xen/blkfront, virtio/block and mfi. This only prints absolute block numbers in unclear units. GEOM would have to be involved to print relative sector numbers and partition names, but I don't know of any GEOM function for this. I think CAM prints absolute block numbers (after an error) in a verbose format that is less useful execpt for SCSI debugging. I used lm's filelocks or mckusick's prtblknos utility to find block numbers. Since I don't have any disks with bad sectors handy, I used good sectors. These utilities print the (relative) ffs fragment number. This must be multiplied by fs_frag (default 8) to get the sector number for badsect. X system and run fsck(8) on the file system. The bad sectors should show X up in two files or in the bad sector files and the free list. Have X fsck(8) remove files containing the offending bad sectors, but do not X have it remove the BAD/nnnnn files. This will leave the bad sectors in X only the BAD files. fsck must be run twice, at least now. X X The badsect utility works by giving the specified sector numbers in a X mknod(2) system call, creating an illegal file whose first block address X is the block containing bad sector and whose name is the bad sector X number. When it is discovered by fsck(8) it will ask "HOLD BAD BLOCK ?". X A positive response will cause fsck(8) to convert the inode to a regular X file containing the bad block. X X DIAGNOSTICS X The badsect utility refuses to attach a block that resides in a critical X area or is out of range of the file system. A warning is issued if the X block is already in use. X X SEE ALSO X fsck(8) X X HISTORY X The badsect utility appeared in 4.1BSD. X X BUGS X If more than one sector which comprise a file system fragment are bad, X you should specify only one of them to badsect, as the blocks in the bad X sector files actually cover all the sectors in a file system fragment. This is a fairly confusing way of saying that you must match up sectors with fragments. E.g., with 8 sectors per frag, round down the sector number to a multiple of 8 and tell badsect that. This gives a fragment of 8 sectors. Even good sectors in this fragment are marked as bad. Don't tell badsect about any other sectors in the fragment. Further BUGS: this man page hasn't been updated much since it first appeared. X X FreeBSD 12.0-CURRENT June 5, 1993 FreeBSD 12.0-CURRENT Better support for bad sectors would do things like automatically marking the bad sector files as nodump, nounlink and unreadable even by root. I think some suj sysctls can handle raw ffs blocks less hackishly, but there is no utility like badsect to use them for marking some blocks as bad. Bruce From owner-svn-src-all@freebsd.org Sat Nov 4 19:05: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 3E798E52FEB; Sat, 4 Nov 2017 19:05:04 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: from mail-io0-f176.google.com (mail-io0-f176.google.com [209.85.223.176]) (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 0FB707D3DA; Sat, 4 Nov 2017 19:05:03 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: by mail-io0-f176.google.com with SMTP id 189so11830223iow.10; Sat, 04 Nov 2017 12:05:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:reply-to:in-reply-to:references :from:date:message-id:subject:to:cc; bh=jKVfKPbSR1GMcvQI/lxnNxMAz7jnLrWNnIZljdWnso8=; b=cppAhAMZTVtOTo73SVJSD0Z42q+sNfcM92f8LQkLk2v6wQVJWPF9Wia48c+/n6upVB mdVUjz/A8rUTtRMX7Fd677w3vFj76OJS9jn0+o/Sc1+c9KohSxSsmSCrf/nGtcRFNwII vDcX90cDwA7lE1uOgXZKwGTN4Kh09TGAbRHmtBs50Hr5C16bgTMuo/f8flpkY3/KIp5l FFi83S6nfqQFJg/J8l94Gx8Y8k6PjdJnd2YcykuT+9mEqs7EGW9/R+pScP4k75E/+dXg L89H+MDiw1oq/DkHOhxzYfXBETiyzSnccNchf4l2ISe6xSXuLxT+zUnRP14oIRukFmOc R9qg== X-Gm-Message-State: AMCzsaU03uP3C4ovGzJXiWzV0uWDv4IhkIdhMBNZOjj+nL1+h2uBrsPh 4korbMC+DMPypWDAhtNAfFNM9Wdr X-Google-Smtp-Source: ABhQp+TmimRRbE9kFr2IbRo0ASH6vewzRM30tyKj9S1Tw/zWRF6YGSrAswnxtHDAu0gR9kLF0NsHYg== X-Received: by 10.107.101.20 with SMTP id z20mr14355335iob.85.1509822297573; Sat, 04 Nov 2017 12:04:57 -0700 (PDT) Received: from mail-io0-f173.google.com (mail-io0-f173.google.com. [209.85.223.173]) by smtp.gmail.com with ESMTPSA id z76sm4020170ioi.57.2017.11.04.12.04.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 04 Nov 2017 12:04:57 -0700 (PDT) Received: by mail-io0-f173.google.com with SMTP id d66so11882977ioe.5; Sat, 04 Nov 2017 12:04:57 -0700 (PDT) X-Received: by 10.107.158.75 with SMTP id h72mr14270322ioe.256.1509822297318; Sat, 04 Nov 2017 12:04:57 -0700 (PDT) MIME-Version: 1.0 Reply-To: cem@freebsd.org Received: by 10.2.164.130 with HTTP; Sat, 4 Nov 2017 12:04:56 -0700 (PDT) In-Reply-To: <201711041049.vA4AnZUE096709@repo.freebsd.org> References: <201711041049.vA4AnZUE096709@repo.freebsd.org> From: Conrad Meyer Date: Sat, 4 Nov 2017 12:04:56 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r325386 - head/sys/kern To: Konstantin Belousov Cc: src-committers , 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: Sat, 04 Nov 2017 19:05:04 -0000 This is a functional change, because MPASS (via KASSERT) is only enabled on DEBUG kernels. Ideally we would have a kind of ASSERT that worked on NODEBUG kernels. Best, Conrad On Sat, Nov 4, 2017 at 3:49 AM, Konstantin Belousov wrote: > Author: kib > Date: Sat Nov 4 10:49:34 2017 > New Revision: 325386 > URL: https://svnweb.freebsd.org/changeset/base/325386 > > Log: > Convert explicit panic() call to assert. > > Based on github pull request: #113 > Submitted by: pmarillo@github > MFC after: 1 week > > Modified: > head/sys/kern/kern_umtx.c > > Modified: head/sys/kern/kern_umtx.c > ============================================================================== > --- head/sys/kern/kern_umtx.c Sat Nov 4 10:10:34 2017 (r325385) > +++ head/sys/kern/kern_umtx.c Sat Nov 4 10:49:34 2017 (r325386) > @@ -1579,8 +1579,7 @@ umtx_pi_setowner(struct umtx_pi *pi, struct thread *ow > > uq_owner = owner->td_umtxq; > mtx_assert(&umtx_lock, MA_OWNED); > - if (pi->pi_owner != NULL) > - panic("pi_owner != NULL"); > + MPASS(pi->pi_owner == NULL); > pi->pi_owner = owner; > TAILQ_INSERT_TAIL(&uq_owner->uq_pi_contested, pi, pi_link); > } > From owner-svn-src-all@freebsd.org Sat Nov 4 21:02: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 28505E55B1A; Sat, 4 Nov 2017 21:02:28 +0000 (UTC) (envelope-from sjg@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 E680A8230C; Sat, 4 Nov 2017 21:02:27 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA4L2Rn5063979; Sat, 4 Nov 2017 21:02:27 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA4L2RuR063978; Sat, 4 Nov 2017 21:02:27 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201711042102.vA4L2RuR063978@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Sat, 4 Nov 2017 21:02:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325404 - head/share/mk X-SVN-Group: head X-SVN-Commit-Author: sjg X-SVN-Commit-Paths: head/share/mk X-SVN-Commit-Revision: 325404 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: Sat, 04 Nov 2017 21:02:28 -0000 Author: sjg Date: Sat Nov 4 21:02:26 2017 New Revision: 325404 URL: https://svnweb.freebsd.org/changeset/base/325404 Log: Ensure .OBJDIR has known value If for any reason we cannot set .OBJDIR==_objdir as desired use .CURDIR so that at least the classic .if ${.OBJDIR} != ${.CURDIR} works and dangerous misstakes can be avoided. Reviewed by: bdrewery Modified: head/share/mk/auto.obj.mk Modified: head/share/mk/auto.obj.mk ============================================================================== --- head/share/mk/auto.obj.mk Sat Nov 4 16:23:34 2017 (r325403) +++ head/share/mk/auto.obj.mk Sat Nov 4 21:02:26 2017 (r325404) @@ -61,11 +61,17 @@ __objdir_made != echo ${__objdir}/; umask ${OBJDIR_UMA .endif # This causes make to use the specified directory as .OBJDIR .OBJDIR: ${__objdir} -.if ${.OBJDIR:tA} != ${__objdir:tA} && ${__objdir_made:Uno:M${__objdir}/*} != "" +.if ${.OBJDIR:tA} != ${__objdir:tA} +# we did not get what we want - do we care? +.if ${__objdir_made:Uno:M${__objdir}/*} != "" # watch out for __objdir being relative path .if !(${__objdir:M/*} == "" && ${.OBJDIR:tA} == ${${.CURDIR}/${__objdir}:L:tA}) .error could not use ${__objdir}: .OBJDIR=${.OBJDIR} .endif +.endif +# apparently we can live with it +# make sure we know what we have +.OBJDIR: ${.CURDIR} .endif .endif .endif From owner-svn-src-all@freebsd.org Sat Nov 4 21:05: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 74332E55BDF; Sat, 4 Nov 2017 21:05: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 416B682475; Sat, 4 Nov 2017 21:05:04 +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 vA4L53OX065069; Sat, 4 Nov 2017 21:05:03 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA4L53it065068; Sat, 4 Nov 2017 21:05:03 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201711042105.vA4L53it065068@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sat, 4 Nov 2017 21:05:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325405 - head/share/mk X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/share/mk X-SVN-Commit-Revision: 325405 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: Sat, 04 Nov 2017 21:05:04 -0000 Author: bdrewery Date: Sat Nov 4 21:05:03 2017 New Revision: 325405 URL: https://svnweb.freebsd.org/changeset/base/325405 Log: Add an assertion to avoid the 'rm -rf /etc' case from cleanobj fixed in r325404. Sponsored by: Dell EMC Isilon Modified: head/share/mk/bsd.obj.mk Modified: head/share/mk/bsd.obj.mk ============================================================================== --- head/share/mk/bsd.obj.mk Sat Nov 4 21:02:26 2017 (r325404) +++ head/share/mk/bsd.obj.mk Sat Nov 4 21:05:03 2017 (r325405) @@ -84,6 +84,10 @@ OBJTOP?= ${MAKEOBJDIR} CANONICALOBJDIR:=/usr/obj${.CURDIR} .endif +.if ${CANONICALOBJDIR} == /${RELDIR} || ${.OBJDIR} == /${RELDIR} +.error .OBJDIR incorrectly set to /${RELDIR} +.endif + OBJTOP?= ${.OBJDIR:S,${.CURDIR},,}${SRCTOP} # From owner-svn-src-all@freebsd.org Sat Nov 4 21:06: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 E11E1E55CB3; Sat, 4 Nov 2017 21:06:40 +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 AEA16825EF; Sat, 4 Nov 2017 21:06: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 vA4L6dVj065295; Sat, 4 Nov 2017 21:06:39 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA4L6dZi065294; Sat, 4 Nov 2017 21:06:39 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201711042106.vA4L6dZi065294@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sat, 4 Nov 2017 21:06:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325406 - head/share/mk X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/share/mk X-SVN-Commit-Revision: 325406 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: Sat, 04 Nov 2017 21:06:41 -0000 Author: bdrewery Date: Sat Nov 4 21:06:39 2017 New Revision: 325406 URL: https://svnweb.freebsd.org/changeset/base/325406 Log: AUTO_OBJ: Revert r325351 now that the fix is in auto.obj.mk in r325404. Forcing MK_AUTO_OBJ to no is not really needed since bsd.obj.mk is protected against 'rm -rf ${.CURDIR}' already. It was also flawed as if MK_AUTO_OBJ=yes was in the .MAKEOVERRIDES already then it just remained on. Sponsored by: Dell EMC Isilon Modified: head/share/mk/sys.mk Modified: head/share/mk/sys.mk ============================================================================== --- head/share/mk/sys.mk Sat Nov 4 21:05:03 2017 (r325405) +++ head/share/mk/sys.mk Sat Nov 4 21:06:39 2017 (r325406) @@ -120,12 +120,6 @@ NO_META_IGNORE_HOST_HEADERS= 1 # is not expected. .if !make(showconfig) && !make(print-dir) .sinclude -# The .OBJDIR was not set, disable MK_AUTO_OBJ so downstream checks won't -# assume .OBJDIR is proper. -.if defined(__objdir) && ${.OBJDIR} != ${__objdir} -.MAKEOVERRIDES+= MK_AUTO_OBJ -MK_AUTO_OBJ= no -.endif .endif .endif # ${MK_AUTO_OBJ} == "yes" .else # bmake From owner-svn-src-all@freebsd.org Sat Nov 4 21:30: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 69351E566EC; Sat, 4 Nov 2017 21:30:28 +0000 (UTC) (envelope-from rmacklem@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 360498325C; Sat, 4 Nov 2017 21:30:28 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA4LUR4u073779; Sat, 4 Nov 2017 21:30:27 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA4LURpL073777; Sat, 4 Nov 2017 21:30:27 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201711042130.vA4LURpL073777@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Sat, 4 Nov 2017 21:30:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r325407 - stable/10/sys/fs/nfs X-SVN-Group: stable-10 X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: stable/10/sys/fs/nfs X-SVN-Commit-Revision: 325407 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: Sat, 04 Nov 2017 21:30:28 -0000 Author: rmacklem Date: Sat Nov 4 21:30:27 2017 New Revision: 325407 URL: https://svnweb.freebsd.org/changeset/base/325407 Log: MFC: r324506 Fix forced dismount when a pNFS mount is hung on a DS. When a "pnfs" NFSv4.1 mount is hung because of an unresponsive DS, a forced dismount wouldn't work, because the RPC socket for the DS was not being closed. This patch fixes this. This will only affect "pnfs" mounts where the pNFS server's DS is unresponsive (crashed or network partitioned or...). Found during testing of the pNFS server. Modified: stable/10/sys/fs/nfs/nfs_commonkrpc.c stable/10/sys/fs/nfs/nfsclstate.h Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/fs/nfs/nfs_commonkrpc.c ============================================================================== --- stable/10/sys/fs/nfs/nfs_commonkrpc.c Sat Nov 4 21:06:39 2017 (r325406) +++ stable/10/sys/fs/nfs/nfs_commonkrpc.c Sat Nov 4 21:30:27 2017 (r325407) @@ -1120,9 +1120,29 @@ nfsmout: int newnfs_nmcancelreqs(struct nfsmount *nmp) { + struct nfsclds *dsp; + struct __rpc_client *cl; if (nmp->nm_sockreq.nr_client != NULL) CLNT_CLOSE(nmp->nm_sockreq.nr_client); +lookformore: + NFSLOCKMNT(nmp); + TAILQ_FOREACH(dsp, &nmp->nm_sess, nfsclds_list) { + NFSLOCKDS(dsp); + if (dsp != TAILQ_FIRST(&nmp->nm_sess) && + (dsp->nfsclds_flags & NFSCLDS_CLOSED) == 0 && + dsp->nfsclds_sockp != NULL && + dsp->nfsclds_sockp->nr_client != NULL) { + dsp->nfsclds_flags |= NFSCLDS_CLOSED; + cl = dsp->nfsclds_sockp->nr_client; + NFSUNLOCKDS(dsp); + NFSUNLOCKMNT(nmp); + CLNT_CLOSE(cl); + goto lookformore; + } + NFSUNLOCKDS(dsp); + } + NFSUNLOCKMNT(nmp); return (0); } Modified: stable/10/sys/fs/nfs/nfsclstate.h ============================================================================== --- stable/10/sys/fs/nfs/nfsclstate.h Sat Nov 4 21:06:39 2017 (r325406) +++ stable/10/sys/fs/nfs/nfsclstate.h Sat Nov 4 21:30:27 2017 (r325407) @@ -91,6 +91,7 @@ struct nfsclds { #define NFSCLDS_HASWRITEVERF 0x0001 #define NFSCLDS_MDS 0x0002 #define NFSCLDS_DS 0x0004 +#define NFSCLDS_CLOSED 0x0008 struct nfsclclient { LIST_ENTRY(nfsclclient) nfsc_list; From owner-svn-src-all@freebsd.org Sat Nov 4 21:31: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 7C286E568BC; Sat, 4 Nov 2017 21:31:51 +0000 (UTC) (envelope-from ohartmann@walstatt.org) Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "mout.gmx.net", Issuer "TeleSec ServerPass DE-2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F2494834BE; Sat, 4 Nov 2017 21:31:50 +0000 (UTC) (envelope-from ohartmann@walstatt.org) Received: from thor.intern.walstatt.dynvpn.de ([78.55.49.122]) by mail.gmx.com (mrgmx001 [212.227.17.190]) with ESMTPSA (Nemesis) id 0M6BKc-1dDLk43ImA-00y8t1; Sat, 04 Nov 2017 22:31:42 +0100 Date: Sat, 4 Nov 2017 22:31:33 +0100 From: "O. Hartmann" To: "Simon J. Gerraty" Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r325404 - head/share/mk Message-ID: <20171104223133.00f5bf30@thor.intern.walstatt.dynvpn.de> In-Reply-To: <201711042102.vA4L2RuR063978@repo.freebsd.org> References: <201711042102.vA4L2RuR063978@repo.freebsd.org> Organization: WALSTATT User-Agent: OutScare 3.1415926 X-Operating-System: ImNotAnOperatingSystem 3.141592527 MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/6f_D8drIBDOSB0Ag2Uz5Aj3"; protocol="application/pgp-signature" X-Provags-ID: V03:K0:0OMuNYOv1ZhbLp7QpkKwJxXQrPlpJ5qCrgAtSnRxioDkxonio7Y Py1U73qQEwFEIoYSnuiJ+jlTE1XEAOXD6trRJNVBXBntBQrpqyvp5lAvwp1drdWhyqtmhP3 BlZ/NgP4L3MN0PL7tXzy3y2yi8+DHRagH5M4/LnHhGu5bvzpw2hL6BqhuYSzy09ad8Hq+TK +K89LaZB0BIpHN00StpPA== X-UI-Out-Filterresults: notjunk:1;V01:K0:N7roxwPhfWg=:PtBgcT8ghQDB+XVmDXwNxO zcCmxD2gF/HmRJMIStZjhPpjeCGh3xtV8LXDImZsTcva8QlYz8NNf67Ht+ynGwV7niHX0bgRc vAZTw/KT9TTnXIlYivLqGevVOcO4CU/706WbJUel7QDigpBEln0breTp/+Hrn74Cova18Rz7u xQnkK1+G/7a82CQl3/HyrFO3QgvP7EHCGa7HHSJlmMike4yQwcsoDhNOCIjwEkBUl72cskX3h TibcQ9jcnC/QpULX3M7vvF2FR1bZFeu23GDj9d/EfiCyuFqszDLFX52R7LuJgYjmbxfcC4whc QPAhaMe3NgaFNx6z7KFKkgbYQPMcP7FZ0J3wYE6b2sPWylGdedMwP0KYiYZvH81b1z/Pabnaw 1v4VJ0uzRFs2m+ZC3dnd4cVHlo2P3gYIFmQ5+2+KNbqieUfm40pdKsNXAYbtUqkRNze6bB5u7 mC933U5Kwus7A1jH2JtkHjxVfqzgZe50DWoDmFo6fBZpbEr6k+igdeQZVvzrjfgvzZRKWHcS5 nBT/0l1Mpc7RjXzW9wTrqrmvmPHqjxVkzbYbIHyvgyyAibv1qtV5H0bUz1CdhEmcpHJ5Flox0 Lv1Otg9ncTZRm7ZSewDs7P1jCQ13dE3BxS4+tLjmHQsJBg0sDevG/fMUenfefnMZdIQf3H2i0 gNqQu0enJsSRQyay49tFncNKxdjoSfIB8hv1uuGUzejYz2VXgO9f5BfOu+tvYxQwoORuAGzws Ymu4U/urFrweqhfJzaknRIF8Ttxa82g55KW/kQ7Rwn2+6M4pDU4wEkAXZg29jWeyI/X0O5Wjo UrwY0ncojPo61lF4xP67zTk92WWKA== 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: Sat, 04 Nov 2017 21:31:51 -0000 --Sig_/6f_D8drIBDOSB0Ag2Uz5Aj3 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Am Sat, 4 Nov 2017 21:02:27 +0000 (UTC) "Simon J. Gerraty" schrieb: > Author: sjg > Date: Sat Nov 4 21:02:26 2017 > New Revision: 325404 > URL: https://svnweb.freebsd.org/changeset/base/325404 >=20 > Log: > Ensure .OBJDIR has known value > =20 > If for any reason we cannot set .OBJDIR=3D=3D_objdir as desired > use .CURDIR so that at least the classic > .if ${.OBJDIR} !=3D ${.CURDIR} > works and dangerous misstakes can be avoided. > =20 > Reviewed by: bdrewery >=20 > Modified: > head/share/mk/auto.obj.mk >=20 > Modified: head/share/mk/auto.obj.mk > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=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/share/mk/auto.obj.mk Sat Nov 4 16:23:34 2017 (r325403) > +++ head/share/mk/auto.obj.mk Sat Nov 4 21:02:26 2017 (r325404) > @@ -61,11 +61,17 @@ __objdir_made !=3D echo ${__objdir}/; umask ${OBJDIR_= UMA > .endif > # This causes make to use the specified directory as .OBJDIR > .OBJDIR: ${__objdir} > -.if ${.OBJDIR:tA} !=3D ${__objdir:tA} && ${__objdir_made:Uno:M${__objdir= }/*} !=3D "" > +.if ${.OBJDIR:tA} !=3D ${__objdir:tA} > +# we did not get what we want - do we care? > +.if ${__objdir_made:Uno:M${__objdir}/*} !=3D "" > # watch out for __objdir being relative path > .if !(${__objdir:M/*} =3D=3D "" && ${.OBJDIR:tA} =3D=3D ${${.CURDIR}/${_= _objdir}:L:tA}) > .error could not use ${__objdir}: .OBJDIR=3D${.OBJDIR} > .endif > +.endif > +# apparently we can live with it > +# make sure we know what we have > +.OBJDIR: ${.CURDIR} > .endif > .endif > .endif > _______________________________________________ > svn-src-head@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org" With the recent patches, nvidia driver x11/nvidia-driver fails tobuild with= the error shown below: [...] =3D=3D=3D> src/nvidia (all) make[7]: "/usr/src/share/mk/bsd.obj.mk" line 87: Malformed conditional (${CANONICALOBJDIR} =3D=3D /${RELDIR} || ${.OBJDIR} =3D=3D /${RELDIR}) make= [7]: Fatal errors encountered -- cannot continue [...] --=20 O. Hartmann Ich widerspreche der Nutzung oder =C3=9Cbermittlung meiner Daten f=C3=BCr Werbezwecke oder f=C3=BCr die Markt- oder Meinungsforschung (=C2=A7 28 Abs.= 4 BDSG). --Sig_/6f_D8drIBDOSB0Ag2Uz5Aj3 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iLUEARMKAB0WIQQZVZMzAtwC2T/86TrS528fyFhYlAUCWf4xtgAKCRDS528fyFhY lPnyAf9i3azMTgv+TNIvOWqeTR8BGaV4bTbFTcEuxAny/u5QKb8pt60l0KvZ4199 awsQ/1RNYlzShMXP3aEOlVzGVWwKAf9gRR0I5s92drJ46UkUBrwMTL7UBgRb+sac LglcJR5D9lu95ihBRqcpqLPQ5z6e4RyFFsgAOO1AnXWpswjsPH6Z =Kf6V -----END PGP SIGNATURE----- --Sig_/6f_D8drIBDOSB0Ag2Uz5Aj3-- From owner-svn-src-all@freebsd.org Sat Nov 4 21:36: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 81ADFE56A60; Sat, 4 Nov 2017 21:36:54 +0000 (UTC) (envelope-from ohartmann@walstatt.org) Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "mout.gmx.net", Issuer "TeleSec ServerPass DE-2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0386A838CF; Sat, 4 Nov 2017 21:36:53 +0000 (UTC) (envelope-from ohartmann@walstatt.org) Received: from thor.intern.walstatt.dynvpn.de ([78.55.49.122]) by mail.gmx.com (mrgmx001 [212.227.17.190]) with ESMTPSA (Nemesis) id 0M3zT0-1dJxEf3CyY-00rWwa; Sat, 04 Nov 2017 22:36:51 +0100 Date: Sat, 4 Nov 2017 22:36:50 +0100 From: "O. Hartmann" To: "Simon J. Gerraty" Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r325404 - head/share/mk Message-ID: <20171104223650.77c06a52@thor.intern.walstatt.dynvpn.de> In-Reply-To: <20171104223133.00f5bf30@thor.intern.walstatt.dynvpn.de> References: <201711042102.vA4L2RuR063978@repo.freebsd.org> <20171104223133.00f5bf30@thor.intern.walstatt.dynvpn.de> Organization: WALSTATT User-Agent: OutScare 3.1415926 X-Operating-System: ImNotAnOperatingSystem 3.141592527 MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/3pjL4/IA1beH7BBzBb7hg_4"; protocol="application/pgp-signature" X-Provags-ID: V03:K0:gmzkXIeDkIVXfPCxBkE2DEUQXFn/+9GxOq0t7kMiPGrY+BUuW1e X9p0PfSO33VQWEEzDElrY4Owy39Hb3BUdlsLjIZJvPkK803zIX1N4CNjtZE5iX07L+gvr25 FQhWYZsN9YYQEJik+SS9pENn2zpDL+bjblmJ2lnwIsTRsJESyoQxTcnQns/byE5RcgUz/pq 5h5XQ74bgOpUrbTlpooww== X-UI-Out-Filterresults: notjunk:1;V01:K0:o8KAqtHzn3I=:wJjx9hNWZzR3dia/09uiPL qOTbD70OJvmfQkva3KaO6MDjMTJnVuJQNPEhnn1dpxItPcJfUEt7JboNNR/KGt5S0ET8unWTs L/CXW7woO+Eh30HdDeObBD7502ooUjGwjUo3V0CSGB6pDltCMyMYUCeY0jQZ6p0sFGNBeTg9a eohDOMdFW6XRw00RgpekvmVjJiNJLLIWZViUP0cGn7ABURH7Ho8n1XJr3XmDWzqQ7VLeJ3Erf oB40YVgkb7D/fNhz5i7hKKhII34/IXk4EaFAnCvof9CosQwtwjrfZ/eWqUYWKSUGlPA7B9x12 XjAb+lxUhZJPpefrSuSR2lrmlVVucj11aTB3/mzv5j6NNQL1T6GrBBHUbd75jeMI3M5Ib+AZY lzmGVwE0cbVs20y5C71n9WsNbZ8XQV8Fq4bZLQ8h3KOBcO1kfZequZgFZPyyoheGvp+ULiQsH //oXPLHDJEzVEsekpWPlC5u/RqBvM+/LhERQWRoNG9Bux4kPYaqQmQudmWOfVw1Lx1EEY9TJG Sk00GGbYQcM01rix649rkOGXDjn+HpnHYqmTdP+Ge6FSqCPuE8lWv3eNAM63pVTtKoR7Tkqiq iArqwzujcBM8fB+ecrfI0X2KrXwbBqTr2va6ySiSt9ZfSptnIGI0fKwctY1MSFvWDt0Tyzxyw kyOToWhpxkheffwNfBoZsdg3OgexbgFYKO6X6O0fo21iqW2dcUedvvTxX0MPAvoihJ9GwoWcf 5c6DWALU8WXTw/gX2h75kKlptZXPW4P/rjXi1tfAo2o5TGjFf8u5KnqFzQXNKE2xQty2UlVPZ 3w3FIodNjG7PZwwADTUdy/UX5Z+ug== 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: Sat, 04 Nov 2017 21:36:54 -0000 --Sig_/3pjL4/IA1beH7BBzBb7hg_4 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Am Sat, 4 Nov 2017 22:31:33 +0100 "O. Hartmann" schrieb: > Am Sat, 4 Nov 2017 21:02:27 +0000 (UTC) > "Simon J. Gerraty" schrieb: >=20 > > Author: sjg > > Date: Sat Nov 4 21:02:26 2017 > > New Revision: 325404 > > URL: https://svnweb.freebsd.org/changeset/base/325404 > >=20 > > Log: > > Ensure .OBJDIR has known value > > =20 > > If for any reason we cannot set .OBJDIR=3D=3D_objdir as desired > > use .CURDIR so that at least the classic > > .if ${.OBJDIR} !=3D ${.CURDIR} > > works and dangerous misstakes can be avoided. > > =20 > > Reviewed by: bdrewery > >=20 > > Modified: > > head/share/mk/auto.obj.mk > >=20 > > Modified: head/share/mk/auto.obj.mk > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=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/share/mk/auto.obj.mk Sat Nov 4 16:23:34 2017 (r325403) > > +++ head/share/mk/auto.obj.mk Sat Nov 4 21:02:26 2017 (r325404) > > @@ -61,11 +61,17 @@ __objdir_made !=3D echo ${__objdir}/; umask ${OBJDI= R_UMA > > .endif > > # This causes make to use the specified directory as .OBJDIR > > .OBJDIR: ${__objdir} > > -.if ${.OBJDIR:tA} !=3D ${__objdir:tA} && ${__objdir_made:Uno:M${__objd= ir}/*} !=3D "" > > +.if ${.OBJDIR:tA} !=3D ${__objdir:tA} > > +# we did not get what we want - do we care? > > +.if ${__objdir_made:Uno:M${__objdir}/*} !=3D "" > > # watch out for __objdir being relative path > > .if !(${__objdir:M/*} =3D=3D "" && ${.OBJDIR:tA} =3D=3D ${${.CURDIR}/$= {__objdir}:L:tA}) > > .error could not use ${__objdir}: .OBJDIR=3D${.OBJDIR} > > .endif > > +.endif > > +# apparently we can live with it > > +# make sure we know what we have > > +.OBJDIR: ${.CURDIR} > > .endif > > .endif > > .endif > > _______________________________________________ > > svn-src-head@freebsd.org mailing list > > https://lists.freebsd.org/mailman/listinfo/svn-src-head > > To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org"= =20 >=20 > With the recent patches, nvidia driver x11/nvidia-driver fails tobuild wi= th the error > shown below: >=20 > [...] > =3D=3D=3D> src/nvidia (all) =20 > make[7]: "/usr/src/share/mk/bsd.obj.mk" line 87: Malformed conditional > (${CANONICALOBJDIR} =3D=3D /${RELDIR} || ${.OBJDIR} =3D=3D /${RELDIR}) ma= ke[7]: Fatal errors > encountered -- cannot continue > [...] The very same with emulators/virtualbox-ose-kmod: [...] kBuild: Installing /usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/virtua= lbox-ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/src/vboxd= rv/Makefile =3D=3D=3D Building 'vboxdrv' module =3D=3D=3D make[6]: "/usr/src/share/mk/b= sd.obj.mk" line 87: Malformed conditional (${CANONICALOBJDIR} =3D=3D /${RELDIR} || ${.OBJDIR} = =3D=3D /${RELDIR}) make[6]: Fatal errors encountered -- cannot continue make[6]: stopped in /usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/virtualbox-ose= -kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/src/vboxdrv *** Error code 1 Stop. make[5]: stopped in /usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/virtualbox-ose= -kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/src =3D=3D=3D> Compilation failed unexpectedly. Try to set MAKE_JOBS_UNSAFE=3Dy= es and rebuild before reporting the failure to the maintainer. *** Error code 1 --=20 O. Hartmann Ich widerspreche der Nutzung oder =C3=9Cbermittlung meiner Daten f=C3=BCr Werbezwecke oder f=C3=BCr die Markt- oder Meinungsforschung (=C2=A7 28 Abs.= 4 BDSG). --Sig_/3pjL4/IA1beH7BBzBb7hg_4 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iLUEARMKAB0WIQQZVZMzAtwC2T/86TrS528fyFhYlAUCWf4y8gAKCRDS528fyFhY lLGxAfoDW2AwO61tZvPO+e/qBVKlKs/i/99jQtDP47nadpPKsNv20491sQtB4LEQ HCdfTiegkdQeuhbNm2cSnml8an2yAgCZwJAh/KHvM820fBzUcVJNjfJDq/cOmwI5 CtU+FppDWWZdf1fa8b+xn7nQGFqZK4FyggYmYM7kDLkiUXQS7N9K =gThS -----END PGP SIGNATURE----- --Sig_/3pjL4/IA1beH7BBzBb7hg_4-- From owner-svn-src-all@freebsd.org Sat Nov 4 21:59: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 A2808E574A2; Sat, 4 Nov 2017 21:59:55 +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 7014E843CC; Sat, 4 Nov 2017 21:59:55 +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 vA4Lxsch086464; Sat, 4 Nov 2017 21:59:54 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA4LxsSt086463; Sat, 4 Nov 2017 21:59:54 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201711042159.vA4LxsSt086463@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sat, 4 Nov 2017 21:59:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325408 - head/share/mk X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/share/mk X-SVN-Commit-Revision: 325408 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: Sat, 04 Nov 2017 21:59:55 -0000 Author: bdrewery Date: Sat Nov 4 21:59:54 2017 New Revision: 325408 URL: https://svnweb.freebsd.org/changeset/base/325408 Log: Follow-up r325405: Only enable assertion for in-tree src builds. Pointyhat to: bdrewery Reported by: O. Hartmann Sponsored by: Dell EMC Isilon Modified: head/share/mk/bsd.obj.mk Modified: head/share/mk/bsd.obj.mk ============================================================================== --- head/share/mk/bsd.obj.mk Sat Nov 4 21:30:27 2017 (r325407) +++ head/share/mk/bsd.obj.mk Sat Nov 4 21:59:54 2017 (r325408) @@ -84,7 +84,8 @@ OBJTOP?= ${MAKEOBJDIR} CANONICALOBJDIR:=/usr/obj${.CURDIR} .endif -.if ${CANONICALOBJDIR} == /${RELDIR} || ${.OBJDIR} == /${RELDIR} +.if defined(SRCTOP) && \ + (${CANONICALOBJDIR} == /${RELDIR} || ${.OBJDIR} == /${RELDIR}) .error .OBJDIR incorrectly set to /${RELDIR} .endif From owner-svn-src-all@freebsd.org Sat Nov 4 22:00: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 3B0E8E57532; Sat, 4 Nov 2017 22:00:35 +0000 (UTC) (envelope-from bdrewery@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 0923084520; Sat, 4 Nov 2017 22:00:35 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (unknown [127.0.1.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id F258B135FF; Sat, 4 Nov 2017 22:00:33 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id C47AB8DEA; Sat, 4 Nov 2017 22:00:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id UGZz_y7WqyMr; Sat, 4 Nov 2017 22:00:29 +0000 (UTC) Subject: Re: svn commit: r325404 - head/share/mk DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com 559408DE5 To: "O. Hartmann" , "Simon J. Gerraty" Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org References: <201711042102.vA4L2RuR063978@repo.freebsd.org> <20171104223133.00f5bf30@thor.intern.walstatt.dynvpn.de> <20171104223650.77c06a52@thor.intern.walstatt.dynvpn.de> From: Bryan Drewery Openpgp: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Organization: FreeBSD Message-ID: <0fc7e918-dcf8-0197-6b50-5936dee23d87@FreeBSD.org> Date: Sat, 4 Nov 2017 15:00:14 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <20171104223650.77c06a52@thor.intern.walstatt.dynvpn.de> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="dokLDw6wDnv1gUfKm3uwMSMnWeibN2RaD" 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: Sat, 04 Nov 2017 22:00:35 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --dokLDw6wDnv1gUfKm3uwMSMnWeibN2RaD Content-Type: multipart/mixed; boundary="MKHGkKGfLlBFL1Vl1W5AEj2BccB14C28h"; protected-headers="v1" From: Bryan Drewery To: "O. Hartmann" , "Simon J. Gerraty" Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Message-ID: <0fc7e918-dcf8-0197-6b50-5936dee23d87@FreeBSD.org> Subject: Re: svn commit: r325404 - head/share/mk References: <201711042102.vA4L2RuR063978@repo.freebsd.org> <20171104223133.00f5bf30@thor.intern.walstatt.dynvpn.de> <20171104223650.77c06a52@thor.intern.walstatt.dynvpn.de> In-Reply-To: <20171104223650.77c06a52@thor.intern.walstatt.dynvpn.de> --MKHGkKGfLlBFL1Vl1W5AEj2BccB14C28h Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 11/4/2017 2:36 PM, O. Hartmann wrote: > Am Sat, 4 Nov 2017 22:31:33 +0100 > "O. Hartmann" schrieb: >=20 >> Am Sat, 4 Nov 2017 21:02:27 +0000 (UTC) >> "Simon J. Gerraty" schrieb: >> >>> Author: sjg >>> Date: Sat Nov 4 21:02:26 2017 >>> New Revision: 325404 >>> URL: https://svnweb.freebsd.org/changeset/base/325404 >>> >>> Log: >>> Ensure .OBJDIR has known value >>> =20 >>> If for any reason we cannot set .OBJDIR=3D=3D_objdir as desired >>> use .CURDIR so that at least the classic >>> .if ${.OBJDIR} !=3D ${.CURDIR} >>> works and dangerous misstakes can be avoided. >>> =20 >>> Reviewed by: bdrewery >>> >>> Modified: >>> head/share/mk/auto.obj.mk >>> >>> Modified: head/share/mk/auto.obj.mk >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=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/share/mk/auto.obj.mk Sat Nov 4 16:23:34 2017 (r325403) >>> +++ head/share/mk/auto.obj.mk Sat Nov 4 21:02:26 2017 (r325404) >>> @@ -61,11 +61,17 @@ __objdir_made !=3D echo ${__objdir}/; umask ${OBJ= DIR_UMA >>> .endif >>> # This causes make to use the specified directory as .OBJDIR >>> .OBJDIR: ${__objdir} >>> -.if ${.OBJDIR:tA} !=3D ${__objdir:tA} && ${__objdir_made:Uno:M${__ob= jdir}/*} !=3D "" >>> +.if ${.OBJDIR:tA} !=3D ${__objdir:tA} >>> +# we did not get what we want - do we care? >>> +.if ${__objdir_made:Uno:M${__objdir}/*} !=3D "" >>> # watch out for __objdir being relative path >>> .if !(${__objdir:M/*} =3D=3D "" && ${.OBJDIR:tA} =3D=3D ${${.CURDIR}= /${__objdir}:L:tA}) >>> .error could not use ${__objdir}: .OBJDIR=3D${.OBJDIR} >>> .endif >>> +.endif >>> +# apparently we can live with it >>> +# make sure we know what we have >>> +.OBJDIR: ${.CURDIR} >>> .endif >>> .endif >>> .endif >>> _______________________________________________ >>> svn-src-head@freebsd.org mailing list >>> https://lists.freebsd.org/mailman/listinfo/svn-src-head >>> To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.or= g" =20 >> >> With the recent patches, nvidia driver x11/nvidia-driver fails tobuild= with the error >> shown below: >> >> [...] >> =3D=3D=3D> src/nvidia (all) =20 >> make[7]: "/usr/src/share/mk/bsd.obj.mk" line 87: Malformed conditional= >> (${CANONICALOBJDIR} =3D=3D /${RELDIR} || ${.OBJDIR} =3D=3D /${RELDIR})= make[7]: Fatal errors >> encountered -- cannot continue >> [...] >=20 > The very same with emulators/virtualbox-ose-kmod: >=20 > [...] > kBuild: > Installing /usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/vi= rtualbox-ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/src= /vboxdrv/Makefile > =3D=3D=3D Building 'vboxdrv' module =3D=3D=3D make[6]: "/usr/src/share/= mk/bsd.obj.mk" line 87: > Malformed conditional (${CANONICALOBJDIR} =3D=3D /${RELDIR} || ${.OBJDI= R} =3D=3D /${RELDIR}) > make[6]: Fatal errors encountered -- cannot continue make[6]: stopped > in /usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/virtualbox= -ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/src/vboxdrv= > *** Error code 1 >=20 > Stop. > make[5]: stopped > in /usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/virtualbox= -ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/src > =3D=3D=3D> Compilation failed unexpectedly. Try to set MAKE_JOBS_UNSAFE= =3Dyes and rebuild before > reporting the failure to the maintainer. > *** Error code 1 >=20 >=20 It was r325405 ... fixed in r325408. --=20 Regards, Bryan Drewery --MKHGkKGfLlBFL1Vl1W5AEj2BccB14C28h-- --dokLDw6wDnv1gUfKm3uwMSMnWeibN2RaD Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJZ/jhvAAoJEDXXcbtuRpfPU6QIANSqTOm9xtkjvuLCBvLIBVWx OxMamlugNVx2BVpIQ/J0FDiJgsipT3qICQ77gYDa182nvmbswW7bBUp+R+nhPZbT PSlb+Ve9d5YfOVTsptWP3+pPu1RVUvjNBT6rxh/xf4ex5vfVx3C4K8JKO0bLol1d rFlGHrUWML+HkAmsXQlTBawVI3LE890+qF64icJu2mm1rnLDIDFYztUvgZrtHJCJ iu9V0QsGBI64Lm+3YsDckJnQTCR6lq6ejKXFyg6QoM1g76a0qjzCN5337sTg/Z7H o4xW354rIBY5zP87nkz6S5NlByaWLH2AC14ysa1TQtSuEkFBfVT2Jj2S6J1uUMg= =yS5e -----END PGP SIGNATURE----- --dokLDw6wDnv1gUfKm3uwMSMnWeibN2RaD-- From owner-svn-src-all@freebsd.org Sat Nov 4 22:23: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 C5BCBE57D20; Sat, 4 Nov 2017 22:23:42 +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 9292A39C; Sat, 4 Nov 2017 22:23:42 +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 vA4MNfxi098720; Sat, 4 Nov 2017 22:23:41 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA4MNfv9098719; Sat, 4 Nov 2017 22:23:41 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201711042223.vA4MNfv9098719@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sat, 4 Nov 2017 22:23:41 +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: r325409 - stable/11/libexec/rtld-elf X-SVN-Group: stable-11 X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: stable/11/libexec/rtld-elf X-SVN-Commit-Revision: 325409 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: Sat, 04 Nov 2017 22:23:42 -0000 Author: bdrewery Date: Sat Nov 4 22:23:41 2017 New Revision: 325409 URL: https://svnweb.freebsd.org/changeset/base/325409 Log: MFC r318432: Fix some nroff syntax in rtld.1. PR: 223420 Modified: stable/11/libexec/rtld-elf/rtld.1 Directory Properties: stable/11/ (props changed) Modified: stable/11/libexec/rtld-elf/rtld.1 ============================================================================== --- stable/11/libexec/rtld-elf/rtld.1 Sat Nov 4 21:59:54 2017 (r325408) +++ stable/11/libexec/rtld-elf/rtld.1 Sat Nov 4 22:23:41 2017 (r325409) @@ -193,7 +193,7 @@ the directories specified by will be searched first followed by the set of built-in standard directories. This variable is unset for set-user-ID and set-group-ID programs. -.Ev LD_LIBRARY_PATH_FDS +.It Ev LD_LIBRARY_PATH_FDS A colon separated list of file descriptor numbers for library directories. This is intended for use within .Xr capsicum 4 From owner-svn-src-all@freebsd.org Sat Nov 4 22:30: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 73EBAE57F69; Sat, 4 Nov 2017 22:30:48 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from smtp-out-no.shaw.ca (smtp-out-no.shaw.ca [64.59.134.9]) (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 1E29A94A; Sat, 4 Nov 2017 22:30:47 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from spqr.komquats.com ([96.50.22.10]) by shaw.ca with SMTP id B6xge8OEuI8mCB6xheNCEs; Sat, 04 Nov 2017 16:30:46 -0600 X-Authority-Analysis: v=2.2 cv=HahkdmM8 c=1 sm=1 tr=0 a=jvE2nwUzI0ECrNeyr98KWA==:117 a=jvE2nwUzI0ECrNeyr98KWA==:17 a=kj9zAlcOel0A:10 a=xqWC_Br6kY4A:10 a=sC3jslCIGhcA:10 a=6I5d2MoRAAAA:8 a=iaTFZB6CAAAA:8 a=YxBL1-UpAAAA:8 a=7ESa97CNvrHrRBSPpZkA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=QWXrQ9iV8q7LKaLQ9lfw:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTPS id BB99EFEC; Sat, 4 Nov 2017 15:30:43 -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 vA4MUhjw014138; Sat, 4 Nov 2017 15:30:43 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <201711042230.vA4MUhjw014138@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: Bryan Drewery cc: "O. Hartmann" , "Simon J. Gerraty" , svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r325404 - head/share/mk In-Reply-To: Message from Bryan Drewery of "Sat, 04 Nov 2017 15:00:14 -0700." <0fc7e918-dcf8-0197-6b50-5936dee23d87@FreeBSD.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Sat, 04 Nov 2017 15:30:43 -0700 X-CMAE-Envelope: MS4wfFgU+xhC/yXLNVIDReByoCXfRIg1zGIyTB4fdk771mWYbe1DvDHLxuc4i5M89PSvHDI0dU1iFx2VjOxUsWYnMrDrxMNDasPQgKHbPKRoCJiTGMAp5JfC xRiV5HavXWwJW3SUcXmvOV6fxFruNNtLj09CdqBAjH3FIj3Z0QFq2SDczpxCm1MkmnKQL1sgDUpHVKEkPoWU+Q/NnHt6EfgpTLWbeSj5zvnDXGkbPRmwZ8d1 hyssh6G4/0kr4Zc71fFBOrQmONyJrsBRcix0i7viu7ixnKT88GnMRMEesnjLDZMlChy4jO8Au3iqbcGL9wQrPRtHSMLPnTjFVCfCHrIBgzWLI0wCb7MrCn9S wgE+fekR 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: Sat, 04 Nov 2017 22:30:48 -0000 In message <0fc7e918-dcf8-0197-6b50-5936dee23d87@FreeBSD.org>, Bryan Drewery wr ites: > This is an OpenPGP/MIME signed message (RFC 4880 and 3156) > --dokLDw6wDnv1gUfKm3uwMSMnWeibN2RaD > Content-Type: multipart/mixed; boundary="MKHGkKGfLlBFL1Vl1W5AEj2BccB14C28h"; > protected-headers="v1" > From: Bryan Drewery > To: "O. Hartmann" , "Simon J. Gerraty" > > Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, > src-committers@freebsd.org > Message-ID: <0fc7e918-dcf8-0197-6b50-5936dee23d87@FreeBSD.org> > Subject: Re: svn commit: r325404 - head/share/mk > References: <201711042102.vA4L2RuR063978@repo.freebsd.org> > <20171104223133.00f5bf30@thor.intern.walstatt.dynvpn.de> > <20171104223650.77c06a52@thor.intern.walstatt.dynvpn.de> > In-Reply-To: <20171104223650.77c06a52@thor.intern.walstatt.dynvpn.de> > > --MKHGkKGfLlBFL1Vl1W5AEj2BccB14C28h > Content-Type: text/plain; charset=utf-8 > Content-Language: en-US > Content-Transfer-Encoding: quoted-printable > > On 11/4/2017 2:36 PM, O. Hartmann wrote: > > Am Sat, 4 Nov 2017 22:31:33 +0100 > > "O. Hartmann" schrieb: > >=20 > >> Am Sat, 4 Nov 2017 21:02:27 +0000 (UTC) > >> "Simon J. Gerraty" schrieb: > >> > >>> Author: sjg > >>> Date: Sat Nov 4 21:02:26 2017 > >>> New Revision: 325404 > >>> URL: https://svnweb.freebsd.org/changeset/base/325404 > >>> > >>> Log: > >>> Ensure .OBJDIR has known value > >>> =20 > >>> If for any reason we cannot set .OBJDIR=3D=3D_objdir as desired > >>> use .CURDIR so that at least the classic > >>> .if ${.OBJDIR} !=3D ${.CURDIR} > >>> works and dangerous misstakes can be avoided. > >>> =20 > >>> Reviewed by: bdrewery > >>> > >>> Modified: > >>> head/share/mk/auto.obj.mk > >>> > >>> Modified: head/share/mk/auto.obj.mk > >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= > =3D=3D=3D=3D=3D=3D=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/share/mk/auto.obj.mk Sat Nov 4 16:23:34 2017 (r32540 > 3) > >>> +++ head/share/mk/auto.obj.mk Sat Nov 4 21:02:26 2017 (r32540 > 4) > >>> @@ -61,11 +61,17 @@ __objdir_made !=3D echo ${__objdir}/; umask ${OBJ= > DIR_UMA > >>> .endif > >>> # This causes make to use the specified directory as .OBJDIR > >>> .OBJDIR: ${__objdir} > >>> -.if ${.OBJDIR:tA} !=3D ${__objdir:tA} && ${__objdir_made:Uno:M${__ob= > jdir}/*} !=3D "" > >>> +.if ${.OBJDIR:tA} !=3D ${__objdir:tA} > >>> +# we did not get what we want - do we care? > >>> +.if ${__objdir_made:Uno:M${__objdir}/*} !=3D "" > >>> # watch out for __objdir being relative path > >>> .if !(${__objdir:M/*} =3D=3D "" && ${.OBJDIR:tA} =3D=3D ${${.CURDIR}= > /${__objdir}:L:tA}) > >>> .error could not use ${__objdir}: .OBJDIR=3D${.OBJDIR} > >>> .endif > >>> +.endif > >>> +# apparently we can live with it > >>> +# make sure we know what we have > >>> +.OBJDIR: ${.CURDIR} > >>> .endif > >>> .endif > >>> .endif > >>> _______________________________________________ > >>> svn-src-head@freebsd.org mailing list > >>> https://lists.freebsd.org/mailman/listinfo/svn-src-head > >>> To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.or= > g" =20 > >> > >> With the recent patches, nvidia driver x11/nvidia-driver fails tobuild= > with the error > >> shown below: > >> > >> [...] > >> =3D=3D=3D> src/nvidia (all) =20 > >> make[7]: "/usr/src/share/mk/bsd.obj.mk" line 87: Malformed conditional= > > >> (${CANONICALOBJDIR} =3D=3D /${RELDIR} || ${.OBJDIR} =3D=3D /${RELDIR})= > make[7]: Fatal errors > >> encountered -- cannot continue > >> [...] > >=20 > > The very same with emulators/virtualbox-ose-kmod: > >=20 > > [...] > > kBuild: > > Installing /usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/vi= > rtualbox-ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/src= > /vboxdrv/Makefile > > =3D=3D=3D Building 'vboxdrv' module =3D=3D=3D make[6]: "/usr/src/share/= > mk/bsd.obj.mk" line 87: > > Malformed conditional (${CANONICALOBJDIR} =3D=3D /${RELDIR} || ${.OBJDI= > R} =3D=3D /${RELDIR}) > > make[6]: Fatal errors encountered -- cannot continue make[6]: stopped > > in /usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/virtualbox= > -ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/src/vboxdrv= > > > *** Error code 1 > >=20 > > Stop. > > make[5]: stopped > > in /usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/virtualbox= > -ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/src > > =3D=3D=3D> Compilation failed unexpectedly. Try to set MAKE_JOBS_UNSAFE= > =3Dyes and rebuild before > > reporting the failure to the maintainer. > > *** Error code 1 > >=20 > >=20 > > It was r325405 ... fixed in r325408. Not really, mergemaster output. *** Creating the temporary root environment in /tmp/temproot *** /tmp/temproot ready for use *** Creating and populating directory structure in /tmp/temproot make[3]: "/opt/src/svn-current/share/mk/bsd.obj.mk" line 89: .OBJDIR incorrectly set to /etc/autofs *** FATAL ERROR: Cannot 'cd' to /opt/src/svn-current and install files to the temproot environment -- 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 Sat Nov 4 23:28:03 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 D74B7E59838; Sat, 4 Nov 2017 23:28:03 +0000 (UTC) (envelope-from gonzo@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 A490736D0; Sat, 4 Nov 2017 23:28:03 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA4NS2tG026065; Sat, 4 Nov 2017 23:28:02 GMT (envelope-from gonzo@FreeBSD.org) Received: (from gonzo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA4NS2DE026064; Sat, 4 Nov 2017 23:28:02 GMT (envelope-from gonzo@FreeBSD.org) Message-Id: <201711042328.vA4NS2DE026064@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gonzo set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko Date: Sat, 4 Nov 2017 23:28:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325410 - head/sys/arm/allwinner X-SVN-Group: head X-SVN-Commit-Author: gonzo X-SVN-Commit-Paths: head/sys/arm/allwinner X-SVN-Commit-Revision: 325410 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: Sat, 04 Nov 2017 23:28:04 -0000 Author: gonzo Date: Sat Nov 4 23:28:02 2017 New Revision: 325410 URL: https://svnweb.freebsd.org/changeset/base/325410 Log: Increase TX_MAX_SEGS from 10 to 20 for the if_awg.c driver Under certain traffic pattern awg driver does not recover from TX queue full condition. The actual source of the problem is not identified yet but jmcneill@ agreed that bumping TX_MAX_SEGS to 20 is OK as a workaround for the problem (NetBSD has it set to 128). Also add some diagnostic printfs to prevent silent failure of bus_dma functions in the future PR will be kept open until root cause of the issue is identified and fixed PR: 219927 Submitted by: Tom Vijlbrief Approved by: jmcneill MFC after: 2 weeks Modified: head/sys/arm/allwinner/if_awg.c Modified: head/sys/arm/allwinner/if_awg.c ============================================================================== --- head/sys/arm/allwinner/if_awg.c Sat Nov 4 22:23:41 2017 (r325409) +++ head/sys/arm/allwinner/if_awg.c Sat Nov 4 23:28:02 2017 (r325410) @@ -92,7 +92,7 @@ __FBSDID("$FreeBSD$"); #define TX_SKIP(n, o) (((n) + (o)) & (TX_DESC_COUNT - 1)) #define RX_NEXT(n) (((n) + 1) & (RX_DESC_COUNT - 1)) -#define TX_MAX_SEGS 10 +#define TX_MAX_SEGS 20 #define SOFT_RST_RETRY 1000 #define MII_BUSY_RETRY 1000 @@ -192,6 +192,7 @@ struct awg_softc { struct resource *res[_RES_NITEMS]; struct mtx mtx; if_t ifp; + device_t dev; device_t miibus; struct callout stat_ch; struct task link_task; @@ -421,14 +422,18 @@ awg_setup_txbuf(struct awg_softc *sc, int index, struc sc->tx.buf_map[index].map, m, segs, &nsegs, BUS_DMA_NOWAIT); if (error == EFBIG) { m = m_collapse(m, M_NOWAIT, TX_MAX_SEGS); - if (m == NULL) + if (m == NULL) { + device_printf(sc->dev, "awg_setup_txbuf: m_collapse failed\n"); return (0); + } *mp = m; error = bus_dmamap_load_mbuf_sg(sc->tx.buf_tag, sc->tx.buf_map[index].map, m, segs, &nsegs, BUS_DMA_NOWAIT); } - if (error != 0) + if (error != 0) { + device_printf(sc->dev, "awg_setup_txbuf: bus_dmamap_load_mbuf_sg failed\n"); return (0); + } bus_dmamap_sync(sc->tx.buf_tag, sc->tx.buf_map[index].map, BUS_DMASYNC_PREWRITE); @@ -1613,6 +1618,7 @@ awg_attach(device_t dev) int error; sc = device_get_softc(dev); + sc->dev = dev; sc->type = ofw_bus_search_compatible(dev, compat_data)->ocd_data; node = ofw_bus_get_node(dev); From owner-svn-src-all@freebsd.org Sat Nov 4 23:58: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 7F9B9E5A302; Sat, 4 Nov 2017 23:58:09 +0000 (UTC) (envelope-from bdrewery@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 4F61C63557; Sat, 4 Nov 2017 23:58:09 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (unknown [127.0.1.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id 7E049158AA; Sat, 4 Nov 2017 23:58:08 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id 84A579101; Sat, 4 Nov 2017 23:58:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id HhKbPVbQhZOw; Sat, 4 Nov 2017 23:57:58 +0000 (UTC) Subject: Re: svn commit: r325404 - head/share/mk DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com 48D0C90FC To: Cy Schubert Cc: "O. Hartmann" , "Simon J. Gerraty" , svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org References: <201711042230.vA4MUhjw014138@slippy.cwsent.com> From: Bryan Drewery Openpgp: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Organization: FreeBSD Message-ID: Date: Sat, 4 Nov 2017 16:57:41 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <201711042230.vA4MUhjw014138@slippy.cwsent.com> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="wjutQoc08VFbVHVqblHnIjkUIRRDidvKU" 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: Sat, 04 Nov 2017 23:58:09 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --wjutQoc08VFbVHVqblHnIjkUIRRDidvKU Content-Type: multipart/mixed; boundary="w3owld0mRIX8gJLALiwWWQkk2reAm3Gik"; protected-headers="v1" From: Bryan Drewery To: Cy Schubert Cc: "O. Hartmann" , "Simon J. Gerraty" , svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Message-ID: Subject: Re: svn commit: r325404 - head/share/mk References: <201711042230.vA4MUhjw014138@slippy.cwsent.com> In-Reply-To: <201711042230.vA4MUhjw014138@slippy.cwsent.com> --w3owld0mRIX8gJLALiwWWQkk2reAm3Gik Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 11/4/2017 3:30 PM, Cy Schubert wrote: > In message <0fc7e918-dcf8-0197-6b50-5936dee23d87@FreeBSD.org>, Bryan=20 > Drewery wr > ites: >> This is an OpenPGP/MIME signed message (RFC 4880 and 3156) >> --dokLDw6wDnv1gUfKm3uwMSMnWeibN2RaD >> Content-Type: multipart/mixed; boundary=3D"MKHGkKGfLlBFL1Vl1W5AEj2BccB= 14C28h"; >> protected-headers=3D"v1" >> From: Bryan Drewery >> To: "O. Hartmann" , "Simon J. Gerraty" >> >> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, >> src-committers@freebsd.org >> Message-ID: <0fc7e918-dcf8-0197-6b50-5936dee23d87@FreeBSD.org> >> Subject: Re: svn commit: r325404 - head/share/mk >> References: <201711042102.vA4L2RuR063978@repo.freebsd.org> >> <20171104223133.00f5bf30@thor.intern.walstatt.dynvpn.de> >> <20171104223650.77c06a52@thor.intern.walstatt.dynvpn.de> >> In-Reply-To: <20171104223650.77c06a52@thor.intern.walstatt.dynvpn.de> >> >> --MKHGkKGfLlBFL1Vl1W5AEj2BccB14C28h >> Content-Type: text/plain; charset=3Dutf-8 >> Content-Language: en-US >> Content-Transfer-Encoding: quoted-printable >> >> On 11/4/2017 2:36 PM, O. Hartmann wrote: >>> Am Sat, 4 Nov 2017 22:31:33 +0100 >>> "O. Hartmann" schrieb: >>> =3D20 >>>> Am Sat, 4 Nov 2017 21:02:27 +0000 (UTC) >>>> "Simon J. Gerraty" schrieb: >>>> >>>>> Author: sjg >>>>> Date: Sat Nov 4 21:02:26 2017 >>>>> New Revision: 325404 >>>>> URL: https://svnweb.freebsd.org/changeset/base/325404 >>>>> >>>>> Log: >>>>> Ensure .OBJDIR has known value >>>>> =3D20 >>>>> If for any reason we cannot set .OBJDIR=3D3D=3D3D_objdir as desir= ed >>>>> use .CURDIR so that at least the classic >>>>> .if ${.OBJDIR} !=3D3D ${.CURDIR} >>>>> works and dangerous misstakes can be avoided. >>>>> =3D20 >>>>> Reviewed by: bdrewery >>>>> >>>>> Modified: >>>>> head/share/mk/auto.obj.mk >>>>> >>>>> Modified: head/share/mk/auto.obj.mk >>>>> =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D= 3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D >> =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D= =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D >> =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D= =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D >> =3D3D=3D3D=3D3D=3D3D=3D3D >>>>> --- head/share/mk/auto.obj.mk Sat Nov 4 16:23:34 2017 (r32540 >> 3) >>>>> +++ head/share/mk/auto.obj.mk Sat Nov 4 21:02:26 2017 (r32540 >> 4) >>>>> @@ -61,11 +61,17 @@ __objdir_made !=3D3D echo ${__objdir}/; umask $= {OBJ=3D >> DIR_UMA >>>>> .endif >>>>> # This causes make to use the specified directory as .OBJDIR >>>>> .OBJDIR: ${__objdir} >>>>> -.if ${.OBJDIR:tA} !=3D3D ${__objdir:tA} && ${__objdir_made:Uno:M${= __ob=3D >> jdir}/*} !=3D3D "" >>>>> +.if ${.OBJDIR:tA} !=3D3D ${__objdir:tA} >>>>> +# we did not get what we want - do we care? >>>>> +.if ${__objdir_made:Uno:M${__objdir}/*} !=3D3D "" >>>>> # watch out for __objdir being relative path >>>>> .if !(${__objdir:M/*} =3D3D=3D3D "" && ${.OBJDIR:tA} =3D3D=3D3D ${= ${.CURDIR}=3D >> /${__objdir}:L:tA}) >>>>> .error could not use ${__objdir}: .OBJDIR=3D3D${.OBJDIR} >>>>> .endif >>>>> +.endif >>>>> +# apparently we can live with it >>>>> +# make sure we know what we have >>>>> +.OBJDIR: ${.CURDIR} >>>>> .endif >>>>> .endif >>>>> .endif >>>>> _______________________________________________ >>>>> svn-src-head@freebsd.org mailing list >>>>> https://lists.freebsd.org/mailman/listinfo/svn-src-head >>>>> To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.= or=3D >> g" =3D20 >>>> >>>> With the recent patches, nvidia driver x11/nvidia-driver fails tobui= ld=3D >> with the error >>>> shown below: >>>> >>>> [...] >>>> =3D3D=3D3D=3D3D> src/nvidia (all) =3D20 >>>> make[7]: "/usr/src/share/mk/bsd.obj.mk" line 87: Malformed condition= al=3D >> >>>> (${CANONICALOBJDIR} =3D3D=3D3D /${RELDIR} || ${.OBJDIR} =3D3D=3D3D /= ${RELDIR})=3D >> make[7]: Fatal errors >>>> encountered -- cannot continue >>>> [...] >>> =3D20 >>> The very same with emulators/virtualbox-ose-kmod: >>> =3D20 >>> [...] >>> kBuild: >>> Installing /usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/= vi=3D >> rtualbox-ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/= src=3D >> /vboxdrv/Makefile >>> =3D3D=3D3D=3D3D Building 'vboxdrv' module =3D3D=3D3D=3D3D make[6]: "/= usr/src/share/=3D >> mk/bsd.obj.mk" line 87: >>> Malformed conditional (${CANONICALOBJDIR} =3D3D=3D3D /${RELDIR} || ${= =2EOBJDI=3D >> R} =3D3D=3D3D /${RELDIR}) >>> make[6]: Fatal errors encountered -- cannot continue make[6]: stopped= >>> in /usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/virtualb= ox=3D >> -ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/src/vbox= drv=3D >> >>> *** Error code 1 >>> =3D20 >>> Stop. >>> make[5]: stopped >>> in /usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/virtualb= ox=3D >> -ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/src >>> =3D3D=3D3D=3D3D> Compilation failed unexpectedly. Try to set MAKE_JOB= S_UNSAFE=3D >> =3D3Dyes and rebuild before >>> reporting the failure to the maintainer. >>> *** Error code 1 >>> =3D20 >>> =3D20 >> >> It was r325405 ... fixed in r325408. >=20 >=20 > Not really, mergemaster output. >=20 > *** Creating the temporary root environment in /tmp/temproot > *** /tmp/temproot ready for use > *** Creating and populating directory structure in /tmp/temproot >=20 > make[3]: "/opt/src/svn-current/share/mk/bsd.obj.mk" line 89: .OBJDIR=20 > incorrectly set to /etc/autofs >=20 > *** FATAL ERROR: Cannot 'cd' to /opt/src/svn-current and install file= s to > the temproot environment >=20 >=20 That's actually a good thing. What command did you run? --=20 Regards, Bryan Drewery --w3owld0mRIX8gJLALiwWWQkk2reAm3Gik-- --wjutQoc08VFbVHVqblHnIjkUIRRDidvKU Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJZ/lP1AAoJEDXXcbtuRpfPjXYIAJ7GckKaUAQzZXsdoymyuFVu DUsqmEiCaM/s+qex1b07/yOoKnDeTB+HQzGBwB4XC0AeDLxEouGwBMNkL9Nmdztt sMt/NeLQdA2B0SX/0mPTV6YTnHng4AYL4k/ejiydGQnFo6qcSwh7UHVlYv5Uorrj ugm2cvf21mEqq8N6bgJdHKacN1QFZeYjmPxB6HkPnEL+WGs9T+CZbVkanjDB7D4A UMppzMFubBFmXQr5l3TCFVY5nmM60Fmy7qoZElt5BjsO88JJbAVbm9uzdf/nSzaf WPZ+XvW4+SB9Qj+xVTdZHEVLT0rE/wG6GVpxTjV3hm4i7qVhJTi7EQOb9vUpGp0= =gTwH -----END PGP SIGNATURE----- --wjutQoc08VFbVHVqblHnIjkUIRRDidvKU--