From owner-svn-src-stable-11@freebsd.org Sun May 13 17:44:27 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C0671FC77D7; Sun, 13 May 2018 17:44:27 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6BC9B7BD97; Sun, 13 May 2018 17:44:27 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4906210A78; Sun, 13 May 2018 17:44:27 +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 w4DHiRL0021892; Sun, 13 May 2018 17:44:27 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4DHiRoh021891; Sun, 13 May 2018 17:44:27 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201805131744.w4DHiRoh021891@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sun, 13 May 2018 17:44:27 +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: r333583 - stable/11/tools/test/popss X-SVN-Group: stable-11 X-SVN-Commit-Author: kib X-SVN-Commit-Paths: stable/11/tools/test/popss X-SVN-Commit-Revision: 333583 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 May 2018 17:44:27 -0000 Author: kib Date: Sun May 13 17:44:26 2018 New Revision: 333583 URL: https://svnweb.freebsd.org/changeset/base/333583 Log: MFC r333460: Add the test program to examine CPU behaviour for pop ss issue CVE-2018-8897. Approved by: re (marius) Added: stable/11/tools/test/popss/ - copied from r333460, head/tools/test/popss/ Modified: Directory Properties: stable/11/ (props changed) From owner-svn-src-stable-11@freebsd.org Mon May 14 11:19:36 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 64817FE86DD; Mon, 14 May 2018 11:19:36 +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 D6D267DC79; Mon, 14 May 2018 11:19:35 +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 w4EBJPTQ077083 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 14 May 2018 14:19:28 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua w4EBJPTQ077083 Received: (from kostik@localhost) by tom.home (8.15.2/8.15.2/Submit) id w4EBJPJJ077082; Mon, 14 May 2018 14:19:25 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Mon, 14 May 2018 14:19:25 +0300 From: Konstantin Belousov To: Helge Oldach Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: Re: svn commit: r333162 - in stable/11: lib/libc/sys sys/compat/freebsd32 sys/kern sys/sys tests/sys/kern Message-ID: <20180514111925.GH6887@kib.kiev.ua> References: <201805020757.w427vaQd080376@repo.freebsd.org> <201805140450.w4E4oouZ087259@nuc.oldach.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201805140450.w4E4oouZ087259@nuc.oldach.net> User-Agent: Mutt/1.9.5 (2018-04-13) 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-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 May 2018 11:19:36 -0000 On Mon, May 14, 2018 at 06:50:50AM +0200, Helge Oldach wrote: > This MFC adds two files and a subdirectory to the root file system: > > /pdeathsig_helper > /.debug/pdeathsig_helper.debug > > I have filed bug 228233. Try the patch from https://lists.freebsd.org/pipermail/freebsd-stable/2018-May/088877.html From owner-svn-src-stable-11@freebsd.org Mon May 14 15:35:55 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0210BDF5C22; Mon, 14 May 2018 15:35:55 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A7B297908B; Mon, 14 May 2018 15:35:54 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 85E941E042; Mon, 14 May 2018 15:35:54 +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 w4EFZs5D089908; Mon, 14 May 2018 15:35:54 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4EFZs8b089907; Mon, 14 May 2018 15:35:54 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201805141535.w4EFZs8b089907@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Mon, 14 May 2018 15:35: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: r333605 - stable/11/release/tools X-SVN-Group: stable-11 X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: stable/11/release/tools X-SVN-Commit-Revision: 333605 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 May 2018 15:35:55 -0000 Author: trasz Date: Mon May 14 15:35:54 2018 New Revision: 333605 URL: https://svnweb.freebsd.org/changeset/base/333605 Log: MFC r333493: Set kldxref_enable="YES" for ARM images. Without it, the images are missing the /boot/kernel/linker.hints file, which breaks loading some of the modules with dependencies, eg cfiscsi.ko. This is a minimal fix for ARM images, in order to safely MFC it before 11.2-RELEASE. Afterwards, however, I believe we should actually just change the default (as in, etc/defaults/rc.conf). The reason is that it's required for every image that's being cross-built, as kldxref(1) cannot handle files for non-native architectures. For the one that is not - amd64 - having it on by default doesn't change anything - the script is noop if the linker.hints already exists. The long-term solution would be to rewrite kldxref(1) to handle other architectures, and generate linker.hints at build time. Approved by: re (marius@) Sponsored by: DARPA, AFRL Modified: stable/11/release/tools/arm.subr Directory Properties: stable/11/ (props changed) Modified: stable/11/release/tools/arm.subr ============================================================================== --- stable/11/release/tools/arm.subr Mon May 14 15:16:51 2018 (r333604) +++ stable/11/release/tools/arm.subr Mon May 14 15:35:54 2018 (r333605) @@ -122,6 +122,7 @@ arm_install_base() { echo 'sendmail_outbound_enable="NO"' >> ${CHROOTDIR}/${DESTDIR}/etc/rc.conf echo 'sendmail_msp_queue_enable="NO"' >> ${CHROOTDIR}/${DESTDIR}/etc/rc.conf echo 'growfs_enable="YES"' >> ${CHROOTDIR}/${DESTDIR}/etc/rc.conf + echo 'kldxref_enable="YES"' >> ${CHROOTDIR}/${DESTDIR}/etc/rc.conf sync umount_loop ${CHROOTDIR}/${DESTDIR} From owner-svn-src-stable-11@freebsd.org Mon May 14 17:43:43 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DC029DFCD6F; Mon, 14 May 2018 17:43:43 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8EA8378B77; Mon, 14 May 2018 17:43:43 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6F8EE1F64D; Mon, 14 May 2018 17:43:43 +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 w4EHhhat059190; Mon, 14 May 2018 17:43:43 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4EHhhOg059189; Mon, 14 May 2018 17:43:43 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201805141743.w4EHhhOg059189@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 14 May 2018 17:43:43 +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: r333607 - stable/11/release X-SVN-Group: stable-11 X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: stable/11/release X-SVN-Commit-Revision: 333607 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 May 2018 17:43:44 -0000 Author: gjb Date: Mon May 14 17:43:43 2018 New Revision: 333607 URL: https://svnweb.freebsd.org/changeset/base/333607 Log: MFC r333473: Add a special GCE_LICENSE variable to Makefile.gce, which when set, will include license metadata in the resultant GCE image. GCE_LICENSE is unset by default, as it primarily pertains to images produced by the FreeBSD Project, but for downstream FreeBSD consumers, it can be set in the make(1) environment in the format of: --licenses="projects/PROJECT_ID/global/licenses/LICENSE_NAME" The "license" is not a license, per se, but required metadata that is required by the GCE marketplace. For the FreeBSD Project, the license name is simply 'freebsd', with the description of 'FreeBSD'. Approved by: re (marius) Sponsored by: The FreeBSD Foundation Modified: stable/11/release/Makefile.gce Directory Properties: stable/11/ (props changed) Modified: stable/11/release/Makefile.gce ============================================================================== --- stable/11/release/Makefile.gce Mon May 14 17:27:53 2018 (r333606) +++ stable/11/release/Makefile.gce Mon May 14 17:43:43 2018 (r333607) @@ -17,6 +17,7 @@ GCE_UPLOAD_TGTS= gce-do-login CLEANFILES+= ${GCE_UPLOAD_TGTS} GCE_BUCKET?= +GCE_LICENSE?= .if !defined(GCE_FAMILY) || empty(GCE_FAMILY) GCE_FAMILY= ${TYPE:tl}-${REVISION:S,.,-,} @@ -69,7 +70,7 @@ gce-do-upload: /usr/local/bin/gsutil cp ${.OBJDIR}/${GCE_TARGET}.tar.gz \ gs://${GCE_BUCKET}/ /usr/local/bin/gcloud compute images create ${GCE_TARGET} \ - --family=${GCE_FAMILY}${GCE_FAMILY_SUFX} \ + --family=${GCE_FAMILY}${GCE_FAMILY_SUFX} ${GCE_LICENSE} \ --source-uri gs://${GCE_BUCKET}/${GCE_TARGET}.tar.gz touch ${.OBJDIR}/${.TARGET} From owner-svn-src-stable-11@freebsd.org Mon May 14 19:20:38 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D1E77E687D9; Mon, 14 May 2018 19:20:38 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 863C772FC0; Mon, 14 May 2018 19:20:38 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 68C8A2056B; Mon, 14 May 2018 19:20:38 +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 w4EJKcmP008330; Mon, 14 May 2018 19:20:38 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4EJKcHk008329; Mon, 14 May 2018 19:20:38 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201805141920.w4EJKcHk008329@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Mon, 14 May 2018 19:20: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: r333610 - stable/11/sys/fs/msdosfs X-SVN-Group: stable-11 X-SVN-Commit-Author: pfg X-SVN-Commit-Paths: stable/11/sys/fs/msdosfs X-SVN-Commit-Revision: 333610 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 May 2018 19:20:39 -0000 Author: pfg Date: Mon May 14 19:20:37 2018 New Revision: 333610 URL: https://svnweb.freebsd.org/changeset/base/333610 Log: MFC r333239: msdosfs: long names of files are created incorrectly. This fixes a regression that happened in r120492 (2003) where libkiconv was introduced and we went from checking unlen to checking for '\0'. PR: 111843 Patch by: Damjan Jovanovic Approved by: re (gjb) Modified: stable/11/sys/fs/msdosfs/msdosfs_conv.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/fs/msdosfs/msdosfs_conv.c ============================================================================== --- stable/11/sys/fs/msdosfs/msdosfs_conv.c Mon May 14 17:49:41 2018 (r333609) +++ stable/11/sys/fs/msdosfs/msdosfs_conv.c Mon May 14 19:20:37 2018 (r333610) @@ -568,7 +568,7 @@ unix2winfn(const u_char *un, size_t unlen, struct wine if (!code) end = WIN_LAST; } - if (*un == '\0') + if (!unlen) end = WIN_LAST; wep->weCnt |= end; return !end; From owner-svn-src-stable-11@freebsd.org Mon May 14 22:56:42 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CB178E7DF70; Mon, 14 May 2018 22:56:42 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 774C287951; Mon, 14 May 2018 22:56:42 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5564C2292E; Mon, 14 May 2018 22:56:42 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4EMugcN021597; Mon, 14 May 2018 22:56:42 GMT (envelope-from sbruno@FreeBSD.org) Received: (from sbruno@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4EMugIk021596; Mon, 14 May 2018 22:56:42 GMT (envelope-from sbruno@FreeBSD.org) Message-Id: <201805142256.w4EMugIk021596@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sbruno set sender to sbruno@FreeBSD.org using -f From: Sean Bruno Date: Mon, 14 May 2018 22:56: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: r333615 - stable/11/sys/netgraph X-SVN-Group: stable-11 X-SVN-Commit-Author: sbruno X-SVN-Commit-Paths: stable/11/sys/netgraph X-SVN-Commit-Revision: 333615 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 May 2018 22:56:43 -0000 Author: sbruno Date: Mon May 14 22:56:41 2018 New Revision: 333615 URL: https://svnweb.freebsd.org/changeset/base/333615 Log: MFC r303848 Repair trivial panic in ng_uncallout. Fixes bugzilla #211031 PR: 211031 Approved by: re (gjb) Modified: stable/11/sys/netgraph/ng_base.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/netgraph/ng_base.c ============================================================================== --- stable/11/sys/netgraph/ng_base.c Mon May 14 21:57:45 2018 (r333614) +++ stable/11/sys/netgraph/ng_base.c Mon May 14 22:56:41 2018 (r333615) @@ -3815,7 +3815,7 @@ ng_uncallout(struct callout *c, node_p node) item = c->c_arg; /* Do an extra check */ if ((rval > 0) && (c->c_func == &ng_callout_trampoline) && - (NGI_NODE(item) == node)) { + (item != NULL) && (NGI_NODE(item) == node)) { /* * We successfully removed it from the queue before it ran * So now we need to unreference everything that was From owner-svn-src-stable-11@freebsd.org Mon May 14 23:12:31 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 24C7EE7ED8F; Mon, 14 May 2018 23:12:31 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C849B6B22D; Mon, 14 May 2018 23:12:30 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A9C2B22C5D; Mon, 14 May 2018 23:12:30 +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 w4ENCUFP031390; Mon, 14 May 2018 23:12:30 GMT (envelope-from gonzo@FreeBSD.org) Received: (from gonzo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4ENCUSl031387; Mon, 14 May 2018 23:12:30 GMT (envelope-from gonzo@FreeBSD.org) Message-Id: <201805142312.w4ENCUSl031387@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gonzo set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko Date: Mon, 14 May 2018 23:12:30 +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: r333616 - in stable/11: lib/libc/gen share/man/man9 X-SVN-Group: stable-11 X-SVN-Commit-Author: gonzo X-SVN-Commit-Paths: in stable/11: lib/libc/gen share/man/man9 X-SVN-Commit-Revision: 333616 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 May 2018 23:12:31 -0000 Author: gonzo Date: Mon May 14 23:12:30 2018 New Revision: 333616 URL: https://svnweb.freebsd.org/changeset/base/333616 Log: MFC r332317, r332439, r332442 Approved by: re r332317: [man] Fix return type of BUS_ADD_CHILD(9) Fix return type of BUS_ADD_CHILD(9) in SYNOPSYS section, it should be device_t, not int PR: 207389 r332439: Fix quotes in the example code in syslog(3) BUGS section mdoc treats verbatim quotes in .Dl as a string delimiter and does not pass them to the rendered output. Use special char \*q to specify double quote PR: 216755 r332442: Bump .Dd value (forgot to do this in r332439) Modified: stable/11/lib/libc/gen/syslog.3 stable/11/share/man/man9/BUS_ADD_CHILD.9 Directory Properties: stable/11/ (props changed) Modified: stable/11/lib/libc/gen/syslog.3 ============================================================================== --- stable/11/lib/libc/gen/syslog.3 Mon May 14 22:56:41 2018 (r333615) +++ stable/11/lib/libc/gen/syslog.3 Mon May 14 23:12:30 2018 (r333616) @@ -28,7 +28,7 @@ .\" @(#)syslog.3 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd July 21, 2015 +.Dd April 12, 2018 .Dt SYSLOG 3 .Os .Sh NAME @@ -292,4 +292,4 @@ for later interpolation by .Pp Always use the proper secure idiom: .Pp -.Dl syslog(priority, "%s", string); +.Dl syslog(priority, \*q%s\*q, string); Modified: stable/11/share/man/man9/BUS_ADD_CHILD.9 ============================================================================== --- stable/11/share/man/man9/BUS_ADD_CHILD.9 Mon May 14 22:56:41 2018 (r333615) +++ stable/11/share/man/man9/BUS_ADD_CHILD.9 Mon May 14 23:12:30 2018 (r333616) @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 28, 2015 +.Dd April 8, 2018 .Dt BUS_ADD_CHILD 9 .Os .Sh NAME @@ -37,7 +37,7 @@ .Sh SYNOPSIS .In sys/param.h .In sys/bus.h -.Ft int +.Ft device_t .Fn BUS_ADD_CHILD "device_t dev" "int order" "const char *name" "int unit" .Sh DESCRIPTION The From owner-svn-src-stable-11@freebsd.org Tue May 15 00:00:48 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C6113EA8FAA; Tue, 15 May 2018 00:00:47 +0000 (UTC) (envelope-from dteske@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 717AE782CD; Tue, 15 May 2018 00:00:47 +0000 (UTC) (envelope-from dteske@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3A48A232E9; Tue, 15 May 2018 00:00:47 +0000 (UTC) (envelope-from dteske@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4F00lPA051828; Tue, 15 May 2018 00:00:47 GMT (envelope-from dteske@FreeBSD.org) Received: (from dteske@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4F00imB051812; Tue, 15 May 2018 00:00:44 GMT (envelope-from dteske@FreeBSD.org) Message-Id: <201805150000.w4F00imB051812@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dteske set sender to dteske@FreeBSD.org using -f From: Devin Teske Date: Tue, 15 May 2018 00:00: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: r333617 - in stable/11: . cddl/lib/libdtrace cddl/usr.sbin cddl/usr.sbin/dwatch cddl/usr.sbin/dwatch/libexec etc/mtree share/dtrace X-SVN-Group: stable-11 X-SVN-Commit-Author: dteske X-SVN-Commit-Paths: in stable/11: . cddl/lib/libdtrace cddl/usr.sbin cddl/usr.sbin/dwatch cddl/usr.sbin/dwatch/libexec etc/mtree share/dtrace X-SVN-Commit-Revision: 333617 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 May 2018 00:00:48 -0000 Author: dteske Date: Tue May 15 00:00:44 2018 New Revision: 333617 URL: https://svnweb.freebsd.org/changeset/base/333617 Log: MFC SVN r329188,329334,329353,329914,329995-329996: DTrace Enhancements r329188: Use tabs in io.d, fix alignment issues, remove extra newlines r329334: Add errno definitions to /usr/lib/dtrace/errno.d r329353: Add inline to errno.d for translating int to string r329914: Updates and enhancements to io.d to aid DTrace scripting r329995: Updates and enhancements to signal.d to aid DTrace scripting r329996: Consistent casing for fallback SIGCHLD (s/Unknown/unknown/) MFC SVN r330559-330560,330672,332865-332867,333513-333519: dwatch(1) r330559: Introduce dwatch(1) as a tool for making DTrace more useful r330560: Bump dwatch(1) internal version from 1.0-beta-91 to 1.0 r330672: Fix display of wrong pid from dtrace_sched(4) r332865: Add `-dev' option to aid debugging of profiles r332866: Add profile for send(2)/recv(2) syscalls r332867: Remove the line used to demonstrate `-dev' option r333513: Bugfix, usage displayed with `-1Q' r333514: Separate default values so `-[BK] num' don't affect usage r333515: Simplify info message test r333516: Export ARGV to profiles loaded via load_profile() r333517: Allow `-E code' to override profile EVENT_DETAILS r333518: Expose process for ip/tcp/udp r333519: Refactor sendrecv profile Reviewed by: markj, gnn, bdrewery (head; earlier version) Approved by: re (gjb) Relnotes: yes Sponsored by: Smule, Inc. Differential Revision: https://reviews.freebsd.org/D15418 Added: stable/11/cddl/usr.sbin/dwatch/ - copied from r330559, head/cddl/usr.sbin/dwatch/ stable/11/cddl/usr.sbin/dwatch/libexec/sendrecv (contents, props changed) - copied, changed from r332866, head/cddl/usr.sbin/dwatch/libexec/sendrecv Deleted: stable/11/share/dtrace/watch_execve stable/11/share/dtrace/watch_kill stable/11/share/dtrace/watch_vop_remove Modified: stable/11/ObsoleteFiles.inc stable/11/cddl/lib/libdtrace/errno.d stable/11/cddl/lib/libdtrace/io.d stable/11/cddl/lib/libdtrace/ip.d stable/11/cddl/lib/libdtrace/libproc_compat.h stable/11/cddl/lib/libdtrace/psinfo.d stable/11/cddl/lib/libdtrace/regs_x86.d stable/11/cddl/lib/libdtrace/sched.d stable/11/cddl/lib/libdtrace/signal.d stable/11/cddl/lib/libdtrace/tcp.d stable/11/cddl/lib/libdtrace/udp.d stable/11/cddl/usr.sbin/Makefile stable/11/cddl/usr.sbin/dwatch/dwatch stable/11/cddl/usr.sbin/dwatch/libexec/Makefile stable/11/cddl/usr.sbin/dwatch/libexec/chmod stable/11/cddl/usr.sbin/dwatch/libexec/errno stable/11/cddl/usr.sbin/dwatch/libexec/io stable/11/cddl/usr.sbin/dwatch/libexec/ip stable/11/cddl/usr.sbin/dwatch/libexec/kill stable/11/cddl/usr.sbin/dwatch/libexec/nanosleep stable/11/cddl/usr.sbin/dwatch/libexec/open stable/11/cddl/usr.sbin/dwatch/libexec/proc stable/11/cddl/usr.sbin/dwatch/libexec/rw stable/11/cddl/usr.sbin/dwatch/libexec/sched stable/11/cddl/usr.sbin/dwatch/libexec/tcp stable/11/cddl/usr.sbin/dwatch/libexec/udp stable/11/cddl/usr.sbin/dwatch/libexec/vop_create stable/11/cddl/usr.sbin/dwatch/libexec/vop_readdir stable/11/cddl/usr.sbin/dwatch/libexec/vop_rename stable/11/cddl/usr.sbin/dwatch/libexec/vop_symlink stable/11/etc/mtree/BSD.usr.dist stable/11/share/dtrace/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/11/ObsoleteFiles.inc ============================================================================== --- stable/11/ObsoleteFiles.inc Mon May 14 23:12:30 2018 (r333616) +++ stable/11/ObsoleteFiles.inc Tue May 15 00:00:44 2018 (r333617) @@ -38,6 +38,10 @@ # xargs -n1 | sort | uniq -d; # done +# 20180513: remove DTrace scripts made obsolete by dwatch(1) +OLD_FILES+=usr/share/dtrace/watch_execve +OLD_FILES+=usr/share/dtrace/watch_kill +OLD_FILES+=usr/share/dtrace/watch_vop_remove # 20180331: new clang import which bumps version from 5.0.1 to 6.0.0. OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/allocator_interface.h OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/asan_interface.h Modified: stable/11/cddl/lib/libdtrace/errno.d ============================================================================== --- stable/11/cddl/lib/libdtrace/errno.d Mon May 14 23:12:30 2018 (r333616) +++ stable/11/cddl/lib/libdtrace/errno.d Tue May 15 00:00:44 2018 (r333617) @@ -20,6 +20,7 @@ * CDDL HEADER END * * Portions Copyright 2006-2008 John Birrell jb@freebsd.org + * Portions Copyright 2018 Devin Teske dteske@freebsd.org * * $FreeBSD$ */ @@ -216,7 +217,15 @@ inline int ENOLINK = 91; #pragma D binding "1.0" ENOLINK inline int EPROTO = 92; #pragma D binding "1.0" EPROTO -inline int ELAST = 92; +inline int ENOTCAPABLE = 93; +#pragma D binding "1.13" ENOTCAPABLE +inline int ECAPMODE = 94; +#pragma D binding "1.13" ECAPMODE +inline int ENOTRECOVERABLE = 95; +#pragma D binding "1.13" ENOTRECOVERABLE +inline int EOWNERDEAD = 96; +#pragma D binding "1.13" EOWNERDEAD +inline int ELAST = 96; #pragma D binding "1.0" ELAST inline int ERESTART = -1; #pragma D binding "1.0" ERESTART @@ -226,3 +235,114 @@ inline int ENOIOCTL = -3; #pragma D binding "1.0" ENOIOCTL inline int EDIRIOCTL = -4; #pragma D binding "1.0" EDIRIOCTL +inline int ERELOOKUP = -5; +#pragma D binding "1.13" ERELOOKUP + +/* + * Error strings from + */ +#pragma D binding "1.13" strerror +inline string strerror[int errno] = + errno == 0 ? "Success" : + errno == EPERM ? "Operation not permitted" : + errno == ENOENT ? "No such file or directory" : + errno == ESRCH ? "No such process" : + errno == EINTR ? "Interrupted system call" : + errno == EIO ? "Input/output error" : + errno == ENXIO ? "Device not configured" : + errno == E2BIG ? "Argument list too long" : + errno == ENOEXEC ? "Exec format error" : + errno == EBADF ? "Bad file descriptor" : + errno == ECHILD ? "No child processes" : + errno == EDEADLK ? "Resource deadlock avoided" : + errno == ENOMEM ? "Cannot allocate memory" : + errno == EACCES ? "Permission denied" : + errno == EFAULT ? "Bad address" : + errno == ENOTBLK ? "Block device required" : + errno == EBUSY ? "Device busy" : + errno == EEXIST ? "File exists" : + errno == EXDEV ? "Cross-device link" : + errno == ENODEV ? "Operation not supported by device" : + errno == ENOTDIR ? "Not a directory" : + errno == EISDIR ? "Is a directory" : + errno == EINVAL ? "Invalid argument" : + errno == ENFILE ? "Too many open files in system" : + errno == EMFILE ? "Too many open files" : + errno == ENOTTY ? "Inappropriate ioctl for device" : + errno == ETXTBSY ? "Text file busy" : + errno == EFBIG ? "File too large" : + errno == ENOSPC ? "No space left on device" : + errno == ESPIPE ? "Illegal seek" : + errno == EROFS ? "Read-only filesystem" : + errno == EMLINK ? "Too many links" : + errno == EPIPE ? "Broken pipe" : + errno == EDOM ? "Numerical argument out of domain" : + errno == ERANGE ? "Result too large" : + errno == EAGAIN ? "Resource temporarily unavailable" : + errno == EINPROGRESS ? "Operation now in progress" : + errno == EALREADY ? "Operation already in progress" : + errno == ENOTSOCK ? "Socket operation on non-socket" : + errno == EDESTADDRREQ ? "Destination address required" : + errno == EMSGSIZE ? "Message too long" : + errno == EPROTOTYPE ? "Protocol wrong type for socket" : + errno == ENOPROTOOPT ? "Protocol not available" : + errno == EPROTONOSUPPORT ? "Protocol not supported" : + errno == ESOCKTNOSUPPORT ? "Socket type not supported" : + errno == EOPNOTSUPP ? "Operation not supported" : + errno == EPFNOSUPPORT ? "Protocol family not supported" : + errno == EAFNOSUPPORT ? "Address family not supported by protocol family" : + errno == EADDRINUSE ? "Address already in use" : + errno == EADDRNOTAVAIL ? "Can't assign requested address" : + errno == ENETDOWN ? "Network is down" : + errno == ENETUNREACH ? "Network is unreachable" : + errno == ENETRESET ? "Network dropped connection on reset" : + errno == ECONNABORTED ? "Software caused connection abort" : + errno == ECONNRESET ? "Connection reset by peer" : + errno == ENOBUFS ? "No buffer space available" : + errno == EISCONN ? "Socket is already connected" : + errno == ENOTCONN ? "Socket is not connected" : + errno == ESHUTDOWN ? "Can't send after socket shutdown" : + errno == ETOOMANYREFS ? "Too many references: can't splice" : + errno == ETIMEDOUT ? "Operation timed out" : + errno == ECONNREFUSED ? "Connection refused" : + errno == ELOOP ? "Too many levels of symbolic links" : + errno == ENAMETOOLONG ? "File name too long" : + errno == EHOSTDOWN ? "Host is down" : + errno == EHOSTUNREACH ? "No route to host" : + errno == ENOTEMPTY ? "Directory not empty" : + errno == EPROCLIM ? "Too many processes" : + errno == EUSERS ? "Too many users" : + errno == EDQUOT ? "Disc quota exceeded" : + errno == ESTALE ? "Stale NFS file handle" : + errno == EREMOTE ? "Too many levels of remote in path" : + errno == EBADRPC ? "RPC struct is bad" : + errno == ERPCMISMATCH ? "RPC version wrong" : + errno == EPROGUNAVAIL ? "RPC prog. not avail" : + errno == EPROGMISMATCH ? "Program version wrong" : + errno == EPROCUNAVAIL ? "Bad procedure for program" : + errno == ENOLCK ? "No locks available" : + errno == ENOSYS ? "Function not implemented" : + errno == EFTYPE ? "Inappropriate file type or format" : + errno == EAUTH ? "Authentication error" : + errno == ENEEDAUTH ? "Need authenticator" : + errno == EIDRM ? "Identifier removed" : + errno == ENOMSG ? "No message of desired type" : + errno == EOVERFLOW ? "Value too large to be stored in data type" : + errno == ECANCELED ? "Operation canceled" : + errno == EILSEQ ? "Illegal byte sequence" : + errno == ENOATTR ? "Attribute not found" : + errno == EDOOFUS ? "Programming error" : + errno == EBADMSG ? "Bad message" : + errno == EMULTIHOP ? "Multihop attempted" : + errno == ENOLINK ? "Link has been severed" : + errno == EPROTO ? "Protocol error" : + errno == ENOTCAPABLE ? "Capabilities insufficient" : + errno == ECAPMODE ? "Not permitted in capability mode" : + errno == ENOTRECOVERABLE ? "State not recoverable" : + errno == EOWNERDEAD ? "Previous owner died" : + errno == ERESTART ? "restart syscall" : + errno == EJUSTRETURN ? "don't modify regs, just return" : + errno == ENOIOCTL ? "ioctl not handled by this layer" : + errno == EDIRIOCTL ? "do direct ioctl in GEOM" : + errno == ERELOOKUP ? "retry the directory lookup" : + "Unknown error"; Modified: stable/11/cddl/lib/libdtrace/io.d ============================================================================== --- stable/11/cddl/lib/libdtrace/io.d Mon May 14 23:12:30 2018 (r333616) +++ stable/11/cddl/lib/libdtrace/io.d Tue May 15 00:00:44 2018 (r333617) @@ -18,6 +18,8 @@ * * CDDL HEADER END * + * Portions Copyright 2018 Devin Teske dteske@freebsd.org + * * $FreeBSD$ */ /* @@ -29,47 +31,51 @@ #pragma D depends_on provider io typedef struct devinfo { - int dev_major; /* major number */ - int dev_minor; /* minor number */ - int dev_instance; /* instance number */ - string dev_name; /* name of device */ - string dev_statname; /* name of device + instance/minor */ - string dev_pathname; /* pathname of device */ + int dev_major; /* major number */ + int dev_minor; /* minor number */ + int dev_instance; /* instance number */ + int dev_type; /* type of device */ + string dev_name; /* name of device */ + string dev_statname; /* name of device + instance/minor */ + string dev_pathname; /* pathname of device */ } devinfo_t; #pragma D binding "1.0" translator translator devinfo_t < struct devstat *D > { - dev_major = D->device_number; - dev_minor = D->unit_number; - dev_instance = 0; - dev_name = stringof(D->device_name); - dev_statname = stringof(D->device_name); - dev_pathname = stringof(D->device_name); + dev_major = D->device_number; + dev_minor = D->unit_number; + dev_instance = 0; + dev_type = D->device_type; + dev_name = stringof(D->device_name); + dev_statname = stringof(D->device_name); + dev_pathname = stringof(D->device_name); }; typedef struct bufinfo { - int b_flags; /* flags */ - long b_bcount; /* number of bytes */ - caddr_t b_addr; /* buffer address */ - uint64_t b_blkno; /* expanded block # on device */ - uint64_t b_lblkno; /* block # on device */ - size_t b_resid; /* # of bytes not transferred */ - size_t b_bufsize; /* size of allocated buffer */ -/* caddr_t b_iodone; I/O completion routine */ - int b_error; /* expanded error field */ -/* dev_t b_edev; extended device */ + int b_cmd; /* I/O operation */ + int b_flags; /* flags */ + long b_bcount; /* number of bytes */ + caddr_t b_addr; /* buffer address */ + uint64_t b_blkno; /* expanded block # on device */ + uint64_t b_lblkno; /* block # on device */ + size_t b_resid; /* # of bytes not transferred */ + size_t b_bufsize; /* size of allocated buffer */ +/* caddr_t b_iodone; I/O completion routine */ + int b_error; /* expanded error field */ +/* dev_t b_edev; extended device */ } bufinfo_t; #pragma D binding "1.0" translator translator bufinfo_t < struct bio *B > { - b_flags = B->bio_flags; - b_bcount = B->bio_bcount; - b_addr = B->bio_data; - b_blkno = 0; - b_lblkno = 0; - b_resid = B->bio_resid; - b_bufsize = 0; /* XXX gnn */ - b_error = B->bio_error; + b_cmd = B->bio_cmd; + b_flags = B->bio_flags; + b_bcount = B->bio_bcount; + b_addr = B->bio_data; + b_blkno = 0; + b_lblkno = 0; + b_resid = B->bio_resid; + b_bufsize = 0; /* XXX gnn */ + b_error = B->bio_error; }; /* @@ -106,4 +112,150 @@ inline int O_SYNC = 0x0080; inline int O_TRUNC = 0x0400; #pragma D binding "1.1" O_TRUNC +/* + * The following inline constants can be used to examine bio_cmd of struct bio + * or a translated bufinfo_t. + */ +inline int BIO_READ = 0x01; +#pragma D binding "1.13" BIO_READ +inline int BIO_WRITE = 0x02; +#pragma D binding "1.13" BIO_WRITE +inline int BIO_DELETE = 0x03; +#pragma D binding "1.13" BIO_DELETE +inline int BIO_GETATTR = 0x04; +#pragma D binding "1.13" BIO_GETATTR +inline int BIO_FLUSH = 0x05; +#pragma D binding "1.13" BIO_FLUSH +inline int BIO_CMD0 = 0x06; +#pragma D binding "1.13" BIO_CMD0 +inline int BIO_CMD1 = 0x07; +#pragma D binding "1.13" BIO_CMD1 +inline int BIO_CMD2 = 0x08; +#pragma D binding "1.13" BIO_CMD2 +inline int BIO_ZONE = 0x09; +#pragma D binding "1.13" BIO_ZONE +/* + * The following inline constants can be used to examine bio_flags of struct + * bio or a translated bufinfo_t. + */ +inline int BIO_ERROR = 0x01; +#pragma D binding "1.13" BIO_ERROR +inline int BIO_DONE = 0x02; +#pragma D binding "1.13" BIO_DONE +inline int BIO_ONQUEUE = 0x04; +#pragma D binding "1.13" BIO_ONQUEUE +inline int BIO_ORDERED = 0x08; +#pragma D binding "1.13" BIO_ORDERED +inline int BIO_UNMAPPED = 0x10; +#pragma D binding "1.13" BIO_UNMAPPED +inline int BIO_TRANSIENT_MAPPING = 0x20; +#pragma D binding "1.13" BIO_TRANSIENT_MAPPING +inline int BIO_VLIST = 0x40; +#pragma D binding "1.13" BIO_VLIST + +/* + * The following inline constants can be used to examine device_type of struct + * devstat or a translated devinfo_t. + */ +inline int DEVSTAT_TYPE_DIRECT = 0x000; +#pragma D binding "1.13" DEVSTAT_TYPE_DIRECT +inline int DEVSTAT_TYPE_SEQUENTIAL = 0x001; +#pragma D binding "1.13" DEVSTAT_TYPE_SEQUENTIAL +inline int DEVSTAT_TYPE_PRINTER = 0x002; +#pragma D binding "1.13" DEVSTAT_TYPE_PRINTER +inline int DEVSTAT_TYPE_PROCESSOR = 0x003; +#pragma D binding "1.13" DEVSTAT_TYPE_PROCESSOR +inline int DEVSTAT_TYPE_WORM = 0x004; +#pragma D binding "1.13" DEVSTAT_TYPE_WORM +inline int DEVSTAT_TYPE_CDROM = 0x005; +#pragma D binding "1.13" DEVSTAT_TYPE_CDROM +inline int DEVSTAT_TYPE_SCANNER = 0x006; +#pragma D binding "1.13" DEVSTAT_TYPE_SCANNER +inline int DEVSTAT_TYPE_OPTICAL = 0x007; +#pragma D binding "1.13" DEVSTAT_TYPE_OPTICAL +inline int DEVSTAT_TYPE_CHANGER = 0x008; +#pragma D binding "1.13" DEVSTAT_TYPE_CHANGER +inline int DEVSTAT_TYPE_COMM = 0x009; +#pragma D binding "1.13" DEVSTAT_TYPE_COMM +inline int DEVSTAT_TYPE_ASC0 = 0x00a; +#pragma D binding "1.13" DEVSTAT_TYPE_ASC0 +inline int DEVSTAT_TYPE_ASC1 = 0x00b; +#pragma D binding "1.13" DEVSTAT_TYPE_ASC1 +inline int DEVSTAT_TYPE_STORARRAY = 0x00c; +#pragma D binding "1.13" DEVSTAT_TYPE_STORARRAY +inline int DEVSTAT_TYPE_ENCLOSURE = 0x00d; +#pragma D binding "1.13" DEVSTAT_TYPE_ENCLOSURE +inline int DEVSTAT_TYPE_FLOPPY = 0x00e; +#pragma D binding "1.13" DEVSTAT_TYPE_FLOPPY +inline int DEVSTAT_TYPE_MASK = 0x00f; +#pragma D binding "1.13" DEVSTAT_TYPE_MASK +inline int DEVSTAT_TYPE_IF_SCSI = 0x010; +#pragma D binding "1.13" DEVSTAT_TYPE_IF_SCSI +inline int DEVSTAT_TYPE_IF_IDE = 0x020; +#pragma D binding "1.13" DEVSTAT_TYPE_IF_IDE +inline int DEVSTAT_TYPE_IF_OTHER = 0x030; +#pragma D binding "1.13" DEVSTAT_TYPE_IF_OTHER +inline int DEVSTAT_TYPE_IF_MASK = 0x0f0; +#pragma D binding "1.13" DEVSTAT_TYPE_IF_MASK +inline int DEVSTAT_TYPE_PASS = 0x100; +#pragma D binding "1.13" DEVSTAT_TYPE_PASS + +#pragma D binding "1.13" device_type_string +inline string device_type_string[int type] = + type == DEVSTAT_TYPE_DIRECT ? "DIRECT" : + type == DEVSTAT_TYPE_SEQUENTIAL ? "SEQUENTIAL" : + type == DEVSTAT_TYPE_PRINTER ? "PRINTER" : + type == DEVSTAT_TYPE_PROCESSOR ? "PROCESSOR" : + type == DEVSTAT_TYPE_WORM ? "WORM" : + type == DEVSTAT_TYPE_CDROM ? "CDROM" : + type == DEVSTAT_TYPE_SCANNER ? "SCANNER" : + type == DEVSTAT_TYPE_OPTICAL ? "OPTICAL" : + type == DEVSTAT_TYPE_CHANGER ? "CHANGER" : + type == DEVSTAT_TYPE_COMM ? "COMM" : + type == DEVSTAT_TYPE_ASC0 ? "ASC0" : + type == DEVSTAT_TYPE_ASC1 ? "ASC1" : + type == DEVSTAT_TYPE_STORARRAY ? "STORARRAY" : + type == DEVSTAT_TYPE_ENCLOSURE ? "ENCLOSURE" : + type == DEVSTAT_TYPE_FLOPPY ? "FLOPPY" : + strjoin("UNKNOWN(", strjoin(lltostr(type), ")")); + +#pragma D binding "1.13" device_type +inline string device_type[int type] = + device_type_string[type & DEVSTAT_TYPE_MASK]; + +#pragma D binding "1.13" device_if_string +inline string device_if_string[int type] = + type == 0 ? "ACCESS" : + type == DEVSTAT_TYPE_IF_SCSI ? "SCSI" : + type == DEVSTAT_TYPE_IF_IDE ? "IDE" : + type == DEVSTAT_TYPE_IF_OTHER ? "OTHER" : + strjoin("UNKNOWN(", strjoin(lltostr(type), ")")); + +#pragma D binding "1.13" device_if +inline string device_if[int type] = + device_if_string[type & DEVSTAT_TYPE_IF_MASK]; + +#pragma D binding "1.13" bio_cmd_string +inline string bio_cmd_string[int cmd] = + cmd == BIO_READ ? "READ" : + cmd == BIO_WRITE ? "WRITE" : + cmd == BIO_DELETE ? "DELETE" : + cmd == BIO_GETATTR ? "GETATTR" : + cmd == BIO_FLUSH ? "FLUSH" : + cmd == BIO_CMD0 ? "CMD0" : + cmd == BIO_CMD1 ? "CMD1" : + cmd == BIO_CMD2 ? "CMD2" : + cmd == BIO_ZONE ? "ZONE" : + strjoin("UNKNOWN(", strjoin(lltostr(cmd), ")")); + +#pragma D binding "1.13" bio_flag_string +inline string bio_flag_string[int flag] = + flag == BIO_ERROR ? "ERROR" : + flag == BIO_DONE ? "DONE" : + flag == BIO_ONQUEUE ? "ONQUEUE" : + flag == BIO_ORDERED ? "ORDERED" : + flag == BIO_UNMAPPED ? "UNMAPPED" : + flag == BIO_TRANSIENT_MAPPING ? "TRANSIENT_MAPPING" : + flag == BIO_VLIST ? "VLIST" : + ""; Modified: stable/11/cddl/lib/libdtrace/ip.d ============================================================================== --- stable/11/cddl/lib/libdtrace/ip.d Mon May 14 23:12:30 2018 (r333616) +++ stable/11/cddl/lib/libdtrace/ip.d Tue May 15 00:00:44 2018 (r333617) @@ -215,10 +215,10 @@ translator csinfo_t < void *p > { #pragma D binding "1.6.3" translator translator csinfo_t < struct inpcb *p > { - cs_addr = NULL; - cs_cid = (uint64_t)p; - cs_pid = 0; /* XXX */ - cs_zoneid = 0; + cs_addr = NULL; + cs_cid = (uint64_t)p; + cs_pid = 0; /* XXX */ + cs_zoneid = 0; }; #pragma D binding "1.5" translator Modified: stable/11/cddl/lib/libdtrace/libproc_compat.h ============================================================================== --- stable/11/cddl/lib/libdtrace/libproc_compat.h Mon May 14 23:12:30 2018 (r333616) +++ stable/11/cddl/lib/libdtrace/libproc_compat.h Tue May 15 00:00:44 2018 (r333617) @@ -4,7 +4,7 @@ * * This software was developed by Rui Paulo under sponsorship from the * FreeBSD Foundation. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: Modified: stable/11/cddl/lib/libdtrace/psinfo.d ============================================================================== --- stable/11/cddl/lib/libdtrace/psinfo.d Mon May 14 23:12:30 2018 (r333616) +++ stable/11/cddl/lib/libdtrace/psinfo.d Tue May 15 00:00:44 2018 (r333617) @@ -97,4 +97,3 @@ inline psinfo_t *curpsinfo = xlate (curth inline lwpsinfo_t *curlwpsinfo = xlate (curthread); #pragma D attributes Stable/Stable/Common curlwpsinfo #pragma D binding "1.0" curlwpsinfo - Modified: stable/11/cddl/lib/libdtrace/regs_x86.d ============================================================================== --- stable/11/cddl/lib/libdtrace/regs_x86.d Mon May 14 23:12:30 2018 (r333616) +++ stable/11/cddl/lib/libdtrace/regs_x86.d Tue May 15 00:00:44 2018 (r333617) @@ -1,4 +1,4 @@ -/* +/* * CDDL HEADER START * * The contents of this file are subject to the terms of the @@ -116,4 +116,3 @@ inline int R_R14 = 18 + 1 + 1; #pragma D binding "1.0" R_R14 inline int R_R15 = 18 + 1 + 0; #pragma D binding "1.0" R_R15 - Modified: stable/11/cddl/lib/libdtrace/sched.d ============================================================================== --- stable/11/cddl/lib/libdtrace/sched.d Mon May 14 23:12:30 2018 (r333616) +++ stable/11/cddl/lib/libdtrace/sched.d Tue May 15 00:00:44 2018 (r333617) @@ -81,4 +81,3 @@ inline chipid_t chip = curcpu->cpu_chip; inline lgrp_id_t lgrp = curcpu->cpu_lgrp; #pragma D attributes Stable/Stable/Common lgrp #pragma D binding "1.0" lgrp - Modified: stable/11/cddl/lib/libdtrace/signal.d ============================================================================== --- stable/11/cddl/lib/libdtrace/signal.d Mon May 14 23:12:30 2018 (r333616) +++ stable/11/cddl/lib/libdtrace/signal.d Tue May 15 00:00:44 2018 (r333617) @@ -20,6 +20,7 @@ * CDDL HEADER END * * Portions Copyright 2008 John Birrell jb@freebsd.org + * Portions Copyright 2018 Devin Teske dteske@freebsd.org * * $FreeBSD$ */ @@ -86,7 +87,48 @@ inline int SIGUSR1 = 30; #pragma D binding "1.0" SIGUSR1 inline int SIGUSR2 = 31; #pragma D binding "1.0" SIGUSR2 +inline int SIGTHR = 32; +#pragma D binding "1.13" SIGTHR +inline int SIGLIBRT = 33; +#pragma D binding "1.13" SIGLIBRT +#pragma D binding "1.13" signal_string +inline string signal_string[int signal] = + signal == SIGHUP ? "SIGHUP" : + signal == SIGINT ? "SIGINT" : + signal == SIGQUIT ? "SIGQUIT" : + signal == SIGILL ? "SIGILL": + signal == SIGTRAP ? "SIGTRAP" : + signal == SIGABRT ? "SIGABRT" : + signal == SIGEMT ? "SIGEMT" : + signal == SIGFPE ? "SIGFPE" : + signal == SIGKILL ? "SIGKILL" : + signal == SIGBUS ? "SIGBUS" : + signal == SIGSEGV ? "SIGSEGV" : + signal == SIGSYS ? "SIGSYS" : + signal == SIGPIPE ? "SIGPIPE" : + signal == SIGALRM ? "SIGALRM" : + signal == SIGTERM ? "SIGTERM" : + signal == SIGURG ? "SIGURG" : + signal == SIGSTOP ? "SIGSTOP" : + signal == SIGTSTP ? "SIGTSTP" : + signal == SIGCONT ? "SIGCONT" : + signal == SIGCHLD ? "SIGCHLD" : + signal == SIGTTIN ? "SIGTTIN" : + signal == SIGTTOU ? "SIGTTOU" : + signal == SIGIO ? "SIGIO" : + signal == SIGXCPU ? "SIGXCPU" : + signal == SIGXFSZ ? "SIGXFSZ" : + signal == SIGVTALRM ? "SIGVTALRM" : + signal == SIGPROF ? "SIGPROF" : + signal == SIGWINCH ? "SIGWINCH" : + signal == SIGINFO ? "SIGINFO" : + signal == SIGUSR1 ? "SIGUSR1" : + signal == SIGUSR2 ? "SIGUSR2" : + signal == SIGTHR ? "SIGTHR" : + signal == SIGLIBRT ? "SIGLIBRT" : + "UNKNOWN"; + inline int CLD_EXITED = 1; #pragma D binding "1.0" CLD_EXITED inline int CLD_KILLED = 2; @@ -99,3 +141,13 @@ inline int CLD_STOPPED = 5; #pragma D binding "1.0" CLD_STOPPED inline int CLD_CONTINUED = 6; #pragma D binding "1.0" CLD_CONTINUED + +#pragma D binding "1.13" child_signal_string +inline string child_signal_string[int child_signal] = + child_signal == CLD_EXITED ? "child exited" : + child_signal == CLD_KILLED ? "child terminated abnormally" : + child_signal == CLD_DUMPED ? "child core dumped" : + child_signal == CLD_TRAPPED ? "traced child trapped" : + child_signal == CLD_STOPPED ? "child stopped" : + child_signal == CLD_CONTINUED ? "stopped child continued" : + strjoin("unknown SIGCHLD code (", strjoin(lltostr(child_signal), ")")); Modified: stable/11/cddl/lib/libdtrace/tcp.d ============================================================================== --- stable/11/cddl/lib/libdtrace/tcp.d Mon May 14 23:12:30 2018 (r333616) +++ stable/11/cddl/lib/libdtrace/tcp.d Tue May 15 00:00:44 2018 (r333617) @@ -118,18 +118,18 @@ typedef struct tcpsinfo { int32_t tcps_rcv_ws; /* receive window scaling */ u_long tcps_cwnd; /* congestion window */ u_long tcps_cwnd_ssthresh; /* threshold for congestion avoidance */ - uint32_t tcps_srecover; /* for use in NewReno Fast Recovery */ + uint32_t tcps_srecover; /* for use in NewReno Fast Recovery */ uint32_t tcps_sack_fack; /* SACK sequence # we have acked */ uint32_t tcps_sack_snxt; /* next SACK seq # for retransmission */ uint32_t tcps_rto; /* round-trip timeout, msec */ uint32_t tcps_mss; /* max segment size */ int tcps_retransmit; /* retransmit send event, boolean */ int tcps_srtt; /* smoothed RTT in units of (TCP_RTT_SCALE*hz) */ - int tcps_debug; /* socket has SO_DEBUG set */ - int tcps_cookie; /* expose the socket's SO_USER_COOKIE */ - int32_t tcps_dupacks; /* consecutive dup acks received */ - uint32_t tcps_rtttime; /* RTT measurement start time */ - uint32_t tcps_rtseq; /* sequence # being timed */ + int tcps_debug; /* socket has SO_DEBUG set */ + int tcps_cookie; /* expose the socket's SO_USER_COOKIE */ + int32_t tcps_dupacks; /* consecutive dup acks received */ + uint32_t tcps_rtttime; /* RTT measurement start time */ + uint32_t tcps_rtseq; /* sequence # being timed */ uint32_t tcps_ts_recent; /* timestamp echo data */ } tcpsinfo_t; @@ -206,31 +206,31 @@ translator tcpsinfo_t < struct tcpcb *p > { tcps_snxt = p == NULL ? 0 : p->snd_nxt; tcps_rack = p == NULL ? 0 : p->last_ack_sent; tcps_rnxt = p == NULL ? 0 : p->rcv_nxt; - tcps_swnd = p == NULL ? -1 : p->snd_wnd; - tcps_snd_ws = p == NULL ? -1 : p->snd_scale; - tcps_swl1 = p == NULL ? -1 : p->snd_wl1; - tcps_swl2 = p == NULL ? -1 : p->snd_wl2; - tcps_radv = p == NULL ? -1 : p->rcv_adv; - tcps_rwnd = p == NULL ? -1 : p->rcv_wnd; - tcps_rup = p == NULL ? -1 : p->rcv_up; - tcps_rcv_ws = p == NULL ? -1 : p->rcv_scale; - tcps_cwnd = p == NULL ? -1 : p->snd_cwnd; - tcps_cwnd_ssthresh = p == NULL ? -1 : p->snd_ssthresh; - tcps_srecover = p == NULL ? -1 : p->snd_recover; + tcps_swnd = p == NULL ? -1 : p->snd_wnd; + tcps_snd_ws = p == NULL ? -1 : p->snd_scale; + tcps_swl1 = p == NULL ? -1 : p->snd_wl1; + tcps_swl2 = p == NULL ? -1 : p->snd_wl2; + tcps_radv = p == NULL ? -1 : p->rcv_adv; + tcps_rwnd = p == NULL ? -1 : p->rcv_wnd; + tcps_rup = p == NULL ? -1 : p->rcv_up; + tcps_rcv_ws = p == NULL ? -1 : p->rcv_scale; + tcps_cwnd = p == NULL ? -1 : p->snd_cwnd; + tcps_cwnd_ssthresh = p == NULL ? -1 : p->snd_ssthresh; + tcps_srecover = p == NULL ? -1 : p->snd_recover; tcps_sack_fack = p == NULL ? 0 : p->snd_fack; tcps_sack_snxt = p == NULL ? 0 : p->sack_newdata; tcps_rto = p == NULL ? -1 : (p->t_rxtcur * 1000) / `hz; - tcps_mss = p == NULL ? -1 : p->t_maxseg; + tcps_mss = p == NULL ? -1 : p->t_maxseg; tcps_retransmit = p == NULL ? -1 : p->t_rxtshift > 0 ? 1 : 0; - tcps_srtt = p == NULL ? -1 : p->t_srtt; /* smoothed RTT in units of (TCP_RTT_SCALE*hz) */ + tcps_srtt = p == NULL ? -1 : p->t_srtt; /* smoothed RTT in units of (TCP_RTT_SCALE*hz) */ tcps_debug = p == NULL ? 0 : p->t_inpcb->inp_socket->so_options & 1; tcps_cookie = p == NULL ? -1 : p->t_inpcb->inp_socket->so_user_cookie; - tcps_dupacks = p == NULL ? -1 : p->t_dupacks; - tcps_rtttime = p == NULL ? -1 : p->t_rtttime; - tcps_rtseq = p == NULL ? -1 : p->t_rtseq; - tcps_ts_recent = p == NULL ? -1 : p->ts_recent; + tcps_dupacks = p == NULL ? -1 : p->t_dupacks; + tcps_rtttime = p == NULL ? -1 : p->t_rtttime; + tcps_rtseq = p == NULL ? -1 : p->t_rtseq; + tcps_ts_recent = p == NULL ? -1 : p->ts_recent; }; #pragma D binding "1.6.3" translator @@ -319,74 +319,74 @@ inline int PRU_LISTEN = 3; #pragma D binding "1.12.1" PRU_CONNECT inline int PRU_CONNECT = 4; #pragma D binding "1.12.1" PRU_ACCEPT -inline int PRU_ACCEPT = 5 ; +inline int PRU_ACCEPT = 5 ; #pragma D binding "1.12.1" PRU_DISCONNECT -inline int PRU_DISCONNECT= 6; +inline int PRU_DISCONNECT = 6; #pragma D binding "1.12.1" PRU_SHUTDOWN -inline int PRU_SHUTDOWN = 7; +inline int PRU_SHUTDOWN = 7; #pragma D binding "1.12.1" PRU_RCVD -inline int PRU_RCVD = 8; +inline int PRU_RCVD = 8; #pragma D binding "1.12.1" PRU_SEND -inline int PRU_SEND = 9; +inline int PRU_SEND = 9; #pragma D binding "1.12.1" PRU_ABORT -inline int PRU_ABORT = 10; +inline int PRU_ABORT = 10; #pragma D binding "1.12.1" PRU_CONTROL -inline int PRU_CONTROL = 11; +inline int PRU_CONTROL = 11; #pragma D binding "1.12.1" PRU_SENSE -inline int PRU_SENSE = 12; +inline int PRU_SENSE = 12; #pragma D binding "1.12.1" PRU_RCVOOB -inline int PRU_RCVOOB = 13; +inline int PRU_RCVOOB = 13; #pragma D binding "1.12.1" PRU_SENDOOB -inline int PRU_SENDOOB = 14; +inline int PRU_SENDOOB = 14; #pragma D binding "1.12.1" PRU_SOCKADDR -inline int PRU_SOCKADDR = 15; +inline int PRU_SOCKADDR = 15; #pragma D binding "1.12.1" PRU_PEERADDR -inline int PRU_PEERADDR = 16; +inline int PRU_PEERADDR = 16; #pragma D binding "1.12.1" PRU_CONNECT2 -inline int PRU_CONNECT2 = 17; +inline int PRU_CONNECT2 = 17; #pragma D binding "1.12.1" PRU_FASTTIMO -inline int PRU_FASTTIMO = 18; +inline int PRU_FASTTIMO = 18; #pragma D binding "1.12.1" PRU_SLOWTIMO -inline int PRU_SLOWTIMO = 19; +inline int PRU_SLOWTIMO = 19; #pragma D binding "1.12.1" PRU_PROTORCV -inline int PRU_PROTORCV = 20; +inline int PRU_PROTORCV = 20; #pragma D binding "1.12.1" PRU_PROTOSEND -inline int PRU_PROTOSEND = 21; +inline int PRU_PROTOSEND = 21; #pragma D binding "1.12.1" PRU_SEND_EOF -inline int PRU_SEND_EOF = 22; +inline int PRU_SEND_EOF = 22; #pragma D binding "1.12.1" PRU_SOSETLABEL -inline int PRU_SOSETLABEL = 23; +inline int PRU_SOSETLABEL = 23; #pragma D binding "1.12.1" PRU_CLOSE -inline int PRU_CLOSE = 24; +inline int PRU_CLOSE = 24; #pragma D binding "1.12.1" PRU_FLUSH -inline int PRU_FLUSH = 25; +inline int PRU_FLUSH = 25; #pragma D binding "1.12.1" prureq_string inline string prureq_string[uint8_t req] = - req == PRU_ATTACH ? "ATTACH" : - req == PRU_DETACH ? "DETACH" : - req == PRU_BIND ? "BIND" : - req == PRU_LISTEN ? "LISTEN" : - req == PRU_CONNECT ? "CONNECT" : - req == PRU_ACCEPT ? "ACCEPT" : - req == PRU_DISCONNECT ? "DISCONNECT" : - req == PRU_SHUTDOWN ? "SHUTDOWN" : - req == PRU_RCVD ? "RCVD" : - req == PRU_SEND ? "SEND" : - req == PRU_ABORT ? "ABORT" : - req == PRU_CONTROL ? "CONTROL" : - req == PRU_SENSE ? "SENSE" : - req == PRU_RCVOOB ? "RCVOOB" : - req == PRU_SENDOOB ? "SENDOOB" : - req == PRU_SOCKADDR ? "SOCKADDR" : - req == PRU_PEERADDR ? "PEERADDR" : - req == PRU_CONNECT2 ? "CONNECT2" : - req == PRU_FASTTIMO ? "FASTTIMO" : - req == PRU_SLOWTIMO ? "SLOWTIMO" : - req == PRU_PROTORCV ? "PROTORCV" : - req == PRU_PROTOSEND ? "PROTOSEND" : - req == PRU_SEND ? "SEND_EOF" : - req == PRU_SOSETLABEL ? "SOSETLABEL" : - req == PRU_CLOSE ? "CLOSE" : - req == PRU_FLUSH ? "FLUSE" : + req == PRU_ATTACH ? "ATTACH" : + req == PRU_DETACH ? "DETACH" : + req == PRU_BIND ? "BIND" : + req == PRU_LISTEN ? "LISTEN" : + req == PRU_CONNECT ? "CONNECT" : + req == PRU_ACCEPT ? "ACCEPT" : + req == PRU_DISCONNECT ? "DISCONNECT" : + req == PRU_SHUTDOWN ? "SHUTDOWN" : + req == PRU_RCVD ? "RCVD" : + req == PRU_SEND ? "SEND" : + req == PRU_ABORT ? "ABORT" : + req == PRU_CONTROL ? "CONTROL" : + req == PRU_SENSE ? "SENSE" : + req == PRU_RCVOOB ? "RCVOOB" : + req == PRU_SENDOOB ? "SENDOOB" : + req == PRU_SOCKADDR ? "SOCKADDR" : + req == PRU_PEERADDR ? "PEERADDR" : + req == PRU_CONNECT2 ? "CONNECT2" : + req == PRU_FASTTIMO ? "FASTTIMO" : + req == PRU_SLOWTIMO ? "SLOWTIMO" : + req == PRU_PROTORCV ? "PROTORCV" : + req == PRU_PROTOSEND ? "PROTOSEND" : + req == PRU_SEND ? "SEND_EOF" : + req == PRU_SOSETLABEL ? "SOSETLABEL" : + req == PRU_CLOSE ? "CLOSE" : + req == PRU_FLUSH ? "FLUSE" : "unknown" ; Modified: stable/11/cddl/lib/libdtrace/udp.d ============================================================================== --- stable/11/cddl/lib/libdtrace/udp.d Mon May 14 23:12:30 2018 (r333616) +++ stable/11/cddl/lib/libdtrace/udp.d Tue May 15 00:00:44 2018 (r333617) @@ -47,7 +47,7 @@ typedef struct udpinfo { uint16_t udp_sport; /* source port */ uint16_t udp_dport; /* destination port */ uint16_t udp_length; /* total length */ - uint16_t udp_checksum; /* headers + data checksum */ + uint16_t udp_checksum; /* headers + data checksum */ struct udphdr *udp_hdr; /* raw UDP header */ } udpinfo_t; Modified: stable/11/cddl/usr.sbin/Makefile ============================================================================== --- stable/11/cddl/usr.sbin/Makefile Mon May 14 23:12:30 2018 (r333616) +++ stable/11/cddl/usr.sbin/Makefile Tue May 15 00:00:44 2018 (r333617) @@ -3,6 +3,7 @@ .include SUBDIR= ${_dtrace} \ + ${_dwatch} \ ${_lockstat} \ ${_plockstat} \ ${_tests} \ @@ -26,6 +27,7 @@ _zfsd= zfsd .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" _dtrace= dtrace +_dwatch= dwatch _lockstat= lockstat _plockstat= plockstat .endif @@ -33,15 +35,18 @@ _plockstat= plockstat .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm" || \ ${MACHINE_CPUARCH} == "riscv" _dtrace= dtrace +_dwatch= dwatch _lockstat= lockstat .endif .if ${MACHINE_CPUARCH} == "mips" _dtrace= dtrace +_dwatch= dwatch .endif .if ${MACHINE_CPUARCH} == "powerpc" _dtrace= dtrace +_dwatch= dwatch _lockstat= lockstat .endif Modified: stable/11/cddl/usr.sbin/dwatch/dwatch ============================================================================== --- head/cddl/usr.sbin/dwatch/dwatch Tue Mar 6 23:44:19 2018 (r330559) +++ stable/11/cddl/usr.sbin/dwatch/dwatch Tue May 15 00:00:44 2018 (r333617) @@ -47,7 +47,7 @@ DTRACE_PRAGMA=" ############################################################ GLOBALS -VERSION='$Version: 1.0-beta-91 $' # -V +VERSION='$Version: 1.2 $' # -V pgm="${0##*/}" # Program basename @@ -57,6 +57,12 @@ pgm="${0##*/}" # Program basename PROBE_ARG= # +# Command-line defaults +# +_MAX_ARGS=64 # -B num +_MAX_DEPTH=64 # -K num + +# # Command-line options # CONSOLE= # -y @@ -67,6 +73,7 @@ CUSTOM_DETAILS= # -E code CUSTOM_TEST= # -t test DEBUG= # -d DESTRUCTIVE_ACTIONS= # -w +DEVELOPER= # -dev EXECNAME= # -k name EXECREGEX= # -z regex EXIT_AFTER_COMPILE= # -e @@ -76,8 +83,8 @@ GROUP= # -g group JID= # -j jail LIST= # -l LIST_PROFILES= # -Q -MAX_ARGS=64 # -B num -MAX_DEPTH=64 # -K num +MAX_ARGS=$_MAX_ARGS # -B num +MAX_DEPTH=$_MAX_DEPTH # -K num ONELINE= # -1 OUTPUT= # -o file OUTPUT_CMD= # -O cmd @@ -143,7 +150,7 @@ usage() printf "$optfmt" "-1" \ "Print one line per process/profile (Default; disables \`-R')." printf "$optfmt" "-B num" \ - "Maximum process arguments to display (Default $MAX_ARGS)." + "Maximum process arguments to display (Default $_MAX_ARGS)." printf "$optfmt" "-d" \ "Debug. Send dtrace(1) script to stdout instead of executing." printf "$optfmt" "-e" \ @@ -161,7 +168,7 @@ usage() printf "$optfmt" "-k name" \ "Only show processes matching name." printf "$optfmt" "-K num" \ - "Maximum directory depth to display (Default $MAX_DEPTH)." + "Maximum directory depth to display (Default $_MAX_DEPTH)." printf "$optfmt" "-l" \ "List available probes on standard output and exit." printf "$optfmt" "-m" \ @@ -489,8 +496,7 @@ list_profiles() function ans(s) { return cons ? "\033[" s "m" : "" } gsub(filter, ans("31;1") "&" ans("39;22")) ' # END-QUOTE - return $SUCCESS - # NOTREACHED + exit $SUCCESS fi [ "$quiet" ] || echo PROFILES: @@ -531,6 +537,11 @@ list_profiles() exit $SUCCESS } +shell_escape() +{ + echo "$*" | awk 'gsub(/'\''/, "&\\\\&&")||1' +} + load_profile() { local profile="$1" @@ -540,7 +551,45 @@ load_profile() local oldIFS="$IFS" local dir found= + local ARGV= + [ $COUNT -gt 0 ] && ARGV="$ARGV -N $COUNT" + [ "$DEBUG" ] && ARGV="$ARGV -d" + [ "$DESTRUCTIVE_ACTIONS" ] && ARGV="$ARGV -w" + [ "$EXIT_AFTER_COMPILE" ] && ARGV="$ARGV -e" + [ "$GROUP" ] && ARGV="$ARGV -g $GROUP" + [ "$JID" ] && ARGV="$ARGV -j $JID" + [ $MAX_ARGS -ne $_MAX_ARGS ] && ARGV="$ARGV -B $MAX_ARGS" + [ $MAX_DEPTH -ne $_MAX_DEPTH ] && ARGV="$ARGV -K $MAX_DEPTH" + [ "$ONELINE" ] && ARGV="$ARGV -1" + [ "$PID" ] && ARGV="$ARGV -p $PID" + [ "$PSTREE" ] && ARGV="$ARGV -R" + [ "$QUIET" ] && ARGV="$ARGV -q" + [ "$TIMEOUT" ] && ARGV="$ARGV -T $TIMEOUT" + [ "$TRACE" ] && ARGV="$ARGV -x" + [ "$USER" ] && ARGV="$ARGV -u $USER" + [ "$VERBOSE" ] && ARGV="$ARGV -v" + + [ "$FILTER" ] && + ARGV="$ARGV -r '$( shell_escape "$FILTER" )'" + [ "$EXECREGEX" ] && + ARGV="$ARGV -z '$( shell_escape "$EXECREGEX" )'" + [ "$CUSTOM_DETAILS" ] && + ARGV="$ARGV -E '$( shell_escape "$EVENT_DETAILS" )'" + [ "$EVENT_TEST" ] && + ARGV="$ARGV -t '$( shell_escape "$EVENT_TEST" )'" + [ "$OUTPUT" ] && + ARGV="$ARGV -o '$( shell_escape "$OUTPUT" )'" + [ "$OUTPUT_CMD" ] && + ARGV="$ARGV -O '$( shell_escape "$OUTPUT_CMD" )'" + + case "$PROBE_TYPE" in + provider) ARGV="$ARGV -P" ;; + module) ARGV="$ARGV -m" ;; + function) ARGV="$ARGV -f" ;; + name) ARGV="$ARGV -n" ;; + esac + IFS=: for dir in $DWATCH_PROFILES_PATH; do [ -d "$dir" ] || continue @@ -835,6 +884,11 @@ if [ "$PROBE_ARG" ]; then fi # +# Developer switch +# +[ "$DEBUG" -a "$EXIT_AFTER_COMPILE" -a "$VERBOSE" ] && DEVELOPER=1 DEBUG= + +# # Set default event details if `-E code' was not given # [ "$CUSTOM_DETAILS" ] || EVENT_DETAILS=$( pproc_dump 0 ) @@ -848,7 +902,7 @@ fi # # Show the user what's being watched # -[ "$DEBUG$QUIET$EXIT_AFTER_COMPILE" ] || info "Watching '$PROBE' ..." +[ "$DEBUG$EXIT_AFTER_COMPILE" ] || info "Watching '$PROBE' ..." # # Header for watched probe entry @@ -966,6 +1020,61 @@ PSARGS_ACTION=$( cat <&9 ) exec 3>&1 console_stdout=3 + # + # Developer debugging aide + # + if [ "$DEVELOPER" ]; then + # + # Run, capture the error line, and focus it + # + # Example error text to capture line number from: + # dtrace: failed to compile script /dev/stdin: line 669: ... + # + errline= + stdin_buf=$( cat ) + stderr_buf=$( echo "$stdin_buf" | + dtrace_cmd -t -es /dev/stdin "$@" 2>&1 > /dev/null ) + status=$? + if [ "$stderr_buf" ]; then + errline=$( echo "$stderr_buf" | awk ' + BEGIN { + ti = "\033[31m" + te = "\033[39m" + } + { line = $0 } + sub(/.*: line /, "") && sub(/:.*/, "") { + print # to errline + sub("line " $0, ti "&" te, line) + } + { print line > "/dev/stderr" } + ' 2>&3 ) + fi + if [ "$errline" ]; then + echo "$stdin_buf" | awk -v line="${errline%%[^0-9]*}" ' + BEGIN { + start = line < 10 ? 1 : line - 10 + end = line + 10 + slen = length(sprintf("%u", start)) + elen = length(sprintf("%u", end)) + N = elen > slen ? elen : slen + for (i = start; i <= end; i++) { + ti[i] = "\033[2m" + te[i] = "\033[22m" + } + ti[line] = "\033[31m" + te[line] = "\033[39m" + fmt = "%s%*u %s%s\n" + } + NR < start { next } + NR == start, NR == end { + printf(fmt, ti[NR], N, NR, $0, te[NR]) + } + NR > end { exit } + ' # END-QUOTE + fi + exit $status + fi + if [ $COUNT -eq 0 -a ! "$EXECREGEX$FILTER$GROUP$OUTPUT_CMD$PID$USER" ] then case "$OUTPUT" in @@ -1285,6 +1394,7 @@ $( pproc_dump -v 3 )} } EOF +# NOTREACHED ################################################################################ # END Modified: stable/11/cddl/usr.sbin/dwatch/libexec/Makefile ============================================================================== --- head/cddl/usr.sbin/dwatch/libexec/Makefile Tue Mar 6 23:44:19 2018 (r330559) +++ stable/11/cddl/usr.sbin/dwatch/libexec/Makefile Tue May 15 00:00:44 2018 (r333617) @@ -11,6 +11,7 @@ FILES= chmod \ proc \ rw \ sched \ + sendrecv \ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-stable-11@freebsd.org Tue May 15 02:26:51 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9941CEB1428; Tue, 15 May 2018 02:26:51 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2221C77844; Tue, 15 May 2018 02:26:51 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DF41224CE7; Tue, 15 May 2018 02:26:50 +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 w4F2Qo0a027177; Tue, 15 May 2018 02:26:50 GMT (envelope-from gonzo@FreeBSD.org) Received: (from gonzo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4F2QoZe027176; Tue, 15 May 2018 02:26:50 GMT (envelope-from gonzo@FreeBSD.org) Message-Id: <201805150226.w4F2QoZe027176@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gonzo set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko Date: Tue, 15 May 2018 02:26: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: r333619 - stable/11/sys/arm/xilinx X-SVN-Group: stable-11 X-SVN-Commit-Author: gonzo X-SVN-Commit-Paths: stable/11/sys/arm/xilinx X-SVN-Commit-Revision: 333619 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 May 2018 02:26:51 -0000 Author: gonzo Date: Tue May 15 02:26:50 2018 New Revision: 333619 URL: https://svnweb.freebsd.org/changeset/base/333619 Log: MFC r331906: Approved by: re (gjb) Fix accidental USB port resets by GPIO on Zynq/Zedboard boards The Zynq/Zedboard GPIO driver attempts to tri-state all GPIO pins on boot up but the order in which I reset the hardware can cause the pins to be briefly held low before being tri-stated. This is a problem on boards that use GPIO pins to reset devices. In particular, the Zybo and ZC-706 boards use a GPIO pin as a USB PHY reset. If U-boot enables the USB port before booting the kernel, the GPIO driver attach causes a glitch on the USB PHY reset and the USB port loses power. My fix is to have the GPIO driver leave the pins in whatever configuration U-boot placed them. PR: 225713 Submitted by: Thomas Skibo Modified: stable/11/sys/arm/xilinx/zy7_gpio.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/arm/xilinx/zy7_gpio.c ============================================================================== --- stable/11/sys/arm/xilinx/zy7_gpio.c Tue May 15 00:50:09 2018 (r333618) +++ stable/11/sys/arm/xilinx/zy7_gpio.c Tue May 15 02:26:50 2018 (r333619) @@ -297,24 +297,6 @@ zy7_gpio_probe(device_t dev) return (0); } -static void -zy7_gpio_hw_reset(struct zy7_gpio_softc *sc) -{ - int i; - - for (i = 0; i < NUMBANKS; i++) { - WR4(sc, ZY7_GPIO_DATA(i), 0); - WR4(sc, ZY7_GPIO_DIRM(i), 0); - WR4(sc, ZY7_GPIO_OEN(i), 0); - WR4(sc, ZY7_GPIO_INT_DIS(i), 0xffffffff); - WR4(sc, ZY7_GPIO_INT_POLARITY(i), 0); - WR4(sc, ZY7_GPIO_INT_TYPE(i), - i == 1 ? 0x003fffff : 0xffffffff); - WR4(sc, ZY7_GPIO_INT_ANY(i), 0); - WR4(sc, ZY7_GPIO_INT_STAT(i), 0xffffffff); - } -} - static int zy7_gpio_detach(device_t dev); static int @@ -336,9 +318,6 @@ zy7_gpio_attach(device_t dev) zy7_gpio_detach(dev); return (ENOMEM); } - - /* Completely reset. */ - zy7_gpio_hw_reset(sc); sc->busdev = gpiobus_attach_bus(dev); if (sc->busdev == NULL) { From owner-svn-src-stable-11@freebsd.org Tue May 15 09:40:53 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 09A79EA8C15; Tue, 15 May 2018 09:40:53 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B3A2D78635; Tue, 15 May 2018 09:40:52 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 949F616A7; Tue, 15 May 2018 09:40:52 +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 w4F9eqoe045321; Tue, 15 May 2018 09:40:52 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4F9eqHV045320; Tue, 15 May 2018 09:40:52 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201805150940.w4F9eqHV045320@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Tue, 15 May 2018 09:40: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: r333624 - stable/11/sys/netinet6 X-SVN-Group: stable-11 X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: stable/11/sys/netinet6 X-SVN-Commit-Revision: 333624 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 May 2018 09:40:53 -0000 Author: hselasky Date: Tue May 15 09:40:52 2018 New Revision: 333624 URL: https://svnweb.freebsd.org/changeset/base/333624 Log: MFC r333362: Fix for missing network interface address event when adding the default IPv6 based link-local address. The default link local address for IPv6 is added as part of bringing the network interface up. Move the call to "EVENTHANDLER_INVOKE(ifaddr_event,)" from the SIOCAIFADDR_IN6 ioctl(2) handler to in6_notify_ifa() which should catch all the cases of adding IPv6 based addresses to a network interface. Add a witness warning in case the event handler is not allowed to sleep. Approved by: re (marius) Reviewed by: network (ae), kib Differential Revision: https://reviews.freebsd.org/D13407 Sponsored by: Mellanox Technologies Modified: stable/11/sys/netinet6/in6.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/netinet6/in6.c ============================================================================== --- stable/11/sys/netinet6/in6.c Tue May 15 07:46:24 2018 (r333623) +++ stable/11/sys/netinet6/in6.c Tue May 15 09:40:52 2018 (r333624) @@ -677,7 +677,6 @@ aifaddr_out: * The failure means address duplication was detected. */ } - EVENTHANDLER_INVOKE(ifaddr_event, ifp); break; } @@ -1364,7 +1363,7 @@ in6_notify_ifa(struct ifnet *ifp, struct in6_ifaddr *i if (ifacount <= 1 && ifp->if_ioctl) { error = (*ifp->if_ioctl)(ifp, SIOCSIFADDR, (caddr_t)ia); if (error) - return (error); + goto done; } /* @@ -1404,7 +1403,7 @@ in6_notify_ifa(struct ifnet *ifp, struct in6_ifaddr *i ia->ia_flags |= IFA_RTSELF; error = rtinit(&ia->ia_ifa, RTM_ADD, ia->ia_flags | rtflags); if (error) - return (error); + goto done; ia->ia_flags |= IFA_ROUTE; } @@ -1417,6 +1416,11 @@ in6_notify_ifa(struct ifnet *ifp, struct in6_ifaddr *i if (error == 0) ia->ia_flags |= IFA_RTSELF; } +done: + WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, + "Invoking IPv6 network device address event may sleep"); + + EVENTHANDLER_INVOKE(ifaddr_event, ifp); return (error); } From owner-svn-src-stable-11@freebsd.org Tue May 15 10:10:16 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 090B6EAAAF9; Tue, 15 May 2018 10:10:16 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id ACA977E5AF; Tue, 15 May 2018 10:10:15 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 888831B7A; Tue, 15 May 2018 10:10:15 +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 w4FAAFMV060400; Tue, 15 May 2018 10:10:15 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4FAAFNC060399; Tue, 15 May 2018 10:10:15 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201805151010.w4FAAFNC060399@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Tue, 15 May 2018 10:10: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: r333625 - stable/11/tests/sys/kern X-SVN-Group: stable-11 X-SVN-Commit-Author: kib X-SVN-Commit-Paths: stable/11/tests/sys/kern X-SVN-Commit-Revision: 333625 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 May 2018 10:10:16 -0000 Author: kib Date: Tue May 15 10:10:14 2018 New Revision: 333625 URL: https://svnweb.freebsd.org/changeset/base/333625 Log: Handle the difference between HEAD and stable/11 tests build. This is a direct commit to stable/11. PR: 228018, 228233 Tested by: Helge Oldach Sponsored by: The FreeBSD Foundation Approved by: re (marius) Modified: stable/11/tests/sys/kern/Makefile Modified: stable/11/tests/sys/kern/Makefile ============================================================================== --- stable/11/tests/sys/kern/Makefile Tue May 15 09:40:52 2018 (r333624) +++ stable/11/tests/sys/kern/Makefile Tue May 15 10:10:14 2018 (r333625) @@ -4,6 +4,7 @@ TESTSRC= ${SRCTOP}/contrib/netbsd-tests/kernel .PATH: ${SRCTOP}/sys/kern TESTSDIR= ${TESTSBASE}/sys/kern +BINDIR= ${TESTSDIR} ATF_TESTS_C+= kern_copyin ATF_TESTS_C+= kern_descrip_test From owner-svn-src-stable-11@freebsd.org Tue May 15 11:25:11 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9CE57EAF10F; Tue, 15 May 2018 11:25:11 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4E4B06FD1E; Tue, 15 May 2018 11:25:11 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 301A72832; Tue, 15 May 2018 11:25:11 +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 w4FBPBHr000795; Tue, 15 May 2018 11:25:11 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4FBPBpO000793; Tue, 15 May 2018 11:25:11 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201805151125.w4FBPBpO000793@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Tue, 15 May 2018 11:25:11 +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: r333626 - stable/11/sys/i386/include X-SVN-Group: stable-11 X-SVN-Commit-Author: kib X-SVN-Commit-Paths: stable/11/sys/i386/include X-SVN-Commit-Revision: 333626 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 May 2018 11:25:11 -0000 Author: kib Date: Tue May 15 11:25:10 2018 New Revision: 333626 URL: https://svnweb.freebsd.org/changeset/base/333626 Log: MFC r333504: Remove dead declaration. Approved by: re (marius) Modified: stable/11/sys/i386/include/pcb_ext.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/i386/include/pcb_ext.h ============================================================================== --- stable/11/sys/i386/include/pcb_ext.h Tue May 15 10:10:14 2018 (r333625) +++ stable/11/sys/i386/include/pcb_ext.h Tue May 15 11:25:10 2018 (r333626) @@ -44,10 +44,7 @@ struct pcb_ext { }; #ifdef _KERNEL -extern int private_tss; - int i386_extend_pcb(struct thread *); - #endif #endif /* _I386_PCB_EXT_H_ */ From owner-svn-src-stable-11@freebsd.org Tue May 15 11:43:06 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E95C7EB0185; Tue, 15 May 2018 11:43:05 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9A2BA73F69; Tue, 15 May 2018 11:43:05 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7AE7D2B6F; Tue, 15 May 2018 11:43:05 +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 w4FBh5EH010372; Tue, 15 May 2018 11:43:05 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4FBh5eU010371; Tue, 15 May 2018 11:43:05 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201805151143.w4FBh5eU010371@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Tue, 15 May 2018 11:43: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: r333627 - stable/11/sys/netinet X-SVN-Group: stable-11 X-SVN-Commit-Author: ae X-SVN-Commit-Paths: stable/11/sys/netinet X-SVN-Commit-Revision: 333627 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 May 2018 11:43:06 -0000 Author: ae Date: Tue May 15 11:43:05 2018 New Revision: 333627 URL: https://svnweb.freebsd.org/changeset/base/333627 Log: MFC r333244: Immediately propagate EACCES error code to application from tcp_output. In r309610 and r315514 the behavior of handling EACCES was changed, and tcp_output() now returns zero when EACCES happens. The reason of this change was a hesitation that applications that use TCP-MD5 will be affected by changes in project/ipsec. TCP-MD5 code returns EACCES when security assocition for given connection is not configured. But the same error code can return pfil(9), and this change has affected connections blocked by pfil(9). E.g. application doesn't return immediately when SYN segment is blocked, instead it waits when several tries will be failed. Actually, for TCP-MD5 application it doesn't matter will it get EACCES after first SYN, or after several tries. Security associtions must be configured before initiating TCP connection. I left the EACCES in the switch() to show that it has special handling. Reported by: Andreas Longwitz Approved by: re (marius) Modified: stable/11/sys/netinet/tcp_output.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/netinet/tcp_output.c ============================================================================== --- stable/11/sys/netinet/tcp_output.c Tue May 15 11:25:10 2018 (r333626) +++ stable/11/sys/netinet/tcp_output.c Tue May 15 11:43:05 2018 (r333627) @@ -1579,8 +1579,6 @@ timer: SOCKBUF_UNLOCK_ASSERT(&so->so_snd); /* Check gotos. */ switch (error) { case EACCES: - tp->t_softerror = error; - return (0); case EPERM: tp->t_softerror = error; return (error); From owner-svn-src-stable-11@freebsd.org Tue May 15 12:11:53 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BE19FEB4631; Tue, 15 May 2018 12:11:53 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6FEFD7A65C; Tue, 15 May 2018 12:11: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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5100F3015; Tue, 15 May 2018 12:11: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 w4FCBrOQ024971; Tue, 15 May 2018 12:11:53 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4FCBrL3024970; Tue, 15 May 2018 12:11:53 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201805151211.w4FCBrL3024970@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Tue, 15 May 2018 12:11: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: r333628 - stable/11/lib/libc/sys X-SVN-Group: stable-11 X-SVN-Commit-Author: kib X-SVN-Commit-Paths: stable/11/lib/libc/sys X-SVN-Commit-Revision: 333628 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 May 2018 12:11:53 -0000 Author: kib Date: Tue May 15 12:11:52 2018 New Revision: 333628 URL: https://svnweb.freebsd.org/changeset/base/333628 Log: MFC r333521: PROC_PDEATHSIG_CTL will appear first in 11.2. Approved by: re (marius) Modified: stable/11/lib/libc/sys/procctl.2 Directory Properties: stable/11/ (props changed) Modified: stable/11/lib/libc/sys/procctl.2 ============================================================================== --- stable/11/lib/libc/sys/procctl.2 Tue May 15 11:43:05 2018 (r333627) +++ stable/11/lib/libc/sys/procctl.2 Tue May 15 12:11:52 2018 (r333628) @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 20, 2018 +.Dd May 12, 2018 .Dt PROCCTL 2 .Os .Sh NAME @@ -550,4 +550,4 @@ The .Dv PROC_PDEATHSIG_CTL facility is based on the prctl(PR_SET_PDEATHSIG, ...) feature of Linux, and first appeared in -.Fx 12.0 . +.Fx 11.2 . From owner-svn-src-stable-11@freebsd.org Tue May 15 18:41:03 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DCB2CEEEF40; Tue, 15 May 2018 18:41:02 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 87DCA73BB0; Tue, 15 May 2018 18:41:02 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6A30F740B; Tue, 15 May 2018 18:41:02 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4FIf25K020967; Tue, 15 May 2018 18:41:02 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4FIf1ln020963; Tue, 15 May 2018 18:41:01 GMT (envelope-from np@FreeBSD.org) Message-Id: <201805151841.w4FIf1ln020963@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Tue, 15 May 2018 18: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: r333642 - in stable/11/sys: conf dev/cxgbe dev/cxgbe/common dev/cxgbe/firmware modules/cxgbe/t4_firmware modules/cxgbe/t5_firmware modules/cxgbe/t6_firmware X-SVN-Group: stable-11 X-SVN-Commit-Author: np X-SVN-Commit-Paths: in stable/11/sys: conf dev/cxgbe dev/cxgbe/common dev/cxgbe/firmware modules/cxgbe/t4_firmware modules/cxgbe/t5_firmware modules/cxgbe/t6_firmware X-SVN-Commit-Revision: 333642 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 May 2018 18:41:03 -0000 Author: np Date: Tue May 15 18:41:01 2018 New Revision: 333642 URL: https://svnweb.freebsd.org/changeset/base/333642 Log: MFC r331340, r331342, r331472, r332050, r333276, r333448: r331340: cxgbe(4): Tunnel congestion drops on a port should be cleared when the stats for that port are cleared. r331342: cxgbe(4): Do not read MFG diags information from custom boards. r331472: cxgbe(4): Always initialize requested_speed to a valid value. This fixes an avoidable EINVAL when the user tries to disable AN after the port is initialized but l1cfg doesn't have a valid speed to use. r332050: cxgbe(4): Always display an error message if SIOCSIFFLAGS will leave IFF_UP and IFF_DRV_RUNNING out of sync. ifhwioctl in the kernel pays no attention to the return code from the driver ioctl during SIOCSIFFLAGS so these messages are the only indication that the ioctl was called but failed. r333276: cxgbe(4): Update all firmwares to 1.19.1.0. r333448: cxgbe(4): Disable write-combined doorbells by default. This had been the default behavior but was changed accidentally as part of the recent iw_cxgbe+OFED overhaul. Fix another bug in that change while here: the global knob affects all the adapters in the system and should be left alone by per-adapter code. Approved by: re@ (marius@) Sponsored by: Chelsio Communications Added: stable/11/sys/dev/cxgbe/firmware/t4fw-1.19.1.0.bin.uu - copied unchanged from r333276, head/sys/dev/cxgbe/firmware/t4fw-1.19.1.0.bin.uu stable/11/sys/dev/cxgbe/firmware/t5fw-1.19.1.0.bin.uu - copied unchanged from r333276, head/sys/dev/cxgbe/firmware/t5fw-1.19.1.0.bin.uu stable/11/sys/dev/cxgbe/firmware/t6fw-1.19.1.0.bin.uu - copied unchanged from r333276, head/sys/dev/cxgbe/firmware/t6fw-1.19.1.0.bin.uu Deleted: stable/11/sys/dev/cxgbe/firmware/t4fw-1.16.63.0.bin.uu stable/11/sys/dev/cxgbe/firmware/t5fw-1.16.63.0.bin.uu stable/11/sys/dev/cxgbe/firmware/t6fw-1.16.63.0.bin.uu Modified: stable/11/sys/conf/files stable/11/sys/dev/cxgbe/common/t4_hw.c stable/11/sys/dev/cxgbe/firmware/t4fw_interface.h stable/11/sys/dev/cxgbe/firmware/t6fw_cfg_uwire.txt stable/11/sys/dev/cxgbe/t4_main.c stable/11/sys/modules/cxgbe/t4_firmware/Makefile stable/11/sys/modules/cxgbe/t5_firmware/Makefile stable/11/sys/modules/cxgbe/t6_firmware/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/conf/files ============================================================================== --- stable/11/sys/conf/files Tue May 15 17:59:46 2018 (r333641) +++ stable/11/sys/conf/files Tue May 15 18:41:01 2018 (r333642) @@ -1381,7 +1381,7 @@ t4fw.fwo optional cxgbe \ no-implicit-rule \ clean "t4fw.fwo" t4fw.fw optional cxgbe \ - dependency "$S/dev/cxgbe/firmware/t4fw-1.16.63.0.bin.uu" \ + dependency "$S/dev/cxgbe/firmware/t4fw-1.19.1.0.bin.uu" \ compile-with "${NORMAL_FW}" \ no-obj no-implicit-rule \ clean "t4fw.fw" @@ -1415,7 +1415,7 @@ t5fw.fwo optional cxgbe \ no-implicit-rule \ clean "t5fw.fwo" t5fw.fw optional cxgbe \ - dependency "$S/dev/cxgbe/firmware/t5fw-1.16.63.0.bin.uu" \ + dependency "$S/dev/cxgbe/firmware/t5fw-1.19.1.0.bin.uu" \ compile-with "${NORMAL_FW}" \ no-obj no-implicit-rule \ clean "t5fw.fw" @@ -1449,7 +1449,7 @@ t6fw.fwo optional cxgbe \ no-implicit-rule \ clean "t6fw.fwo" t6fw.fw optional cxgbe \ - dependency "$S/dev/cxgbe/firmware/t6fw-1.16.63.0.bin.uu" \ + dependency "$S/dev/cxgbe/firmware/t6fw-1.19.1.0.bin.uu" \ compile-with "${NORMAL_FW}" \ no-obj no-implicit-rule \ clean "t6fw.fw" Modified: stable/11/sys/dev/cxgbe/common/t4_hw.c ============================================================================== --- stable/11/sys/dev/cxgbe/common/t4_hw.c Tue May 15 17:59:46 2018 (r333641) +++ stable/11/sys/dev/cxgbe/common/t4_hw.c Tue May 15 18:41:01 2018 (r333642) @@ -2958,7 +2958,7 @@ static int get_vpd_keyword_val(const u8 *vpd, const ch * Reads card parameters stored in VPD EEPROM. */ static int get_vpd_params(struct adapter *adapter, struct vpd_params *p, - u32 *buf) + uint16_t device_id, u32 *buf) { int i, ret, addr; int ec, sn, pn, na, md; @@ -3026,12 +3026,16 @@ static int get_vpd_params(struct adapter *adapter, str memcpy(p->na, vpd + na, min(i, MACADDR_LEN)); strstrip((char *)p->na); + if (device_id & 0x80) + return 0; /* Custom card */ + md = get_vpd_keyword_val(vpd, "VF", 1); if (md < 0) { snprintf(p->md, sizeof(p->md), "unknown"); } else { i = vpd[md - VPD_INFO_FLD_HDR_SIZE + 2]; memcpy(p->md, vpd + md, min(i, MD_LEN)); + strstrip((char *)p->md); } return 0; @@ -3716,8 +3720,6 @@ int t4_link_l1cfg(struct adapter *adap, unsigned int m fec = FW_PORT_CAP_FEC_RS; else if (lc->requested_fec & FEC_BASER_RS) fec = FW_PORT_CAP_FEC_BASER_RS; - else if (lc->requested_fec & FEC_RESERVED) - fec = FW_PORT_CAP_FEC_RESERVED; if (!(lc->supported & FW_PORT_CAP_ANEG) || lc->requested_aneg == AUTONEG_DISABLE) { @@ -7714,8 +7716,6 @@ static void handle_port_info(struct port_info *pi, con fec |= FEC_RS; if (lc->advertising & FW_PORT_CAP_FEC_BASER_RS) fec |= FEC_BASER_RS; - if (lc->advertising & FW_PORT_CAP_FEC_RESERVED) - fec |= FEC_RESERVED; lc->fec = fec; } @@ -8051,10 +8051,6 @@ int t4_prep_adapter(struct adapter *adapter, u32 *buf) if (ret < 0) return ret; - ret = get_vpd_params(adapter, &adapter->params.vpd, buf); - if (ret < 0) - return ret; - /* Cards with real ASICs have the chipid in the PCIe device id */ t4_os_pci_read_cfg2(adapter, PCI_DEVICE_ID, &device_id); if (device_id >> 12 == chip_id(adapter)) @@ -8064,6 +8060,10 @@ int t4_prep_adapter(struct adapter *adapter, u32 *buf) adapter->params.fpga = 1; adapter->params.cim_la_size = 2 * CIMLA_SIZE; } + + ret = get_vpd_params(adapter, &adapter->params.vpd, device_id, buf); + if (ret < 0) + return ret; init_cong_ctrl(adapter->params.a_wnd, adapter->params.b_wnd); Copied: stable/11/sys/dev/cxgbe/firmware/t4fw-1.19.1.0.bin.uu (from r333276, head/sys/dev/cxgbe/firmware/t4fw-1.19.1.0.bin.uu) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/11/sys/dev/cxgbe/firmware/t4fw-1.19.1.0.bin.uu Tue May 15 18:41:01 2018 (r333642, copy of r333276, head/sys/dev/cxgbe/firmware/t4fw-1.19.1.0.bin.uu) @@ -0,0 +1,9747 @@ +/*- + * Copyright (c) 2018 Chelsio Communications, Inc. + * 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. + */ +begin-base64 644 t4fw +AAAEOgETAQAAAQkEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAABB0ELAQ0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAENoZWxzaW8gRlcgUlVOTUVNIERFQlVHPTAgKEJ1aWx0IFR1ZSBBcHIgMTAgMDU6 +MDY6MzIgUERUIDIwMTggb24gdm5jNC5hc2ljZGVzaWduZXJzLmNvbTovaG9tZS9maXJtd2FyZS9j +dnMvZnctcmVsZWFzZSksIFZlcnNpb24gVDR4eCAwMS4xMy4wMS4wMAAAAAAAAAAAAAAAAPpruZRg +AMgA4QB78AAQAADhADC4eP///x/84UCAAAAB4QB7cAAAEAAf//0o4QGUcCAAAADhAZwE4QB5AAAC +AEDhAHmAAAYAQAACAAoABgAK4QB5BAAMAACAAAEC4QB7POEAe0ThAHvk4gAAAAABAADhAHuQIAAA +AAAAgADhAHsAAABAAeEAe5wAAEAAREREQuAAAADjAARzREREQOMACAAgAAJcAAAAAB//jhAAAAAA +H/+OFAAAAAAf/44YAAAAAB//jhwf/8AAAAAAAAAAAADAABL/zRP/zZMgEv/NE//NhCAEMwGTIBH/ +zBL/zJIQEf/MEv/MkhAR/8wB9DER/8siCv+SEADkMQAFMQECABL/yALnMQIWABH/x4EQAQFfwCEC +EQHJERH/xBL/xJIQEf/EEv/EkhBgAA8R/78S/8OSEBH/vxL/wpIQgRAR/8HAIJIREv/AkhLAIJIT +Ev+/khCCEALyUGUv9xH/vccvkhAR/7ySEBL/vBP/vJMgwDKTIRP/u5MigiIS/7oT/7qTICMiIRT/ +uQQzAck4E/+4gzADgxQIMxEU/7akM5MhE/+qkyJgAAjCMJMhE/+nkyIS/7GQIJAhkCKQI5AkkCWQ +JpAnkCiQKZAqkCuQLJAtkC6QLyAmECAmEYIiEv+kwDAtNzAtNzQtNzgtNzwjPQFyM+0AAgAS/6HA +MC83AC83EC83IC83MCM9AXIz7QACABL/l8AwKDcwKDc0KDc4KDc8Iz0BcjPtEv+VwDAnNwAnNxAn +NyAnNzAjPQFyM+0S/5AV/5AW/5HAMNcgBWYBYAAZAAAAAAAAAAQ2BQACANMP0w8FMwxuOxQHRxQH +BEN2MeYENgUFMwxvO+0AAgAS/4MV/4EjCgACJwIHBEMEPgUFMwwHRxRvO/ADAgAS/33JLoMghCGF +IrwidDsOhlC0VZYwtDN0M/Rj/+YAZT/iZV/fEv9xwDIDLgUDAgAS/2jAMCg3QCg3RCg3SCg3TCM9 +AXIz7QACABL/ay0nAMARAUkxAEgxAQIAwAAU/2gE0jEV/2eUUBT/ZwTTMRX/ZpRQFP9mBNQxFf9m +lFAU/2UE1TEV/2WUUBD/ZQMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAf/AAA +H/wAAOMACfgf/AAAH/wAAOMACfgf/AAAH/wAAOMACfgf/4AAH/+FsOMACfgf/4WwH/+FsOMAD6gf +/4WwH/+FsOMAD6gf/4WwH/+HQOMAD6gf/4dAH/+OBOMAETgf/44QH/+yMOMAGAgf/7IwH/+yMOMA +PCgf/8AAH//+FeMAPCggAAAAIAABauMAekAgAAF4IAABfOMAe6wgAAF8IAABheMAe7AgAAGYIAAB +nOMAe7wgAAGcIAABpeMAe8AgAAG4IAABvOMAe8wgAAG8IAABxeMAe9AgAAHYIAAB2OMAe9wgAAHc +IAAB4uMAe9wgAAH4IAAB+OMAe+QgAAH8IAAB/OMAe+QgAAIYIAACGOMAe+QgAAIcIAACHOMAe+Qg +AAI4IAACOOMAe+QgAAI8IAACPOMAe+QgAAJYIAACWOMAe+QgAAJcIAACYuMAe+QgAAJ4IAACeOMA +e+wgAAJ8IAACguMAe+wgAAKYIAIPE+MAe/QgAwAAIAMXYOMCiHAgAxdgIAMXYOMCn9AgAxdgIAcH +5OMCn9AgBwfwIAcLYOMGkGAgCAAAIAgS8OMGk9AgCBLwIAksXuMGpsAgCSxgIAktLOMHwDAgCwAA +IAsAAOMHwPwgCwAAIAsAAOMHwPwgCwAAIAt3GOMHwPwAAAAAAAAAAAAAAAAgABQWIAAUCCAAF/Ig +ABQIIAAXbSAAFAggABS6IAAXBSAAFoogABQIIAAWOSAAFfIgABWFIAAT9SAAFS8gABQIIAAUCCAA +FAggABTaAAAAAP///////w/8///w////APz///////8P/P//8P///wD8IADIliAAyh4gAMpOIADK +FCAAyb8gAMm1IADJhCAAyXogAMlwIADJHyAAykwgAMkVIADI5SAAyk4gAMjbIADIyQEQGAEABAAA +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 +H/+AAAAAPyggAxCMz////yALBfAQAAAAP////wIAAABAAAAAGgAAAB/84HQgoAAAH/+nuCAAHeAg +AB98gAAAAAAAgAD//v//AAAQAABAAAAgADn8IAAjCCAAAAAgACNwIAsIwP//f///+///D/aAACAL +CPAgCwkgAAEAAAAEAAAf/6goIAtTYCALCbAgADToIAA2OCAAMxwgCwtQIAsKECALCqAgADFkIAsK +8FMAAAAA////UgAAAFEAAAAgAf5YH/+p2CAAOWAgBA1gH/+p0CALC3Af/5kUH/+ppCALDZAUAAAA +gAAAAnxQAACAAAAQgAAABoAAsAAAAAoAAP80kv//8A+AALEA4QGaAAACAAAgCw0gH/+WiAAAfkAg +Cw1gH/+p1AD/wAABAAAAKAAAAOAAAAAmAAAAAAD//x//j3AGAAAABYAAAB//pYgrAAAAIABWACAL +VkAf/6dUA4AAAAf///8EAQAINQAAAAMAAAAAP///gEAAAAgP//8f////QUAAAEFAAQAABf//AQQB +AAEEAAAAAMAAH/+puD0AAAAf/5UABwAAAIEEAQCBBAAAH/+pkAAAOpjDAAAAAAAP/wBDAAAf/6cY +AAAIAAQAAAAgC1agH/+xZB//r7Af/5RYAAYAAOEAegAf/5TAH/+pxB//qgAf/5kkH/+ZECALVtAA +AweAIAtXQAgAAAAf/5bwACAAAAAACQAAADAC//z4f8AAAACj/7sAo/+6AA0AAADgAwAAg/+2AA// +//8P//gA/wAAACALV4AgCw7QIAsPACALWBAADwAAAAoAAP//AA8D/8AAg//AACALWJAgC1kAH/+q +SB//sCD/YPAAH/+wAB//jiAEgAAIH/+AUABEAAABgMIAAACBAB//jmAf/4Bg/x///wDAAADwAAAA +gYAAAP9///8f/6Rc/7//////AAAAgAAAAACG3R//mlwf/OIAH/+PYO4AAAAAAAnMH/ziDA8AAAAg +Cw9AAAAIzB//q1Qf/5pkIAsRMCADCDDg//4AIAtM0B//muAf/5T8H/+AcCAHCZAAADAAAAAnEB// +3CAgC2OQIAtjYB//qrQf/5T0AAD//h//mQTerb7vNAAAAD8AAAAAAIkGAJkAAB//rygQAAcCAcCA +AB//rwSZAAAAH/+v5ACIAAiCgAABH/+veP//8AADFQAAAxEAAAAPA/8gAQHsIAEF2CkAAAAAAIkU +IAEKrCADC3QAAEAAIAMOoAwAAAAgARWwH/+wQAAAIaAgAwuEH/+qGB//rkgf/6nc/wD/APDw8PCq +qqqqzMzMzB//pcgAA///AAAn/yADC8ggC2PgIAEmCAAPQkAgA1t4H/+qeAAJAAAAAEgAggAAACAB +Omgf/6osOwAACA4AAADQAAAAH/+AsAAAIooAAAhQAAAfQB//qeQgCyKwIAsi0CALIvD/3///AAkA +CB//r3QwAAAAfwAAAB//qBQgCyYQAAAP/iALJUAgCyWgIAsl4AAA4AD///f/IAsmoCADYqwAAIP/ +IAcPmBWgAAAgBxCQH/+vOAAACAYAAIjMH/+WoAAEA/8KAAAAIAcMKCAHDcggBwxwH/+ZoIP/twCD +/7YgIAsm0OEAAAAzAAAAH/+vQB//sDQD/+AAf///AAA/9pAAACKYA//wACALSiAgC0ngIAtKQB// +sUAf/688AA///x//qeAgC2ZAH/+ZRCAAerggBwkYIAAFiB//pKAf/5YcH/+UjB//qRQgCydQwAQA +AB//p9Af/6fEH/+n3B//rfAf/61kIAPm4CALJ5AgAw9QH/+l3CAAe5jgAQAAH/+aYCALZwAgCyfQ +IADBkB//mlggAL6QH/+QqCALZoAgC2bQH/+WwCALKeAf/480H/+Q7CALPkAgCz5wSAAAACAB0Bgf +/6dkIAHSHB//lUgf/6Y8H/+lJB//pOwAABhQAAAWTB//qDQgBwukH/+lfB//lMThAC4AH/+oQOEA +XgDhAg4A//+//+EADgDhAY4A//++/x//pgwgAddgIAHjdOAFAAAD/wAAH/+lRCADDqgf/L//PAAA +AB//gLiDAAAAH/+lLA88AAAgC0mggoAAACACBVQgAggIH/+qxCACC8AAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAACBgAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAgYAAAAAAAAD/////////////////////H//8AB///AAf//vIH//7 +yB//+8gf//vIH//1SB//+Hgf//bQH//20B//9tAgBt+AAAAAAAAAAAAAAAAAAAAAACAG4sggBuLI +AAAAAAAAAAAAAAAAAAAAACAG34AgBt+AH//5dB//+XQf//l0H//5dB//+XQf//l0AAAAACAB2HgA +AAAAAAAAAAAAAAAAAAAAAgEAAAAAAAAAAAAAAAAAAAEDEREICBAJAwEAAAAAAAAEAAAAAAAAAIGA +AAAAAAAQBQAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAgQAAAAAAABgFAAAAgAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAACAKABHxaxPxa9MPA+YxAQIAFvFpF/Fqd2sGkGC0Zndj+FQPEFXRwg8UAGP/+QAA +AGwQCCggBZQVJCAH9mCkFaAZRQD5AA2NYUQBAIgiGvFdF/Fc7fFdHAsOAAAMSRGnmSuSnsDp/2AM ++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 *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-stable-11@freebsd.org Wed May 16 11:06:40 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6C46EED9DA9; Wed, 16 May 2018 11:06:40 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 19748835F3; Wed, 16 May 2018 11:06: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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EA56B19619; Wed, 16 May 2018 11:06:39 +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 w4GB6d3n021255; Wed, 16 May 2018 11:06:39 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4GB6dx5021254; Wed, 16 May 2018 11:06:39 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201805161106.w4GB6dx5021254@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Wed, 16 May 2018 11:06: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: r333671 - stable/11/sys/amd64/amd64 X-SVN-Group: stable-11 X-SVN-Commit-Author: kib X-SVN-Commit-Paths: stable/11/sys/amd64/amd64 X-SVN-Commit-Revision: 333671 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 May 2018 11:06:40 -0000 Author: kib Date: Wed May 16 11:06:39 2018 New Revision: 333671 URL: https://svnweb.freebsd.org/changeset/base/333671 Log: MFC r333404, r333405: Remove PG_U from the recursive pte for kernel pmap' PML4 page and from the rest of the kernel pmap ptes. Approved by: re (marius) Modified: stable/11/sys/amd64/amd64/pmap.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/amd64/amd64/pmap.c ============================================================================== --- stable/11/sys/amd64/amd64/pmap.c Wed May 16 10:08:50 2018 (r333670) +++ stable/11/sys/amd64/amd64/pmap.c Wed May 16 11:06:39 2018 (r333671) @@ -951,8 +951,7 @@ create_pagetables(vm_paddr_t *firstaddr) /* And connect up the PD to the PDP (leaving room for L4 pages) */ pdp_p = (pdp_entry_t *)(KPDPphys + ptoa(KPML4I - KPML4BASE)); for (i = 0; i < nkpdpe; i++) - pdp_p[i + KPDPI] = (KPDphys + ptoa(i)) | X86_PG_RW | X86_PG_V | - PG_U; + pdp_p[i + KPDPI] = (KPDphys + ptoa(i)) | X86_PG_RW | X86_PG_V; /* * Now, set up the direct map region using 2MB and/or 1GB pages. If @@ -978,24 +977,24 @@ create_pagetables(vm_paddr_t *firstaddr) } for (j = 0; i < ndmpdp; i++, j++) { pdp_p[i] = DMPDphys + ptoa(j); - pdp_p[i] |= X86_PG_RW | X86_PG_V | PG_U; + pdp_p[i] |= X86_PG_RW | X86_PG_V; } /* And recursively map PML4 to itself in order to get PTmap */ p4_p = (pml4_entry_t *)KPML4phys; p4_p[PML4PML4I] = KPML4phys; - p4_p[PML4PML4I] |= X86_PG_RW | X86_PG_V | PG_U | pg_nx; + p4_p[PML4PML4I] |= X86_PG_RW | X86_PG_V | pg_nx; /* Connect the Direct Map slot(s) up to the PML4. */ for (i = 0; i < ndmpdpphys; i++) { p4_p[DMPML4I + i] = DMPDPphys + ptoa(i); - p4_p[DMPML4I + i] |= X86_PG_RW | X86_PG_V | PG_U; + p4_p[DMPML4I + i] |= X86_PG_RW | X86_PG_V; } /* Connect the KVA slots up to the PML4 */ for (i = 0; i < NKPML4E; i++) { p4_p[KPML4BASE + i] = KPDPphys + ptoa(i); - p4_p[KPML4BASE + i] |= X86_PG_RW | X86_PG_V | PG_U; + p4_p[KPML4BASE + i] |= X86_PG_RW | X86_PG_V; } } @@ -2564,11 +2563,11 @@ pmap_pinit_pml4(vm_page_t pml4pg) /* Wire in kernel global address entries. */ for (i = 0; i < NKPML4E; i++) { pm_pml4[KPML4BASE + i] = (KPDPphys + ptoa(i)) | X86_PG_RW | - X86_PG_V | PG_U; + X86_PG_V; } for (i = 0; i < ndmpdpphys; i++) { pm_pml4[DMPML4I + i] = (DMPDPphys + ptoa(i)) | X86_PG_RW | - X86_PG_V | PG_U; + X86_PG_V; } /* install self-referential address mapping entry(s) */ From owner-svn-src-stable-11@freebsd.org Wed May 16 13:18:40 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5437FEE1BFD; Wed, 16 May 2018 13:18:40 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E80AC68147; Wed, 16 May 2018 13:18:39 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BC7A01AAA3; Wed, 16 May 2018 13:18: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 w4GDIdwr086349; Wed, 16 May 2018 13:18:39 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4GDIcpx086341; Wed, 16 May 2018 13:18:38 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201805161318.w4GDIcpx086341@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Wed, 16 May 2018 13:18: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: r333673 - in stable/11/etc: etc.aarch64 etc.amd64 etc.arm etc.i386 etc.powerpc etc.riscv etc.sparc64 X-SVN-Group: stable-11 X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in stable/11/etc: etc.aarch64 etc.amd64 etc.arm etc.i386 etc.powerpc etc.riscv etc.sparc64 X-SVN-Commit-Revision: 333673 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 May 2018 13:18:40 -0000 Author: imp Date: Wed May 16 13:18:37 2018 New Revision: 333673 URL: https://svnweb.freebsd.org/changeset/base/333673 Log: MFC r333436: only launch getty if underlying device exists Note: pc98 isn't run under VM, so I didn't do a direct commit to it. Approved by: re@ (gjb@) Modified: stable/11/etc/etc.aarch64/ttys stable/11/etc/etc.amd64/ttys stable/11/etc/etc.arm/ttys stable/11/etc/etc.i386/ttys stable/11/etc/etc.powerpc/ttys stable/11/etc/etc.riscv/ttys stable/11/etc/etc.sparc64/ttys Directory Properties: stable/11/ (props changed) Modified: stable/11/etc/etc.aarch64/ttys ============================================================================== --- stable/11/etc/etc.aarch64/ttys Wed May 16 11:19:03 2018 (r333672) +++ stable/11/etc/etc.aarch64/ttys Wed May 16 13:18:37 2018 (r333673) @@ -29,16 +29,16 @@ # when going to single-user mode. console none unknown off secure # -ttyv0 "/usr/libexec/getty Pc" xterm onifconsole secure +ttyv0 "/usr/libexec/getty Pc" xterm onifexists secure # Virtual terminals -ttyv1 "/usr/libexec/getty Pc" xterm off secure -ttyv2 "/usr/libexec/getty Pc" xterm off secure -ttyv3 "/usr/libexec/getty Pc" xterm off secure -ttyv4 "/usr/libexec/getty Pc" xterm off secure -ttyv5 "/usr/libexec/getty Pc" xterm off secure -ttyv6 "/usr/libexec/getty Pc" xterm off secure -ttyv7 "/usr/libexec/getty Pc" xterm off secure -#ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure +ttyv1 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv2 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv3 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv4 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv5 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv6 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv7 "/usr/libexec/getty Pc" xterm onifexists secure +#ttyv8 "/usr/local/bin/xdm -nodaemon" xterm onifexists secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. ttyu0 "/usr/libexec/getty 3wire" vt100 onifconsole secure Modified: stable/11/etc/etc.amd64/ttys ============================================================================== --- stable/11/etc/etc.amd64/ttys Wed May 16 11:19:03 2018 (r333672) +++ stable/11/etc/etc.amd64/ttys Wed May 16 13:18:37 2018 (r333673) @@ -29,15 +29,15 @@ # when going to single-user mode. console none unknown off secure # -ttyv0 "/usr/libexec/getty Pc" xterm on secure +ttyv0 "/usr/libexec/getty Pc" xterm onifexists secure # Virtual terminals -ttyv1 "/usr/libexec/getty Pc" xterm on secure -ttyv2 "/usr/libexec/getty Pc" xterm on secure -ttyv3 "/usr/libexec/getty Pc" xterm on secure -ttyv4 "/usr/libexec/getty Pc" xterm on secure -ttyv5 "/usr/libexec/getty Pc" xterm on secure -ttyv6 "/usr/libexec/getty Pc" xterm on secure -ttyv7 "/usr/libexec/getty Pc" xterm on secure +ttyv1 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv2 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv3 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv4 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv5 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv6 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv7 "/usr/libexec/getty Pc" xterm onifexists secure ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. Modified: stable/11/etc/etc.arm/ttys ============================================================================== --- stable/11/etc/etc.arm/ttys Wed May 16 11:19:03 2018 (r333672) +++ stable/11/etc/etc.arm/ttys Wed May 16 13:18:37 2018 (r333673) @@ -29,15 +29,15 @@ # when going to single-user mode. console none unknown off secure # -ttyv0 "/usr/libexec/getty Pc" xterm onifconsole secure +ttyv0 "/usr/libexec/getty Pc" xterm onifexists secure # Virtual terminals -ttyv1 "/usr/libexec/getty Pc" xterm off secure -ttyv2 "/usr/libexec/getty Pc" xterm off secure -ttyv3 "/usr/libexec/getty Pc" xterm off secure -ttyv4 "/usr/libexec/getty Pc" xterm off secure -ttyv5 "/usr/libexec/getty Pc" xterm off secure -ttyv6 "/usr/libexec/getty Pc" xterm off secure -ttyv7 "/usr/libexec/getty Pc" xterm off secure +ttyv1 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv2 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv3 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv4 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv5 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv6 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv7 "/usr/libexec/getty Pc" xterm onifexists secure #ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. Modified: stable/11/etc/etc.i386/ttys ============================================================================== --- stable/11/etc/etc.i386/ttys Wed May 16 11:19:03 2018 (r333672) +++ stable/11/etc/etc.i386/ttys Wed May 16 13:18:37 2018 (r333673) @@ -29,15 +29,15 @@ # when going to single-user mode. console none unknown off secure # -ttyv0 "/usr/libexec/getty Pc" xterm on secure +ttyv0 "/usr/libexec/getty Pc" xterm onifexists secure # Virtual terminals -ttyv1 "/usr/libexec/getty Pc" xterm on secure -ttyv2 "/usr/libexec/getty Pc" xterm on secure -ttyv3 "/usr/libexec/getty Pc" xterm on secure -ttyv4 "/usr/libexec/getty Pc" xterm on secure -ttyv5 "/usr/libexec/getty Pc" xterm on secure -ttyv6 "/usr/libexec/getty Pc" xterm on secure -ttyv7 "/usr/libexec/getty Pc" xterm on secure +ttyv1 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv2 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv3 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv4 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv5 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv6 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv7 "/usr/libexec/getty Pc" xterm onifexists secure ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. Modified: stable/11/etc/etc.powerpc/ttys ============================================================================== --- stable/11/etc/etc.powerpc/ttys Wed May 16 11:19:03 2018 (r333672) +++ stable/11/etc/etc.powerpc/ttys Wed May 16 13:18:37 2018 (r333673) @@ -29,15 +29,15 @@ # when going to single-user mode. console none unknown off secure # -ttyv0 "/usr/libexec/getty Pc" xterm on secure +ttyv0 "/usr/libexec/getty Pc" xterm onifexists secure # Virtual terminals -ttyv1 "/usr/libexec/getty Pc" xterm on secure -ttyv2 "/usr/libexec/getty Pc" xterm on secure -ttyv3 "/usr/libexec/getty Pc" xterm on secure -ttyv4 "/usr/libexec/getty Pc" xterm on secure -ttyv5 "/usr/libexec/getty Pc" xterm on secure -ttyv6 "/usr/libexec/getty Pc" xterm on secure -ttyv7 "/usr/libexec/getty Pc" xterm on secure +ttyv1 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv2 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv3 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv4 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv5 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv6 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv7 "/usr/libexec/getty Pc" xterm onifexists secure #ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. Modified: stable/11/etc/etc.riscv/ttys ============================================================================== --- stable/11/etc/etc.riscv/ttys Wed May 16 11:19:03 2018 (r333672) +++ stable/11/etc/etc.riscv/ttys Wed May 16 13:18:37 2018 (r333673) @@ -29,16 +29,16 @@ # when going to single-user mode. console none unknown off secure # -ttyv0 "/usr/libexec/getty Pc" xterm onifconsole secure +ttyv0 "/usr/libexec/getty Pc" xterm onifexists secure # Virtual terminals -ttyv1 "/usr/libexec/getty Pc" xterm off secure -ttyv2 "/usr/libexec/getty Pc" xterm off secure -ttyv3 "/usr/libexec/getty Pc" xterm off secure -ttyv4 "/usr/libexec/getty Pc" xterm off secure -ttyv5 "/usr/libexec/getty Pc" xterm off secure -ttyv6 "/usr/libexec/getty Pc" xterm off secure -ttyv7 "/usr/libexec/getty Pc" xterm off secure -#ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure +ttyv1 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv2 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv3 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv4 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv5 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv6 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv7 "/usr/libexec/getty Pc" xterm onifexists secure +#ttyv8 "/usr/local/bin/xdm -nodaemon" xterm onifexists secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. ttyu0 "/usr/libexec/getty 3wire" vt100 onifconsole secure Modified: stable/11/etc/etc.sparc64/ttys ============================================================================== --- stable/11/etc/etc.sparc64/ttys Wed May 16 11:19:03 2018 (r333672) +++ stable/11/etc/etc.sparc64/ttys Wed May 16 13:18:37 2018 (r333673) @@ -33,15 +33,15 @@ screen "/usr/libexec/getty Pc" vt100 off secure ttya "/usr/libexec/getty 3wire.9600" vt100 off secure ttyb "/usr/libexec/getty 3wire.9600" vt100 off secure # syscons(4) -ttyv0 "/usr/libexec/getty Pc" xterm on secure +ttyv0 "/usr/libexec/getty Pc" xterm onifexists secure # Virtual terminals -ttyv1 "/usr/libexec/getty Pc" xterm on secure -ttyv2 "/usr/libexec/getty Pc" xterm on secure -ttyv3 "/usr/libexec/getty Pc" xterm on secure -ttyv4 "/usr/libexec/getty Pc" xterm on secure -ttyv5 "/usr/libexec/getty Pc" xterm on secure -ttyv6 "/usr/libexec/getty Pc" xterm on secure -ttyv7 "/usr/libexec/getty Pc" xterm on secure +ttyv1 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv2 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv3 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv4 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv5 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv6 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv7 "/usr/libexec/getty Pc" xterm onifexists secure ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. From owner-svn-src-stable-11@freebsd.org Wed May 16 21:04:21 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 04275EB1AD9; Wed, 16 May 2018 21:04:21 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AB15E7C073; Wed, 16 May 2018 21:04:20 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8D9141F713; Wed, 16 May 2018 21:04:20 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4GL4K4x029012; Wed, 16 May 2018 21:04:20 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4GL4Kmw029010; Wed, 16 May 2018 21:04:20 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201805162104.w4GL4Kmw029010@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Wed, 16 May 2018 21:04: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: r333687 - stable/11/sys/arm/include X-SVN-Group: stable-11 X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: stable/11/sys/arm/include X-SVN-Commit-Revision: 333687 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 May 2018 21:04:21 -0000 Author: jhb Date: Wed May 16 21:04:19 2018 New Revision: 333687 URL: https://svnweb.freebsd.org/changeset/base/333687 Log: MFC 332891,332892: Fixes for atomic_*cmpset() on arm. 332891: Fix some harmless type mismatches in the ARM atomic_cmpset implementations. The return value of atomic_cmpset() and atomic_fcmpset() is an int (which is really a bool) that has the values 0 or 1. Some of the inlines were using the type being operated on (e.g. uint32_t) as either the return type of the function, or the type of a local 'ret' variable used to hold the return value. Fix all of these to just use plain 'int'. Due to C promotion rules and the fact that the value can only be 0 or 1, these should all be harmless. 332892: Implement 32-bit atomic_fcmpset() in userland for armv4/v5. - Add an implementation of atomic_fcmpset_32() using RAS for armv4/v5. This fixes recent world breakage due to use of atomic_fcmpset() in userland. - While here, be more careful to not expose wrapper macros for 64-bit atomic_*cmpset to userland for armv4/v5 as only 32-bit cmpset is implemented. This has been reviewed, but not runtime-tested, but should fix the arm.arm and arm.armeb worlds that have been broken for a while. Approved by: re (kib) Modified: stable/11/sys/arm/include/atomic-v4.h stable/11/sys/arm/include/atomic-v6.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/arm/include/atomic-v4.h ============================================================================== --- stable/11/sys/arm/include/atomic-v4.h Wed May 16 21:03:22 2018 (r333686) +++ stable/11/sys/arm/include/atomic-v4.h Wed May 16 21:04:19 2018 (r333687) @@ -115,7 +115,7 @@ atomic_clear_64(volatile uint64_t *address, uint64_t c static __inline int atomic_fcmpset_32(volatile u_int32_t *p, volatile u_int32_t *cmpval, volatile u_int32_t newval) { - u_int32_t ret; + int ret; __with_interrupts_disabled( { @@ -134,7 +134,7 @@ atomic_fcmpset_32(volatile u_int32_t *p, volatile u_in static __inline int atomic_fcmpset_64(volatile u_int64_t *p, volatile u_int64_t *cmpval, volatile u_int64_t newval) { - u_int64_t ret; + int ret; __with_interrupts_disabled( { @@ -149,7 +149,7 @@ atomic_fcmpset_64(volatile u_int64_t *p, volatile u_in return (ret); } -static __inline u_int32_t +static __inline int atomic_cmpset_32(volatile u_int32_t *p, volatile u_int32_t cmpval, volatile u_int32_t newval) { int ret; @@ -166,7 +166,7 @@ atomic_cmpset_32(volatile u_int32_t *p, volatile u_int return (ret); } -static __inline u_int64_t +static __inline int atomic_cmpset_64(volatile u_int64_t *p, volatile u_int64_t cmpval, volatile u_int64_t newval) { int ret; @@ -296,7 +296,7 @@ atomic_clear_32(volatile uint32_t *address, uint32_t c } -static __inline u_int32_t +static __inline int atomic_cmpset_32(volatile u_int32_t *p, volatile u_int32_t cmpval, volatile u_int32_t newval) { int done, ras_start = ARM_RAS_START; @@ -321,6 +321,33 @@ atomic_cmpset_32(volatile u_int32_t *p, volatile u_int return (done); } +static __inline int +atomic_fcmpset_32(volatile u_int32_t *p, volatile u_int32_t *cmpval, volatile u_int32_t newval) +{ + int done, oldval, ras_start = ARM_RAS_START; + + __asm __volatile("1:\n" + "adr %1, 1b\n" + "str %1, [%0]\n" + "adr %1, 2f\n" + "str %1, [%0, #4]\n" + "ldr %1, [%2]\n" + "ldr %5, [%3]\n" + "cmp %1, %5\n" + "streq %4, [%2]\n" + "2:\n" + "mov %5, #0\n" + "str %5, [%0]\n" + "mov %5, #0xffffffff\n" + "str %5, [%0, #4]\n" + "strne %1, [%3]\n" + "moveq %1, #1\n" + "movne %1, #0\n" + : "+r" (ras_start), "=r" (done) ,"+r" (p) + , "+r" (cmpval), "+r" (newval), "+r" (oldval) : : "cc", "memory"); + return (done); +} + static __inline uint32_t atomic_fetchadd_32(volatile uint32_t *p, uint32_t v) { @@ -409,14 +436,18 @@ atomic_swap_32(volatile u_int32_t *p, u_int32_t v) #define atomic_fcmpset_rel_32 atomic_fcmpset_32 #define atomic_fcmpset_acq_32 atomic_fcmpset_32 +#ifdef _KERNEL #define atomic_fcmpset_rel_64 atomic_fcmpset_64 #define atomic_fcmpset_acq_64 atomic_fcmpset_64 +#endif #define atomic_fcmpset_acq_long atomic_fcmpset_long #define atomic_fcmpset_rel_long atomic_fcmpset_long #define atomic_cmpset_rel_32 atomic_cmpset_32 #define atomic_cmpset_acq_32 atomic_cmpset_32 +#ifdef _KERNEL #define atomic_cmpset_rel_64 atomic_cmpset_64 #define atomic_cmpset_acq_64 atomic_cmpset_64 +#endif #define atomic_set_rel_32 atomic_set_32 #define atomic_set_acq_32 atomic_set_32 #define atomic_clear_rel_32 atomic_clear_32 @@ -463,8 +494,6 @@ atomic_cmpset_long(volatile u_long *dst, u_long old, u return (atomic_cmpset_32((volatile uint32_t *)dst, old, newe)); } -#ifdef _KERNEL -/* atomic_fcmpset_32 is only defined for the kernel */ static __inline u_long atomic_fcmpset_long(volatile u_long *dst, u_long *old, u_long newe) { @@ -472,7 +501,6 @@ atomic_fcmpset_long(volatile u_long *dst, u_long *old, return (atomic_fcmpset_32((volatile uint32_t *)dst, (uint32_t *)old, newe)); } -#endif static __inline u_long atomic_fetchadd_long(volatile u_long *p, u_long v) Modified: stable/11/sys/arm/include/atomic-v6.h ============================================================================== --- stable/11/sys/arm/include/atomic-v6.h Wed May 16 21:03:22 2018 (r333686) +++ stable/11/sys/arm/include/atomic-v6.h Wed May 16 21:04:19 2018 (r333687) @@ -209,7 +209,7 @@ atomic_fcmpset_32(volatile uint32_t *p, uint32_t *cmpv return (!ret); } -static __inline uint64_t +static __inline int atomic_fcmpset_64(volatile uint64_t *p, uint64_t *cmpval, uint64_t newval) { uint64_t tmp; @@ -235,7 +235,7 @@ atomic_fcmpset_64(volatile uint64_t *p, uint64_t *cmpv return (!ret); } -static __inline u_long +static __inline int atomic_fcmpset_long(volatile u_long *p, u_long *cmpval, u_long newval) { @@ -243,38 +243,38 @@ atomic_fcmpset_long(volatile u_long *p, u_long *cmpval (uint32_t *)cmpval, newval)); } -static __inline uint64_t +static __inline int atomic_fcmpset_acq_64(volatile uint64_t *p, uint64_t *cmpval, uint64_t newval) { - uint64_t ret; + int ret; ret = atomic_fcmpset_64(p, cmpval, newval); dmb(); return (ret); } -static __inline u_long +static __inline int atomic_fcmpset_acq_long(volatile u_long *p, u_long *cmpval, u_long newval) { - u_long ret; + int ret; ret = atomic_fcmpset_long(p, cmpval, newval); dmb(); return (ret); } -static __inline uint32_t +static __inline int atomic_fcmpset_acq_32(volatile uint32_t *p, uint32_t *cmpval, uint32_t newval) { - uint32_t ret; + int ret; ret = atomic_fcmpset_32(p, cmpval, newval); dmb(); return (ret); } -static __inline uint32_t +static __inline int atomic_fcmpset_rel_32(volatile uint32_t *p, uint32_t *cmpval, uint32_t newval) { @@ -282,7 +282,7 @@ atomic_fcmpset_rel_32(volatile uint32_t *p, uint32_t * return (atomic_fcmpset_32(p, cmpval, newval)); } -static __inline uint64_t +static __inline int atomic_fcmpset_rel_64(volatile uint64_t *p, uint64_t *cmpval, uint64_t newval) { @@ -290,7 +290,7 @@ atomic_fcmpset_rel_64(volatile uint64_t *p, uint64_t * return (atomic_fcmpset_64(p, cmpval, newval)); } -static __inline u_long +static __inline int atomic_fcmpset_rel_long(volatile u_long *p, u_long *cmpval, u_long newval) { @@ -298,10 +298,10 @@ atomic_fcmpset_rel_long(volatile u_long *p, u_long *cm return (atomic_fcmpset_long(p, cmpval, newval)); } -static __inline uint32_t +static __inline int atomic_cmpset_32(volatile uint32_t *p, uint32_t cmpval, uint32_t newval) { - uint32_t ret; + int ret; __asm __volatile( "1: ldrex %0, [%1] \n" @@ -349,44 +349,44 @@ atomic_cmpset_64(volatile uint64_t *p, uint64_t cmpval return (ret); } -static __inline u_long +static __inline int atomic_cmpset_long(volatile u_long *p, u_long cmpval, u_long newval) { return (atomic_cmpset_32((volatile uint32_t *)p, cmpval, newval)); } -static __inline uint32_t +static __inline int atomic_cmpset_acq_32(volatile uint32_t *p, uint32_t cmpval, uint32_t newval) { - uint32_t ret; + int ret; ret = atomic_cmpset_32(p, cmpval, newval); dmb(); return (ret); } -static __inline uint64_t +static __inline int atomic_cmpset_acq_64(volatile uint64_t *p, uint64_t cmpval, uint64_t newval) { - uint64_t ret; + int ret; ret = atomic_cmpset_64(p, cmpval, newval); dmb(); return (ret); } -static __inline u_long +static __inline int atomic_cmpset_acq_long(volatile u_long *p, u_long cmpval, u_long newval) { - u_long ret; + int ret; ret = atomic_cmpset_long(p, cmpval, newval); dmb(); return (ret); } -static __inline uint32_t +static __inline int atomic_cmpset_rel_32(volatile uint32_t *p, uint32_t cmpval, uint32_t newval) { @@ -394,7 +394,7 @@ atomic_cmpset_rel_32(volatile uint32_t *p, uint32_t cm return (atomic_cmpset_32(p, cmpval, newval)); } -static __inline uint64_t +static __inline int atomic_cmpset_rel_64(volatile uint64_t *p, uint64_t cmpval, uint64_t newval) { @@ -402,7 +402,7 @@ atomic_cmpset_rel_64(volatile uint64_t *p, uint64_t cm return (atomic_cmpset_64(p, cmpval, newval)); } -static __inline u_long +static __inline int atomic_cmpset_rel_long(volatile u_long *p, u_long cmpval, u_long newval) { From owner-svn-src-stable-11@freebsd.org Thu May 17 10:01:48 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7090EEE538F; Thu, 17 May 2018 10:01:48 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1E459772B1; Thu, 17 May 2018 10:01: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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F3507279DF; Thu, 17 May 2018 10:01:47 +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 w4HA1lWW030307; Thu, 17 May 2018 10:01:47 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4HA1lxw030306; Thu, 17 May 2018 10:01:47 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201805171001.w4HA1lxw030306@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Thu, 17 May 2018 10:01: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: r333705 - stable/11/sbin/ipfw X-SVN-Group: stable-11 X-SVN-Commit-Author: ae X-SVN-Commit-Paths: stable/11/sbin/ipfw X-SVN-Commit-Revision: 333705 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 10:01:48 -0000 Author: ae Date: Thu May 17 10:01:47 2018 New Revision: 333705 URL: https://svnweb.freebsd.org/changeset/base/333705 Log: MFC r333458: Fix the printing of rule comments. Change uint8_t type of opcode argument to int in the print_opcode() function. Use negative value to print the rest of opcodes, because zero value is O_NOP, and it can't be uses for this purpose. Reported by: lev Approved by: re (gjb) Modified: stable/11/sbin/ipfw/ipfw2.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sbin/ipfw/ipfw2.c ============================================================================== --- stable/11/sbin/ipfw/ipfw2.c Thu May 17 06:04:50 2018 (r333704) +++ stable/11/sbin/ipfw/ipfw2.c Thu May 17 10:01:47 2018 (r333705) @@ -1708,7 +1708,7 @@ print_instruction(struct buf_pr *bp, const struct form static ipfw_insn * print_opcode(struct buf_pr *bp, struct format_opts *fo, - struct show_state *state, uint8_t opcode) + struct show_state *state, int opcode) { ipfw_insn *cmd; int l; @@ -1716,7 +1716,7 @@ print_opcode(struct buf_pr *bp, struct format_opts *fo for (l = state->rule->act_ofs, cmd = state->rule->cmd; l > 0; l -= F_LEN(cmd), cmd += F_LEN(cmd)) { /* We use zero opcode to print the rest of options */ - if (opcode != 0 && cmd->opcode != opcode) + if (opcode >= 0 && cmd->opcode != opcode) continue; /* * Skip O_NOP, when we printing the rest @@ -2192,7 +2192,7 @@ show_static_rule(struct cmdline_opts *co, struct forma O_IP_DSTPORT, HAVE_DSTIP); /* Print the rest of options */ - while (print_opcode(bp, fo, &state, 0)) + while (print_opcode(bp, fo, &state, -1)) ; end: /* Print comment at the end */ From owner-svn-src-stable-11@freebsd.org Thu May 17 15:24:55 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 469B4EACB61; Thu, 17 May 2018 15:24:55 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EC2A784F70; Thu, 17 May 2018 15:24:54 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CA6C52F9B; Thu, 17 May 2018 15:24:54 +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 w4HFOsM5093639; Thu, 17 May 2018 15:24:54 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4HFOr90093633; Thu, 17 May 2018 15:24:53 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201805171524.w4HFOr90093633@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Thu, 17 May 2018 15:24: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: r333720 - in stable/11/sys: amd64/amd64 i386/i386 kern sys X-SVN-Group: stable-11 X-SVN-Commit-Author: kib X-SVN-Commit-Paths: in stable/11/sys: amd64/amd64 i386/i386 kern sys X-SVN-Commit-Revision: 333720 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 15:24:55 -0000 Author: kib Date: Thu May 17 15:24:53 2018 New Revision: 333720 URL: https://svnweb.freebsd.org/changeset/base/333720 Log: MFC r333228 Implement support for ifuncs in the kernel linker on x86. MFC r333411: Avoid calls to bzero() before ireloc Approved by: re (marius) Modified: stable/11/sys/amd64/amd64/elf_machdep.c stable/11/sys/amd64/amd64/machdep.c stable/11/sys/i386/i386/elf_machdep.c stable/11/sys/i386/i386/machdep.c stable/11/sys/kern/link_elf.c stable/11/sys/kern/link_elf_obj.c stable/11/sys/sys/linker.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/amd64/amd64/elf_machdep.c ============================================================================== --- stable/11/sys/amd64/amd64/elf_machdep.c Thu May 17 15:21:19 2018 (r333719) +++ stable/11/sys/amd64/amd64/elf_machdep.c Thu May 17 15:24:53 2018 (r333720) @@ -173,10 +173,13 @@ elf64_dump_thread(struct thread *td, void *dst, size_t *off = len; } +#define ERI_LOCAL 0x0001 +#define ERI_ONLYIFUNC 0x0002 + /* Process one elf relocation with addend. */ static int elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data, - int type, int local, elf_lookup_fn lookup) + int type, elf_lookup_fn lookup, int flags) { Elf64_Addr *where, val; Elf32_Addr *where32, val32; @@ -215,6 +218,9 @@ elf_reloc_internal(linker_file_t lf, Elf_Addr relocbas panic("unknown reloc type %d\n", type); } + if (((flags & ERI_ONLYIFUNC) == 0) ^ (rtype != R_X86_64_IRELATIVE)) + return (0); + switch (rtype) { case R_X86_64_NONE: /* none */ break; @@ -273,6 +279,13 @@ elf_reloc_internal(linker_file_t lf, Elf_Addr relocbas *where = val; break; + case R_X86_64_IRELATIVE: + addr = relocbase + addend; + val = ((Elf64_Addr (*)(void))addr)(); + if (*where != val) + *where = val; + break; + default: printf("kldload: unexpected relocation type %ld\n", rtype); @@ -282,11 +295,20 @@ elf_reloc_internal(linker_file_t lf, Elf_Addr relocbas } int +elf_reloc_ifunc(linker_file_t lf, Elf_Addr relocbase, const void *data, + int type, elf_lookup_fn lookup) +{ + + return (elf_reloc_internal(lf, relocbase, data, type, lookup, + ERI_ONLYIFUNC)); +} + +int elf_reloc(linker_file_t lf, Elf_Addr relocbase, const void *data, int type, elf_lookup_fn lookup) { - return (elf_reloc_internal(lf, relocbase, data, type, 0, lookup)); + return (elf_reloc_internal(lf, relocbase, data, type, lookup, 0)); } int @@ -294,7 +316,8 @@ elf_reloc_local(linker_file_t lf, Elf_Addr relocbase, int type, elf_lookup_fn lookup) { - return (elf_reloc_internal(lf, relocbase, data, type, 1, lookup)); + return (elf_reloc_internal(lf, relocbase, data, type, lookup, + ERI_LOCAL)); } int Modified: stable/11/sys/amd64/amd64/machdep.c ============================================================================== --- stable/11/sys/amd64/amd64/machdep.c Thu May 17 15:21:19 2018 (r333719) +++ stable/11/sys/amd64/amd64/machdep.c Thu May 17 15:24:53 2018 (r333720) @@ -1564,16 +1564,23 @@ hammer_time(u_int64_t modulep, u_int64_t physfree) size_t kstack0_sz; int late_console; - /* - * This may be done better later if it gets more high level - * components in it. If so just link td->td_proc here. - */ - proc_linkup0(&proc0, &thread0); - kmdp = init_ops.parse_preload_data(modulep); identify_cpu1(); identify_hypervisor(); + /* + * hw.cpu_stdext_disable is ignored by the call, it will be + * re-evaluted by the below call to finishidentcpu(). + */ + identify_cpu2(); + + link_elf_ireloc(kmdp); + + /* + * This may be done better later if it gets more high level + * components in it. If so just link td->td_proc here. + */ + proc_linkup0(&proc0, &thread0); /* Init basic tunables, hz etc */ init_param1(); Modified: stable/11/sys/i386/i386/elf_machdep.c ============================================================================== --- stable/11/sys/i386/i386/elf_machdep.c Thu May 17 15:21:19 2018 (r333719) +++ stable/11/sys/i386/i386/elf_machdep.c Thu May 17 15:24:53 2018 (r333720) @@ -158,10 +158,13 @@ elf32_dump_thread(struct thread *td, void *dst, size_t *off = len; } +#define ERI_LOCAL 0x0001 +#define ERI_ONLYIFUNC 0x0002 + /* Process one elf relocation with addend. */ static int elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data, - int type, int local, elf_lookup_fn lookup) + int type, elf_lookup_fn lookup, int flags) { Elf_Addr *where; Elf_Addr addr; @@ -190,7 +193,10 @@ elf_reloc_internal(linker_file_t lf, Elf_Addr relocbas panic("unknown reloc type %d\n", type); } - if (local) { + if (((flags & ERI_ONLYIFUNC) == 0) ^ (rtype != R_386_IRELATIVE)) + return (0); + + if ((flags & ERI_LOCAL) != 0) { if (rtype == R_386_RELATIVE) { /* A + B */ addr = elf_relocaddr(lf, relocbase + addend); if (*where != addr) @@ -242,6 +248,12 @@ elf_reloc_internal(linker_file_t lf, Elf_Addr relocbas case R_386_RELATIVE: break; + case R_386_IRELATIVE: + addr = relocbase + addend; + addr = ((Elf_Addr (*)(void))addr)(); + if (*where != addr) + *where = addr; + break; default: printf("kldload: unexpected relocation type %d\n", rtype); @@ -251,11 +263,20 @@ elf_reloc_internal(linker_file_t lf, Elf_Addr relocbas } int +elf_reloc_ifunc(linker_file_t lf, Elf_Addr relocbase, const void *data, + int type, elf_lookup_fn lookup) +{ + + return (elf_reloc_internal(lf, relocbase, data, type, lookup, + ERI_ONLYIFUNC)); +} + +int elf_reloc(linker_file_t lf, Elf_Addr relocbase, const void *data, int type, elf_lookup_fn lookup) { - return (elf_reloc_internal(lf, relocbase, data, type, 0, lookup)); + return (elf_reloc_internal(lf, relocbase, data, type, lookup, 0)); } int @@ -263,7 +284,8 @@ elf_reloc_local(linker_file_t lf, Elf_Addr relocbase, int type, elf_lookup_fn lookup) { - return (elf_reloc_internal(lf, relocbase, data, type, 1, lookup)); + return (elf_reloc_internal(lf, relocbase, data, type, lookup, + ERI_LOCAL)); } int Modified: stable/11/sys/i386/i386/machdep.c ============================================================================== --- stable/11/sys/i386/i386/machdep.c Thu May 17 15:21:19 2018 (r333719) +++ stable/11/sys/i386/i386/machdep.c Thu May 17 15:24:53 2018 (r333720) @@ -2441,6 +2441,7 @@ init386(int first) int gsel_tss, metadata_missing, x, pa; struct pcpu *pc; struct xstate_hdr *xhdr; + caddr_t kmdp; int late_console; thread0.td_kstack = proc0kstack; @@ -2687,6 +2688,9 @@ init386(int first) cninit(); i386_kdb_init(); } + + kmdp = preload_search_by_type("elf kernel"); + link_elf_ireloc(kmdp); vm86_initialize(); getmemsize(first); Modified: stable/11/sys/kern/link_elf.c ============================================================================== --- stable/11/sys/kern/link_elf.c Thu May 17 15:21:19 2018 (r333719) +++ stable/11/sys/kern/link_elf.c Thu May 17 15:24:53 2018 (r333720) @@ -188,6 +188,9 @@ static struct linker_class link_elf_class = { static int parse_dynamic(elf_file_t); static int relocate_file(elf_file_t); +static int relocate_file1(elf_file_t ef, int (*elf_reloc_func)( + linker_file_t lf, Elf_Addr relocbase, const void *data, + int type, elf_lookup_fn lookup)); static int link_elf_preload_parse_symbols(elf_file_t); static struct elf_set_head set_pcpu_list; @@ -1183,7 +1186,8 @@ symbol_name(elf_file_t ef, Elf_Size r_info) } static int -relocate_file(elf_file_t ef) +relocate_file1(elf_file_t ef, int (*elf_reloc_func)(linker_file_t lf, + Elf_Addr relocbase, const void *data, int type, elf_lookup_fn lookup)) { const Elf_Rel *rellim; const Elf_Rel *rel; @@ -1197,7 +1201,7 @@ relocate_file(elf_file_t ef) rellim = (const Elf_Rel *) ((const char *)ef->rel + ef->relsize); while (rel < rellim) { - if (elf_reloc(&ef->lf, (Elf_Addr)ef->address, rel, + if (elf_reloc_func(&ef->lf, (Elf_Addr)ef->address, rel, ELF_RELOC_REL, elf_lookup)) { symname = symbol_name(ef, rel->r_info); printf("link_elf: symbol %s undefined\n", symname); @@ -1213,7 +1217,7 @@ relocate_file(elf_file_t ef) relalim = (const Elf_Rela *) ((const char *)ef->rela + ef->relasize); while (rela < relalim) { - if (elf_reloc(&ef->lf, (Elf_Addr)ef->address, rela, + if (elf_reloc_func(&ef->lf, (Elf_Addr)ef->address, rela, ELF_RELOC_RELA, elf_lookup)) { symname = symbol_name(ef, rela->r_info); printf("link_elf: symbol %s undefined\n", @@ -1230,7 +1234,7 @@ relocate_file(elf_file_t ef) rellim = (const Elf_Rel *) ((const char *)ef->pltrel + ef->pltrelsize); while (rel < rellim) { - if (elf_reloc(&ef->lf, (Elf_Addr)ef->address, rel, + if (elf_reloc_func(&ef->lf, (Elf_Addr)ef->address, rel, ELF_RELOC_REL, elf_lookup)) { symname = symbol_name(ef, rel->r_info); printf("link_elf: symbol %s undefined\n", @@ -1247,7 +1251,7 @@ relocate_file(elf_file_t ef) relalim = (const Elf_Rela *) ((const char *)ef->pltrela + ef->pltrelasize); while (rela < relalim) { - if (elf_reloc(&ef->lf, (Elf_Addr)ef->address, rela, + if (elf_reloc_func(&ef->lf, (Elf_Addr)ef->address, rela, ELF_RELOC_RELA, elf_lookup)) { symname = symbol_name(ef, rela->r_info); printf("link_elf: symbol %s undefined\n", @@ -1261,6 +1265,19 @@ relocate_file(elf_file_t ef) return (0); } +static int +relocate_file(elf_file_t ef) +{ + int e; + + e = relocate_file1(ef, elf_reloc); +#if defined(__i386__) || defined(__amd64__) + if (e == 0) + e = relocate_file1(ef, elf_reloc_ifunc); +#endif + return (e); +} + /* * Hash function for symbol table lookup. Don't even think about changing * this. It is specified by the System V ABI. @@ -1318,7 +1335,8 @@ link_elf_lookup_symbol(linker_file_t lf, const char* n if (strcmp(name, strp) == 0) { if (symp->st_shndx != SHN_UNDEF || (symp->st_value != 0 && - ELF_ST_TYPE(symp->st_info) == STT_FUNC)) { + (ELF_ST_TYPE(symp->st_info) == STT_FUNC || + ELF_ST_TYPE(symp->st_info) == STT_GNU_IFUNC))) { *sym = (c_linker_sym_t) symp; return (0); } @@ -1338,7 +1356,8 @@ link_elf_lookup_symbol(linker_file_t lf, const char* n if (strcmp(name, strp) == 0) { if (symp->st_shndx != SHN_UNDEF || (symp->st_value != 0 && - ELF_ST_TYPE(symp->st_info) == STT_FUNC)) { + (ELF_ST_TYPE(symp->st_info) == STT_FUNC || + ELF_ST_TYPE(symp->st_info) == STT_GNU_IFUNC))) { *sym = (c_linker_sym_t) symp; return (0); } @@ -1353,12 +1372,18 @@ static int link_elf_symbol_values(linker_file_t lf, c_linker_sym_t sym, linker_symval_t *symval) { - elf_file_t ef = (elf_file_t) lf; - const Elf_Sym* es = (const Elf_Sym*) sym; + elf_file_t ef; + const Elf_Sym *es; + caddr_t val; + ef = (elf_file_t)lf; + es = (const Elf_Sym *)sym; if (es >= ef->symtab && es < (ef->symtab + ef->nchains)) { symval->name = ef->strtab + es->st_name; - symval->value = (caddr_t) ef->address + es->st_value; + val = (caddr_t)ef->address + es->st_value; + if (ELF_ST_TYPE(es->st_info) == STT_GNU_IFUNC) + val = ((caddr_t (*)(void))val)(); + symval->value = val; symval->size = es->st_size; return (0); } @@ -1366,7 +1391,10 @@ link_elf_symbol_values(linker_file_t lf, c_linker_sym_ return (ENOENT); if (es >= ef->ddbsymtab && es < (ef->ddbsymtab + ef->ddbsymcnt)) { symval->name = ef->ddbstrtab + es->st_name; - symval->value = (caddr_t) ef->address + es->st_value; + val = (caddr_t)ef->address + es->st_value; + if (ELF_ST_TYPE(es->st_info) == STT_GNU_IFUNC) + val = ((caddr_t (*)(void))val)(); + symval->value = val; symval->size = es->st_size; return (0); } @@ -1476,7 +1504,8 @@ link_elf_each_function_name(linker_file_t file, /* Exhaustive search */ for (i = 0, symp = ef->ddbsymtab; i < ef->ddbsymcnt; i++, symp++) { if (symp->st_value != 0 && - ELF_ST_TYPE(symp->st_info) == STT_FUNC) { + (ELF_ST_TYPE(symp->st_info) == STT_FUNC || + ELF_ST_TYPE(symp->st_info) == STT_GNU_IFUNC)) { error = callback(ef->ddbstrtab + symp->st_name, opaque); if (error != 0) return (error); @@ -1497,7 +1526,8 @@ link_elf_each_function_nameval(linker_file_t file, /* Exhaustive search */ for (i = 0, symp = ef->ddbsymtab; i < ef->ddbsymcnt; i++, symp++) { if (symp->st_value != 0 && - ELF_ST_TYPE(symp->st_info) == STT_FUNC) { + (ELF_ST_TYPE(symp->st_info) == STT_FUNC || + ELF_ST_TYPE(symp->st_info) == STT_GNU_IFUNC)) { error = link_elf_symbol_values(file, (c_linker_sym_t) symp, &symval); if (error != 0) @@ -1656,3 +1686,27 @@ link_elf_strtab_get(linker_file_t lf, caddr_t *strtab) return (ef->ddbstrcnt); } + +#if defined(__i386__) || defined(__amd64__) +void +link_elf_ireloc(caddr_t kmdp) +{ + struct elf_file eff; + elf_file_t ef; + volatile char *c; + size_t i; + + ef = &eff; + + /* Do not use bzero/memset before ireloc is done. */ + for (c = (char *)ef, i = 0; i < sizeof(*ef); i++) + c[i] = 0; + + ef->modptr = kmdp; + ef->dynamic = (Elf_Dyn *)&_DYNAMIC; + parse_dynamic(ef); + ef->address = 0; + link_elf_preload_parse_symbols(ef); + relocate_file1(ef, elf_reloc_ifunc); +} +#endif Modified: stable/11/sys/kern/link_elf_obj.c ============================================================================== --- stable/11/sys/kern/link_elf_obj.c Thu May 17 15:21:19 2018 (r333719) +++ stable/11/sys/kern/link_elf_obj.c Thu May 17 15:24:53 2018 (r333720) @@ -1194,12 +1194,19 @@ static int link_elf_symbol_values(linker_file_t lf, c_linker_sym_t sym, linker_symval_t *symval) { - elf_file_t ef = (elf_file_t) lf; - const Elf_Sym *es = (const Elf_Sym*) sym; + elf_file_t ef; + const Elf_Sym *es; + caddr_t val; + ef = (elf_file_t) lf; + es = (const Elf_Sym*) sym; + val = (caddr_t)es->st_value; if (es >= ef->ddbsymtab && es < (ef->ddbsymtab + ef->ddbsymcnt)) { symval->name = ef->ddbstrtab + es->st_name; - symval->value = (caddr_t)es->st_value; + val = (caddr_t)es->st_value; + if (ELF_ST_TYPE(es->st_info) == STT_GNU_IFUNC) + val = ((caddr_t (*)(void))val)(); + symval->value = val; symval->size = es->st_size; return 0; } @@ -1284,7 +1291,8 @@ link_elf_each_function_name(linker_file_t file, /* Exhaustive search */ for (i = 0, symp = ef->ddbsymtab; i < ef->ddbsymcnt; i++, symp++) { if (symp->st_value != 0 && - ELF_ST_TYPE(symp->st_info) == STT_FUNC) { + (ELF_ST_TYPE(symp->st_info) == STT_FUNC || + ELF_ST_TYPE(symp->st_info) == STT_GNU_IFUNC)) { error = callback(ef->ddbstrtab + symp->st_name, opaque); if (error) return (error); @@ -1305,8 +1313,10 @@ link_elf_each_function_nameval(linker_file_t file, /* Exhaustive search */ for (i = 0, symp = ef->ddbsymtab; i < ef->ddbsymcnt; i++, symp++) { if (symp->st_value != 0 && - ELF_ST_TYPE(symp->st_info) == STT_FUNC) { - error = link_elf_symbol_values(file, (c_linker_sym_t) symp, &symval); + (ELF_ST_TYPE(symp->st_info) == STT_FUNC || + ELF_ST_TYPE(symp->st_info) == STT_GNU_IFUNC)) { + error = link_elf_symbol_values(file, + (c_linker_sym_t)symp, &symval); if (error) return (error); error = callback(file, i, &symval, opaque); Modified: stable/11/sys/sys/linker.h ============================================================================== --- stable/11/sys/sys/linker.h Thu May 17 15:21:19 2018 (r333719) +++ stable/11/sys/sys/linker.h Thu May 17 15:24:53 2018 (r333720) @@ -269,11 +269,16 @@ extern int kld_debug; typedef int elf_lookup_fn(linker_file_t, Elf_Size, int, Elf_Addr *); /* Support functions */ -int elf_reloc(linker_file_t _lf, Elf_Addr base, const void *_rel, int _type, elf_lookup_fn _lu); -int elf_reloc_local(linker_file_t _lf, Elf_Addr base, const void *_rel, int _type, elf_lookup_fn _lu); +int elf_reloc(linker_file_t _lf, Elf_Addr base, const void *_rel, + int _type, elf_lookup_fn _lu); +int elf_reloc_ifunc(linker_file_t _lf, Elf_Addr base, const void *_rel, + int _type, elf_lookup_fn _lu); +int elf_reloc_local(linker_file_t _lf, Elf_Addr base, const void *_rel, + int _type, elf_lookup_fn _lu); Elf_Addr elf_relocaddr(linker_file_t _lf, Elf_Addr addr); const Elf_Sym *elf_get_sym(linker_file_t _lf, Elf_Size _symidx); const char *elf_get_symname(linker_file_t _lf, Elf_Size _symidx); +void link_elf_ireloc(caddr_t kmdp); typedef struct linker_ctf { const uint8_t *ctftab; /* Decompressed CTF data. */ From owner-svn-src-stable-11@freebsd.org Thu May 17 15:53:33 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 93DE9EAE5CE; Thu, 17 May 2018 15:53:33 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 44E59867CB; Thu, 17 May 2018 15:53:33 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 24EF5347B; Thu, 17 May 2018 15:53:33 +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 w4HFrXdo008953; Thu, 17 May 2018 15:53:33 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4HFrXZw008952; Thu, 17 May 2018 15:53:33 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201805171553.w4HFrXZw008952@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 17 May 2018 15:53: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: r333722 - stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-11 X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Commit-Revision: 333722 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 15:53:33 -0000 Author: gjb Date: Thu May 17 15:53:32 2018 New Revision: 333722 URL: https://svnweb.freebsd.org/changeset/base/333722 Log: Document r328495, dtc(1) update from upstream. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 15:53:31 2018 (r333721) +++ stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 15:53:32 2018 (r333722) @@ -343,6 +343,9 @@ Subversion has been updated to version 1.9.7. + The &man.dtc.1; utility has been updated + to upstream commit 9ce35ff8. + The &man.file.1; utility has been updated to version 5.32. From owner-svn-src-stable-11@freebsd.org Thu May 17 15:53:32 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B922CEAE5BB; Thu, 17 May 2018 15:53:32 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 68323867CA; Thu, 17 May 2018 15:53:32 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 484D7347A; Thu, 17 May 2018 15:53:32 +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 w4HFrWbS008910; Thu, 17 May 2018 15:53:32 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4HFrWJb008909; Thu, 17 May 2018 15:53:32 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201805171553.w4HFrWJb008909@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 17 May 2018 15:53: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: r333721 - stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-11 X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Commit-Revision: 333721 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 15:53:32 -0000 Author: gjb Date: Thu May 17 15:53:31 2018 New Revision: 333721 URL: https://svnweb.freebsd.org/changeset/base/333721 Log: Document r331465, BSD-licensed diff(1) imported from OpenBSD. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 15:24:53 2018 (r333720) +++ stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 15:53:31 2018 (r333721) @@ -364,6 +364,12 @@ The bmake utility has been updated to upstream version 20180222. + The BSD-licensed + &man.diff.1; utility has been imported from OpenBSD, which is + installed if WITHOUT_GNU_DIFF is set in + &man.src.conf.5;, and otherwise not installed by + default. + OpenSSL has been updated to version 1.0.2o. From owner-svn-src-stable-11@freebsd.org Thu May 17 15:53:34 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D7723EAE5F1; Thu, 17 May 2018 15:53:34 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 42505867E9; Thu, 17 May 2018 15:53:34 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1CE24347C; Thu, 17 May 2018 15:53:34 +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 w4HFrXil008997; Thu, 17 May 2018 15:53:33 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4HFrXdP008996; Thu, 17 May 2018 15:53:33 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201805171553.w4HFrXdP008996@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 17 May 2018 15:53: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: r333723 - stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-11 X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Commit-Revision: 333723 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 15:53:35 -0000 Author: gjb Date: Thu May 17 15:53:33 2018 New Revision: 333723 URL: https://svnweb.freebsd.org/changeset/base/333723 Log: Document r328139, du(1) '--si' option. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 15:53:32 2018 (r333722) +++ stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 15:53:33 2018 (r333723) @@ -262,6 +262,11 @@ identical across the system. + The &man.du.1; utility has been updated + to include the --si long option, which is + used to display output in "human-readable" output in + powers of 1000. + The &man.df.1; utility has been updated to include the --si long option, which is an alias to -H. From owner-svn-src-stable-11@freebsd.org Thu May 17 15:53:38 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 96D2AEAE647; Thu, 17 May 2018 15:53:38 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E0C2F868A6; Thu, 17 May 2018 15:53:37 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 123FF347E; Thu, 17 May 2018 15:53:36 +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 w4HFrZXn009085; Thu, 17 May 2018 15:53:35 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4HFrZlP009084; Thu, 17 May 2018 15:53:35 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201805171553.w4HFrZlP009084@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 17 May 2018 15:53: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: r333725 - stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-11 X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Commit-Revision: 333725 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 15:53:38 -0000 Author: gjb Date: Thu May 17 15:53:35 2018 New Revision: 333725 URL: https://svnweb.freebsd.org/changeset/base/333725 Log: Document r322525, rgrep(1) hard link addition. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 15:53:34 2018 (r333724) +++ stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 15:53:35 2018 (r333725) @@ -195,6 +195,11 @@ been updated to include device model when the -s flag is used. + The &man.bsdgrep.1; utility has been + updated to include a rgrep hard link to + &man.grep.1;, which when used is equivalent to + grep -r. + The &man.umount.8; utility has been updated to include a new flag, -N, which is used to forcefully unmount an NFS From owner-svn-src-stable-11@freebsd.org Thu May 17 15:53:39 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 393C1EAE663; Thu, 17 May 2018 15:53:39 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BB32E868CE; Thu, 17 May 2018 15:53:38 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 19D43347F; Thu, 17 May 2018 15:53:37 +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 w4HFra9F009128; Thu, 17 May 2018 15:53:36 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4HFrafk009127; Thu, 17 May 2018 15:53:36 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201805171553.w4HFrafk009127@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 17 May 2018 15:53: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: r333726 - stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-11 X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Commit-Revision: 333726 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 15:53:39 -0000 Author: gjb Date: Thu May 17 15:53:36 2018 New Revision: 333726 URL: https://svnweb.freebsd.org/changeset/base/333726 Log: Document r322555, various bsdgrep(1) pattern matching fixes. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 15:53:35 2018 (r333725) +++ stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 15:53:36 2018 (r333726) @@ -200,6 +200,10 @@ &man.grep.1;, which when used is equivalent to grep -r. + The &man.bsdgrep.1; utility has been + updated to address various issues with pattern matching + behavior. + The &man.umount.8; utility has been updated to include a new flag, -N, which is used to forcefully unmount an NFS From owner-svn-src-stable-11@freebsd.org Thu May 17 15:53:37 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 01990EAE62F; Thu, 17 May 2018 15:53:37 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2EC9886847; Thu, 17 May 2018 15:53:35 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 16AEB347D; Thu, 17 May 2018 15:53:35 +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 w4HFrYRt009040; Thu, 17 May 2018 15:53:34 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4HFrYKH009039; Thu, 17 May 2018 15:53:34 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201805171553.w4HFrYKH009039@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 17 May 2018 15:53: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: r333724 - stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-11 X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Commit-Revision: 333724 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 15:53:37 -0000 Author: gjb Date: Thu May 17 15:53:34 2018 New Revision: 333724 URL: https://svnweb.freebsd.org/changeset/base/333724 Log: Document r324124, getconf(1) '-a' flag addition. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 15:53:33 2018 (r333723) +++ stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 15:53:34 2018 (r333724) @@ -205,6 +205,13 @@ to the -G flag when using the usermod subcommand. + The &man.getconf.1; utility has been + updated to include a new flag, -a, which + prints the name and value of all system or path configuration + values to &man.stdout.4; or optionally a file as an argument + to -a. + The &man.ps.1; utility has been updated to reflect realtime and idle priorities in state flags. From owner-svn-src-stable-11@freebsd.org Thu May 17 15:53:46 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3CFC8EAE6F1; Thu, 17 May 2018 15:53:46 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E18B1869B4; Thu, 17 May 2018 15:53:43 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 963723482; Thu, 17 May 2018 15:53:40 +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 w4HFre0S009260; Thu, 17 May 2018 15:53:40 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4HFrelE009259; Thu, 17 May 2018 15:53:40 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201805171553.w4HFrelE009259@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 17 May 2018 15:53:40 +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: r333729 - stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-11 X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Commit-Revision: 333729 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 15:53:46 -0000 Author: gjb Date: Thu May 17 15:53:40 2018 New Revision: 333729 URL: https://svnweb.freebsd.org/changeset/base/333729 Log: Document r322509, top(1) enhancement to filter on multiple user names. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 15:53:39 2018 (r333728) +++ stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 15:53:40 2018 (r333729) @@ -195,6 +195,10 @@ been updated to include device model when the -s flag is used. + The &man.top.1; utility has been updated + to allow filtering on multiple user names when the + -U flag is used. + The &man.bsdgrep.1; utility has been updated to include a rgrep hard link to &man.grep.1;, which when used is equivalent to From owner-svn-src-stable-11@freebsd.org Thu May 17 15:53:42 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 66B60EAE696; Thu, 17 May 2018 15:53:42 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A400F86954; Thu, 17 May 2018 15:53:41 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A955A3480; Thu, 17 May 2018 15:53:38 +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 w4HFrcCZ009174; Thu, 17 May 2018 15:53:38 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4HFrbmo009171; Thu, 17 May 2018 15:53:37 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201805171553.w4HFrbmo009171@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 17 May 2018 15:53: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: r333727 - in stable/11/release/doc/en_US.ISO8859-1: hardware installation readme relnotes X-SVN-Group: stable-11 X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: in stable/11/release/doc/en_US.ISO8859-1: hardware installation readme relnotes X-SVN-Commit-Revision: 333727 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 15:53:42 -0000 Author: gjb Date: Thu May 17 15:53:37 2018 New Revision: 333727 URL: https://svnweb.freebsd.org/changeset/base/333727 Log: Bump copyright year. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/11/release/doc/en_US.ISO8859-1/hardware/article.xml stable/11/release/doc/en_US.ISO8859-1/installation/article.xml stable/11/release/doc/en_US.ISO8859-1/readme/article.xml stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/11/release/doc/en_US.ISO8859-1/hardware/article.xml ============================================================================== --- stable/11/release/doc/en_US.ISO8859-1/hardware/article.xml Thu May 17 15:53:36 2018 (r333726) +++ stable/11/release/doc/en_US.ISO8859-1/hardware/article.xml Thu May 17 15:53:37 2018 (r333727) @@ -37,6 +37,7 @@ 2015 2016 2017 + 2018 The &os; Documentation Project Modified: stable/11/release/doc/en_US.ISO8859-1/installation/article.xml ============================================================================== --- stable/11/release/doc/en_US.ISO8859-1/installation/article.xml Thu May 17 15:53:36 2018 (r333726) +++ stable/11/release/doc/en_US.ISO8859-1/installation/article.xml Thu May 17 15:53:37 2018 (r333727) @@ -22,7 +22,7 @@ $FreeBSD$ - 2017 + 2018 The &os; Documentation Project Modified: stable/11/release/doc/en_US.ISO8859-1/readme/article.xml ============================================================================== --- stable/11/release/doc/en_US.ISO8859-1/readme/article.xml Thu May 17 15:53:36 2018 (r333726) +++ stable/11/release/doc/en_US.ISO8859-1/readme/article.xml Thu May 17 15:53:37 2018 (r333727) @@ -41,6 +41,7 @@ 2015 2016 2017 + 2018 The &os; Documentation Project Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 15:53:36 2018 (r333726) +++ stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 15:53:37 2018 (r333727) @@ -25,7 +25,7 @@ - 2017 + 2018 The &os; Documentation Project From owner-svn-src-stable-11@freebsd.org Thu May 17 15:53:47 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3929FEAE70F; Thu, 17 May 2018 15:53:47 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 515FD86A10; Thu, 17 May 2018 15:53:45 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 776763485; Thu, 17 May 2018 15:53:43 +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 w4HFrhGA009391; Thu, 17 May 2018 15:53:43 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4HFrh2H009390; Thu, 17 May 2018 15:53:43 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201805171553.w4HFrh2H009390@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 17 May 2018 15:53:43 +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: r333732 - stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-11 X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Commit-Revision: 333732 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 15:53:47 -0000 Author: gjb Date: Thu May 17 15:53:43 2018 New Revision: 333732 URL: https://svnweb.freebsd.org/changeset/base/333732 Log: Document r333006, amd64 hybrid ISO images. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 15:53:42 2018 (r333731) +++ stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 15:53:43 2018 (r333732) @@ -693,6 +693,12 @@ keep their clocks synchronized using the Amazon Time Sync Service, the NTP service internal to the EC2™ infrastructure. + + The + &os; installation ISO medium creation tools + have been updated to generate hybrid images for &arch.amd64;, + supporting both BIOS and + EFI. From owner-svn-src-stable-11@freebsd.org Thu May 17 15:53:48 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CE73FEAE734; Thu, 17 May 2018 15:53:48 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C0D7386A50; Thu, 17 May 2018 15:53:47 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 645923487; Thu, 17 May 2018 15:53:45 +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 w4HFrjFN009478; Thu, 17 May 2018 15:53:45 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4HFrjdM009477; Thu, 17 May 2018 15:53:45 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201805171553.w4HFrjdM009477@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 17 May 2018 15:53:45 +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: r333734 - stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-11 X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Commit-Revision: 333734 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 15:53:49 -0000 Author: gjb Date: Thu May 17 15:53:44 2018 New Revision: 333734 URL: https://svnweb.freebsd.org/changeset/base/333734 Log: Document r332460, makefs(8) default block and fragment sizes synced with newfs(8). Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 15:53:44 2018 (r333733) +++ stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 15:53:44 2018 (r333734) @@ -373,6 +373,11 @@ attempt to mount write-protected media read-write fails. This behavior is disabled by default, and can be requested with the new autoro option. + + The + &man.makefs.8; utility has been updated to default the block + and fragment sizes to match that of &man.newfs.8;, 32K and 4K, + respectively. From owner-svn-src-stable-11@freebsd.org Thu May 17 15:53:49 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5DA69EAE73E; Thu, 17 May 2018 15:53:49 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 73F5586A6D; Thu, 17 May 2018 15:53:47 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 599693488; Thu, 17 May 2018 15:53:46 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4HFrkwG009521; Thu, 17 May 2018 15:53:46 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4HFrkoS009520; Thu, 17 May 2018 15:53:46 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201805171553.w4HFrkoS009520@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 17 May 2018 15:53:46 +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: r333735 - stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-11 X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Commit-Revision: 333735 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 15:53:49 -0000 Author: gjb Date: Thu May 17 15:53:45 2018 New Revision: 333735 URL: https://svnweb.freebsd.org/changeset/base/333735 Log: Document r332929, pwd_mkdb(8) deprecation notice when legacy (-l) mode is used. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 15:53:44 2018 (r333734) +++ stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 15:53:45 2018 (r333735) @@ -378,6 +378,12 @@ &man.makefs.8; utility has been updated to default the block and fragment sizes to match that of &man.newfs.8;, 32K and 4K, respectively. + + The + &man.pwd.mkdb.8; utility has been updated to emit a notice + that legacy database support will be removed effective + &os; 12 when the -l flag is + used. From owner-svn-src-stable-11@freebsd.org Thu May 17 15:53:49 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 27E96EAE738; Thu, 17 May 2018 15:53:49 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 43E0286A37; Thu, 17 May 2018 15:53:46 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6DB923486; Thu, 17 May 2018 15:53:44 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4HFriwm009435; Thu, 17 May 2018 15:53:44 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4HFridJ009434; Thu, 17 May 2018 15:53:44 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201805171553.w4HFridJ009434@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 17 May 2018 15:53: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: r333733 - stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-11 X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Commit-Revision: 333733 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 15:53:49 -0000 Author: gjb Date: Thu May 17 15:53:44 2018 New Revision: 333733 URL: https://svnweb.freebsd.org/changeset/base/333733 Log: Document r322753, mount(8) 'autoro' option addition. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 15:53:43 2018 (r333732) +++ stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 15:53:44 2018 (r333733) @@ -367,6 +367,12 @@ The &man.etdump.1; utility has been added, which is used to view El Torito boot catalog information. + + The &man.mount.8; utility has been + updated to allow fallback to mount media read-only if an + attempt to mount write-protected media read-write fails. This + behavior is disabled by default, and can be requested with the + new autoro option. From owner-svn-src-stable-11@freebsd.org Thu May 17 15:53:49 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D7E8BEAE748; Thu, 17 May 2018 15:53:49 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EAE9686A89; Thu, 17 May 2018 15:53:48 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 534513489; Thu, 17 May 2018 15:53:47 +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 w4HFrlHu009564; Thu, 17 May 2018 15:53:47 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4HFrlNm009563; Thu, 17 May 2018 15:53:47 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201805171553.w4HFrlNm009563@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 17 May 2018 15:53: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: r333736 - stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-11 X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Commit-Revision: 333736 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 15:53:50 -0000 Author: gjb Date: Thu May 17 15:53:46 2018 New Revision: 333736 URL: https://svnweb.freebsd.org/changeset/base/333736 Log: Document r333312, tzdata version 2018e. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 15:53:45 2018 (r333735) +++ stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 15:53:46 2018 (r333736) @@ -431,9 +431,6 @@ OpenSSL has been updated to version 1.0.2o. - Timezone data files have been updated to - version 2018d. - The clang, llvm, lld, @@ -441,6 +438,9 @@ compiler-rt utilities as well as libc++ have been updated to upstream version 6.0.0. + + Timezone data files have been updated to + version 2018e. From owner-svn-src-stable-11@freebsd.org Thu May 17 15:53:43 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 58E57EAE6AE; Thu, 17 May 2018 15:53:43 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5154F86973; Thu, 17 May 2018 15:53:41 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A409C3481; Thu, 17 May 2018 15:53:39 +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 w4HFrdHO009217; Thu, 17 May 2018 15:53:39 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4HFrdWF009216; Thu, 17 May 2018 15:53:39 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201805171553.w4HFrdWF009216@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 17 May 2018 15:53: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: r333728 - stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-11 X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Commit-Revision: 333728 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 15:53:43 -0000 Author: gjb Date: Thu May 17 15:53:39 2018 New Revision: 333728 URL: https://svnweb.freebsd.org/changeset/base/333728 Log: Document r327837, lint(1) is no longer built and installed by default. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 15:53:37 2018 (r333727) +++ stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 15:53:39 2018 (r333728) @@ -265,6 +265,11 @@ The &man.mdmfs.8; utility has been updated to support &man.tmpfs.5;. + The &man.lint.1; utility is not longer + built by default. The WITH_LINT + &man.src.conf.5; option has been added to enable building and + installing the utility. + The &man.cpucontrol.8; utility has been updated to include a new flag, -e, which is used to re-evaluate reported CPU features From owner-svn-src-stable-11@freebsd.org Thu May 17 15:53:47 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E306DEAE70A; Thu, 17 May 2018 15:53:46 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9A62A869CE; Thu, 17 May 2018 15:53:43 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AE00C3483; Thu, 17 May 2018 15:53:41 +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 w4HFrfnc009303; Thu, 17 May 2018 15:53:41 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4HFrfO9009302; Thu, 17 May 2018 15:53:41 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201805171553.w4HFrfO9009302@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 17 May 2018 15:53: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: r333730 - stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-11 X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Commit-Revision: 333730 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 15:53:47 -0000 Author: gjb Date: Thu May 17 15:53:41 2018 New Revision: 333730 URL: https://svnweb.freebsd.org/changeset/base/333730 Log: Document r328138, indent(1) supports the SIMPLE_BACKUP_SUFFIX environment variable also used by patch(1). Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 15:53:40 2018 (r333729) +++ stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 15:53:41 2018 (r333730) @@ -287,6 +287,10 @@ identical across the system. + The &man.indent.1; utility has been + updated to respect the SIMPLE_BACKUP_SUFFIX + environment variable if set. + The &man.du.1; utility has been updated to include the --si long option, which is used to display output in "human-readable" output in From owner-svn-src-stable-11@freebsd.org Thu May 17 15:53:47 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 179D4EAE70B; Thu, 17 May 2018 15:53:47 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 856BC869F4; Thu, 17 May 2018 15:53:44 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 82A593484; Thu, 17 May 2018 15:53:42 +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 w4HFrgiM009347; Thu, 17 May 2018 15:53:42 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4HFrg6E009346; Thu, 17 May 2018 15:53:42 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201805171553.w4HFrg6E009346@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 17 May 2018 15:53: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: r333731 - stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-11 X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Commit-Revision: 333731 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 15:53:47 -0000 Author: gjb Date: Thu May 17 15:53:42 2018 New Revision: 333731 URL: https://svnweb.freebsd.org/changeset/base/333731 Log: Document r332947, etdump(1) utility addition. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 15:53:41 2018 (r333730) +++ stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 15:53:42 2018 (r333731) @@ -363,6 +363,10 @@ sponsor="&netflix;">The &man.efibootmgr.8; utility has been added, which is used to manipulate the EFI boot manager. + + The &man.etdump.1; utility has been + added, which is used to view El Torito boot catalog + information. From owner-svn-src-stable-11@freebsd.org Thu May 17 16:32:40 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F3E92EB105E; Thu, 17 May 2018 16:32:39 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A7BA2697D1; Thu, 17 May 2018 16:32:39 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 88EC93F45; Thu, 17 May 2018 16:32:39 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4HGWd0U029827; Thu, 17 May 2018 16:32:39 GMT (envelope-from sbruno@FreeBSD.org) Received: (from sbruno@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4HGWdtP029825; Thu, 17 May 2018 16:32:39 GMT (envelope-from sbruno@FreeBSD.org) Message-Id: <201805171632.w4HGWdtP029825@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sbruno set sender to sbruno@FreeBSD.org using -f From: Sean Bruno Date: Thu, 17 May 2018 16:32: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: r333738 - in stable/11: share/man/man4 sys/dev/vxge X-SVN-Group: stable-11 X-SVN-Commit-Author: sbruno X-SVN-Commit-Paths: in stable/11: share/man/man4 sys/dev/vxge X-SVN-Commit-Revision: 333738 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 16:32:40 -0000 Author: sbruno Date: Thu May 17 16:32:38 2018 New Revision: 333738 URL: https://svnweb.freebsd.org/changeset/base/333738 Log: MFC r333499 Add deprecation notice for vxge. This driver was merged to HEAD one week prior to Exar publicly announcing theyhad left the Ethernet market. It is not known to be used and has various code quality issues spotted by Brooks and Hiren. Retire it in preparation for FreeBSD 12.0. Submitted by: kbowling Reported by: rgrimes Approved by: re (gjb) Relnotes: yes Modified: stable/11/share/man/man4/vxge.4 stable/11/sys/dev/vxge/vxge.c Directory Properties: stable/11/ (props changed) Modified: stable/11/share/man/man4/vxge.4 ============================================================================== --- stable/11/share/man/man4/vxge.4 Thu May 17 16:21:12 2018 (r333737) +++ stable/11/share/man/man4/vxge.4 Thu May 17 16:32:38 2018 (r333738) @@ -44,6 +44,12 @@ module at boot time, place the following line in .Bd -literal -offset indent if_vxge_load="YES" .Ed +.Sh DEPRECATION NOTICE +The +.Nm +driver is not present in +.Fx 12.0 +and later. .Sh DESCRIPTION The .Nm Modified: stable/11/sys/dev/vxge/vxge.c ============================================================================== --- stable/11/sys/dev/vxge/vxge.c Thu May 17 16:21:12 2018 (r333737) +++ stable/11/sys/dev/vxge/vxge.c Thu May 17 16:32:38 2018 (r333738) @@ -234,6 +234,7 @@ _exit0: err = ENXIO; } + gone_in_dev(ndev, 12, "vxge(4) driver"); return (err); } From owner-svn-src-stable-11@freebsd.org Thu May 17 17:00:08 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7543DED6816; Thu, 17 May 2018 17:00:08 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BEB36A69E; Thu, 17 May 2018 17:00:08 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2A10742CB; Thu, 17 May 2018 17:00:08 +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 w4HH08ST040275; Thu, 17 May 2018 17:00:08 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4HH079v040272; Thu, 17 May 2018 17:00:07 GMT (envelope-from manu@FreeBSD.org) Message-Id: <201805171700.w4HH079v040272@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Thu, 17 May 2018 17:00: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: r333739 - stable/11/release/arm X-SVN-Group: stable-11 X-SVN-Commit-Author: manu X-SVN-Commit-Paths: stable/11/release/arm X-SVN-Commit-Revision: 333739 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 17:00:08 -0000 Author: manu Date: Thu May 17 17:00:07 2018 New Revision: 333739 URL: https://svnweb.freebsd.org/changeset/base/333739 Log: MFC r333737: release: arm: Format FAT partition as FAT16 r332674 raised the size of the FAT partition from 2MB to 41MB for some boards. But we format them in FAT12 and this size appears to be to big for FAT12 and some SoC bootrom cannot cope with that. Format the msdosfs partition as FAT16, PR: 228285 Approved by: re (marius) Modified: stable/11/release/arm/BEAGLEBONE.conf stable/11/release/arm/GUMSTIX.conf stable/11/release/arm/PANDABOARD.conf Directory Properties: stable/11/ (props changed) Modified: stable/11/release/arm/BEAGLEBONE.conf ============================================================================== --- stable/11/release/arm/BEAGLEBONE.conf Thu May 17 16:32:38 2018 (r333738) +++ stable/11/release/arm/BEAGLEBONE.conf Thu May 17 17:00:07 2018 (r333739) @@ -8,7 +8,7 @@ EMBEDDED_TARGET="arm" EMBEDDEDBUILD=1 EMBEDDEDPORTS="sysutils/u-boot-beaglebone" FAT_SIZE="41m" -FAT_TYPE="12" +FAT_TYPE="16" IMAGE_SIZE="1G" KERNEL="BEAGLEBONE" MD_ARGS="-x 63 -y 255" Modified: stable/11/release/arm/GUMSTIX.conf ============================================================================== --- stable/11/release/arm/GUMSTIX.conf Thu May 17 16:32:38 2018 (r333738) +++ stable/11/release/arm/GUMSTIX.conf Thu May 17 17:00:07 2018 (r333739) @@ -8,7 +8,7 @@ EMBEDDED_TARGET="arm" EMBEDDEDBUILD=1 EMBEDDEDPORTS="sysutils/u-boot-duovero" FAT_SIZE="41m" -FAT_TYPE="12" +FAT_TYPE="16" IMAGE_SIZE="1G" KERNEL="GUMSTIX" MD_ARGS="-x 63 -y 255" Modified: stable/11/release/arm/PANDABOARD.conf ============================================================================== --- stable/11/release/arm/PANDABOARD.conf Thu May 17 16:32:38 2018 (r333738) +++ stable/11/release/arm/PANDABOARD.conf Thu May 17 17:00:07 2018 (r333739) @@ -8,7 +8,7 @@ EMBEDDED_TARGET="arm" EMBEDDEDBUILD=1 EMBEDDEDPORTS="sysutils/u-boot-pandaboard" FAT_SIZE="41m" -FAT_TYPE="12" +FAT_TYPE="16" IMAGE_SIZE="1G" KERNEL="PANDABOARD" MD_ARGS="-x 63 -y 255" From owner-svn-src-stable-11@freebsd.org Thu May 17 17:00:50 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 69EF8ED68B9; Thu, 17 May 2018 17:00:50 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1D0506A909; Thu, 17 May 2018 17:00:50 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F286542E8; Thu, 17 May 2018 17:00:49 +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 w4HH0npo042555; Thu, 17 May 2018 17:00:49 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4HH0nm3042554; Thu, 17 May 2018 17:00:49 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201805171700.w4HH0nm3042554@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 17 May 2018 17:00:49 +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: r333740 - stable/11/stand/arm64 X-SVN-Group: stable-11 X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: stable/11/stand/arm64 X-SVN-Commit-Revision: 333740 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 17:00:50 -0000 Author: gjb Date: Thu May 17 17:00:49 2018 New Revision: 333740 URL: https://svnweb.freebsd.org/changeset/base/333740 Log: MFC r333079 (imp): No need to make objects here. This fixes polluting the src checkout when building arm64/aarch64. Approved by: re (marius) Sponsored by: The FreeBSD Foundation Modified: stable/11/stand/arm64/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/11/stand/arm64/Makefile ============================================================================== --- stable/11/stand/arm64/Makefile Thu May 17 17:00:07 2018 (r333739) +++ stable/11/stand/arm64/Makefile Thu May 17 17:00:49 2018 (r333740) @@ -1,3 +1,5 @@ # $FreeBSD$ +NO_OBJ=t + .include From owner-svn-src-stable-11@freebsd.org Thu May 17 17:40:07 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2E8DFEDABBD; Thu, 17 May 2018 17:40:07 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D0FB76C0AC; Thu, 17 May 2018 17:40:06 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B2C72494F; Thu, 17 May 2018 17:40:06 +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 w4HHe6mO060064; Thu, 17 May 2018 17:40:06 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4HHe6fh060063; Thu, 17 May 2018 17:40:06 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201805171740.w4HHe6fh060063@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Thu, 17 May 2018 17:40: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: r333741 - stable/11/sys/x86/include X-SVN-Group: stable-11 X-SVN-Commit-Author: kib X-SVN-Commit-Paths: stable/11/sys/x86/include X-SVN-Commit-Revision: 333741 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 17:40:07 -0000 Author: kib Date: Thu May 17 17:40:06 2018 New Revision: 333741 URL: https://svnweb.freebsd.org/changeset/base/333741 Log: MFC r333229: Add helper macros to hide some boring repeatable ceremonies to define ifuncs on x86. Approved by: re (marius) Added: stable/11/sys/x86/include/ifunc.h - copied unchanged from r333229, head/sys/x86/include/ifunc.h Modified: Directory Properties: stable/11/ (props changed) Copied: stable/11/sys/x86/include/ifunc.h (from r333229, head/sys/x86/include/ifunc.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/11/sys/x86/include/ifunc.h Thu May 17 17:40:06 2018 (r333741, copy of r333229, head/sys/x86/include/ifunc.h) @@ -0,0 +1,58 @@ +/*- + * Copyright (c) 2015, 2017 The FreeBSD Foundation + * All rights reserved. + * + * This software was developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + * + * 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$ + */ + +#ifndef __X86_IFUNC_H +#define __X86_IFUNC_H + +#define DECLARE_LIFUNC(ret_type, name, args) \ +ret_type name args + +#define DEFINE_LIFUNC(scope, selector_qual, ret_type, name, args) \ +__asm__ (scope "\t" #name "\n" \ + "\t.type\t" #name ",@function\n" \ + #name ":\n" \ + "\tjmp *" #name "_selector\n" \ + "\t.size\t" #name ",\t. - "#name); \ +selector_qual ret_type (*name##_selector)args __used; \ +DECLARE_LIFUNC(ret_type, name, args) + +#define DEFINE_STATIC_LIFUNC(ret_type, name, args) \ + DEFINE_LIFUNC(".local", static, ret_type, name, args) + +#define DEFINE_GLOBAL_LIFUNC(ret_type, name, args) \ + DEFINE_LIFUNC(".globl", , ret_type, name, args) + +#define DEFINE_IFUNC(qual, ret_type, name, args, resolver_qual) \ + resolver_qual ret_type (*name##_resolver(void))args __used; \ + qual ret_type name args __attribute__((ifunc(#name "_resolver"))); \ + resolver_qual ret_type (*name##_resolver(void))args + +#endif From owner-svn-src-stable-11@freebsd.org Thu May 17 17:44:04 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EBC0DEDB132; Thu, 17 May 2018 17:44:03 +0000 (UTC) (envelope-from gonzo@bluezbox.com) Received: from id.bluezbox.com (id.bluezbox.com [45.55.20.155]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4F7A76C5BA; Thu, 17 May 2018 17:44:03 +0000 (UTC) (envelope-from gonzo@bluezbox.com) Received: from localhost ([127.0.0.1] helo=id.bluezbox.com) by id.bluezbox.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1 (FreeBSD)) (envelope-from ) id 1fJMwa-000Ozs-4X; Thu, 17 May 2018 10:44:00 -0700 Received: (from gonzo@localhost) by id.bluezbox.com (8.15.2/8.15.2/Submit) id w4HHhxiB096079; Thu, 17 May 2018 10:43:59 -0700 (PDT) (envelope-from gonzo@bluezbox.com) X-Authentication-Warning: id.bluezbox.com: gonzo set sender to gonzo@bluezbox.com using -f Date: Thu, 17 May 2018 10:43:59 -0700 From: Oleksandr Tymoshenko To: Emmanuel Vadot Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: Re: svn commit: r333739 - stable/11/release/arm Message-ID: <20180517174359.GA95995@bluezbox.com> References: <201805171700.w4HH079v040272@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201805171700.w4HH079v040272@repo.freebsd.org> X-Operating-System: FreeBSD/11.1-RELEASE-p4 (amd64) User-Agent: Mutt/1.9.1 (2017-09-22) X-Spam-Level: -- X-Spam-Report: Spam detection software, running on the system "id.bluezbox.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see The administrator of that system for details. Content preview: Emmanuel Vadot (manu@FreeBSD.org) wrote: > Author: manu > Date: Thu May 17 17:00:07 2018 > New Revision: 333739 > URL: https://svnweb.freebsd.org/changeset/base/333739 > > Log: > MFC r333737: > > rele [...] Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 17:44:04 -0000 Emmanuel Vadot (manu@FreeBSD.org) wrote: > Author: manu > Date: Thu May 17 17:00:07 2018 > New Revision: 333739 > URL: https://svnweb.freebsd.org/changeset/base/333739 > > Log: > MFC r333737: > > release: arm: Format FAT partition as FAT16 > > r332674 raised the size of the FAT partition from 2MB to 41MB for some > boards. But we format them in FAT12 and this size appears to be to big > for FAT12 and some SoC bootrom cannot cope with that. > Format the msdosfs partition as FAT16, > > PR: 228285 > Approved by: re (marius) Thanks for working on this -- gonzo From owner-svn-src-stable-11@freebsd.org Thu May 17 18:40:01 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id ABE07EDCAB0; Thu, 17 May 2018 18:40:01 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5CCEE70261; Thu, 17 May 2018 18:40:01 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3F3815324; Thu, 17 May 2018 18:40:01 +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 w4HIe1il092272; Thu, 17 May 2018 18:40:01 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4HIe1IS092271; Thu, 17 May 2018 18:40:01 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201805171840.w4HIe1IS092271@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 17 May 2018 18:40: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: r333746 - stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-11 X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Commit-Revision: 333746 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 18:40:01 -0000 Author: gjb Date: Thu May 17 18:40:00 2018 New Revision: 333746 URL: https://svnweb.freebsd.org/changeset/base/333746 Log: Document r331882, cm(4) and fpa(4) deprecation in FreeBSD 12. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 18:14:10 2018 (r333745) +++ stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 18:40:00 2018 (r333746) @@ -570,6 +570,11 @@ Support for the TAIO USB multi-protocol adapter (TUMPA) has been added. + + The &man.cm.4; and &man.fpa.4; drivers + have been marked as deprecated, and will be removed in + &os; 12. From owner-svn-src-stable-11@freebsd.org Thu May 17 18:40:02 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C3A8EEDCAB7; Thu, 17 May 2018 18:40:02 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 74E7E70262; Thu, 17 May 2018 18:40:02 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 55F325325; Thu, 17 May 2018 18:40:02 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4HIe2Q4092315; Thu, 17 May 2018 18:40:02 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4HIe2jb092314; Thu, 17 May 2018 18:40:02 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201805171840.w4HIe2jb092314@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 17 May 2018 18:40:02 +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: r333747 - stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-11 X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Commit-Revision: 333747 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 18:40:02 -0000 Author: gjb Date: Thu May 17 18:40:01 2018 New Revision: 333747 URL: https://svnweb.freebsd.org/changeset/base/333747 Log: Document r332519, various GEOM classes deprecation in FreeBSD 12. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 18:40:00 2018 (r333746) +++ stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 18:40:01 2018 (r333747) @@ -618,7 +618,13 @@ <literal>geom(4)</literal> -   + The geom_aes, + geom_bsd, geom_mbr, + geom_sunlabel &man.geom.4; classes have + been marked as deprecated. They have been replaced by the + geom_part class in &os; 7, and removed + from the GENERIC kernel configurations in + &os; 8, and will be removed in &os; 12. From owner-svn-src-stable-11@freebsd.org Thu May 17 18:40:04 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 013F0EDCAC9; Thu, 17 May 2018 18:40:04 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 90CA770284; Thu, 17 May 2018 18:40:03 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6703F5326; Thu, 17 May 2018 18:40:03 +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 w4HIe3tj092360; Thu, 17 May 2018 18:40:03 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4HIe3UB092359; Thu, 17 May 2018 18:40:03 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201805171840.w4HIe3UB092359@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 17 May 2018 18:40: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: r333748 - stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-11 X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Commit-Revision: 333748 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 18:40:04 -0000 Author: gjb Date: Thu May 17 18:40:02 2018 New Revision: 333748 URL: https://svnweb.freebsd.org/changeset/base/333748 Log: Document r333171, ixgb(4) deprecation in FreeBSD 12. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 18:40:01 2018 (r333747) +++ stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 18:40:02 2018 (r333748) @@ -575,6 +575,9 @@ sponsor="&darpa_afrl;">The &man.cm.4; and &man.fpa.4; drivers have been marked as deprecated, and will be removed in &os; 12. + + The &man.ixgb.4; driver has been marked + as deprecated, and will be removed in &os; 12. From owner-svn-src-stable-11@freebsd.org Thu May 17 18:40:07 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1E6C0EDCB1C; Thu, 17 May 2018 18:40:07 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 59DB0702E6; Thu, 17 May 2018 18:40:05 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 653485327; Thu, 17 May 2018 18:40:04 +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 w4HIe42x092404; Thu, 17 May 2018 18:40:04 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4HIe4XZ092403; Thu, 17 May 2018 18:40:04 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201805171840.w4HIe4XZ092403@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 17 May 2018 18:40: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: r333749 - stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-11 X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Commit-Revision: 333749 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 18:40:07 -0000 Author: gjb Date: Thu May 17 18:40:03 2018 New Revision: 333749 URL: https://svnweb.freebsd.org/changeset/base/333749 Log: Document r333367, nxge(4) deprecation in FreeBSD 12. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 18:40:02 2018 (r333748) +++ stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 18:40:03 2018 (r333749) @@ -578,6 +578,9 @@ The &man.ixgb.4; driver has been marked as deprecated, and will be removed in &os; 12. + + The &man.nxge.4; driver has been marked + as deprecated, and will be removed in &os; 12. From owner-svn-src-stable-11@freebsd.org Thu May 17 18:40:08 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1A44AEDCB34; Thu, 17 May 2018 18:40:08 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 00D4C7033F; Thu, 17 May 2018 18:40:06 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 780CE5328; Thu, 17 May 2018 18:40:05 +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 w4HIe5Hi092448; Thu, 17 May 2018 18:40:05 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4HIe55T092447; Thu, 17 May 2018 18:40:05 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201805171840.w4HIe55T092447@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 17 May 2018 18:40: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: r333750 - stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-11 X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Commit-Revision: 333750 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 18:40:08 -0000 Author: gjb Date: Thu May 17 18:40:04 2018 New Revision: 333750 URL: https://svnweb.freebsd.org/changeset/base/333750 Log: Document r333412, lmc(4) deprecation in FreeBSD 12. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 18:40:03 2018 (r333749) +++ stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 18:40:04 2018 (r333750) @@ -581,6 +581,10 @@ The &man.nxge.4; driver has been marked as deprecated, and will be removed in &os; 12. + + The + &man.lmc.4; driver has been marked as deprecated, and will be + removed in &os; 12. From owner-svn-src-stable-11@freebsd.org Thu May 17 18:40:08 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 73D14EDCB3A; Thu, 17 May 2018 18:40:08 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A95BB7034C; Thu, 17 May 2018 18:40:06 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3DFD05329; Thu, 17 May 2018 18:40:06 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4HIe5WZ092491; Thu, 17 May 2018 18:40:05 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4HIe5s0092490; Thu, 17 May 2018 18:40:05 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201805171840.w4HIe5s0092490@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 17 May 2018 18:40: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: r333751 - stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-11 X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Commit-Revision: 333751 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 18:40:08 -0000 Author: gjb Date: Thu May 17 18:40:05 2018 New Revision: 333751 URL: https://svnweb.freebsd.org/changeset/base/333751 Log: Document r333738, vxge(4) deprecation in FreeBSD 12. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 18:40:04 2018 (r333750) +++ stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 18:40:05 2018 (r333751) @@ -585,6 +585,9 @@ The &man.lmc.4; driver has been marked as deprecated, and will be removed in &os; 12. + + The &man.vxge.4; driver has been marked + as deprecated, and will be removed in &os; 12. From owner-svn-src-stable-11@freebsd.org Thu May 17 18:40:08 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 893A4EDCB3E; Thu, 17 May 2018 18:40:08 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AF8AB70354; Thu, 17 May 2018 18:40:07 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 20F6D532A; Thu, 17 May 2018 18:40:07 +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 w4HIe6Ao092536; Thu, 17 May 2018 18:40:06 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4HIe61O092535; Thu, 17 May 2018 18:40:06 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201805171840.w4HIe61O092535@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 17 May 2018 18:40: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: r333752 - stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-11 X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Commit-Revision: 333752 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 18:40:08 -0000 Author: gjb Date: Thu May 17 18:40:06 2018 New Revision: 333752 URL: https://svnweb.freebsd.org/changeset/base/333752 Log: Further expand on the description of r333006, noting the ISO images can now be used to write to a memory stick, as well as a CD. Suggested by: benno Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 18:40:05 2018 (r333751) +++ stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 18:40:06 2018 (r333752) @@ -739,7 +739,9 @@ &os; installation ISO medium creation tools have been updated to generate hybrid images for &arch.amd64;, supporting both BIOS and - EFI. + EFI. The ISO image can + now be written to a memory stick as well as being used as + a CD image. From owner-svn-src-stable-11@freebsd.org Thu May 17 18:59:13 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CCC3FEDD6AD; Thu, 17 May 2018 18:59:13 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 79F4F713F2; Thu, 17 May 2018 18:59:13 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 572FF566F; Thu, 17 May 2018 18:59:13 +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 w4HIxDmZ002997; Thu, 17 May 2018 18:59:13 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4HIxDcJ002996; Thu, 17 May 2018 18:59:13 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201805171859.w4HIxDcJ002996@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 17 May 2018 18:59:13 +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: r333753 - stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-11 X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: stable/11/release/doc/en_US.ISO8859-1/relnotes X-SVN-Commit-Revision: 333753 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 18:59:14 -0000 Author: gjb Date: Thu May 17 18:59:12 2018 New Revision: 333753 URL: https://svnweb.freebsd.org/changeset/base/333753 Log: Document r333410, i386 memory stick installer images now use MBR. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 18:40:06 2018 (r333752) +++ stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu May 17 18:59:12 2018 (r333753) @@ -735,6 +735,12 @@ Service, the NTP service internal to the EC2™ infrastructure. + The + &arch.i386; memory stick image installer have been changed + to use the MBR partitioning scheme, which + addresses a boot issue from a GPT partition + scheme in non-UEFI mode. + The &os; installation ISO medium creation tools have been updated to generate hybrid images for &arch.amd64;, From owner-svn-src-stable-11@freebsd.org Thu May 17 21:22:20 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3D363EE0FC9; Thu, 17 May 2018 21:22:20 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E3AC176FFB; Thu, 17 May 2018 21:22:19 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C66256EE6; Thu, 17 May 2018 21:22:19 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4HLMJtx078174; Thu, 17 May 2018 21:22:19 GMT (envelope-from marius@FreeBSD.org) Received: (from marius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4HLMJSW078172; Thu, 17 May 2018 21:22:19 GMT (envelope-from marius@FreeBSD.org) Message-Id: <201805172122.w4HLMJSW078172@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marius set sender to marius@FreeBSD.org using -f From: Marius Strobl Date: Thu, 17 May 2018 21:22:19 +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: r333767 - stable/11/sys/dev/sdhci X-SVN-Group: stable-11 X-SVN-Commit-Author: marius X-SVN-Commit-Paths: stable/11/sys/dev/sdhci X-SVN-Commit-Revision: 333767 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 21:22:20 -0000 Author: marius Date: Thu May 17 21:22:19 2018 New Revision: 333767 URL: https://svnweb.freebsd.org/changeset/base/333767 Log: MFC: r333613 The broken DDR52 support of Intel Bay Trail eMMC controllers rumored in the commit log of r321385 has been confirmed via the public VLI54 erratum. Thus, stop advertising DDR52 for these controllers. Note that this change should hardly make a difference in practice as eMMC chips from the same era as these SoCs most likely support HS200 at least, probably even up to HS400ES. Approved by: re (gjb, kib) Modified: stable/11/sys/dev/sdhci/sdhci_acpi.c stable/11/sys/dev/sdhci/sdhci_pci.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/sdhci/sdhci_acpi.c ============================================================================== --- stable/11/sys/dev/sdhci/sdhci_acpi.c Thu May 17 21:17:20 2018 (r333766) +++ stable/11/sys/dev/sdhci/sdhci_acpi.c Thu May 17 21:22:19 2018 (r333767) @@ -60,7 +60,6 @@ static const struct sdhci_acpi_device { { "80860F14", 1, "Intel Bay Trail/Braswell eMMC 4.5/4.5.1 Controller", SDHCI_QUIRK_INTEL_POWER_UP_RESET | SDHCI_QUIRK_WAIT_WHILE_BUSY | - SDHCI_QUIRK_MMC_DDR52 | SDHCI_QUIRK_CAPS_BIT63_FOR_MMC_HS400 | SDHCI_QUIRK_PRESET_VALUE_BROKEN }, { "80860F14", 3, "Intel Bay Trail/Braswell SDXC Controller", @@ -261,11 +260,16 @@ sdhci_acpi_attach(device_t dev) return (ENOMEM); } - /* Intel Braswell eMMC 4.5.1 controller quirk */ + /* + * Intel Bay Trail and Braswell eMMC controllers share the same IDs, + * but while with these former DDR52 is affected by the VLI54 erratum, + * these latter require the timeout clock to be hardcoded to 1 MHz. + */ if (strcmp(acpi_dev->hid, "80860F14") == 0 && acpi_dev->uid == 1 && SDHCI_READ_4(dev, &sc->slot, SDHCI_CAPABILITIES) == 0x446cc8b2 && SDHCI_READ_4(dev, &sc->slot, SDHCI_CAPABILITIES2) == 0x00000807) - sc->quirks |= SDHCI_QUIRK_DATA_TIMEOUT_1MHZ; + sc->quirks |= SDHCI_QUIRK_MMC_DDR52 | + SDHCI_QUIRK_DATA_TIMEOUT_1MHZ; sc->quirks &= ~sdhci_quirk_clear; sc->quirks |= sdhci_quirk_set; sc->slot.quirks = sc->quirks; Modified: stable/11/sys/dev/sdhci/sdhci_pci.c ============================================================================== --- stable/11/sys/dev/sdhci/sdhci_pci.c Thu May 17 21:17:20 2018 (r333766) +++ stable/11/sys/dev/sdhci/sdhci_pci.c Thu May 17 21:22:19 2018 (r333767) @@ -104,18 +104,18 @@ static const struct sdhci_device { { 0x16bc14e4, 0xffff, "Broadcom BCM577xx SDXC/MMC Card Reader", SDHCI_QUIRK_BCM577XX_400KHZ_CLKSRC }, { 0x0f148086, 0xffff, "Intel Bay Trail eMMC 4.5 Controller", + /* DDR52 is supported but affected by the VLI54 erratum */ SDHCI_QUIRK_INTEL_POWER_UP_RESET | SDHCI_QUIRK_WAIT_WHILE_BUSY | - SDHCI_QUIRK_MMC_DDR52 | SDHCI_QUIRK_CAPS_BIT63_FOR_MMC_HS400 | SDHCI_QUIRK_PRESET_VALUE_BROKEN}, { 0x0f158086, 0xffff, "Intel Bay Trail SDXC Controller", SDHCI_QUIRK_WAIT_WHILE_BUSY | SDHCI_QUIRK_PRESET_VALUE_BROKEN }, { 0x0f508086, 0xffff, "Intel Bay Trail eMMC 4.5 Controller", + /* DDR52 is supported but affected by the VLI54 erratum */ SDHCI_QUIRK_INTEL_POWER_UP_RESET | SDHCI_QUIRK_WAIT_WHILE_BUSY | - SDHCI_QUIRK_MMC_DDR52 | SDHCI_QUIRK_CAPS_BIT63_FOR_MMC_HS400 | SDHCI_QUIRK_PRESET_VALUE_BROKEN }, { 0x19db8086, 0xffff, "Intel Denverton eMMC 5.0 Controller", From owner-svn-src-stable-11@freebsd.org Thu May 17 21:23:15 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4BB16EE1039; Thu, 17 May 2018 21:23:15 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F09427715E; Thu, 17 May 2018 21:23:14 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D166B6EF3; Thu, 17 May 2018 21:23:14 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4HLNEDr078252; Thu, 17 May 2018 21:23:14 GMT (envelope-from marius@FreeBSD.org) Received: (from marius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4HLNEnk078251; Thu, 17 May 2018 21:23:14 GMT (envelope-from marius@FreeBSD.org) Message-Id: <201805172123.w4HLNEnk078251@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marius set sender to marius@FreeBSD.org using -f From: Marius Strobl Date: Thu, 17 May 2018 21:23: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: r333768 - stable/11/sys/dev/mmc X-SVN-Group: stable-11 X-SVN-Commit-Author: marius X-SVN-Commit-Paths: stable/11/sys/dev/mmc X-SVN-Commit-Revision: 333768 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 21:23:15 -0000 Author: marius Date: Thu May 17 21:23:14 2018 New Revision: 333768 URL: https://svnweb.freebsd.org/changeset/base/333768 Log: MFC: r333614 Let mmcsd_ioctl() ensure appropriate privileges via priv_check(9). Approved by: re (gjb, kib) Modified: stable/11/sys/dev/mmc/mmcsd.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/mmc/mmcsd.c ============================================================================== --- stable/11/sys/dev/mmc/mmcsd.c Thu May 17 21:22:19 2018 (r333767) +++ stable/11/sys/dev/mmc/mmcsd.c Thu May 17 21:23:14 2018 (r333768) @@ -67,6 +67,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -177,7 +178,7 @@ static int mmcsd_bus_bit_width(device_t dev); static daddr_t mmcsd_delete(struct mmcsd_part *part, struct bio *bp); static const char *mmcsd_errmsg(int e); static int mmcsd_ioctl(struct mmcsd_part *part, u_long cmd, void *data, - int fflag); + int fflag, struct thread *td); static int mmcsd_ioctl_cmd(struct mmcsd_part *part, struct mmc_ioc_cmd *mic, int fflag); static uintmax_t mmcsd_pretty_size(off_t size, char *unit); @@ -771,22 +772,23 @@ mmcsd_strategy(struct bio *bp) static int mmcsd_ioctl_rpmb(struct cdev *dev, u_long cmd, caddr_t data, - int fflag, struct thread *td __unused) + int fflag, struct thread *td) { - return (mmcsd_ioctl(dev->si_drv1, cmd, data, fflag)); + return (mmcsd_ioctl(dev->si_drv1, cmd, data, fflag, td)); } static int mmcsd_ioctl_disk(struct disk *disk, u_long cmd, void *data, int fflag, - struct thread *td __unused) + struct thread *td) { - return (mmcsd_ioctl(disk->d_drv1, cmd, data, fflag)); + return (mmcsd_ioctl(disk->d_drv1, cmd, data, fflag, td)); } static int -mmcsd_ioctl(struct mmcsd_part *part, u_long cmd, void *data, int fflag) +mmcsd_ioctl(struct mmcsd_part *part, u_long cmd, void *data, int fflag, + struct thread *td) { struct mmc_ioc_cmd *mic; struct mmc_ioc_multi_cmd *mimc; @@ -795,6 +797,10 @@ mmcsd_ioctl(struct mmcsd_part *part, u_long cmd, void if ((fflag & FREAD) == 0) return (EBADF); + + err = priv_check(td, PRIV_DRIVER); + if (err != 0) + return (err); err = 0; switch (cmd) { From owner-svn-src-stable-11@freebsd.org Thu May 17 21:49:35 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C45C6EE1782; Thu, 17 May 2018 21:49:35 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7847C77F46; Thu, 17 May 2018 21:49:35 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 55DDA7236; Thu, 17 May 2018 21:49:35 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4HLnZnZ088710; Thu, 17 May 2018 21:49:35 GMT (envelope-from marius@FreeBSD.org) Received: (from marius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4HLnYAw088707; Thu, 17 May 2018 21:49:34 GMT (envelope-from marius@FreeBSD.org) Message-Id: <201805172149.w4HLnYAw088707@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marius set sender to marius@FreeBSD.org using -f From: Marius Strobl Date: Thu, 17 May 2018 21:49: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: r333770 - in stable/11/contrib/elftoolchain: elfcopy readelf X-SVN-Group: stable-11 X-SVN-Commit-Author: marius X-SVN-Commit-Paths: in stable/11/contrib/elftoolchain: elfcopy readelf X-SVN-Commit-Revision: 333770 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 21:49:36 -0000 Author: marius Date: Thu May 17 21:49:34 2018 New Revision: 333770 URL: https://svnweb.freebsd.org/changeset/base/333770 Log: MFC: r333600 (phil) Handle thread-local storage (TLS) segments correctly when copying (objcopy) and displaying (readelf) them. PR: 227552 Submitted by: kaiw (maintainer) Approved by: re (gjb) Modified: stable/11/contrib/elftoolchain/elfcopy/elfcopy.h stable/11/contrib/elftoolchain/elfcopy/sections.c stable/11/contrib/elftoolchain/elfcopy/segments.c stable/11/contrib/elftoolchain/readelf/readelf.c Directory Properties: stable/11/ (props changed) Modified: stable/11/contrib/elftoolchain/elfcopy/elfcopy.h ============================================================================== --- stable/11/contrib/elftoolchain/elfcopy/elfcopy.h Thu May 17 21:39:15 2018 (r333769) +++ stable/11/contrib/elftoolchain/elfcopy/elfcopy.h Thu May 17 21:49:34 2018 (r333770) @@ -127,6 +127,7 @@ struct section { uint64_t cap; /* section capacity */ uint64_t align; /* section alignment */ uint64_t type; /* section type */ + uint64_t flags; /* section flags */ uint64_t vma; /* section virtual addr */ uint64_t lma; /* section load addr */ uint64_t pad_sz;/* section padding size */ Modified: stable/11/contrib/elftoolchain/elfcopy/sections.c ============================================================================== --- stable/11/contrib/elftoolchain/elfcopy/sections.c Thu May 17 21:39:15 2018 (r333769) +++ stable/11/contrib/elftoolchain/elfcopy/sections.c Thu May 17 21:49:34 2018 (r333770) @@ -411,6 +411,7 @@ create_scn(struct elfcopy *ecp) s->sz = ish.sh_size; s->align = ish.sh_addralign; s->type = ish.sh_type; + s->flags = ish.sh_flags; s->vma = ish.sh_addr; /* Modified: stable/11/contrib/elftoolchain/elfcopy/segments.c ============================================================================== --- stable/11/contrib/elftoolchain/elfcopy/segments.c Thu May 17 21:39:15 2018 (r333769) +++ stable/11/contrib/elftoolchain/elfcopy/segments.c Thu May 17 21:49:34 2018 (r333770) @@ -79,6 +79,8 @@ add_to_inseg_list(struct elfcopy *ecp, struct section continue; if (s->vma + s->sz > seg->vaddr + seg->msz) continue; + if (seg->type == PT_TLS && ((s->flags & SHF_TLS) == 0)) + continue; insert_to_inseg_list(seg, s); if (seg->type == PT_LOAD) Modified: stable/11/contrib/elftoolchain/readelf/readelf.c ============================================================================== --- stable/11/contrib/elftoolchain/readelf/readelf.c Thu May 17 21:39:15 2018 (r333769) +++ stable/11/contrib/elftoolchain/readelf/readelf.c Thu May 17 21:49:34 2018 (r333770) @@ -2377,11 +2377,22 @@ dump_phdr(struct readelf *re) } printf(" %2.2d ", i); /* skip NULL section. */ - for (j = 1; (size_t)j < re->shnum; j++) - if (re->sl[j].addr >= phdr.p_vaddr && - re->sl[j].addr + re->sl[j].sz <= + for (j = 1; (size_t)j < re->shnum; j++) { + if (re->sl[j].off < phdr.p_offset) + continue; + if (re->sl[j].off + re->sl[j].sz > + phdr.p_offset + phdr.p_filesz && + re->sl[j].type != SHT_NOBITS) + continue; + if (re->sl[j].addr < phdr.p_vaddr || + re->sl[j].addr + re->sl[j].sz > phdr.p_vaddr + phdr.p_memsz) - printf("%s ", re->sl[j].name); + continue; + if (phdr.p_type == PT_TLS && + (re->sl[j].flags & SHF_TLS) == 0) + continue; + printf("%s ", re->sl[j].name); + } printf("\n"); } #undef PH_HDR From owner-svn-src-stable-11@freebsd.org Thu May 17 23:59:57 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 81977EE3C90; Thu, 17 May 2018 23:59:57 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 20EFA7BFB1; Thu, 17 May 2018 23:59:57 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E7C301070A; Thu, 17 May 2018 23:59:56 +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 w4HNxu59053679; Thu, 17 May 2018 23:59:56 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4HNxuN4053678; Thu, 17 May 2018 23:59:56 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201805172359.w4HNxuN4053678@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 17 May 2018 23:59:56 +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: r333774 - stable/11/sys/conf X-SVN-Group: stable-11 X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: stable/11/sys/conf X-SVN-Commit-Revision: 333774 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 23:59:57 -0000 Author: gjb Date: Thu May 17 23:59:56 2018 New Revision: 333774 URL: https://svnweb.freebsd.org/changeset/base/333774 Log: Update stable/11 to BETA2 as part of the 11.2-RELEASE cycle. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/11/sys/conf/newvers.sh Modified: stable/11/sys/conf/newvers.sh ============================================================================== --- stable/11/sys/conf/newvers.sh Thu May 17 23:07:51 2018 (r333773) +++ stable/11/sys/conf/newvers.sh Thu May 17 23:59:56 2018 (r333774) @@ -44,7 +44,7 @@ TYPE="FreeBSD" REVISION="11.2" -BRANCH="BETA1" +BRANCH="BETA2" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From owner-svn-src-stable-11@freebsd.org Fri May 18 10:17:14 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6F275EF0732; Fri, 18 May 2018 10:17:14 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1B5B86FCF9; Fri, 18 May 2018 10:17: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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EC25316BD9; Fri, 18 May 2018 10:17:13 +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 w4IAHDoi069045; Fri, 18 May 2018 10:17:13 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4IAHDjs069044; Fri, 18 May 2018 10:17:13 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201805181017.w4IAHDjs069044@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Fri, 18 May 2018 10:17:13 +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: r333785 - stable/11/sys/net X-SVN-Group: stable-11 X-SVN-Commit-Author: ae X-SVN-Commit-Paths: stable/11/sys/net X-SVN-Commit-Revision: 333785 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 May 2018 10:17:14 -0000 Author: ae Date: Fri May 18 10:17:13 2018 New Revision: 333785 URL: https://svnweb.freebsd.org/changeset/base/333785 Log: MFC r333497: Apply the change from r272770 to if_ipsec(4) interface. It is guaranteed that if_ipsec(4) interface is used only for tunnel mode IPsec, i.e. decrypted and decapsulated packet has its own IP header. Thus we can consider it as new packet and clear the protocols flags. This allows ICMP/ICMPv6 properly handle errors that may cause this packet. PR: 228108 Approved by: re (kib) Modified: stable/11/sys/net/if_ipsec.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/net/if_ipsec.c ============================================================================== --- stable/11/sys/net/if_ipsec.c Fri May 18 07:31:26 2018 (r333784) +++ stable/11/sys/net/if_ipsec.c Fri May 18 10:17:13 2018 (r333785) @@ -434,7 +434,7 @@ ipsec_if_input(struct mbuf *m, struct secasvar *sav, u m->m_pkthdr.rcvif = ifp; IPSEC_SC_RUNLOCK(); - /* m_clrprotoflags(m); */ + m_clrprotoflags(m); M_SETFIB(m, ifp->if_fib); BPF_MTAP2(ifp, &af, sizeof(af), m); if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1); From owner-svn-src-stable-11@freebsd.org Fri May 18 14:21:41 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 97769EA9CE6; Fri, 18 May 2018 14:21:41 +0000 (UTC) (envelope-from Andre.Albsmeier@siemens.com) Received: from david.siemens.de (david.siemens.de [192.35.17.14]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "david.siemens.de", Issuer "Siemens Issuing CA Internet Server 2017" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 14536783C2; Fri, 18 May 2018 14:21:40 +0000 (UTC) (envelope-from Andre.Albsmeier@siemens.com) Received: from mail2.siemens.de (mail2.siemens.de [139.25.208.11]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id w4IEHquq007265 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 18 May 2018 16:17:52 +0200 Received: from curry.mchp.siemens.de (curry.mchp.siemens.de [139.25.40.130]) by mail2.siemens.de (8.15.2/8.15.2) with ESMTP id w4IEHqqi014986; Fri, 18 May 2018 16:17:52 +0200 Received: (from user@localhost) by curry.mchp.siemens.de (8.15.2/8.15.2) id w4IEHqcs029708; Date: Fri, 18 May 2018 16:17:52 +0200 From: Andre Albsmeier To: Warner Losh Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: Re: svn commit: r333673 - in stable/11/etc: etc.aarch64 etc.amd64 etc.arm etc.i386 etc.powerpc etc.riscv etc.sparc64 Message-ID: <20180518141752.GA6250@bali> References: <201805161318.w4GDIcpx086341@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201805161318.w4GDIcpx086341@repo.freebsd.org> User-Agent: Mutt/1.7.2 (2016-11-26) X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 May 2018 14:21:41 -0000 On Wed, 16-May-2018 at 13:18:38 +0000, Warner Losh wrote: > Author: imp > Date: Wed May 16 13:18:37 2018 > New Revision: 333673 > URL: https://svnweb.freebsd.org/changeset/base/333673 > > Log: > MFC r333436: only launch getty if underlying device exists Can the onifexists thing work under 11? I had problems with my ttys until I switched back to "on". I also can't find an MFC of r315733 which apparently implemented this in HEAD... From owner-svn-src-stable-11@freebsd.org Fri May 18 14:35:32 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 21798EAA231; Fri, 18 May 2018 14:35:32 +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 7371278B01; Fri, 18 May 2018 14:35:31 +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 w4IEZSUo011246; Fri, 18 May 2018 07:35:29 -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 w4IEZSIQ011245; Fri, 18 May 2018 07:35:28 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201805181435.w4IEZSIQ011245@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r333673 - in stable/11/etc: etc.aarch64 etc.amd64 etc.arm etc.i386 etc.powerpc etc.riscv etc.sparc64 In-Reply-To: <20180518141752.GA6250@bali> To: Andre Albsmeier Date: Fri, 18 May 2018 07:35:28 -0700 (PDT) CC: Warner Losh , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@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-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 May 2018 14:35:32 -0000 > On Wed, 16-May-2018 at 13:18:38 +0000, Warner Losh wrote: > > Author: imp > > Date: Wed May 16 13:18:37 2018 > > New Revision: 333673 > > URL: https://svnweb.freebsd.org/changeset/base/333673 > > > > Log: > > MFC r333436: only launch getty if underlying device exists > > Can the onifexists thing work under 11? I had problems > with my ttys until I switched back to "on". I also can't > find an MFC of r315733 which apparently implemented this > in HEAD... This has been caught during the Beta2 build and corrective actions are in process. The pointy hat belongs to me, as I asked imp to merge this, thinking that all the other parts had been merged as I did not get an error when I put onifexists in my 11-beta1 /etc/ttys, but was getting lots of noise from getty about attempts to start ttys on v1-v7 without this. -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-stable-11@freebsd.org Fri May 18 14:57:07 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 66CCCEAABFE; Fri, 18 May 2018 14:57:07 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 18CA7797D0; Fri, 18 May 2018 14:57:07 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EE19B19A13; Fri, 18 May 2018 14:57:06 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4IEv6LI012630; Fri, 18 May 2018 14:57:06 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4IEv69W012629; Fri, 18 May 2018 14:57:06 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201805181457.w4IEv69W012629@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 18 May 2018 14:57: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: r333795 - stable/11/sys/conf X-SVN-Group: stable-11 X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: stable/11/sys/conf X-SVN-Commit-Revision: 333795 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 May 2018 14:57:07 -0000 Author: gjb Date: Fri May 18 14:57:06 2018 New Revision: 333795 URL: https://svnweb.freebsd.org/changeset/base/333795 Log: Revert r333774, which renames stable/11 from BETA1 to BETA2 in order to address an issue what was discovered with the BETA2 builds. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/11/sys/conf/newvers.sh Modified: stable/11/sys/conf/newvers.sh ============================================================================== --- stable/11/sys/conf/newvers.sh Fri May 18 14:30:45 2018 (r333794) +++ stable/11/sys/conf/newvers.sh Fri May 18 14:57:06 2018 (r333795) @@ -44,7 +44,7 @@ TYPE="FreeBSD" REVISION="11.2" -BRANCH="BETA2" +BRANCH="BETA1" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From owner-svn-src-stable-11@freebsd.org Fri May 18 14:58:00 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A45D6EAAC8C; Fri, 18 May 2018 14:58:00 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 586F079966; Fri, 18 May 2018 14:58: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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3983C19A14; Fri, 18 May 2018 14:58: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 w4IEw0OI012710; Fri, 18 May 2018 14:58:00 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4IEvxut012704; Fri, 18 May 2018 14:57:59 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201805181457.w4IEvxut012704@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 18 May 2018 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: r333796 - in stable/11: include lib/libc/gen libexec/getty sbin/init X-SVN-Group: stable-11 X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: in stable/11: include lib/libc/gen libexec/getty sbin/init X-SVN-Commit-Revision: 333796 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 May 2018 14:58:01 -0000 Author: gjb Date: Fri May 18 14:57:58 2018 New Revision: 333796 URL: https://svnweb.freebsd.org/changeset/base/333796 Log: MFC r315733, r315737, r315740, r330054: r315733 (imp): Impelemnt ttys onifexists in init. Implement a new init(8) option in /etc/ttys. If this option is present on the entry in /etc/ttys, the entry will be active if and only if it exists. If the name starts with a '/', it will be considered an absolute path. If not, it will be a path relative to /dev. This allows one to turn off video console getty that aren't present (while running a getty on them even when they aren't the system console). Likewise with serial ports. It differs from onifconsole in only requiring the device exist rather than it be listed as one of the system consoles. r315737 (ngie): Unbreak world by adding sys/stat.h for stat(2) r315740 (imp): Simplify the code a little. r330054 (trasz): Improve missing tty handling in init(8). This removes a check that did nothing - it was checking for ENXIO, which, with devfs, is no longer returned - and was badly placed anyway, and replaces it with similar one that works, and is done just before starting getty, instead of being done when rereading ttys(5). From the practical point of view, this makes init(8) handle disappearing terminals (eg /dev/ttyU*) gracefully, without unneccessary getty restarts and resulting error messages. Reported by: Bart Ender, Andre Albsmeier PR: 228315 Blocks: 11.2-BETA2 Approved by: re (marius) Sponsored by: The FreeBSD Foundation Modified: stable/11/include/ttyent.h stable/11/lib/libc/gen/getttyent.3 stable/11/lib/libc/gen/getttyent.c stable/11/libexec/getty/ttys.5 stable/11/sbin/init/init.c Directory Properties: stable/11/ (props changed) Modified: stable/11/include/ttyent.h ============================================================================== --- stable/11/include/ttyent.h Fri May 18 14:57:06 2018 (r333795) +++ stable/11/include/ttyent.h Fri May 18 14:57:58 2018 (r333796) @@ -38,6 +38,7 @@ #define _TTYS_OFF "off" #define _TTYS_ON "on" #define _TTYS_ONIFCONSOLE "onifconsole" +#define _TTYS_ONIFEXISTS "onifexists" #define _TTYS_SECURE "secure" #define _TTYS_INSECURE "insecure" #define _TTYS_WINDOW "window" @@ -54,6 +55,8 @@ struct ttyent { #define TTY_SECURE 0x02 /* allow uid of 0 to login */ #define TTY_DIALUP 0x04 /* is a dialup tty */ #define TTY_NETWORK 0x08 /* is a network tty */ +#define TTY_IFEXISTS 0x10 /* configured as "onifexists" */ +#define TTY_IFCONSOLE 0x20 /* configured as "onifconsole" */ int ty_status; /* status flags */ char *ty_window; /* command to start up window manager */ char *ty_comment; /* comment field */ Modified: stable/11/lib/libc/gen/getttyent.3 ============================================================================== --- stable/11/lib/libc/gen/getttyent.3 Fri May 18 14:57:06 2018 (r333795) +++ stable/11/lib/libc/gen/getttyent.3 Fri May 18 14:57:58 2018 (r333796) @@ -75,6 +75,8 @@ struct ttyent { #define TTY_SECURE 0x02 /* allow uid of 0 to login */ #define TTY_DIALUP 0x04 /* is a dialup tty */ #define TTY_NETWORK 0x08 /* is a network tty */ +#define TTY_IFEXISTS 0x10 /* configured as "onifexists" */ +#define TTY_IFCONSOLE 0x20 /* configured as "onifconsole" */ int ty_status; /* status flags */ char *ty_window; /* command to start up window manager */ char *ty_comment; /* comment field */ @@ -115,6 +117,10 @@ Identifies a tty used for network connections. If this flag is set, then .Fn isnettty will return a non-zero value. +.It Dv TTY_IFEXISTS +Identifies a tty that does not neccessarily exist. +.It Dv TTY_IFCONSOLE +Identifies a tty that might be a system console. .El .It Fa ty_window The command to execute for a window system associated with the line. Modified: stable/11/lib/libc/gen/getttyent.c ============================================================================== --- stable/11/lib/libc/gen/getttyent.c Fri May 18 14:57:06 2018 (r333795) +++ stable/11/lib/libc/gen/getttyent.c Fri May 18 14:57:58 2018 (r333796) @@ -34,6 +34,7 @@ static char sccsid[] = "@(#)getttyent.c 8.1 (Berkeley) __FBSDID("$FreeBSD$"); #include +#include #include #include @@ -72,11 +73,14 @@ auto_tty_status(const char *ty_name) { size_t len; char *buf, *cons, *nextcons; + int rv; + rv = TTY_IFCONSOLE; + /* Check if this is an enabled kernel console line */ buf = NULL; if (sysctlbyname("kern.console", NULL, &len, NULL, 0) == -1) - return (0); /* Errors mean don't enable */ + return (rv); /* Errors mean don't enable */ buf = malloc(len); if (sysctlbyname("kern.console", buf, &len, NULL, 0) == -1) goto done; @@ -87,16 +91,34 @@ auto_tty_status(const char *ty_name) nextcons = buf; while ((cons = strsep(&nextcons, ",")) != NULL && strlen(cons) != 0) { if (strcmp(cons, ty_name) == 0) { - free(buf); - return (TTY_ON); + rv |= TTY_ON; + break; } } done: free(buf); - return (0); + return (rv); } +static int +auto_exists_status(const char *ty_name) +{ + struct stat sb; + char *dev; + int rv; + + rv = TTY_IFEXISTS; + if (*ty_name == '/') + asprintf(&dev, "%s", ty_name); + else + asprintf(&dev, "/dev/%s", ty_name); + if (dev != NULL && stat(dev, &sb) == 0) + rv |= TTY_ON; + free(dev); + return (rv); +} + struct ttyent * getttyent(void) { @@ -161,6 +183,8 @@ getttyent(void) tty.ty_status |= TTY_ON; else if (scmp(_TTYS_ONIFCONSOLE)) tty.ty_status |= auto_tty_status(tty.ty_name); + else if (scmp(_TTYS_ONIFEXISTS)) + tty.ty_status |= auto_exists_status(tty.ty_name); else if (scmp(_TTYS_SECURE)) tty.ty_status |= TTY_SECURE; else if (scmp(_TTYS_INSECURE)) Modified: stable/11/libexec/getty/ttys.5 ============================================================================== --- stable/11/libexec/getty/ttys.5 Fri May 18 14:57:06 2018 (r333795) +++ stable/11/libexec/getty/ttys.5 Fri May 18 14:57:58 2018 (r333796) @@ -28,7 +28,7 @@ .\" from: @(#)ttys.5 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" " -.Dd March 9, 2014 +.Dd March 16, 2017 .Dt TTYS 5 .Os .Sh NAME @@ -105,6 +105,12 @@ should (should not) execute the command given in the s ``onifconsole'' will cause this line to be enabled if and only if it is an active kernel console device (it is equivalent to ``on'' in this case). +The flag ``onifexists'' will cause this line to be enabled if and only +if the name exists. +If the name starts with a ``/'', it will be considered an absolute +path. +Otherwise, it is considered a path relative to +.Pa /dev . The flag ``secure'' (if the console is enabled) allows users with a uid of 0 to login on this line. Modified: stable/11/sbin/init/init.c ============================================================================== --- stable/11/sbin/init/init.c Fri May 18 14:57:06 2018 (r333795) +++ stable/11/sbin/init/init.c Fri May 18 14:57:58 2018 (r333796) @@ -154,6 +154,8 @@ typedef struct init_session { int se_flags; /* status of session */ #define SE_SHUTDOWN 0x1 /* session won't be restarted */ #define SE_PRESENT 0x2 /* session is in /etc/ttys */ +#define SE_IFEXISTS 0x4 /* session defined as "onifexists" */ +#define SE_IFCONSOLE 0x8 /* session defined as "onifconsole" */ int se_nspace; /* spacing count */ char *se_device; /* filename of port */ char *se_getty; /* what to run on that port */ @@ -1260,7 +1262,6 @@ static session_t * new_session(session_t *sprev, struct ttyent *typ) { session_t *sp; - int fd; if ((typ->ty_status & TTY_ON) == 0 || typ->ty_name == 0 || @@ -1271,21 +1272,15 @@ new_session(session_t *sprev, struct ttyent *typ) sp->se_flags |= SE_PRESENT; + if ((typ->ty_status & TTY_IFEXISTS) != 0) + sp->se_flags |= SE_IFEXISTS; + + if ((typ->ty_status & TTY_IFCONSOLE) != 0) + sp->se_flags |= SE_IFCONSOLE; + if (asprintf(&sp->se_device, "%s%s", _PATH_DEV, typ->ty_name) < 0) err(1, "asprintf"); - /* - * Attempt to open the device, if we get "device not configured" - * then don't add the device to the session list. - */ - if ((fd = open(sp->se_device, O_RDONLY | O_NONBLOCK, 0)) < 0) { - if (errno == ENXIO) { - free_session(sp); - return (0); - } - } else - close(fd); - if (setupargv(sp, typ) == 0) { free_session(sp); return (0); @@ -1505,6 +1500,30 @@ start_getty(session_t *sp) } /* + * Return 1 if the session is defined as "onifexists" + * or "onifconsole" and the device node does not exist. + */ +static int +session_has_no_tty(session_t *sp) +{ + int fd; + + if ((sp->se_flags & SE_IFEXISTS) == 0 && + (sp->se_flags & SE_IFCONSOLE) == 0) + return (0); + + fd = open(sp->se_device, O_RDONLY | O_NONBLOCK, 0); + if (fd < 0) { + if (errno == ENOENT) + return (1); + return (0); + } + + close(fd); + return (0); +} + +/* * Collect exit status for a child. * If an exiting login, start a new login running. */ @@ -1522,7 +1541,8 @@ collect_child(pid_t pid) del_session(sp); sp->se_process = 0; - if (sp->se_flags & SE_SHUTDOWN) { + if (sp->se_flags & SE_SHUTDOWN || + session_has_no_tty(sp)) { if ((sprev = sp->se_prev) != NULL) sprev->se_next = sp->se_next; else @@ -1607,6 +1627,8 @@ multi_user(void) for (sp = sessions; sp; sp = sp->se_next) { if (sp->se_process) + continue; + if (session_has_no_tty(sp)) continue; if ((pid = start_getty(sp)) == -1) { /* serious trouble */ From owner-svn-src-stable-11@freebsd.org Fri May 18 14:59:05 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2F2A3EAAD4B; Fri, 18 May 2018 14:59:05 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D575879AC7; Fri, 18 May 2018 14:59:04 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B782719A16; Fri, 18 May 2018 14:59:04 +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 w4IEx4Ne012809; Fri, 18 May 2018 14:59:04 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4IEx4BA012808; Fri, 18 May 2018 14:59:04 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201805181459.w4IEx4BA012808@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 18 May 2018 14:59: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: r333797 - stable/11/sys/conf X-SVN-Group: stable-11 X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: stable/11/sys/conf X-SVN-Commit-Revision: 333797 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 May 2018 14:59:05 -0000 Author: gjb Date: Fri May 18 14:59:04 2018 New Revision: 333797 URL: https://svnweb.freebsd.org/changeset/base/333797 Log: Update stable/11 to BETA2 as part of the 11.2-RELEASE cycle. As 11.2-BETA2 needs to be rebuilt, this commit marks the real point in time for the rename. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/11/sys/conf/newvers.sh Modified: stable/11/sys/conf/newvers.sh ============================================================================== --- stable/11/sys/conf/newvers.sh Fri May 18 14:57:58 2018 (r333796) +++ stable/11/sys/conf/newvers.sh Fri May 18 14:59:04 2018 (r333797) @@ -44,7 +44,7 @@ TYPE="FreeBSD" REVISION="11.2" -BRANCH="BETA1" +BRANCH="BETA2" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From owner-svn-src-stable-11@freebsd.org Fri May 18 16:26:19 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AE42EEAD99C for ; Fri, 18 May 2018 16:26:19 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-it0-x22e.google.com (mail-it0-x22e.google.com [IPv6:2607:f8b0:4001:c0b::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 38EB57D7A5 for ; Fri, 18 May 2018 16:26:19 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-it0-x22e.google.com with SMTP id z6-v6so13800250iti.4 for ; Fri, 18 May 2018 09:26: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=JUB6Y+uP4y0Y0xmKC70IcBGn1ghU8bG0L/5NBcoOSno=; b=iycna/flxR9/5K/vP8VRVXuDpXockYbEmh2vh9k9HtmhoYbTvjWi4Qzh89WbSxQoAW df5dPiC5wp1pJCW8yv4mThK03N7ZoHJ1kBYgMqVx5D3N0DzCWnZfmPdhWryyGsc69/3k RixTngRx06hqdRA+6HOHeKAWtjfoZTL0AjzrXWoGNL02l8d7SIR3cof+UrOO2z3IHX11 swlFAYva6ArYR24HBoWTB9guwYVnuTQfhe+R6rFpCITmSWGfFGYC7FVdlhD4i94PY9qk sEFziX51Mo+d4+dYpTDxLMuCi9j7au2uBq30VmNUcpp2kWWKvecbVBKRvsK6/3vcPn4g 9MAA== 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=JUB6Y+uP4y0Y0xmKC70IcBGn1ghU8bG0L/5NBcoOSno=; b=d3qV19XW6pfwRIspysqtYQ9wSuV6NnthXahbzrtxaaqeeEOJGeXJTYVxswIfmo5ATG ap+HN9RKta0D1ikJKa9NCwTm0L1jyUiTFxxjXXTdLA6145q+rWBC0RyK2K/tYwI1TJ55 BlasAui8VAuPr0paQtsNrY3J4sCxf+DPKv8t7V16F3z4UvwtxALpSAT9h3Sz4WH8FpXE huaiWgdTUZ0VE0RzMQqUz2qM1FuN9YnivpXMvHzM+rafnQ/er+yORbzvKNKDRkUzySiN ycHr0Folggfi5mkBLkRMQfdKcUYCut8VZanZ/kvWU21Opj+QSIcVQykVSNDG0wNKyDtM TsCg== X-Gm-Message-State: ALKqPwcmALf9LOZ08z4l38416Ia/o59h27O+2T/OpoufV063qFB+XJ/8 z6hKLn9KFesNZaHTKcAi5zLIBhlhn/r6YLqKV9hFPQ== X-Google-Smtp-Source: AB8JxZrf0VEOHmW4TtSOWtDaTiFRjwOqwXzGGNbX48ylTZH4mKyAknNNj8QJev1lspu2ihNMhqPqd1eGwBe/x7JVUJ4= X-Received: by 2002:a24:6ec1:: with SMTP id w184-v6mr7472497itc.57.1526660778469; Fri, 18 May 2018 09:26:18 -0700 (PDT) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 2002:a4f:a649:0:0:0:0:0 with HTTP; Fri, 18 May 2018 09:26:17 -0700 (PDT) X-Originating-IP: [50.253.99.174] In-Reply-To: <201805181435.w4IEZSIQ011245@pdx.rh.CN85.dnsmgr.net> References: <20180518141752.GA6250@bali> <201805181435.w4IEZSIQ011245@pdx.rh.CN85.dnsmgr.net> From: Warner Losh Date: Fri, 18 May 2018 10:26:17 -0600 X-Google-Sender-Auth: oWcLgSdKgp1UzZKcgUSsBWzrbRg Message-ID: Subject: Re: svn commit: r333673 - in stable/11/etc: etc.aarch64 etc.amd64 etc.arm etc.i386 etc.powerpc etc.riscv etc.sparc64 To: "Rodney W. Grimes" Cc: Andre Albsmeier , Warner Losh , src-committers , svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.26 X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 May 2018 16:26:19 -0000 On Fri, May 18, 2018 at 8:35 AM, Rodney W. Grimes < freebsd@pdx.rh.cn85.dnsmgr.net> wrote: > > On Wed, 16-May-2018 at 13:18:38 +0000, Warner Losh wrote: > > > Author: imp > > > Date: Wed May 16 13:18:37 2018 > > > New Revision: 333673 > > > URL: https://svnweb.freebsd.org/changeset/base/333673 > > > > > > Log: > > > MFC r333436: only launch getty if underlying device exists > > > > Can the onifexists thing work under 11? I had problems > > with my ttys until I switched back to "on". I also can't > > find an MFC of r315733 which apparently implemented this > > in HEAD... > > This has been caught during the Beta2 build and corrective > actions are in process. > > The pointy hat belongs to me, as I asked imp to merge this, > thinking that all the other parts had been merged as I did > not get an error when I put onifexists in my 11-beta1 /etc/ttys, > but was getting lots of noise from getty about attempts to > start ttys on v1-v7 without this. > Should I un-merge this or merge the init code? I just checked the VM I tested against, and it was my -current VM, no the -stable one that I thought :( Or do you have it under control? Warner From owner-svn-src-stable-11@freebsd.org Fri May 18 16:31:45 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BD900EADAC6; Fri, 18 May 2018 16:31:45 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6DCF77DB67; Fri, 18 May 2018 16:31:45 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-lf0-f51.google.com (mail-lf0-f51.google.com [209.85.215.51]) (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)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 085FA1C160; Fri, 18 May 2018 16:31:45 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-lf0-f51.google.com with SMTP id w202-v6so14795304lff.12; Fri, 18 May 2018 09:31:44 -0700 (PDT) X-Gm-Message-State: ALKqPwfgsDU9orEAu/VDe4x7wf66d07qiaNAX00k7UwXAuyZYKdL+6K7 bg4gie0RZsKBHaxj7FyVZPpdqWzFg8eimUQjtoI= X-Google-Smtp-Source: AB8JxZp6x3VkZ9ZgVyOX18hKztzC3/3ou0Rz7vERVC8f5HGjAati8ZRaiv4S2+oScWR7AEY3yiA6P35GAOVDTraXLe4= X-Received: by 2002:a19:8f8a:: with SMTP id s10-v6mr22426359lfk.47.1526661103527; Fri, 18 May 2018 09:31:43 -0700 (PDT) MIME-Version: 1.0 Received: by 10.46.49.18 with HTTP; Fri, 18 May 2018 09:31:22 -0700 (PDT) In-Reply-To: References: <20180518141752.GA6250@bali> <201805181435.w4IEZSIQ011245@pdx.rh.CN85.dnsmgr.net> From: Kyle Evans Date: Fri, 18 May 2018 11:31:22 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r333673 - in stable/11/etc: etc.aarch64 etc.amd64 etc.arm etc.i386 etc.powerpc etc.riscv etc.sparc64 To: Warner Losh Cc: "Rodney W. Grimes" , Andre Albsmeier , Warner Losh , src-committers , svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org, Glen Barber Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 May 2018 16:31:45 -0000 On Fri, May 18, 2018 at 11:26 AM, Warner Losh wrote: > > > On Fri, May 18, 2018 at 8:35 AM, Rodney W. Grimes > wrote: >> >> > On Wed, 16-May-2018 at 13:18:38 +0000, Warner Losh wrote: >> > > Author: imp >> > > Date: Wed May 16 13:18:37 2018 >> > > New Revision: 333673 >> > > URL: https://svnweb.freebsd.org/changeset/base/333673 >> > > >> > > Log: >> > > MFC r333436: only launch getty if underlying device exists >> > >> > Can the onifexists thing work under 11? I had problems >> > with my ttys until I switched back to "on". I also can't >> > find an MFC of r315733 which apparently implemented this >> > in HEAD... >> >> This has been caught during the Beta2 build and corrective >> actions are in process. >> >> The pointy hat belongs to me, as I asked imp to merge this, >> thinking that all the other parts had been merged as I did >> not get an error when I put onifexists in my 11-beta1 /etc/ttys, >> but was getting lots of noise from getty about attempts to >> start ttys on v1-v7 without this. > > > Should I un-merge this or merge the init code? I just checked the VM I > tested against, and it was my -current VM, no the -stable one that I thought > :( Or do you have it under control? > > Warner Pretty sure gjb@ already went ham and fixed this in r333796 . From owner-svn-src-stable-11@freebsd.org Fri May 18 16:37:51 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 34017EADD42; Fri, 18 May 2018 16:37:51 +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 A028C7DECE; Fri, 18 May 2018 16:37:49 +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 w4IGWDPl011718; Fri, 18 May 2018 09:32:13 -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 w4IGWDss011717; Fri, 18 May 2018 09:32:13 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201805181632.w4IGWDss011717@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r333673 - in stable/11/etc: etc.aarch64 etc.amd64 etc.arm etc.i386 etc.powerpc etc.riscv etc.sparc64 In-Reply-To: To: Warner Losh Date: Fri, 18 May 2018 09:32:13 -0700 (PDT) CC: "Rodney W. Grimes" , Andre Albsmeier , Warner Losh , src-committers , svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@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-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 May 2018 16:37:51 -0000 [ Charset UTF-8 unsupported, converting... ] > On Fri, May 18, 2018 at 8:35 AM, Rodney W. Grimes < > freebsd@pdx.rh.cn85.dnsmgr.net> wrote: > > > > On Wed, 16-May-2018 at 13:18:38 +0000, Warner Losh wrote: > > > > Author: imp > > > > Date: Wed May 16 13:18:37 2018 > > > > New Revision: 333673 > > > > URL: https://svnweb.freebsd.org/changeset/base/333673 > > > > > > > > Log: > > > > MFC r333436: only launch getty if underlying device exists > > > > > > Can the onifexists thing work under 11? I had problems > > > with my ttys until I switched back to "on". I also can't > > > find an MFC of r315733 which apparently implemented this > > > in HEAD... > > > > This has been caught during the Beta2 build and corrective > > actions are in process. > > > > The pointy hat belongs to me, as I asked imp to merge this, > > thinking that all the other parts had been merged as I did > > not get an error when I put onifexists in my 11-beta1 /etc/ttys, > > but was getting lots of noise from getty about attempts to > > start ttys on v1-v7 without this. > > > > Should I un-merge this or merge the init code? I just checked the VM I > tested against, and it was my -current VM, no the -stable one that I > thought :( Or do you have it under control? No, re(gjb) has merged the additional missing bits of the init changes to stable/11 and is rebuilding 11.2-Beta2. > Warner -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-stable-11@freebsd.org Sat May 19 18:02:48 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EE179EDC512; Sat, 19 May 2018 18:02:47 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 92282788DB; Sat, 19 May 2018 18:02:47 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 539FA288C; Sat, 19 May 2018 18:02: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 w4JI2lre051713; Sat, 19 May 2018 18:02:47 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4JI2l3i051712; Sat, 19 May 2018 18:02:47 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201805191802.w4JI2l3i051712@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sat, 19 May 2018 18:02: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: r333881 - stable/11/tools/test/vm86 X-SVN-Group: stable-11 X-SVN-Commit-Author: kib X-SVN-Commit-Paths: stable/11/tools/test/vm86 X-SVN-Commit-Revision: 333881 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 May 2018 18:02:48 -0000 Author: kib Date: Sat May 19 18:02:46 2018 New Revision: 333881 URL: https://svnweb.freebsd.org/changeset/base/333881 Log: MFC r333534: Add a test for vm86(2). Approved by: re (gjb) Added: stable/11/tools/test/vm86/ - copied from r333534, head/tools/test/vm86/ Modified: Directory Properties: stable/11/ (props changed) From owner-svn-src-stable-11@freebsd.org Sat May 19 19:09:42 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 10F52EE0147; Sat, 19 May 2018 19:09:42 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B92717B6B0; Sat, 19 May 2018 19:09:41 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 963D632AD; Sat, 19 May 2018 19:09:41 +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 w4JJ9fgB083558; Sat, 19 May 2018 19:09:41 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4JJ9fqE083557; Sat, 19 May 2018 19:09:41 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201805191909.w4JJ9fqE083557@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Sat, 19 May 2018 19:09: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: r333887 - stable/11/sys/contrib/rdma/krping X-SVN-Group: stable-11 X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: stable/11/sys/contrib/rdma/krping X-SVN-Commit-Revision: 333887 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 May 2018 19:09:42 -0000 Author: hselasky Date: Sat May 19 19:09:41 2018 New Revision: 333887 URL: https://svnweb.freebsd.org/changeset/base/333887 Log: MFC r333623: Add support for setting type of service, TOS, for outgoing RDMA connections in the krping kernel test utility. Approved by: re (gjb) Sponsored by: Mellanox Technologies Modified: stable/11/sys/contrib/rdma/krping/krping.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/contrib/rdma/krping/krping.c ============================================================================== --- stable/11/sys/contrib/rdma/krping/krping.c Sat May 19 19:00:04 2018 (r333886) +++ stable/11/sys/contrib/rdma/krping/krping.c Sat May 19 19:09:41 2018 (r333887) @@ -96,6 +96,7 @@ static const struct krping_option krping_opts[] = { {"rlat", OPT_NOPARAM, 'L'}, {"bw", OPT_NOPARAM, 'B'}, {"duplex", OPT_NOPARAM, 'd'}, + {"tos", OPT_INT, 't'}, {"txdepth", OPT_INT, 'T'}, {"poll", OPT_NOPARAM, 'P'}, {"local_dma_lkey", OPT_NOPARAM, 'Z'}, @@ -234,6 +235,7 @@ struct krping_cb { int txdepth; /* SQ depth */ int local_dma_lkey; /* use 0 for lkey */ int frtest; /* reg test */ + int tos; /* type of service */ /* CM stuff */ struct rdma_cm_id *cm_id; /* connection on client side,*/ @@ -1918,6 +1920,10 @@ static void krping_run_client(struct krping_cb *cb) struct ib_recv_wr *bad_wr; int ret; + /* set type of service, if any */ + if (cb->tos != 0) + rdma_set_service_type(cb->cm_id, cb->tos); + ret = krping_bind_client(cb); if (ret) return; @@ -2096,6 +2102,10 @@ int krping_doit(char *cmd) break; case 'I': cb->server_invalidate = 1; + break; + case 't': + cb->tos = optint; + DEBUG_LOG("type of service, tos=%d\n", (int) cb->tos); break; case 'T': cb->txdepth = optint;