From owner-svn-src-stable-11@freebsd.org Sun Dec 10 12:25:34 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0D0EEE8B370; Sun, 10 Dec 2017 12:25:34 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DBA626F0D4; Sun, 10 Dec 2017 12:25:33 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBACPW63014247; Sun, 10 Dec 2017 12:25:32 GMT (envelope-from ed@FreeBSD.org) Received: (from ed@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBACPWEC014242; Sun, 10 Dec 2017 12:25:32 GMT (envelope-from ed@FreeBSD.org) Message-Id: <201712101225.vBACPWEC014242@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ed set sender to ed@FreeBSD.org using -f From: Ed Schouten Date: Sun, 10 Dec 2017 12:25: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: r326743 - in stable/11/sys: amd64/cloudabi32 amd64/cloudabi64 arm/cloudabi32 arm64/cloudabi64 i386/cloudabi32 X-SVN-Group: stable-11 X-SVN-Commit-Author: ed X-SVN-Commit-Paths: in stable/11/sys: amd64/cloudabi32 amd64/cloudabi64 arm/cloudabi32 arm64/cloudabi64 i386/cloudabi32 X-SVN-Commit-Revision: 326743 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, 10 Dec 2017 12:25:34 -0000 Author: ed Date: Sun Dec 10 12:25:32 2017 New Revision: 326743 URL: https://svnweb.freebsd.org/changeset/base/326743 Log: MFC r326228 and r326229: Use TO_PTR() to convert integers to pointers. For FreeBSD/arm64's cloudabi32 support, I'm going to need a TO_PTR() in this place. Also use it for all of the other source files, so that the difference remains as minimal as possible. Modified: stable/11/sys/amd64/cloudabi32/cloudabi32_sysvec.c stable/11/sys/amd64/cloudabi64/cloudabi64_sysvec.c stable/11/sys/arm/cloudabi32/cloudabi32_sysvec.c stable/11/sys/arm64/cloudabi64/cloudabi64_sysvec.c stable/11/sys/i386/cloudabi32/cloudabi32_sysvec.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/amd64/cloudabi32/cloudabi32_sysvec.c ============================================================================== --- stable/11/sys/amd64/cloudabi32/cloudabi32_sysvec.c Sun Dec 10 09:17:21 2017 (r326742) +++ stable/11/sys/amd64/cloudabi32/cloudabi32_sysvec.c Sun Dec 10 12:25:32 2017 (r326743) @@ -86,7 +86,7 @@ cloudabi32_proc_setregs(struct thread *td, struct imag { ia32_setregs(td, imgp, stack); - (void)cpu_set_user_tls(td, (void *)stack); + (void)cpu_set_user_tls(td, TO_PTR(stack)); } static int Modified: stable/11/sys/amd64/cloudabi64/cloudabi64_sysvec.c ============================================================================== --- stable/11/sys/amd64/cloudabi64/cloudabi64_sysvec.c Sun Dec 10 09:17:21 2017 (r326742) +++ stable/11/sys/amd64/cloudabi64/cloudabi64_sysvec.c Sun Dec 10 12:25:32 2017 (r326743) @@ -83,7 +83,7 @@ cloudabi64_proc_setregs(struct thread *td, struct imag regs = td->td_frame; regs->tf_rdi = stack + sizeof(register_t) + roundup(sizeof(cloudabi64_tcb_t), sizeof(register_t)); - (void)cpu_set_user_tls(td, (void *)stack); + (void)cpu_set_user_tls(td, TO_PTR(stack)); } static int @@ -188,7 +188,7 @@ cloudabi64_thread_setregs(struct thread *td, frame->tf_rdi = td->td_tid; frame->tf_rsi = attr->argument; - return (cpu_set_user_tls(td, (void *)tcbptr)); + return (cpu_set_user_tls(td, TO_PTR(tcbptr))); } static struct sysentvec cloudabi64_elf_sysvec = { Modified: stable/11/sys/arm/cloudabi32/cloudabi32_sysvec.c ============================================================================== --- stable/11/sys/arm/cloudabi32/cloudabi32_sysvec.c Sun Dec 10 09:17:21 2017 (r326742) +++ stable/11/sys/arm/cloudabi32/cloudabi32_sysvec.c Sun Dec 10 12:25:32 2017 (r326743) @@ -63,7 +63,7 @@ cloudabi32_proc_setregs(struct thread *td, struct imag regs = td->td_frame; regs->tf_r0 = td->td_retval[0] = stack + roundup(sizeof(cloudabi32_tcb_t), sizeof(register_t)); - (void)cpu_set_user_tls(td, (void *)stack); + (void)cpu_set_user_tls(td, TO_PTR(stack)); } static int @@ -165,7 +165,7 @@ cloudabi32_thread_setregs(struct thread *td, frame->tf_r1 = attr->argument; /* Set up TLS. */ - return (cpu_set_user_tls(td, (void *)tcb)); + return (cpu_set_user_tls(td, TO_PTR(tcb))); } static struct sysentvec cloudabi32_elf_sysvec = { Modified: stable/11/sys/arm64/cloudabi64/cloudabi64_sysvec.c ============================================================================== --- stable/11/sys/arm64/cloudabi64/cloudabi64_sysvec.c Sun Dec 10 09:17:21 2017 (r326742) +++ stable/11/sys/arm64/cloudabi64/cloudabi64_sysvec.c Sun Dec 10 12:25:32 2017 (r326743) @@ -63,7 +63,7 @@ cloudabi64_proc_setregs(struct thread *td, struct imag regs = td->td_frame; regs->tf_x[0] = td->td_retval[0] = stack + roundup(sizeof(cloudabi64_tcb_t), sizeof(register_t)); - (void)cpu_set_user_tls(td, (void *)stack); + (void)cpu_set_user_tls(td, TO_PTR(stack)); } static int @@ -157,7 +157,7 @@ cloudabi64_thread_setregs(struct thread *td, frame->tf_x[1] = attr->argument; /* Set up TLS. */ - return (cpu_set_user_tls(td, (void *)tcb)); + return (cpu_set_user_tls(td, TO_PTR(tcb))); } static struct sysentvec cloudabi64_elf_sysvec = { Modified: stable/11/sys/i386/cloudabi32/cloudabi32_sysvec.c ============================================================================== --- stable/11/sys/i386/cloudabi32/cloudabi32_sysvec.c Sun Dec 10 09:17:21 2017 (r326742) +++ stable/11/sys/i386/cloudabi32/cloudabi32_sysvec.c Sun Dec 10 12:25:32 2017 (r326743) @@ -81,7 +81,7 @@ cloudabi32_proc_setregs(struct thread *td, struct imag { exec_setregs(td, imgp, stack); - (void)cpu_set_user_tls(td, (void *)stack); + (void)cpu_set_user_tls(td, TO_PTR(stack)); } static int From owner-svn-src-stable-11@freebsd.org Sun Dec 10 13:45:00 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0445AE8D1DE; Sun, 10 Dec 2017 13:45:00 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C3C7171CEB; Sun, 10 Dec 2017 13:44:59 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBADiwbr048067; Sun, 10 Dec 2017 13:44:58 GMT (envelope-from eugen@FreeBSD.org) Received: (from eugen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBADiw8l048065; Sun, 10 Dec 2017 13:44:58 GMT (envelope-from eugen@FreeBSD.org) Message-Id: <201712101344.vBADiw8l048065@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eugen set sender to eugen@FreeBSD.org using -f From: Eugene Grosbein Date: Sun, 10 Dec 2017 13:44:58 +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: r326744 - stable/11/sys/geom/raid X-SVN-Group: stable-11 X-SVN-Commit-Author: eugen X-SVN-Commit-Paths: stable/11/sys/geom/raid X-SVN-Commit-Revision: 326744 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, 10 Dec 2017 13:45:00 -0000 Author: eugen Date: Sun Dec 10 13:44:58 2017 New Revision: 326744 URL: https://svnweb.freebsd.org/changeset/base/326744 Log: MFC r326655,326668: correct error handling for graid SINGLE/CONCAT/RAID5 volumes. Approved by: mav (mentor) Modified: stable/11/sys/geom/raid/tr_concat.c stable/11/sys/geom/raid/tr_raid5.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/geom/raid/tr_concat.c ============================================================================== --- stable/11/sys/geom/raid/tr_concat.c Sun Dec 10 12:25:32 2017 (r326743) +++ stable/11/sys/geom/raid/tr_concat.c Sun Dec 10 13:44:58 2017 (r326744) @@ -339,7 +339,7 @@ g_raid_tr_iodone_concat(struct g_raid_tr_object *tr, pbp->bio_inbed++; if (pbp->bio_children == pbp->bio_inbed) { pbp->bio_completed = pbp->bio_length; - g_raid_iodone(pbp, bp->bio_error); + g_raid_iodone(pbp, pbp->bio_error); } } Modified: stable/11/sys/geom/raid/tr_raid5.c ============================================================================== --- stable/11/sys/geom/raid/tr_raid5.c Sun Dec 10 12:25:32 2017 (r326743) +++ stable/11/sys/geom/raid/tr_raid5.c Sun Dec 10 13:44:58 2017 (r326744) @@ -371,15 +371,15 @@ g_raid_tr_iodone_raid5(struct g_raid_tr_object *tr, struct g_raid_subdisk *sd, struct bio *bp) { struct bio *pbp; - int error; pbp = bp->bio_parent; + if (pbp->bio_error == 0) + pbp->bio_error = bp->bio_error; pbp->bio_inbed++; - error = bp->bio_error; g_destroy_bio(bp); if (pbp->bio_children == pbp->bio_inbed) { pbp->bio_completed = pbp->bio_length; - g_raid_iodone(pbp, error); + g_raid_iodone(pbp, pbp->bio_error); } } From owner-svn-src-stable-11@freebsd.org Sun Dec 10 13:58:38 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7DE8EE8D530; Sun, 10 Dec 2017 13:58:38 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4936172389; Sun, 10 Dec 2017 13:58:38 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBADwbIV052455; Sun, 10 Dec 2017 13:58:37 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBADwbUv052454; Sun, 10 Dec 2017 13:58:37 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201712101358.vBADwbUv052454@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sun, 10 Dec 2017 13:58: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: r326746 - in stable: 10/lib/msun/man 11/lib/msun/man X-SVN-Group: stable-11 X-SVN-Commit-Author: dim X-SVN-Commit-Paths: in stable: 10/lib/msun/man 11/lib/msun/man X-SVN-Commit-Revision: 326746 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, 10 Dec 2017 13:58:38 -0000 Author: dim Date: Sun Dec 10 13:58:37 2017 New Revision: 326746 URL: https://svnweb.freebsd.org/changeset/base/326746 Log: MFC r326669: Remove the sentence in math(3) about some long double math functions not being available. Submitted by: Steve Kargl Modified: stable/11/lib/msun/man/math.3 Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Modified: stable/10/lib/msun/man/math.3 Directory Properties: stable/10/ (props changed) Modified: stable/11/lib/msun/man/math.3 ============================================================================== --- stable/11/lib/msun/man/math.3 Sun Dec 10 13:45:41 2017 (r326745) +++ stable/11/lib/msun/man/math.3 Sun Dec 10 13:58:37 2017 (r326746) @@ -28,7 +28,7 @@ .\" from: @(#)math.3 6.10 (Berkeley) 5/6/91 .\" $FreeBSD$ .\" -.Dd December 5, 2010 +.Dd December 7, 2017 .Dt MATH 3 .Os .Sh NAME @@ -235,12 +235,6 @@ and .Vt long double values, were written for or imported into subsequent versions of FreeBSD. .Sh BUGS -Some of the -.Vt "long double" -math functions in -.St -isoC-99 -are not available. -.Pp Many of the routines to compute transcendental functions produce inaccurate results in other than the default rounding mode. .Pp From owner-svn-src-stable-11@freebsd.org Sun Dec 10 14:49:07 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DC271E8E485; Sun, 10 Dec 2017 14:49:07 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A398473917; Sun, 10 Dec 2017 14:49:07 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBAEn65M073450; Sun, 10 Dec 2017 14:49:06 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBAEn6fv073449; Sun, 10 Dec 2017 14:49:06 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201712101449.vBAEn6fv073449@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sun, 10 Dec 2017 14:49: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: r326747 - in stable: 10/lib/msun/bsdsrc 11/lib/msun/bsdsrc X-SVN-Group: stable-11 X-SVN-Commit-Author: dim X-SVN-Commit-Paths: in stable: 10/lib/msun/bsdsrc 11/lib/msun/bsdsrc X-SVN-Commit-Revision: 326747 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, 10 Dec 2017 14:49:08 -0000 Author: dim Date: Sun Dec 10 14:49:06 2017 New Revision: 326747 URL: https://svnweb.freebsd.org/changeset/base/326747 Log: MFC r326670: Remove an unused incude from lib/msun/bsdsrc/b_log.c. Submitted by: Steve Kargl Modified: stable/11/lib/msun/bsdsrc/b_log.c Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Modified: stable/10/lib/msun/bsdsrc/b_log.c Directory Properties: stable/10/ (props changed) Modified: stable/11/lib/msun/bsdsrc/b_log.c ============================================================================== --- stable/11/lib/msun/bsdsrc/b_log.c Sun Dec 10 13:58:37 2017 (r326746) +++ stable/11/lib/msun/bsdsrc/b_log.c Sun Dec 10 14:49:06 2017 (r326747) @@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$"); #include -#include #include "mathimpl.h" From owner-svn-src-stable-11@freebsd.org Sun Dec 10 19:22:45 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 53E43E97BCC; Sun, 10 Dec 2017 19:22:45 +0000 (UTC) (envelope-from bryanv@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1EB4C7DEF4; Sun, 10 Dec 2017 19:22:45 +0000 (UTC) (envelope-from bryanv@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBAJMim8089805; Sun, 10 Dec 2017 19:22:44 GMT (envelope-from bryanv@FreeBSD.org) Received: (from bryanv@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBAJMiGb089804; Sun, 10 Dec 2017 19:22:44 GMT (envelope-from bryanv@FreeBSD.org) Message-Id: <201712101922.vBAJMiGb089804@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bryanv set sender to bryanv@FreeBSD.org using -f From: Bryan Venteicher Date: Sun, 10 Dec 2017 19:22: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: r326751 - stable/11/sys/dev/vmware/vmxnet3 X-SVN-Group: stable-11 X-SVN-Commit-Author: bryanv X-SVN-Commit-Paths: stable/11/sys/dev/vmware/vmxnet3 X-SVN-Commit-Revision: 326751 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, 10 Dec 2017 19:22:45 -0000 Author: bryanv Date: Sun Dec 10 19:22:43 2017 New Revision: 326751 URL: https://svnweb.freebsd.org/changeset/base/326751 Log: MFC r326744: Correctly report the vmxnet3 link down media status Modified: stable/11/sys/dev/vmware/vmxnet3/if_vmx.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/vmware/vmxnet3/if_vmx.c ============================================================================== --- stable/11/sys/dev/vmware/vmxnet3/if_vmx.c Sun Dec 10 18:55:42 2017 (r326750) +++ stable/11/sys/dev/vmware/vmxnet3/if_vmx.c Sun Dec 10 19:22:43 2017 (r326751) @@ -3485,14 +3485,15 @@ vmxnet3_media_status(struct ifnet *ifp, struct ifmedia sc = ifp->if_softc; - ifmr->ifm_active = IFM_ETHER | IFM_AUTO; ifmr->ifm_status = IFM_AVALID; + ifmr->ifm_active = IFM_ETHER; VMXNET3_CORE_LOCK(sc); - if (vmxnet3_link_is_up(sc) != 0) + if (vmxnet3_link_is_up(sc) != 0) { ifmr->ifm_status |= IFM_ACTIVE; - else - ifmr->ifm_status |= IFM_NONE; + ifmr->ifm_active |= IFM_AUTO; + } else + ifmr->ifm_active |= IFM_NONE; VMXNET3_CORE_UNLOCK(sc); } From owner-svn-src-stable-11@freebsd.org Mon Dec 11 05:06:29 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7F059E8630A; Mon, 11 Dec 2017 05:06:29 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3DB847181B; Mon, 11 Dec 2017 05:06:29 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBB56S7K034142; Mon, 11 Dec 2017 05:06:28 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBB56Sk5034141; Mon, 11 Dec 2017 05:06:28 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201712110506.vBB56Sk5034141@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Mon, 11 Dec 2017 05:06:28 +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: r326760 - stable/11/usr.sbin/inetd X-SVN-Group: stable-11 X-SVN-Commit-Author: delphij X-SVN-Commit-Paths: stable/11/usr.sbin/inetd X-SVN-Commit-Revision: 326760 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: Mon, 11 Dec 2017 05:06:29 -0000 Author: delphij Date: Mon Dec 11 05:06:28 2017 New Revision: 326760 URL: https://svnweb.freebsd.org/changeset/base/326760 Log: MFC r326244: Don't assign rs as we will assign it later. Modified: stable/11/usr.sbin/inetd/builtins.c Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.sbin/inetd/builtins.c ============================================================================== --- stable/11/usr.sbin/inetd/builtins.c Mon Dec 11 04:40:25 2017 (r326759) +++ stable/11/usr.sbin/inetd/builtins.c Mon Dec 11 05:06:28 2017 (r326760) @@ -167,10 +167,8 @@ chargen_stream(int s, struct servtab *sep) inetd_setproctitle(sep->se_service, s); - if (!endring) { + if (!endring) initring(); - rs = ring; - } text[LINESIZ] = '\r'; text[LINESIZ + 1] = '\n'; From owner-svn-src-stable-11@freebsd.org Mon Dec 11 05:19:46 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DBCAAE868A6; Mon, 11 Dec 2017 05:19:46 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A821A720CE; Mon, 11 Dec 2017 05:19:46 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBB5JjkZ038903; Mon, 11 Dec 2017 05:19:45 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBB5JjHg038902; Mon, 11 Dec 2017 05:19:45 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201712110519.vBB5JjHg038902@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Mon, 11 Dec 2017 05:19: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: r326762 - stable/11/usr.bin/find X-SVN-Group: stable-11 X-SVN-Commit-Author: delphij X-SVN-Commit-Paths: stable/11/usr.bin/find X-SVN-Commit-Revision: 326762 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: Mon, 11 Dec 2017 05:19:47 -0000 Author: delphij Date: Mon Dec 11 05:19:45 2017 New Revision: 326762 URL: https://svnweb.freebsd.org/changeset/base/326762 Log: MFC r325723: find(1): Don't treat statfs() error as fatal in f_fstype, which can happen when a directory is removed in the middle of find. Instead of a full err(), allow find to continue, plus print a warning with exitstatus set when appropriate. Reported by: 100.chksetuid via gordon Reviewed by: jilles Modified: stable/11/usr.bin/find/function.c Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.bin/find/function.c ============================================================================== --- stable/11/usr.bin/find/function.c Mon Dec 11 05:10:11 2017 (r326761) +++ stable/11/usr.bin/find/function.c Mon Dec 11 05:19:45 2017 (r326762) @@ -902,8 +902,13 @@ f_fstype(PLAN *plan, FTSENT *entry) } else p = NULL; - if (statfs(entry->fts_accpath, &sb)) - err(1, "%s", entry->fts_accpath); + if (statfs(entry->fts_accpath, &sb)) { + if (!ignore_readdir_race || errno != ENOENT) { + warn("statfs: %s", entry->fts_accpath); + exitstatus = 1; + } + return 0; + } if (p) { p[0] = save[0]; From owner-svn-src-stable-11@freebsd.org Mon Dec 11 12:38:52 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3D325E90C82; Mon, 11 Dec 2017 12:38:52 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 07088635AD; Mon, 11 Dec 2017 12:38:51 +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 vBBCcoka034021; Mon, 11 Dec 2017 12:38:50 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBBCco1M034020; Mon, 11 Dec 2017 12:38:50 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201712111238.vBBCco1M034020@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Mon, 11 Dec 2017 12:38: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: r326766 - stable/11/contrib/bsnmp/snmpd X-SVN-Group: stable-11 X-SVN-Commit-Author: ae X-SVN-Commit-Paths: stable/11/contrib/bsnmp/snmpd X-SVN-Commit-Revision: 326766 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: Mon, 11 Dec 2017 12:38:52 -0000 Author: ae Date: Mon Dec 11 12:38:50 2017 New Revision: 326766 URL: https://svnweb.freebsd.org/changeset/base/326766 Log: MFC r326510: Fix format string warning with enabled DEBUGGING. Modified: stable/11/contrib/bsnmp/snmpd/config.c Directory Properties: stable/11/ (props changed) Modified: stable/11/contrib/bsnmp/snmpd/config.c ============================================================================== --- stable/11/contrib/bsnmp/snmpd/config.c Mon Dec 11 11:59:45 2017 (r326765) +++ stable/11/contrib/bsnmp/snmpd/config.c Mon Dec 11 12:38:50 2017 (r326766) @@ -663,7 +663,7 @@ gettoken() printf("(EOL)"); break; case TOK_NUM: - printf("(NUM %llu)", numval); + printf("(NUM %ju)", (uintmax_t)numval); break; case TOK_STR: printf("(STR %.*s)", (int)strvallen, strval); From owner-svn-src-stable-11@freebsd.org Mon Dec 11 14:38:43 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F0A50E937FA; Mon, 11 Dec 2017 14:38:43 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CAC9B67C9D; Mon, 11 Dec 2017 14:38:43 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBBEcgOi085080; Mon, 11 Dec 2017 14:38:42 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBBEcgD2085079; Mon, 11 Dec 2017 14:38:42 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201712111438.vBBEcgD2085079@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Mon, 11 Dec 2017 14:38:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r326767 - stable/11/usr.bin/ctlstat X-SVN-Group: stable-11 X-SVN-Commit-Author: mav X-SVN-Commit-Paths: stable/11/usr.bin/ctlstat X-SVN-Commit-Revision: 326767 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: Mon, 11 Dec 2017 14:38:44 -0000 Author: mav Date: Mon Dec 11 14:38:42 2017 New Revision: 326767 URL: https://svnweb.freebsd.org/changeset/base/326767 Log: MFC r326273: Make ctlstat -n option work reasonably for sparse LUN list. Modified: stable/11/usr.bin/ctlstat/ctlstat.c Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.bin/ctlstat/ctlstat.c ============================================================================== --- stable/11/usr.bin/ctlstat/ctlstat.c Mon Dec 11 12:38:50 2017 (r326766) +++ stable/11/usr.bin/ctlstat/ctlstat.c Mon Dec 11 14:38:42 2017 (r326767) @@ -320,11 +320,12 @@ static const char *iotypes[] = {"NO IO", "READ", "WRIT static void ctlstat_dump(struct ctlstat_context *ctx) { - int iotype, i; + int iotype, i, n; struct ctl_io_stats *stats = ctx->cur_stats; - for (i = 0; i < ctx->cur_items;i++) { - if (F_MASK(ctx) && bit_test(ctx->item_mask, i) == 0) + for (i = n = 0; i < ctx->cur_items;i++) { + if (F_MASK(ctx) && bit_test(ctx->item_mask, + (int)stats[i].item) == 0) continue; printf("%s %d\n", F_PORTS(ctx) ? "port" : "lun", stats[i].item); for (iotype = 0; iotype < CTL_STATS_NUM_TYPES; iotype++) { @@ -341,17 +342,20 @@ ctlstat_dump(struct ctlstat_context *ctx) PRINT_BINTIME(stats[i].dma_time[iotype]); printf("\n"); } + if (++n >= ctx->numdevs) + break; } } static void ctlstat_json(struct ctlstat_context *ctx) { - int iotype, i; + int iotype, i, n; struct ctl_io_stats *stats = ctx->cur_stats; printf("{\"%s\":[", F_PORTS(ctx) ? "ports" : "luns"); - for (i = 0; i < ctx->cur_items; i++) { - if (F_MASK(ctx) && bit_test(ctx->item_mask, i) == 0) + for (i = n = 0; i < ctx->cur_items; i++) { + if (F_MASK(ctx) && bit_test(ctx->item_mask, + (int)stats[i].item) == 0) continue; printf("{\"num\":%d,\"io\":[", stats[i].item); @@ -372,6 +376,8 @@ ctlstat_json(struct ctlstat_context *ctx) { printf(","); /* continue io array */ } printf("]}"); + if (++n >= ctx->numdevs) + break; if (i < (ctx->cur_items - 1)) printf(","); /* continue lun array */ } @@ -383,7 +389,7 @@ ctlstat_standard(struct ctlstat_context *ctx) { long double etime; uint64_t delta_jiffies, delta_idle; long double cpu_percentage; - int i, j; + int i, j, n; cpu_percentage = 0; @@ -413,10 +419,6 @@ ctlstat_standard(struct ctlstat_context *ctx) { if (F_HDR(ctx)) { ctx->header_interval--; if (ctx->header_interval <= 0) { - int hdr_devs; - - hdr_devs = 0; - if (F_CPU(ctx)) fprintf(stdout, " CPU"); if (F_TOTALS(ctx)) { @@ -425,9 +427,9 @@ ctlstat_standard(struct ctlstat_context *ctx) { (F_TIMEVAL(ctx) != 0) ? " " : "", (F_TIMEVAL(ctx) != 0) ? " " : "", (F_TIMEVAL(ctx) != 0) ? " " : ""); - hdr_devs = 3; + n = 3; } else { - for (i = 0; i < min(CTL_STAT_BITS, + for (i = n = 0; i < min(CTL_STAT_BITS, ctx->cur_items); i++) { int item; @@ -444,13 +446,14 @@ ctlstat_standard(struct ctlstat_context *ctx) { fprintf(stdout, "%15.6s%d %s", F_PORTS(ctx) ? "port" : "lun", item, (F_TIMEVAL(ctx) != 0) ? " " : ""); - hdr_devs++; + if (++n >= ctx->numdevs) + break; } fprintf(stdout, "\n"); } if (F_CPU(ctx)) fprintf(stdout, " "); - for (i = 0; i < hdr_devs; i++) + for (i = 0; i < n; i++) fprintf(stdout, "%s KB/t %s MB/s", (F_TIMEVAL(ctx) != 0) ? " ms" : "", (F_DMA(ctx) == 0) ? "tps" : "dps"); @@ -534,7 +537,7 @@ ctlstat_standard(struct ctlstat_context *ctx) { dmas_per_sec[i], mbsec[i]); } } else { - for (i = 0; i < min(CTL_STAT_BITS, ctx->cur_items); i++) { + for (i = n = 0; i < min(CTL_STAT_BITS, ctx->cur_items); i++) { long double mbsec, kb_per_transfer; long double transfers_per_sec; long double ms_per_transfer; @@ -565,6 +568,8 @@ ctlstat_standard(struct ctlstat_context *ctx) { fprintf(stdout, " %4.0Lf %5.0Lf %4.0Lf", kb_per_transfer, (F_DMA(ctx) == 0) ? transfers_per_sec : dmas_per_sec, mbsec); + if (++n >= ctx->numdevs) + break; } } } @@ -668,18 +673,6 @@ main(int argc, char **argv) ctx.flags |= CTLSTAT_FLAG_PORTS; else ctx.flags |= CTLSTAT_FLAG_LUNS; - } - - if (!F_TOTALS(&ctx) && !F_MASK(&ctx)) { - /* - * Note that this just selects the first N LUNs to display, - * but at this point we have no knoweledge of which LUN - * numbers actually exist. So we may select LUNs that - * aren't there. - */ - bit_nset(ctx.item_mask, 0, min(ctx.numdevs - 1, - CTL_STAT_BITS - 1)); - ctx.flags |= CTLSTAT_FLAG_MASK; } if ((fd = open(CTL_DEFAULT_DEV, O_RDWR)) == -1) From owner-svn-src-stable-11@freebsd.org Mon Dec 11 20:21:36 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5E109E9D631; Mon, 11 Dec 2017 20:21:36 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 27494772B7; Mon, 11 Dec 2017 20:21:36 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBBKLZ7E033423; Mon, 11 Dec 2017 20:21:35 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBBKLZsu033422; Mon, 11 Dec 2017 20:21:35 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201712112021.vBBKLZsu033422@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Mon, 11 Dec 2017 20:21: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: r326777 - stable/11/sys/cam/scsi X-SVN-Group: stable-11 X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: stable/11/sys/cam/scsi X-SVN-Commit-Revision: 326777 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: Mon, 11 Dec 2017 20:21:36 -0000 Author: asomers Date: Mon Dec 11 20:21:35 2017 New Revision: 326777 URL: https://svnweb.freebsd.org/changeset/base/326777 Log: MFC r325959: Add assertion in probedone() that we're holding the device lock. Submitted by: ken Reviewed by: asomers Sponsored by: Spectra Logic Corp Modified: stable/11/sys/cam/scsi/scsi_xpt.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/cam/scsi/scsi_xpt.c ============================================================================== --- stable/11/sys/cam/scsi/scsi_xpt.c Mon Dec 11 20:04:40 2017 (r326776) +++ stable/11/sys/cam/scsi/scsi_xpt.c Mon Dec 11 20:21:35 2017 (r326777) @@ -1128,6 +1128,7 @@ probedone(struct cam_periph *periph, union ccb *done_c softc = (probe_softc *)periph->softc; path = done_ccb->ccb_h.path; priority = done_ccb->ccb_h.pinfo.priority; + cam_periph_assert(periph, MA_OWNED); switch (softc->action) { case PROBE_TUR: From owner-svn-src-stable-11@freebsd.org Mon Dec 11 20:24:30 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E9703E9D7A1; Mon, 11 Dec 2017 20:24:30 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B273F775B3; Mon, 11 Dec 2017 20:24:30 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBBKOTa1035251; Mon, 11 Dec 2017 20:24:29 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBBKOTFG035250; Mon, 11 Dec 2017 20:24:29 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201712112024.vBBKOTFG035250@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Mon, 11 Dec 2017 20:24:29 +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: r326778 - stable/11/sbin/camcontrol X-SVN-Group: stable-11 X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: stable/11/sbin/camcontrol X-SVN-Commit-Revision: 326778 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: Mon, 11 Dec 2017 20:24:31 -0000 Author: asomers Date: Mon Dec 11 20:24:29 2017 New Revision: 326778 URL: https://svnweb.freebsd.org/changeset/base/326778 Log: MFC r326032: Print ZAC device type in "camcontrol identify" output ZAC (Zoned-device ATA Command set) is the standard for addressing SMR (shingled magnetic recording) devices over SATA. Drives indicate their support for ZAC in their IDENTIFY block. Print whether and how a drive supports ZAC in the output of "camcontrol identify". Reviewed by: ken, imp Sponsored by: Spectra Logic Corp Differential Revision: https://reviews.freebsd.org/D13171 Modified: stable/11/sbin/camcontrol/camcontrol.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sbin/camcontrol/camcontrol.c ============================================================================== --- stable/11/sbin/camcontrol/camcontrol.c Mon Dec 11 20:21:35 2017 (r326777) +++ stable/11/sbin/camcontrol/camcontrol.c Mon Dec 11 20:24:29 2017 (r326778) @@ -1391,6 +1391,18 @@ atacapprint(struct ata_params *parm) parm->media_rotation_rate); } + printf("Zoned-Device Commands "); + switch (parm->support3 & ATA_SUPPORT_ZONE_MASK) { + case ATA_SUPPORT_ZONE_DEV_MANAGED: + printf("device managed\n"); + break; + case ATA_SUPPORT_ZONE_HOST_AWARE: + printf("host aware\n"); + break; + default: + printf("no\n"); + } + printf("\nFeature " "Support Enabled Value Vendor\n"); printf("read ahead %s %s\n", From owner-svn-src-stable-11@freebsd.org Mon Dec 11 20:30:59 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CD4ADE9D9BF; Mon, 11 Dec 2017 20:30:59 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 96DE9779CD; Mon, 11 Dec 2017 20:30:59 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBBKUwOn035573; Mon, 11 Dec 2017 20:30:58 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBBKUwP3035572; Mon, 11 Dec 2017 20:30:58 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201712112030.vBBKUwP3035572@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Mon, 11 Dec 2017 20:30:58 +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: r326779 - stable/11/sys/cam/scsi X-SVN-Group: stable-11 X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: stable/11/sys/cam/scsi X-SVN-Commit-Revision: 326779 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: Mon, 11 Dec 2017 20:30:59 -0000 Author: asomers Date: Mon Dec 11 20:30:58 2017 New Revision: 326779 URL: https://svnweb.freebsd.org/changeset/base/326779 Log: MFC r326036: da(4): Short-circuit unnecessary BIO_FLUSH commands sys/cam/scsi/scsi_da.c Complete BIO_FLUSH commands immediately if the da(4) device hasn't been written to since the last flush. If we haven't written to the device, there is no reason to send a flush. Submitted by: gibbs Reviewed by: imp Sponsored by: Spectra Logic Corp Differential Revision: https://reviews.freebsd.org/D13106 Modified: stable/11/sys/cam/scsi/scsi_da.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/cam/scsi/scsi_da.c ============================================================================== --- stable/11/sys/cam/scsi/scsi_da.c Mon Dec 11 20:24:29 2017 (r326778) +++ stable/11/sys/cam/scsi/scsi_da.c Mon Dec 11 20:30:58 2017 (r326779) @@ -2994,6 +2994,18 @@ more: } case BIO_FLUSH: /* + * If we don't support sync cache, or the disk + * isn't dirty, FLUSH is a no-op. Use the + * allocated * CCB for the next bio if one is + * available. + */ + if ((softc->quirks & DA_Q_NO_SYNC_CACHE) != 0 || + (softc->flags & DA_FLAG_DIRTY) == 0) { + biodone(bp); + goto skipstate; + } + + /* * BIO_FLUSH doesn't currently communicate * range data, so we synchronize the cache * over the whole disk. We also force @@ -3008,6 +3020,15 @@ more: /*lb_count*/0, SSD_FULL_SIZE, da_default_timeout*1000); + /* + * Clear the dirty flag before sending the command. + * Either this sync cache will be successful, or it + * will fail after a retry. If it fails, it is + * unlikely to be successful if retried later, so + * we'll save ourselves time by just marking the + * device clean. + */ + softc->flags &= ~DA_FLAG_DIRTY; break; case BIO_ZONE: { int error, queue_ccb; From owner-svn-src-stable-11@freebsd.org Mon Dec 11 20:33:12 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E90B0E9DCDE; Mon, 11 Dec 2017 20:33:12 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B146678007; Mon, 11 Dec 2017 20:33:12 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBBKXBli039514; Mon, 11 Dec 2017 20:33:11 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBBKXBbY039512; Mon, 11 Dec 2017 20:33:11 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201712112033.vBBKXBbY039512@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Mon, 11 Dec 2017 20:33: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: r326780 - in stable/11: etc/mtree usr.bin/head usr.bin/head/tests X-SVN-Group: stable-11 X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in stable/11: etc/mtree usr.bin/head usr.bin/head/tests X-SVN-Commit-Revision: 326780 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: Mon, 11 Dec 2017 20:33:13 -0000 Author: asomers Date: Mon Dec 11 20:33:11 2017 New Revision: 326780 URL: https://svnweb.freebsd.org/changeset/base/326780 Log: MFC r326039: Add ATF tests for head(1) Submitted by: Fred Schlecter Reviewed by: asomers, jilles Differential Revision: https://github.com/freebsd/freebsd/pull/127 Added: stable/11/usr.bin/head/tests/ - copied from r326039, head/usr.bin/head/tests/ Modified: stable/11/etc/mtree/BSD.tests.dist stable/11/usr.bin/head/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/11/etc/mtree/BSD.tests.dist ============================================================================== --- stable/11/etc/mtree/BSD.tests.dist Mon Dec 11 20:30:58 2017 (r326779) +++ stable/11/etc/mtree/BSD.tests.dist Mon Dec 11 20:33:11 2017 (r326780) @@ -646,6 +646,8 @@ .. gzip .. + head + .. ident .. join Modified: stable/11/usr.bin/head/Makefile ============================================================================== --- stable/11/usr.bin/head/Makefile Mon Dec 11 20:30:58 2017 (r326779) +++ stable/11/usr.bin/head/Makefile Mon Dec 11 20:33:11 2017 (r326780) @@ -1,6 +1,11 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ +.include + PROG= head + +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests .include From owner-svn-src-stable-11@freebsd.org Mon Dec 11 20:36:02 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D9034E9DE1A; Mon, 11 Dec 2017 20:36:02 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9E7B7781AE; Mon, 11 Dec 2017 20:36:02 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBBKa19N039667; Mon, 11 Dec 2017 20:36:01 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBBKa1bS039666; Mon, 11 Dec 2017 20:36:01 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201712112036.vBBKa1bS039666@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Mon, 11 Dec 2017 20:36: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: r326781 - stable/11/usr.sbin/periodic X-SVN-Group: stable-11 X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: stable/11/usr.sbin/periodic X-SVN-Commit-Revision: 326781 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: Mon, 11 Dec 2017 20:36:03 -0000 Author: asomers Date: Mon Dec 11 20:36:01 2017 New Revision: 326781 URL: https://svnweb.freebsd.org/changeset/base/326781 Log: MFC r326041: periodic: fix exit status for nonexistent arguments When called with an absolute pathname, periodic should attempt to execute every script in that directory. If the directory does not exist, it should print an error and exit 1. Due to a copy/paste mistake in r231568, it exits 0 in that case. Reported by: devel/hs-ShellCheck Sponsored by: Spectra Logic Corp Differential Revision: https://reviews.freebsd.org/D13070 Modified: stable/11/usr.sbin/periodic/periodic.sh Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.sbin/periodic/periodic.sh ============================================================================== --- stable/11/usr.sbin/periodic/periodic.sh Mon Dec 11 20:33:11 2017 (r326780) +++ stable/11/usr.sbin/periodic/periodic.sh Mon Dec 11 20:36:01 2017 (r326781) @@ -103,7 +103,7 @@ case $arg in dirlist="$arg" else echo "$0: $arg not found" >&2 - continue + exit 1 fi ;; *) dirlist= From owner-svn-src-stable-11@freebsd.org Mon Dec 11 20:47:28 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 73869E9E0E6; Mon, 11 Dec 2017 20:47:28 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4ABD5786B0; Mon, 11 Dec 2017 20:47:28 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBBKlRAp043737; Mon, 11 Dec 2017 20:47:27 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBBKlROC043733; Mon, 11 Dec 2017 20:47:27 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201712112047.vBBKlROC043733@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Mon, 11 Dec 2017 20:47: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: r326782 - in stable/11: lib/libcam/tests sys/cam X-SVN-Group: stable-11 X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in stable/11: lib/libcam/tests sys/cam X-SVN-Commit-Revision: 326782 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: Mon, 11 Dec 2017 20:47:28 -0000 Author: asomers Date: Mon Dec 11 20:47:26 2017 New Revision: 326782 URL: https://svnweb.freebsd.org/changeset/base/326782 Log: MFC r304443, r326034, r326065 r304443 by imp: Improve the pattern matching so that internal *'s work, as well as [set] notation. This fixes pattern matching for recently added drives that would set the NCQ Trim being broken incorrectly. PR: 210686 Tested-by: Tomoaki AOKI r326034: Fix multiple bugs in cam_strmatch * Wrongly matches strings that are shorter than the pattern * Fails to match negative character sets * Fails to match character sets that aren't at the end of the pattern * Fails to match character ranges Reviewed by: imp Sponsored by: Spectra Logic Corp Differential Revision: https://reviews.freebsd.org/D13173 r326065: Fix uninitialized variable from 326034 Reported by: Coverity CID: 1382887 X-MFC-With: 326034 Sponsored by: Spectra Logic Corp Added: stable/11/lib/libcam/tests/cam_test.c - copied unchanged from r326034, head/lib/libcam/tests/cam_test.c Modified: stable/11/lib/libcam/tests/Makefile stable/11/lib/libcam/tests/libcam_test.c stable/11/sys/cam/cam.c Directory Properties: stable/11/ (props changed) Modified: stable/11/lib/libcam/tests/Makefile ============================================================================== --- stable/11/lib/libcam/tests/Makefile Mon Dec 11 20:36:01 2017 (r326781) +++ stable/11/lib/libcam/tests/Makefile Mon Dec 11 20:47:26 2017 (r326782) @@ -1,6 +1,7 @@ # $FreeBSD$ ATF_TESTS_C+= libcam_test +ATF_TESTS_C+= cam_test LIBADD+= cam Copied: stable/11/lib/libcam/tests/cam_test.c (from r326034, head/lib/libcam/tests/cam_test.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/11/lib/libcam/tests/cam_test.c Mon Dec 11 20:47:26 2017 (r326782, copy of r326034, head/lib/libcam/tests/cam_test.c) @@ -0,0 +1,111 @@ +/*- + * Copyright (c) 2017 Spectra Logic Corporation + * 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. + */ + +/* Tests functions in sys/cam/cam.c */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include + +#include + +#define ATF_CHECK_NE(x, y) ATF_CHECK((x) != (y)) + +ATF_TC_WITHOUT_HEAD(cam_strmatch); +ATF_TC_BODY(cam_strmatch, tc) +{ + /* Basic fixed patterns */ + ATF_CHECK_EQ(0, cam_strmatch("foo", "foo", 3)); + ATF_CHECK_NE(0, cam_strmatch("foo", "bar", 3)); + ATF_CHECK_NE(0, cam_strmatch("foo", "foobar", 3)); + + /* The str is not necessarily null-terminated */ + ATF_CHECK_EQ(0, cam_strmatch("fooxuehfxeuf", "foo", 3)); + ATF_CHECK_NE(0, cam_strmatch("foo\0bar", "foo", 7)); + + /* Eat trailing spaces, which get added by SAT */ + ATF_CHECK_EQ(0, cam_strmatch("foo ", "foo", 16)); + + /* '*' matches everything, like shell globbing */ + ATF_CHECK_EQ(0, cam_strmatch("foobar", "foo*", 6)); + ATF_CHECK_EQ(0, cam_strmatch("foobar", "*bar", 6)); + ATF_CHECK_NE(0, cam_strmatch("foobar", "foo*x", 6)); + ATF_CHECK_EQ(0, cam_strmatch("foobarbaz", "*bar*", 9)); + /* Even NUL */ + ATF_CHECK_EQ(0, cam_strmatch("foo\0bar", "foo*", 7)); + /* Or nothing */ + ATF_CHECK_EQ(0, cam_strmatch("foo", "foo*", 3)); + /* But stuff after the * still must match */ + ATF_CHECK_NE(0, cam_strmatch("foo", "foo*x", 3)); + + /* '?' matches exactly one single character */ + ATF_CHECK_EQ(0, cam_strmatch("foobar", "foo?ar", 6)); + ATF_CHECK_NE(0, cam_strmatch("foo", "foo?", 3)); + /* Even NUL */ + ATF_CHECK_EQ(0, cam_strmatch("foo\0bar", "foo?bar", 7)); + + /* '[]' contains a set of characters */ + ATF_CHECK_EQ(0, cam_strmatch("foobar", "foo[abc]ar", 6)); + ATF_CHECK_EQ(0, cam_strmatch("foobar", "foo[b]ar", 6)); + ATF_CHECK_NE(0, cam_strmatch("foobar", "foo[ac]ar", 6)); + + /* '[]' can contain a range of characters, too */ + ATF_CHECK_EQ(0, cam_strmatch("foobar", "foo[a-c]ar", 6)); + ATF_CHECK_EQ(0, cam_strmatch("fooxar", "foo[a-cx]ar", 6)); + ATF_CHECK_NE(0, cam_strmatch("foodar", "foo[a-c]ar", 6)); + + /* Back-to-back '[]' character sets */ + ATF_CHECK_EQ(0, cam_strmatch("foobar", "fo[a-z][abc]ar", 6)); + ATF_CHECK_NE(0, cam_strmatch("foAbar", "fo[a-z][abc]ar", 6)); + ATF_CHECK_NE(0, cam_strmatch("foodar", "fo[a-z][abc]ar", 6)); + + /* A '^' negates a set of characters */ + ATF_CHECK_NE(0, cam_strmatch("foobar", "foo[^abc]ar", 6)); + ATF_CHECK_NE(0, cam_strmatch("foobar", "foo[^b]ar", 6)); + ATF_CHECK_EQ(0, cam_strmatch("foobar", "foo[^ac]ar", 6)); + ATF_CHECK_NE(0, cam_strmatch("foobar", "foo[^a-c]ar", 6)); + ATF_CHECK_NE(0, cam_strmatch("fooxar", "foo[^a-cx]ar", 6)); + ATF_CHECK_EQ(0, cam_strmatch("foodar", "foo[^a-c]ar", 6)); + + /* Outside of '[]' a ']' is just an ordinary character */ + ATF_CHECK_EQ(0, cam_strmatch("f]o", "f]o", 3)); + ATF_CHECK_NE(0, cam_strmatch("foo", "f]o", 3)); + + /* Matching a literal '[' requires specifying a range */ + ATF_CHECK_EQ(0, cam_strmatch("f[o", "f[[]o", 3)); + ATF_CHECK_NE(0, cam_strmatch("foo", "f[[]o", 3)); +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, cam_strmatch); + + return (atf_no_error()); +} Modified: stable/11/lib/libcam/tests/libcam_test.c ============================================================================== --- stable/11/lib/libcam/tests/libcam_test.c Mon Dec 11 20:36:01 2017 (r326781) +++ stable/11/lib/libcam/tests/libcam_test.c Mon Dec 11 20:47:26 2017 (r326782) @@ -24,6 +24,8 @@ * SUCH DAMAGE. */ +/* Tests functions in lib/libcam/camlib.c */ + #include __FBSDID("$FreeBSD$"); Modified: stable/11/sys/cam/cam.c ============================================================================== --- stable/11/sys/cam/cam.c Mon Dec 11 20:36:01 2017 (r326781) +++ stable/11/sys/cam/cam.c Mon Dec 11 20:47:26 2017 (r326782) @@ -207,32 +207,89 @@ cam_strvis_sbuf(struct sbuf *sb, const u_int8_t *src, /* * Compare string with pattern, returning 0 on match. * Short pattern matches trailing blanks in name, - * wildcard '*' in pattern matches rest of name, - * wildcard '?' matches a single non-space character. + * Shell globbing rules apply: * matches 0 or more characters, + * ? matchces one character, [...] denotes a set to match one char, + * [^...] denotes a complimented set to match one character. + * Spaces in str used to match anything in the pattern string + * but was removed because it's a bug. No current patterns require + * it, as far as I know, but it's impossible to know what drives + * returned. + * + * Each '*' generates recursion, so keep the number of * in check. */ int cam_strmatch(const u_int8_t *str, const u_int8_t *pattern, int str_len) { - while (*pattern != '\0'&& str_len > 0) { - + while (*pattern != '\0' && str_len > 0) { if (*pattern == '*') { - return (0); - } - if ((*pattern != *str) - && (*pattern != '?' || *str == ' ')) { + pattern++; + if (*pattern == '\0') + return (0); + do { + if (cam_strmatch(str, pattern, str_len) == 0) + return (0); + str++; + str_len--; + } while (str_len > 0); return (1); + } else if (*pattern == '[') { + int negate_range, ok; + uint8_t pc = UCHAR_MAX; + uint8_t sc; + + ok = 0; + sc = *str++; + str_len--; + pattern++; + if ((negate_range = (*pattern == '^')) != 0) + pattern++; + while ((*pattern != ']') && *pattern != '\0') { + if (*pattern == '-') { + if (pattern[1] == '\0') /* Bad pattern */ + return (1); + if (sc >= pc && sc <= pattern[1]) + ok = 1; + pattern++; + } else if (*pattern == sc) + ok = 1; + pc = *pattern; + pattern++; + } + if (ok == negate_range) + return (1); + pattern++; + } else if (*pattern == '?') { + /* + * NB: || *str == ' ' of the old code is a bug and was + * removed. If you add it back, keep this the last if + * before the naked else */ + pattern++; + str++; + str_len--; + } else { + if (*str != *pattern) + return (1); + pattern++; + str++; + str_len--; } + } + + /* '*' is allowed to match nothing, so gobble it */ + while (*pattern == '*') pattern++; - str++; - str_len--; + + if ( *pattern != '\0') { + /* Pattern not fully consumed. Not a match */ + return (1); } + + /* Eat trailing spaces, which get added by SAT */ while (str_len > 0 && *str == ' ') { str++; str_len--; } - if (str_len > 0 && *str == 0) - str_len = 0; return (str_len); } From owner-svn-src-stable-11@freebsd.org Tue Dec 12 01:19:22 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2645BE82BC0; Tue, 12 Dec 2017 01:19:22 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BECE82C72; Tue, 12 Dec 2017 01:19:20 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBC1JIc3056328; Tue, 12 Dec 2017 01:19:18 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBC1JIsp056327; Tue, 12 Dec 2017 01:19:18 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201712120119.vBC1JIsp056327@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Tue, 12 Dec 2017 01:19:18 +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: r326787 - stable/11/contrib/llvm/tools/lld/ELF X-SVN-Group: stable-11 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/11/contrib/llvm/tools/lld/ELF X-SVN-Commit-Revision: 326787 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: Tue, 12 Dec 2017 01:19:22 -0000 Author: emaste Date: Tue Dec 12 01:19:18 2017 New Revision: 326787 URL: https://svnweb.freebsd.org/changeset/base/326787 Log: MFC r326547: lld: make -v behave similarly to GNU ld.bfd Previously, lld exited with an error status if the only option given to the command was -v. GNU linkers gracefully exit in that case. This patch makes lld behave like GNU. Note that even with this patch, lld's -v and --version options behave slightly differently than GNU linkers' counterparts. For example, if you run ld.bfd -v -v, the version string is printed out twice. But that is an edge case that I don't think we need to take care of. Fixes https://bugs.llvm.org/show_bug.cgi?id=31582 Obtained from: LLVM r319717 Modified: stable/11/contrib/llvm/tools/lld/ELF/Driver.cpp Directory Properties: stable/11/ (props changed) Modified: stable/11/contrib/llvm/tools/lld/ELF/Driver.cpp ============================================================================== --- stable/11/contrib/llvm/tools/lld/ELF/Driver.cpp Tue Dec 12 01:19:08 2017 (r326786) +++ stable/11/contrib/llvm/tools/lld/ELF/Driver.cpp Tue Dec 12 01:19:18 2017 (r326787) @@ -345,9 +345,10 @@ void LinkerDriver::main(ArrayRef ArgsArr if (Args.hasArg(OPT_v) || Args.hasArg(OPT_version)) message(getLLDVersion() + " (compatible with GNU linkers)"); - // ld.bfd always exits after printing out the version string. - // ld.gold proceeds if a given option is -v. Because gold's behavior - // is more permissive than ld.bfd, we chose what gold does here. + // The behavior of -v or --version is a bit strange, but this is + // needed for compatibility with GNU linkers. + if (Args.hasArg(OPT_v) && !Args.hasArg(OPT_INPUT)) + return; if (Args.hasArg(OPT_version)) return; From owner-svn-src-stable-11@freebsd.org Tue Dec 12 01:20:47 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4BBE1E82E10; Tue, 12 Dec 2017 01:20:47 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 17312304C; Tue, 12 Dec 2017 01:20:47 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBC1Kk2I056448; Tue, 12 Dec 2017 01:20:46 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBC1Kkar056447; Tue, 12 Dec 2017 01:20:46 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201712120120.vBC1Kkar056447@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Tue, 12 Dec 2017 01:20: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: r326788 - stable/11/sys/dev/vnic X-SVN-Group: stable-11 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/11/sys/dev/vnic X-SVN-Commit-Revision: 326788 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: Tue, 12 Dec 2017 01:20:47 -0000 Author: emaste Date: Tue Dec 12 01:20:45 2017 New Revision: 326788 URL: https://svnweb.freebsd.org/changeset/base/326788 Log: MFC r326597: vnic: apply hardware L3 checksum only for IPv4 Previously we set the csum_l3 flag for IPv4 and IPv6, but only IPv4 should have header checksumming applied. Prompted by Linux commit fa6d7cb5d76cf0467c61420fc9238045aedfd379. Sponsored by: The FreeBSD Foundation Modified: stable/11/sys/dev/vnic/nicvf_queues.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/vnic/nicvf_queues.c ============================================================================== --- stable/11/sys/dev/vnic/nicvf_queues.c Tue Dec 12 01:19:18 2017 (r326787) +++ stable/11/sys/dev/vnic/nicvf_queues.c Tue Dec 12 01:20:45 2017 (r326788) @@ -1802,6 +1802,8 @@ nicvf_sq_add_hdr_subdesc(struct snd_queue *sq, int qen if (mbuf == NULL) return (ENOBUFS); } + if (mbuf->m_pkthdr.csum_flags & CSUM_IP) + hdr->csum_l3 = 1; /* Enable IP csum calculation */ ip = (struct ip *)(mbuf->m_data + ehdrlen); iphlen = ip->ip_hl << 2; @@ -1809,13 +1811,10 @@ nicvf_sq_add_hdr_subdesc(struct snd_queue *sq, int qen proto = ip->ip_p; break; #endif - default: - hdr->csum_l3 = 0; } #if defined(INET6) || defined(INET) if (poff > 0 && mbuf->m_pkthdr.csum_flags != 0) { - hdr->csum_l3 = 1; /* Enable IP csum calculation */ switch (proto) { case IPPROTO_TCP: if ((mbuf->m_pkthdr.csum_flags & CSUM_TCP) == 0) From owner-svn-src-stable-11@freebsd.org Tue Dec 12 11:09:47 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5D8F8E945F6; Tue, 12 Dec 2017 11:09: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 mx1.freebsd.org (Postfix) with ESMTPS id 2A7337680B; Tue, 12 Dec 2017 11:09: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 vBCB9k1B009759; Tue, 12 Dec 2017 11:09:46 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBCB9k6P009758; Tue, 12 Dec 2017 11:09:46 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201712121109.vBCB9k6P009758@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Tue, 12 Dec 2017 11:09: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: r326793 - 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: 326793 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: Tue, 12 Dec 2017 11:09:47 -0000 Author: kib Date: Tue Dec 12 11:09:46 2017 New Revision: 326793 URL: https://svnweb.freebsd.org/changeset/base/326793 Log: MFC r326311: Fix index calculation for the page table pages for efirt 1:1 map. Modified: stable/11/sys/amd64/amd64/efirt.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/amd64/amd64/efirt.c ============================================================================== --- stable/11/sys/amd64/amd64/efirt.c Tue Dec 12 09:46:53 2017 (r326792) +++ stable/11/sys/amd64/amd64/efirt.c Tue Dec 12 11:09:46 2017 (r326793) @@ -104,6 +104,7 @@ static struct mtx efi_lock; static pml4_entry_t *efi_pml4; static vm_object_t obj_1t1_pt; static vm_page_t efi_pml4_page; +static vm_pindex_t efi_1t1_idx; static void efi_destroy_1t1_map(void) @@ -126,10 +127,10 @@ efi_destroy_1t1_map(void) } static vm_page_t -efi_1t1_page(vm_pindex_t idx) +efi_1t1_page(void) { - return (vm_page_grab(obj_1t1_pt, idx, VM_ALLOC_NOBUSY | + return (vm_page_grab(obj_1t1_pt, efi_1t1_idx++, VM_ALLOC_NOBUSY | VM_ALLOC_WIRED | VM_ALLOC_ZERO)); } @@ -147,7 +148,7 @@ efi_1t1_pte(vm_offset_t va) pml4_idx = pmap_pml4e_index(va); pml4e = &efi_pml4[pml4_idx]; if (*pml4e == 0) { - m = efi_1t1_page(1 + pml4_idx); + m = efi_1t1_page(); mphys = VM_PAGE_TO_PHYS(m); *pml4e = mphys | X86_PG_RW | X86_PG_V; } else { @@ -158,7 +159,7 @@ efi_1t1_pte(vm_offset_t va) pdp_idx = pmap_pdpe_index(va); pdpe += pdp_idx; if (*pdpe == 0) { - m = efi_1t1_page(1 + NPML4EPG + (pml4_idx + 1) * (pdp_idx + 1)); + m = efi_1t1_page(); mphys = VM_PAGE_TO_PHYS(m); *pdpe = mphys | X86_PG_RW | X86_PG_V; } else { @@ -169,8 +170,7 @@ efi_1t1_pte(vm_offset_t va) pd_idx = pmap_pde_index(va); pde += pd_idx; if (*pde == 0) { - m = efi_1t1_page(1 + NPML4EPG + NPML4EPG * NPDPEPG + - (pml4_idx + 1) * (pdp_idx + 1) * (pd_idx + 1)); + m = efi_1t1_page(); mphys = VM_PAGE_TO_PHYS(m); *pde = mphys | X86_PG_RW | X86_PG_V; } else { @@ -196,8 +196,9 @@ efi_create_1t1_map(struct efi_md *map, int ndesc, int obj_1t1_pt = vm_pager_allocate(OBJT_PHYS, NULL, ptoa(1 + NPML4EPG + NPML4EPG * NPDPEPG + NPML4EPG * NPDPEPG * NPDEPG), VM_PROT_ALL, 0, NULL); + efi_1t1_idx = 0; VM_OBJECT_WLOCK(obj_1t1_pt); - efi_pml4_page = efi_1t1_page(0); + efi_pml4_page = efi_1t1_page(); VM_OBJECT_WUNLOCK(obj_1t1_pt); efi_pml4 = (pml4_entry_t *)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(efi_pml4_page)); pmap_pinit_pml4(efi_pml4_page); From owner-svn-src-stable-11@freebsd.org Tue Dec 12 17:11:08 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 04FA9E9F424; Tue, 12 Dec 2017 17:11:08 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2CD9E6611A; Tue, 12 Dec 2017 17:11:06 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from FreeBSD.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id 96E3F11153; Tue, 12 Dec 2017 17:11:03 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Date: Tue, 12 Dec 2017 17:11:01 +0000 From: Glen Barber To: Michael Tuexen Cc: Konstantin Belousov , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: Re: svn commit: r324686 - stable/11/sys/netinet Message-ID: <20171212171101.GM17600@FreeBSD.org> References: <201710171242.v9HCgHG4030707@repo.freebsd.org> <20171203133946.GJ2272@kib.kiev.ua> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="W4pDZ/VvazBYHhxQ" Content-Disposition: inline In-Reply-To: <20171203133946.GJ2272@kib.kiev.ua> User-Agent: Mutt/1.9.1 (2017-09-22) 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: Tue, 12 Dec 2017 17:11:08 -0000 --W4pDZ/VvazBYHhxQ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Dec 03, 2017 at 03:39:46PM +0200, Konstantin Belousov wrote: > On Tue, Oct 17, 2017 at 12:42:17PM +0000, Michael Tuexen wrote: > > Author: tuexen > > Date: Tue Oct 17 12:42:17 2017 > > New Revision: 324686 > > URL: https://svnweb.freebsd.org/changeset/base/324686 > >=20 > > Log: > > MFC r322648: > > =20 > > Ensure inp_vflag is consistently set for TCP endpoints. > > =20 > > Make sure that the flags INP_IPV4 and INP_IPV6 are consistently set > > for inpcbs used for TCP sockets, no matter if the setting is derived > > from the net.inet6.ip6.v6only sysctl or the IPV6_V6ONLY socket option. > > For UDP this was already done right. > > =20 > > PR: 221385 > >=20 > > Modified: > > stable/11/sys/netinet/tcp_usrreq.c > > Directory Properties: > > stable/11/ (props changed) > >=20 > > Modified: stable/11/sys/netinet/tcp_usrreq.c > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > --- stable/11/sys/netinet/tcp_usrreq.c Tue Oct 17 11:20:32 2017 (r32468= 5) > > +++ stable/11/sys/netinet/tcp_usrreq.c Tue Oct 17 12:42:17 2017 (r32468= 6) > > @@ -1899,6 +1899,8 @@ tcp_attach(struct socket *so) > > #ifdef INET6 > > if (inp->inp_vflag & INP_IPV6PROTO) { > > inp->inp_vflag |=3D INP_IPV6; > > + if ((inp->inp_flags & IN6P_IPV6_V6ONLY) =3D=3D 0) > > + inp->inp_vflag |=3D INP_IPV4; > > inp->in6p_hops =3D -1; /* use kernel default */ > > } > > else >=20 > I highly suspect that this commit causes the breakage. Example is taken > from the 'nestat -f inet6 -n' output, but in fact the problem is much > more serious, e.g. squid acls are broken as well: > tcp6 0 0 2001:470:1f14:13.23047 2a03:2880:f003:c.443 ESTABLI= SHED > tcp46 0 0 0.0.0.1.22 69.223.183.85.58766 ESTABLI= SHED >=20 > The tcp46 and 0.0.0.1 values in the second line are clearly nonsensical. >=20 Hi Michael, Following up on this, as there has been no reply from you. Glen --W4pDZ/VvazBYHhxQ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAlowDaUACgkQAxRYpUeP 4pMt8w//YS0kijGEY7ngu6Bvy9A3F0LRepy7vzl2f5HW+so30qX/g6D1K3OqBMnH i/YbaIF5ts8/+PqMTt3ImwP103LIlVl9RbJtJftHE9hnyfmMtWWz1IOvjRtqU4Iz OkkgbtMRYoCyG1HMSH8o0UJ2Lf1usyWYVgAAHfIXhnKN9h3uZ1jfKUjPdhehzKY7 EAXERJ4ab4DWHGS0/f+HXkRLQurSmY4gdW+d9Irl4LsmjHy5iU+lyIcW0l909CAe s9y1ElIxmrzTE8pkz5bestdwPHokxGEfDXM3ZzkfZS/QdM9g4U+Hzf98QKl12bfS Rsx3AAmZ1Pfy68cE1hHBOn3kM2riUlUXpenlWjVWwBl7lK8ono4HEl+idi8TKZlq 10loWmlk16vH9mn51CK2gPnZKteWLk5DolaSqBNl2QXFr4tn31iysoBYgHXG/cko HFksdOWsdRJUwVorvMCPBZaOeisCmZ6bGVi9cmk782/bnvz3ReL6MfKGroXpV6Vc rKmlCi7Fu6cpk9ry5khGJ4eEtkhs49kdWaF5sP9mLzMh+nFMbGzQS6EUYt3PiSYC GuhSrspVIKHLt2he2I3NRIPY94FXWecN4x7IVHmpy9xK/+Lij02h3J1ZggD4shij HI7zdKHvH7HnqAFXPt2vzpcQjzfFXorLIZS0493u2zbaoUXp9bQ= =Ongh -----END PGP SIGNATURE----- --W4pDZ/VvazBYHhxQ-- From owner-svn-src-stable-11@freebsd.org Tue Dec 12 20:28:56 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 204F3E83B3F; Tue, 12 Dec 2017 20:28:56 +0000 (UTC) (envelope-from fsu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D649471449; Tue, 12 Dec 2017 20:28:55 +0000 (UTC) (envelope-from fsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBCKSsbk051827; Tue, 12 Dec 2017 20:28:54 GMT (envelope-from fsu@FreeBSD.org) Received: (from fsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBCKSsdd051823; Tue, 12 Dec 2017 20:28:54 GMT (envelope-from fsu@FreeBSD.org) Message-Id: <201712122028.vBCKSsdd051823@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fsu set sender to fsu@FreeBSD.org using -f From: Fedor Uporov Date: Tue, 12 Dec 2017 20:28: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: r326810 - in stable/11: lib/libsysdecode sys/amd64/linux sys/amd64/linux32 sys/i386/linux X-SVN-Group: stable-11 X-SVN-Commit-Author: fsu X-SVN-Commit-Paths: in stable/11: lib/libsysdecode sys/amd64/linux sys/amd64/linux32 sys/i386/linux X-SVN-Commit-Revision: 326810 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: Tue, 12 Dec 2017 20:28:56 -0000 Author: fsu Date: Tue Dec 12 20:28:54 2017 New Revision: 326810 URL: https://svnweb.freebsd.org/changeset/base/326810 Log: MFC r326282, r326317: Remap ENOATTR to ENODATA in the linuxulator. In the linux ENOADATA is frequently #defined as ENOATTR. The change is required for an xattrs support implementation. Sync bsd_to_linux_errno[] table with i386 and amd64 tables in the sys directory. Discussed with: netchild Requested by: jhb Approved by: pfg (mentor) Modified: stable/11/lib/libsysdecode/errno.c stable/11/sys/amd64/linux/linux_sysvec.c stable/11/sys/amd64/linux32/linux32_sysvec.c stable/11/sys/i386/linux/linux_sysvec.c Modified: stable/11/lib/libsysdecode/errno.c ============================================================================== --- stable/11/lib/libsysdecode/errno.c Tue Dec 12 20:22:09 2017 (r326809) +++ stable/11/lib/libsysdecode/errno.c Tue Dec 12 20:28:54 2017 (r326810) @@ -53,7 +53,7 @@ static int bsd_to_linux_errno[ELAST + 1] = { -100,-101,-102,-103,-104,-105,-106,-107,-108,-109, -110,-111, -40, -36,-112,-113, -39, -11, -87,-122, -116, -66, -6, -6, -6, -6, -6, -37, -38, -9, - -6, -6, -43, -42, -75,-125, -84, -95, -16, -74, + -6, -6, -43, -42, -75,-125, -84, -61, -16, -74, -72, -67, -71 }; #endif Modified: stable/11/sys/amd64/linux/linux_sysvec.c ============================================================================== --- stable/11/sys/amd64/linux/linux_sysvec.c Tue Dec 12 20:22:09 2017 (r326809) +++ stable/11/sys/amd64/linux/linux_sysvec.c Tue Dec 12 20:28:54 2017 (r326810) @@ -147,7 +147,7 @@ static int bsd_to_linux_errno[ELAST + 1] = { -100,-101,-102,-103,-104,-105,-106,-107,-108,-109, -110,-111, -40, -36,-112,-113, -39, -11, -87,-122, -116, -66, -6, -6, -6, -6, -6, -37, -38, -9, - -6, -6, -43, -42, -75,-125, -84, -95, -16, -74, + -6, -6, -43, -42, -75,-125, -84, -61, -16, -74, -72, -67, -71 }; Modified: stable/11/sys/amd64/linux32/linux32_sysvec.c ============================================================================== --- stable/11/sys/amd64/linux32/linux32_sysvec.c Tue Dec 12 20:22:09 2017 (r326809) +++ stable/11/sys/amd64/linux32/linux32_sysvec.c Tue Dec 12 20:28:54 2017 (r326810) @@ -146,7 +146,7 @@ static int bsd_to_linux_errno[ELAST + 1] = { -100,-101,-102,-103,-104,-105,-106,-107,-108,-109, -110,-111, -40, -36,-112,-113, -39, -11, -87,-122, -116, -66, -6, -6, -6, -6, -6, -37, -38, -9, - -6, -6, -43, -42, -75,-125, -84, -95, -16, -74, + -6, -6, -43, -42, -75,-125, -84, -61, -16, -74, -72, -67, -71 }; Modified: stable/11/sys/i386/linux/linux_sysvec.c ============================================================================== --- stable/11/sys/i386/linux/linux_sysvec.c Tue Dec 12 20:22:09 2017 (r326809) +++ stable/11/sys/i386/linux/linux_sysvec.c Tue Dec 12 20:28:54 2017 (r326810) @@ -145,7 +145,7 @@ static int bsd_to_linux_errno[ELAST + 1] = { -100,-101,-102,-103,-104,-105,-106,-107,-108,-109, -110,-111, -40, -36,-112,-113, -39, -11, -87,-122, -116, -66, -6, -6, -6, -6, -6, -37, -38, -9, - -6, -6, -43, -42, -75,-125, -84, -95, -16, -74, + -6, -6, -43, -42, -75,-125, -84, -61, -16, -74, -72, -67, -71 }; From owner-svn-src-stable-11@freebsd.org Wed Dec 13 06:17:21 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 78DA2E9295B; Wed, 13 Dec 2017 06:17:21 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4239863ABF; Wed, 13 Dec 2017 06:17:21 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBD6HKhd097300; Wed, 13 Dec 2017 06:17:20 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBD6HKlg097299; Wed, 13 Dec 2017 06:17:20 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201712130617.vBD6HKlg097299@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Wed, 13 Dec 2017 06:17: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: r326817 - stable/11/usr.bin/ipcs X-SVN-Group: stable-11 X-SVN-Commit-Author: delphij X-SVN-Commit-Paths: stable/11/usr.bin/ipcs X-SVN-Commit-Revision: 326817 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: Wed, 13 Dec 2017 06:17:21 -0000 Author: delphij Date: Wed Dec 13 06:17:20 2017 New Revision: 326817 URL: https://svnweb.freebsd.org/changeset/base/326817 Log: MFC r326361: Remove unused include. Modified: stable/11/usr.bin/ipcs/ipc.c Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.bin/ipcs/ipc.c ============================================================================== --- stable/11/usr.bin/ipcs/ipc.c Wed Dec 13 03:36:33 2017 (r326816) +++ stable/11/usr.bin/ipcs/ipc.c Wed Dec 13 06:17:20 2017 (r326817) @@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include "ipc.h" From owner-svn-src-stable-11@freebsd.org Wed Dec 13 15:20:12 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5CDF7EA1666; Wed, 13 Dec 2017 15:20:12 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 27DD974BC2; Wed, 13 Dec 2017 15:20:12 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBDFKBYE023024; Wed, 13 Dec 2017 15:20:11 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBDFKBtH023023; Wed, 13 Dec 2017 15:20:11 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201712131520.vBDFKBtH023023@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Wed, 13 Dec 2017 15:20: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: r326821 - stable/11/sys/vm X-SVN-Group: stable-11 X-SVN-Commit-Author: markj X-SVN-Commit-Paths: stable/11/sys/vm X-SVN-Commit-Revision: 326821 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: Wed, 13 Dec 2017 15:20:12 -0000 Author: markj Date: Wed Dec 13 15:20:11 2017 New Revision: 326821 URL: https://svnweb.freebsd.org/changeset/base/326821 Log: MFC r326629: Use unique wait messages in the page daemon control loop. Modified: stable/11/sys/vm/vm_pageout.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/vm/vm_pageout.c ============================================================================== --- stable/11/sys/vm/vm_pageout.c Wed Dec 13 14:08:33 2017 (r326820) +++ stable/11/sys/vm/vm_pageout.c Wed Dec 13 15:20:11 2017 (r326821) @@ -1764,7 +1764,7 @@ vm_pageout_worker(void *arg) */ mtx_unlock(&vm_page_queue_free_mtx); if (pass >= 1) - pause("psleep", hz / VM_INACT_SCAN_RATE); + pause("pwait", hz / VM_INACT_SCAN_RATE); pass++; } else { /* From owner-svn-src-stable-11@freebsd.org Wed Dec 13 16:17:38 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D2E3AEA2D93; Wed, 13 Dec 2017 16:17:38 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 99F6F76FA6; Wed, 13 Dec 2017 16:17:38 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBDGHbc1048558; Wed, 13 Dec 2017 16:17:37 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBDGHbJm048556; Wed, 13 Dec 2017 16:17:37 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201712131617.vBDGHbJm048556@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Wed, 13 Dec 2017 16:17: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: r326825 - in stable/11/sys/cam: ata scsi X-SVN-Group: stable-11 X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in stable/11/sys/cam: ata scsi X-SVN-Commit-Revision: 326825 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: Wed, 13 Dec 2017 16:17:38 -0000 Author: asomers Date: Wed Dec 13 16:17:37 2017 New Revision: 326825 URL: https://svnweb.freebsd.org/changeset/base/326825 Log: MFC r326040: Quirk Seagate ST8000AS0003-2HH Like its predecessor ST8000AS0002, this is a drive-managed SMR drive, but doesn't declare that in its ATA identify data. Sponsored by: Spectra Logic Corp Modified: stable/11/sys/cam/ata/ata_da.c stable/11/sys/cam/scsi/scsi_da.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/cam/ata/ata_da.c ============================================================================== --- stable/11/sys/cam/ata/ata_da.c Wed Dec 13 16:14:38 2017 (r326824) +++ stable/11/sys/cam/ata/ata_da.c Wed Dec 13 16:17:37 2017 (r326825) @@ -717,7 +717,7 @@ static struct ada_quirk_entry ada_quirk_table[] = * Drive Managed SATA hard drive. This drive doesn't report * in firmware that it is a drive managed SMR drive. */ - { T_DIRECT, SIP_MEDIA_FIXED, "*", "ST8000AS0002*", "*" }, + { T_DIRECT, SIP_MEDIA_FIXED, "*", "ST8000AS000[23]*", "*" }, /*quirks*/ADA_Q_SMR_DM }, { Modified: stable/11/sys/cam/scsi/scsi_da.c ============================================================================== --- stable/11/sys/cam/scsi/scsi_da.c Wed Dec 13 16:14:38 2017 (r326824) +++ stable/11/sys/cam/scsi/scsi_da.c Wed Dec 13 16:17:37 2017 (r326825) @@ -1306,7 +1306,7 @@ static struct da_quirk_entry da_quirk_table[] = * Drive Managed SATA hard drive. This drive doesn't report * in firmware that it is a drive managed SMR drive. */ - { T_DIRECT, SIP_MEDIA_FIXED, "ATA", "ST8000AS0002*", "*" }, + { T_DIRECT, SIP_MEDIA_FIXED, "ATA", "ST8000AS000[23]*", "*" }, /*quirks*/DA_Q_SMR_DM }, { From owner-svn-src-stable-11@freebsd.org Wed Dec 13 16:20:56 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 47258EA2FB2; Wed, 13 Dec 2017 16:20:56 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1DDA07717B; Wed, 13 Dec 2017 16:20:56 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBDGKt6Z049610; Wed, 13 Dec 2017 16:20:55 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBDGKtgw049609; Wed, 13 Dec 2017 16:20:55 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201712131620.vBDGKtgw049609@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Wed, 13 Dec 2017 16:20:55 +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: r326826 - stable/11/sys/cam X-SVN-Group: stable-11 X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: stable/11/sys/cam X-SVN-Commit-Revision: 326826 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: Wed, 13 Dec 2017 16:20:56 -0000 Author: asomers Date: Wed Dec 13 16:20:55 2017 New Revision: 326826 URL: https://svnweb.freebsd.org/changeset/base/326826 Log: MFC r326100: Always null-terminate CAM periph_name and dev_name Reported by: Coverity CID: 1010039, 1010040, 1010041, 1010043 Reviewed by: ken, imp Sponsored by: Spectra Logic Corp Differential Revision: https://reviews.freebsd.org/D13194 Modified: stable/11/sys/cam/cam_xpt.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/cam/cam_xpt.c ============================================================================== --- stable/11/sys/cam/cam_xpt.c Wed Dec 13 16:17:37 2017 (r326825) +++ stable/11/sys/cam/cam_xpt.c Wed Dec 13 16:20:55 2017 (r326826) @@ -655,8 +655,9 @@ xptdoioctl(struct cdev *dev, u_long cmd, caddr_t addr, /* * Fill in the getdevlist fields. */ - strcpy(ccb->cgdl.periph_name, - periph->periph_name); + strlcpy(ccb->cgdl.periph_name, + periph->periph_name, + sizeof(ccb->cgdl.periph_name)); ccb->cgdl.unit_number = periph->unit_number; if (SLIST_NEXT(periph, periph_links)) @@ -1604,8 +1605,9 @@ xptedtbusfunc(struct cam_eb *bus, void *arg) cdm->matches[j].result.bus_result.bus_id = bus->sim->bus_id; cdm->matches[j].result.bus_result.unit_number = bus->sim->unit_number; - strncpy(cdm->matches[j].result.bus_result.dev_name, - bus->sim->sim_name, DEV_IDLEN); + strlcpy(cdm->matches[j].result.bus_result.dev_name, + bus->sim->sim_name, + sizeof(cdm->matches[j].result.bus_result.dev_name)); } /* @@ -1821,6 +1823,7 @@ xptedtperiphfunc(struct cam_periph *periph, void *arg) */ if (retval & DM_RET_COPY) { int spaceleft, j; + size_t l; spaceleft = cdm->match_buf_len - (cdm->num_matches * sizeof(struct dev_match_result)); @@ -1864,8 +1867,9 @@ xptedtperiphfunc(struct cam_periph *periph, void *arg) periph->path->device->lun_id; cdm->matches[j].result.periph_result.unit_number = periph->unit_number; - strncpy(cdm->matches[j].result.periph_result.periph_name, - periph->periph_name, DEV_IDLEN); + l = sizeof(cdm->matches[j].result.periph_result.periph_name); + strlcpy(cdm->matches[j].result.periph_result.periph_name, + periph->periph_name, l); } return(1); @@ -1960,6 +1964,7 @@ xptplistperiphfunc(struct cam_periph *periph, void *ar */ if (retval & DM_RET_COPY) { int spaceleft, j; + size_t l; spaceleft = cdm->match_buf_len - (cdm->num_matches * sizeof(struct dev_match_result)); @@ -2036,8 +2041,9 @@ xptplistperiphfunc(struct cam_periph *periph, void *ar cdm->matches[j].result.periph_result.unit_number = periph->unit_number; - strncpy(cdm->matches[j].result.periph_result.periph_name, - periph->periph_name, DEV_IDLEN); + l = sizeof(cdm->matches[j].result.periph_result.periph_name); + strlcpy(cdm->matches[j].result.periph_result.periph_name, + periph->periph_name, l); } return(1); @@ -2750,9 +2756,9 @@ call_sim: (nperiph != NULL) && (i <= cgdl->index); nperiph = SLIST_NEXT(nperiph, periph_links), i++) { if (i == cgdl->index) { - strncpy(cgdl->periph_name, + strlcpy(cgdl->periph_name, nperiph->periph_name, - DEV_IDLEN); + sizeof(cgdl->periph_name)); cgdl->unit_number = nperiph->unit_number; found = 1; } From owner-svn-src-stable-11@freebsd.org Wed Dec 13 16:22:04 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 41EA7EA302D; Wed, 13 Dec 2017 16:22:04 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0A85477483; Wed, 13 Dec 2017 16:22:03 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBDGM2wd052582; Wed, 13 Dec 2017 16:22:02 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBDGM216052581; Wed, 13 Dec 2017 16:22:02 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201712131622.vBDGM216052581@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Wed, 13 Dec 2017 16:22: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: r326827 - stable/11/lib/libcam/tests X-SVN-Group: stable-11 X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: stable/11/lib/libcam/tests X-SVN-Commit-Revision: 326827 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: Wed, 13 Dec 2017 16:22:04 -0000 Author: asomers Date: Wed Dec 13 16:22:02 2017 New Revision: 326827 URL: https://svnweb.freebsd.org/changeset/base/326827 Log: MFC r326101: Add a test case for cam_get_device with sa(4) devices sa(4) has some unique behavior that is special-cased in cam_get_device. The existing tests don't provide coverage for this special case. Reviewed by: ken Sponsored by: Spectra Logic Corp Differential Revision: https://reviews.freebsd.org/D13185 Modified: stable/11/lib/libcam/tests/libcam_test.c Directory Properties: stable/11/ (props changed) Modified: stable/11/lib/libcam/tests/libcam_test.c ============================================================================== --- stable/11/lib/libcam/tests/libcam_test.c Wed Dec 13 16:20:55 2017 (r326826) +++ stable/11/lib/libcam/tests/libcam_test.c Wed Dec 13 16:22:02 2017 (r326827) @@ -129,6 +129,33 @@ ATF_TC_BODY(cam_get_device_positive_test, tc) ATF_REQUIRE(parsed_unit == expected_unit); } +/* + * sa(4) uniquely creates nsa and esa device nodes for non-rewind operations + * and eject-on-close operations. cam_get_device must special case these nodes + * to always return the base device. + */ +ATF_TC_WITHOUT_HEAD(cam_get_device_sa_test); +ATF_TC_BODY(cam_get_device_sa_test, tc) +{ + char parsed_dev_name[DEV_IDLEN + 1]; + int parsed_unit; + + ATF_REQUIRE_MSG(cam_get_device("nsa99", parsed_dev_name, + nitems(parsed_dev_name), &parsed_unit) == 0, + "cam_get_device failed"); + ATF_REQUIRE_STREQ(parsed_dev_name, "sa"); + ATF_REQUIRE(parsed_unit == 99); + + strcpy(parsed_dev_name, ""); + parsed_unit = -1; + + ATF_REQUIRE_MSG(cam_get_device("esa99", parsed_dev_name, + nitems(parsed_dev_name), &parsed_unit) == 0, + "cam_get_device failed"); + ATF_REQUIRE_STREQ(parsed_dev_name, "sa"); + ATF_REQUIRE(parsed_unit == 99); +} + ATF_TC(cam_open_device_negative_test_O_RDONLY); ATF_TC_HEAD(cam_open_device_negative_test_O_RDONLY, tc) { @@ -282,6 +309,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, cam_get_device_negative_test_nul_path); ATF_TP_ADD_TC(tp, cam_get_device_negative_test_root); ATF_TP_ADD_TC(tp, cam_get_device_positive_test); + ATF_TP_ADD_TC(tp, cam_get_device_sa_test); ATF_TP_ADD_TC(tp, cam_open_device_negative_test_O_RDONLY); ATF_TP_ADD_TC(tp, cam_open_device_negative_test_nonexistent); ATF_TP_ADD_TC(tp, cam_open_device_negative_test_unprivileged); From owner-svn-src-stable-11@freebsd.org Wed Dec 13 18:38:03 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DA87DE82BF8; Wed, 13 Dec 2017 18:38:03 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 979607CF92; Wed, 13 Dec 2017 18:38:03 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBDIc2VD007618; Wed, 13 Dec 2017 18:38:02 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBDIc2Av007616; Wed, 13 Dec 2017 18:38:02 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201712131838.vBDIc2Av007616@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Wed, 13 Dec 2017 18:38: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: r326830 - in stable: 10/lib/msun/man 11/lib/msun/man X-SVN-Group: stable-11 X-SVN-Commit-Author: dim X-SVN-Commit-Paths: in stable: 10/lib/msun/man 11/lib/msun/man X-SVN-Commit-Revision: 326830 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: Wed, 13 Dec 2017 18:38:04 -0000 Author: dim Date: Wed Dec 13 18:38:02 2017 New Revision: 326830 URL: https://svnweb.freebsd.org/changeset/base/326830 Log: MFC r326748: Document the existence and precision of the remaining long double functions for which an imprecise stub implementation was added in r255294, namely powl(3) and tgammal(3). Submitted by: Steve Kargl MFC r326753: Correct r326748, indicating that tgammal(3) is mapped to tgamma(3), not to itself. Noticed by: jilles Modified: stable/11/lib/msun/man/exp.3 stable/11/lib/msun/man/lgamma.3 Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Modified: stable/10/lib/msun/man/exp.3 stable/10/lib/msun/man/lgamma.3 Directory Properties: stable/10/ (props changed) Modified: stable/11/lib/msun/man/exp.3 ============================================================================== --- stable/11/lib/msun/man/exp.3 Wed Dec 13 17:11:57 2017 (r326829) +++ stable/11/lib/msun/man/exp.3 Wed Dec 13 18:38:02 2017 (r326830) @@ -28,7 +28,7 @@ .\" from: @(#)exp.3 6.12 (Berkeley) 7/31/91 .\" $FreeBSD$ .\" -.Dd November 9, 2015 +.Dd December 8, 2017 .Dt EXP 3 .Os .Sh NAME @@ -180,6 +180,15 @@ If 0**0 = 1, then then \*(Na**0 = 1 too because x**0 = 1 for all finite and infinite x, i.e., independently of x. .El +.Sh BUGS +To conform with newer C/C++ standards, a stub implementation for +.Nm powl +was committed to the math library, where +.Nm powl +is mapped to +.Nm pow . +Thus, the numerical accuracy is at most that of the 53-bit double +precision implementation. .Sh SEE ALSO .Xr fenv 3 , .Xr ldexp 3 , Modified: stable/11/lib/msun/man/lgamma.3 ============================================================================== --- stable/11/lib/msun/man/lgamma.3 Wed Dec 13 17:11:57 2017 (r326829) +++ stable/11/lib/msun/man/lgamma.3 Wed Dec 13 18:38:02 2017 (r326830) @@ -28,7 +28,7 @@ .\" from: @(#)lgamma.3 6.6 (Berkeley) 12/3/92 .\" $FreeBSD$ .\" -.Dd September 12, 2014 +.Dd December 8, 2017 .Dt LGAMMA 3 .Os .Sh NAME @@ -43,7 +43,8 @@ .Nm gammaf , .Nm gammaf_r , .Nm tgamma , -.Nm tgammaf +.Nm tgammaf , +.Nm tgammal , .Nd log gamma functions, gamma function .Sh LIBRARY .Lb libm @@ -76,6 +77,8 @@ .Fn tgamma "double x" .Ft float .Fn tgammaf "float x" +.Ft "long double" +.Fn tgammal "long double x" .Sh DESCRIPTION .Fn lgamma x , .Fn lgammaf x , @@ -106,9 +109,10 @@ and but the caller must provide an integer to store the sign of \(*G(x). .Pp The -.Fn tgamma x +.Fn tgamma x , +.Fn tgammaf x , and -.Fn tgammaf x +.Fn tgammal x functions return \(*G(x), with no effect on .Fa signgam . .Pp @@ -166,6 +170,15 @@ non-positive integers. For large non-integer negative values, .Fn tgamma will underflow. +.Sh BUGS +To conform with newer C/C++ standards, a stub implementation for +.Nm tgammal +was committed to the math library, where +.Nm tgammal +is mapped to +.Nm tgamma . +Thus, the numerical accuracy is at most that of the 53-bit double +precision implementation. .Sh SEE ALSO .Xr math 3 .Sh STANDARDS @@ -174,8 +187,9 @@ The .Fn lgammaf , .Fn lgammal , .Fn tgamma , +.Fn tgammaf , and -.Fn tgammaf +.Fn tgammal functions are expected to conform to .St -isoC-99 . .Sh HISTORY From owner-svn-src-stable-11@freebsd.org Wed Dec 13 18:52:35 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EE460E8366C; Wed, 13 Dec 2017 18:52:35 +0000 (UTC) (envelope-from peter@rulingia.com) Received: from vps.rulingia.com (vps.rulingia.com [103.243.244.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.rulingia.com", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A2F537DF32; Wed, 13 Dec 2017 18:52:35 +0000 (UTC) (envelope-from peter@rulingia.com) Received: from server.rulingia.com (ppp59-167-167-3.static.internode.on.net [59.167.167.3]) by vps.rulingia.com (8.15.2/8.15.2) with ESMTPS id vBDIqKNW057884 (version=TLSv1.2 cipher=DHE-RSA-CHACHA20-POLY1305 bits=256 verify=OK); Thu, 14 Dec 2017 05:52:26 +1100 (AEDT) (envelope-from peter@rulingia.com) X-Bogosity: Ham, spamicity=0.000000 Received: from server.rulingia.com (localhost.rulingia.com [127.0.0.1]) by server.rulingia.com (8.15.2/8.15.2) with ESMTPS id vBDIqFrT012087 (version=TLSv1.2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256 verify=NO); Thu, 14 Dec 2017 05:52:15 +1100 (AEDT) (envelope-from peter@server.rulingia.com) Received: (from peter@localhost) by server.rulingia.com (8.15.2/8.15.2/Submit) id vBDIqFBZ012086; Thu, 14 Dec 2017 05:52:15 +1100 (AEDT) (envelope-from peter) Date: Thu, 14 Dec 2017 05:52:15 +1100 From: Peter Jeremy To: Baptiste Daroussin 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: r326619 - stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs Message-ID: <20171213185214.GA12026@server.rulingia.com> References: <201712061001.vB6A12Ot032201@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="wac7ysb48OaltWcw" Content-Disposition: inline In-Reply-To: <201712061001.vB6A12Ot032201@repo.freebsd.org> X-PGP-Key: http://www.rulingia.com/keys/peter.pgp User-Agent: Mutt/1.9.1 (2017-09-22) 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: Wed, 13 Dec 2017 18:52:36 -0000 --wac7ysb48OaltWcw Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 2017-Dec-06 10:01:02 +0000, Baptiste Daroussin wrote: >Author: bapt >Date: Wed Dec 6 10:01:02 2017 >New Revision: 326619 >URL: https://svnweb.freebsd.org/changeset/base/326619 > >Log: > MFC r325851: > =20 > remove the poor emulation of the IllumOS needfree global variable to pre= vent > the ARC reclaim thread running longer than needed. > =20 This change appears to break the backpressure mechanism that forces ARC to release wired memory. Running FreeBSD/amd64 r326743, I found that my system was thrashing badly with almost all memory (~31GB out of 32GB) wired (including 19GB ARC, 7GB VBox guests). Running a tool that just allocates and dirties a large amount of memory had no effect on the ARC size. Reverting this change only restores normal behaviour where ARC will shrink under pressure. My ZFS boot tunables are: vfs.zfs.arc_max=3D"24G" vfs.zfs.arc_meta_limit=3D"12G" --=20 Peter Jeremy --wac7ysb48OaltWcw Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQJ8BAEBCgBmBQJaMXbeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFRUIyOTg2QzMwNjcxRTc0RTY1QzIyN0Ux NkE1OTdBMEU0QTIwQjM0AAoJEBall6Dkogs0qBEP/jgEyTai46NhxOuUzzxI6y2g rwnxgAAX+yMOU4ZdaK0SuSQUsmCS1SHQnuORG1Ay1CCaWcf6vtKEt0Ce90+zTMjZ qqmWLvBOOCfBSCTQzcVs1ICcKtML/zsXEO2wxyZu94yIc4kwa5Az4R5J5RCeCb9w 1iGSFWbeyTevC0QReKgj2NKhVZ6Lb9281GXq3aZJH1cONG1xDCOb9V8kw9VRtj/G sy5gaUK8ph+BWySd/PJ02cibJBPUptHSBUQdJGnU2h7HLuy/dO0tFrb2WmDozsFE CXeuPtdE8bOlJVEMFj7w1KYPIXjKBUP6g+y1ZI7hFWrecbwLWVWCiO0AmB5/bZTT +D79/c7DxLMIXwjN8iaRwJiAfMeFJcZQFVu7RtKHHb9gEpAU5QRt57RjJtqTuhXn 5tC5M1DDv5lwz6cACFG7dlRfaLvAcJgfhG0hJKtWlFlSUSfpX/Mlcv2gJUWZz/4t K/wE1iRX+EvRkmFnBThJtzizyu1NIyT+CZu4PbwiL6WJdesoO3f+vfcBnQaDR2gL /bHSofISm/GKhpCbzmbaZ7Xw1Fp/S6TBthKBESYFTExKze4Am6EdayqphIa9Sytj J9euCfAxags1d3IJ30GF7pNzqYBgXmobd4Wfca1F8P1ZQRtPtqHg6wb1kIOKYyAm rTQkYjlzaOmbjMrz0H4Y =fypZ -----END PGP SIGNATURE----- --wac7ysb48OaltWcw-- From owner-svn-src-stable-11@freebsd.org Wed Dec 13 20:15:25 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3D08DE85344; Wed, 13 Dec 2017 20:15:25 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E26FA80FD0; Wed, 13 Dec 2017 20:15:24 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBDKFNtC049728; Wed, 13 Dec 2017 20:15:23 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBDKFNNo049726; Wed, 13 Dec 2017 20:15:23 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201712132015.vBDKFNNo049726@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Wed, 13 Dec 2017 20:15:23 +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: r326833 - in stable: 10 11 X-SVN-Group: stable-11 X-SVN-Commit-Author: cy X-SVN-Commit-Paths: in stable: 10 11 X-SVN-Commit-Revision: 326833 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: Wed, 13 Dec 2017 20:15:25 -0000 Author: cy Date: Wed Dec 13 20:15:23 2017 New Revision: 326833 URL: https://svnweb.freebsd.org/changeset/base/326833 Log: MFC r324248: hen building multiple kernels using KERNCONF, non-existent KERNCONF files will produce an error and buildkernel will fail. Previously missing KERNCONF files silently failed giving no indication as to why, only to subsequently discover during installkernel that the desired kernel was never built in the first place. This is a rework of r302865. This is the correct patch. Reviewed by: ngie (previous version, r302865) Differential Revision: https://reviews.freebsd.org/D7167 Modified: stable/11/Makefile.inc1 stable/11/UPDATING Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Modified: stable/10/Makefile.inc1 stable/10/UPDATING Directory Properties: stable/10/ (props changed) Modified: stable/11/Makefile.inc1 ============================================================================== --- stable/11/Makefile.inc1 Wed Dec 13 19:36:29 2017 (r326832) +++ stable/11/Makefile.inc1 Wed Dec 13 20:15:23 2017 (r326833) @@ -1210,6 +1210,10 @@ BUILDKERNELS+= ${_kernel} .if empty(INSTALLKERNEL) && !defined(NO_INSTALLKERNEL) INSTALLKERNEL= ${_kernel} .endif +.else +.if make(buildkernel) +.error Missing KERNCONF ${KERNCONFDIR}/${_kernel} +.endif .endif .endfor Modified: stable/11/UPDATING ============================================================================== --- stable/11/UPDATING Wed Dec 13 19:36:29 2017 (r326832) +++ stable/11/UPDATING Wed Dec 13 20:15:23 2017 (r326833) @@ -16,6 +16,13 @@ from older versions of FreeBSD, try WITHOUT_CLANG and the tip of head, and then rebuild without this option. The bootstrap process from older version of current across the gcc/clang cutover is a bit fragile. +20171003: + When building multiple kernels using KERNCONF, non-existent KERNCONF + files will produce an error and buildkernel will fail. Previously + missing KERNCONF files silently failed giving no indication as to + why, only to subsequently discover during installkernel that the + desired kernel was never built in the first place. + 20170926: Clang, llvm, lldb, compiler-rt and libc++ have been upgraded to 5.0.0. Please see the 20141231 entry below for information about prerequisites From owner-svn-src-stable-11@freebsd.org Thu Dec 14 07:52:39 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7D041E9AA3C; Thu, 14 Dec 2017 07:52:39 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4719E791AF; Thu, 14 Dec 2017 07:52:39 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBE7qclE044607; Thu, 14 Dec 2017 07:52:38 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBE7qc0t044606; Thu, 14 Dec 2017 07:52:38 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201712140752.vBE7qc0t044606@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Thu, 14 Dec 2017 07:52: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: r326842 - stable/11/sbin/fsck_msdosfs X-SVN-Group: stable-11 X-SVN-Commit-Author: delphij X-SVN-Commit-Paths: stable/11/sbin/fsck_msdosfs X-SVN-Commit-Revision: 326842 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: Thu, 14 Dec 2017 07:52:39 -0000 Author: delphij Date: Thu Dec 14 07:52:38 2017 New Revision: 326842 URL: https://svnweb.freebsd.org/changeset/base/326842 Log: MFC r326391: Prevent OOB access on corrupted msdos directories. Submitted by: Veo Zhang Modified: stable/11/sbin/fsck_msdosfs/dir.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sbin/fsck_msdosfs/dir.c ============================================================================== --- stable/11/sbin/fsck_msdosfs/dir.c Thu Dec 14 06:45:04 2017 (r326841) +++ stable/11/sbin/fsck_msdosfs/dir.c Thu Dec 14 07:52:38 2017 (r326842) @@ -619,7 +619,7 @@ readDosDirSection(int f, struct bootblock *boot, struc dirent.name[8] = '\0'; for (k = 7; k >= 0 && dirent.name[k] == ' '; k--) dirent.name[k] = '\0'; - if (dirent.name[k] != '\0') + if (k < 0 || dirent.name[k] != '\0') k++; if (dirent.name[0] == SLOT_E5) dirent.name[0] = 0xe5; From owner-svn-src-stable-11@freebsd.org Thu Dec 14 11:41:13 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 61E5BEA0C05; Thu, 14 Dec 2017 11:41:13 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2E8E27FF85; Thu, 14 Dec 2017 11:41:13 +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 vBEBfCEH038816; Thu, 14 Dec 2017 11:41:12 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBEBfCJN038815; Thu, 14 Dec 2017 11:41:12 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201712141141.vBEBfCJN038815@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Thu, 14 Dec 2017 11:41:12 +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: r326845 - stable/11/sys/ufs/ufs X-SVN-Group: stable-11 X-SVN-Commit-Author: kib X-SVN-Commit-Paths: stable/11/sys/ufs/ufs X-SVN-Commit-Revision: 326845 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: Thu, 14 Dec 2017 11:41:13 -0000 Author: kib Date: Thu Dec 14 11:41:12 2017 New Revision: 326845 URL: https://svnweb.freebsd.org/changeset/base/326845 Log: MFC r326657: Fix livelock in ufsdirhash_create(). Modified: stable/11/sys/ufs/ufs/ufs_dirhash.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/ufs/ufs/ufs_dirhash.c ============================================================================== --- stable/11/sys/ufs/ufs/ufs_dirhash.c Thu Dec 14 08:57:37 2017 (r326844) +++ stable/11/sys/ufs/ufs/ufs_dirhash.c Thu Dec 14 11:41:12 2017 (r326845) @@ -190,9 +190,11 @@ ufsdirhash_create(struct inode *ip) struct dirhash *ndh; struct dirhash *dh; struct vnode *vp; + bool excl; ndh = dh = NULL; vp = ip->i_vnode; + excl = false; for (;;) { /* Racy check for i_dirhash to prefetch a dirhash structure. */ if (ip->i_dirhash == NULL && ndh == NULL) { @@ -229,8 +231,11 @@ ufsdirhash_create(struct inode *ip) ufsdirhash_hold(dh); VI_UNLOCK(vp); - /* Acquire a shared lock on existing hashes. */ - sx_slock(&dh->dh_lock); + /* Acquire a lock on existing hashes. */ + if (excl) + sx_xlock(&dh->dh_lock); + else + sx_slock(&dh->dh_lock); /* The hash could've been recycled while we were waiting. */ VI_LOCK(vp); @@ -251,9 +256,10 @@ ufsdirhash_create(struct inode *ip) * so we can recreate it. If we fail the upgrade, drop our * lock and try again. */ - if (sx_try_upgrade(&dh->dh_lock)) + if (excl || sx_try_upgrade(&dh->dh_lock)) break; sx_sunlock(&dh->dh_lock); + excl = true; } /* Free the preallocated structure if it was not necessary. */ if (ndh) { From owner-svn-src-stable-11@freebsd.org Thu Dec 14 13:06:43 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 74F9DEA35F8; Thu, 14 Dec 2017 13:06:43 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4D1EE34AC; Thu, 14 Dec 2017 13:06:43 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBED6gYS073509; Thu, 14 Dec 2017 13:06:42 GMT (envelope-from eugen@FreeBSD.org) Received: (from eugen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBED6f0Y073503; Thu, 14 Dec 2017 13:06:41 GMT (envelope-from eugen@FreeBSD.org) Message-Id: <201712141306.vBED6f0Y073503@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eugen set sender to eugen@FreeBSD.org using -f From: Eugene Grosbein Date: Thu, 14 Dec 2017 13:06: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: r326848 - stable/11/usr.sbin/pw X-SVN-Group: stable-11 X-SVN-Commit-Author: eugen X-SVN-Commit-Paths: stable/11/usr.sbin/pw X-SVN-Commit-Revision: 326848 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: Thu, 14 Dec 2017 13:06:43 -0000 Author: eugen Date: Thu Dec 14 13:06:41 2017 New Revision: 326848 URL: https://svnweb.freebsd.org/changeset/base/326848 Log: MFC r326738: pw(8): correct expiration period handling and command line overrides to preconfigured values for -e, -p and -w flags. Use non-negative symbols instead of magic values in passwd_val/pw_password functions. PR: 223431 Submitted by: Yuri Pankov (in part, patch for the manual) Approved by: mav (mentor) Relnotes: yes Modified: stable/11/usr.sbin/pw/psdate.c stable/11/usr.sbin/pw/psdate.h stable/11/usr.sbin/pw/pw.8 stable/11/usr.sbin/pw/pw.h stable/11/usr.sbin/pw/pw_conf.c stable/11/usr.sbin/pw/pw_user.c Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.sbin/pw/psdate.c ============================================================================== --- stable/11/usr.sbin/pw/psdate.c Thu Dec 14 12:54:20 2017 (r326847) +++ stable/11/usr.sbin/pw/psdate.c Thu Dec 14 13:06:41 2017 (r326848) @@ -38,7 +38,7 @@ static const char rcsid[] = #include "psdate.h" -static int +int numerics(char const * str) { Modified: stable/11/usr.sbin/pw/psdate.h ============================================================================== --- stable/11/usr.sbin/pw/psdate.h Thu Dec 14 12:54:20 2017 (r326847) +++ stable/11/usr.sbin/pw/psdate.h Thu Dec 14 13:06:41 2017 (r326848) @@ -33,6 +33,7 @@ #include __BEGIN_DECLS +int numerics(char const * str); time_t parse_date(time_t dt, char const * str); void print_date(char *buf, time_t t, int dotime); __END_DECLS Modified: stable/11/usr.sbin/pw/pw.8 ============================================================================== --- stable/11/usr.sbin/pw/pw.8 Thu Dec 14 12:54:20 2017 (r326847) +++ stable/11/usr.sbin/pw/pw.8 Thu Dec 14 13:06:41 2017 (r326848) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 23, 2016 +.Dd December 10, 2017 .Dt PW 8 .Os .Sh NAME @@ -611,6 +611,14 @@ that the account expires. A value of 0 suppresses automatic calculation of the expiry date. .It Fl p Ar days Set the default password expiration period in days. +When +.Fl D +is used, the +.Ar days +argument is interpreted differently. +It must be numeric and represents the number of days after creation +that the account expires. +A value of 0 suppresses automatic calculation of the expiry date. .It Fl g Ar group Set the default group for new users. If a blank group is specified using Modified: stable/11/usr.sbin/pw/pw.h ============================================================================== --- stable/11/usr.sbin/pw/pw.h Thu Dec 14 12:54:20 2017 (r326847) +++ stable/11/usr.sbin/pw/pw.h Thu Dec 14 13:06:41 2017 (r326848) @@ -47,6 +47,14 @@ enum _mode M_NUM }; +enum _passmode +{ + P_NO, + P_NONE, + P_RANDOM, + P_YES +}; + enum _which { W_USER, Modified: stable/11/usr.sbin/pw/pw_conf.c ============================================================================== --- stable/11/usr.sbin/pw/pw_conf.c Thu Dec 14 12:54:20 2017 (r326847) +++ stable/11/usr.sbin/pw/pw_conf.c Thu Dec 14 13:06:41 2017 (r326848) @@ -198,18 +198,18 @@ passwd_val(char const * str, int dflt) for (i = 0; booltrue[i]; i++) if (strcmp(str, booltrue[i]) == 0) - return 1; + return P_YES; for (i = 0; boolfalse[i]; i++) if (strcmp(str, boolfalse[i]) == 0) - return 0; + return P_NO; /* * Special cases for defaultpassword */ if (strcmp(str, "random") == 0) - return -1; + return P_RANDOM; if (strcmp(str, "none") == 0) - return -2; + return P_NONE; errx(1, "Invalid value for default password"); } Modified: stable/11/usr.sbin/pw/pw_user.c ============================================================================== --- stable/11/usr.sbin/pw/pw_user.c Thu Dec 14 12:54:20 2017 (r326847) +++ stable/11/usr.sbin/pw/pw_user.c Thu Dec 14 13:06:41 2017 (r326848) @@ -515,7 +515,9 @@ pw_password(struct userconf * cnf, char const * user, char pwbuf[32]; switch (cnf->default_password) { - case -1: /* Random password */ + case P_NONE: /* No password at all! */ + return ""; + case P_RANDOM: /* Random password */ l = (arc4random() % 8 + 8); /* 8 - 16 chars */ for (i = 0; i < l; i++) pwbuf[i] = chars[arc4random_uniform(sizeof(chars)-1)]; @@ -531,17 +533,13 @@ pw_password(struct userconf * cnf, char const * user, fflush(stdout); } break; - - case -2: /* No password at all! */ - return ""; - - case 0: /* No login - default */ - default: - return "*"; - - case 1: /* user's name */ + case P_YES: /* user's name */ strlcpy(pwbuf, user, sizeof(pwbuf)); break; + case P_NO: /* No login - default */ + /* FALLTHROUGH */ + default: + return "*"; } return pw_pwcrypt(pwbuf); } @@ -1122,11 +1120,20 @@ validate_mode(char *mode) return (m); } +static long +validate_expire(char *str, int opt) +{ + if (!numerics(str)) + errx(EX_DATAERR, "-%c argument must be numeric " + "when setting defaults: %s", (char)opt, str); + return strtol(str, NULL, 0); +} + static void mix_config(struct userconf *cmdcnf, struct userconf *cfg) { - if (cmdcnf->default_password == 0) + if (cmdcnf->default_password < 0) cmdcnf->default_password = cfg->default_password; if (cmdcnf->reuse_uids == 0) cmdcnf->reuse_uids = cfg->reuse_uids; @@ -1164,9 +1171,9 @@ mix_config(struct userconf *cmdcnf, struct userconf *c cmdcnf->min_gid = cfg->min_gid; if (cmdcnf->max_gid == 0) cmdcnf->max_gid = cfg->max_gid; - if (cmdcnf->expire_days == 0) + if (cmdcnf->expire_days < 0) cmdcnf->expire_days = cfg->expire_days; - if (cmdcnf->password_days == 0) + if (cmdcnf->password_days < 0) cmdcnf->password_days = cfg->password_days; } @@ -1198,6 +1205,9 @@ pw_user_add(int argc, char **argv, char *arg1) if ((cmdcnf = calloc(1, sizeof(struct userconf))) == NULL) err(EXIT_FAILURE, "calloc()"); + cmdcnf->default_password = cmdcnf->expire_days = cmdcnf->password_days = -1; + now = time(NULL); + if (arg1 != NULL) { if (arg1[strspn(arg1, "0123456789")] == '\0') id = pw_checkid(arg1, UID_MAX); @@ -1226,12 +1236,16 @@ pw_user_add(int argc, char **argv, char *arg1) homedir = optarg; break; case 'e': - now = time(NULL); - cmdcnf->expire_days = parse_date(now, optarg); + if (genconf) + cmdcnf->expire_days = validate_expire(optarg, ch); + else + cmdcnf->expire_days = parse_date(now, optarg); break; case 'p': - now = time(NULL); - cmdcnf->password_days = parse_date(now, optarg); + if (genconf) + cmdcnf->password_days = validate_expire(optarg, ch); + else + cmdcnf->password_days = parse_date(now, optarg); break; case 'g': validate_grname(cmdcnf, optarg); @@ -1369,8 +1383,12 @@ pw_user_add(int argc, char **argv, char *arg1) pwd->pw_uid = pw_uidpolicy(cmdcnf, id); pwd->pw_gid = pw_gidpolicy(cnf, grname, pwd->pw_name, (gid_t) pwd->pw_uid, dryrun); - pwd->pw_change = cmdcnf->password_days; - pwd->pw_expire = cmdcnf->expire_days; + + if (cmdcnf->password_days > 0) + pwd->pw_change = now + cmdcnf->password_days * 86400L; + if (cmdcnf->expire_days > 0) + pwd->pw_expire = now + cmdcnf->expire_days * 86400L; + pwd->pw_dir = pw_homepolicy(cmdcnf, homedir, pwd->pw_name); pwd->pw_shell = pw_shellpolicy(cmdcnf); lc = login_getpwclass(pwd); @@ -1511,6 +1529,7 @@ pw_user_mod(int argc, char **argv, char *arg1) class = nispasswd = NULL; quiet = createhome = pretty = dryrun = nis = precrypted = false; edited = false; + now = time(NULL); if (arg1 != NULL) { if (arg1[strspn(arg1, "0123456789")] == '\0') @@ -1540,11 +1559,9 @@ pw_user_mod(int argc, char **argv, char *arg1) homedir = optarg; break; case 'e': - now = time(NULL); expire_days = parse_date(now, optarg); break; case 'p': - now = time(NULL); password_days = parse_date(now, optarg); break; case 'g': @@ -1679,13 +1696,14 @@ pw_user_mod(int argc, char **argv, char *arg1) } } - if (password_days >= 0 && pwd->pw_change != password_days) { - pwd->pw_change = password_days; + + if (password_days >= 0) { + pwd->pw_change = now + password_days * 86400L; edited = true; } - if (expire_days >= 0 && pwd->pw_expire != expire_days) { - pwd->pw_expire = expire_days; + if (expire_days >= 0) { + pwd->pw_expire = now + expire_days * 86400L; edited = true; } From owner-svn-src-stable-11@freebsd.org Sat Dec 16 00:44:12 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9FBDAE91467; Sat, 16 Dec 2017 00:44:12 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6C1806D6C5; Sat, 16 Dec 2017 00:44:12 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBG0iB2Y082413; Sat, 16 Dec 2017 00:44:11 GMT (envelope-from cperciva@FreeBSD.org) Received: (from cperciva@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBG0iBMI082412; Sat, 16 Dec 2017 00:44:11 GMT (envelope-from cperciva@FreeBSD.org) Message-Id: <201712160044.vBG0iBMI082412@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cperciva set sender to cperciva@FreeBSD.org using -f From: Colin Percival Date: Sat, 16 Dec 2017 00:44: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: r326891 - stable/11/sys/fs/nfs X-SVN-Group: stable-11 X-SVN-Commit-Author: cperciva X-SVN-Commit-Paths: stable/11/sys/fs/nfs X-SVN-Commit-Revision: 326891 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: Sat, 16 Dec 2017 00:44:12 -0000 Author: cperciva Date: Sat Dec 16 00:44:11 2017 New Revision: 326891 URL: https://svnweb.freebsd.org/changeset/base/326891 Log: Add vfs.nfs.suppress_32bits_warning sysctl which reduces the frequency of 'fileid > 32bits' warnings from at most once per minute to at most once per day. Direct commit to stable/11 since the relevant code was removed from HEAD following the switch to 64-bit inodes. Requested by: Rafal Lukawiecki Approved by: rmacklem Modified: stable/11/sys/fs/nfs/nfs_commonsubs.c Modified: stable/11/sys/fs/nfs/nfs_commonsubs.c ============================================================================== --- stable/11/sys/fs/nfs/nfs_commonsubs.c Fri Dec 15 23:50:26 2017 (r326890) +++ stable/11/sys/fs/nfs/nfs_commonsubs.c Sat Dec 16 00:44:11 2017 (r326891) @@ -69,6 +69,7 @@ int nfsrv_lease = NFSRV_LEASE; int ncl_mbuf_mlen = MLEN; int nfsd_enable_stringtouid = 0; static int nfs_enable_uidtostring = 0; +static int nfs_suppress_32bits_warning = 0; NFSNAMEIDMUTEX; NFSSOCKMUTEX; extern int nfsrv_lughashsize; @@ -76,6 +77,8 @@ extern int nfsrv_lughashsize; SYSCTL_DECL(_vfs_nfs); SYSCTL_INT(_vfs_nfs, OID_AUTO, enable_uidtostring, CTLFLAG_RW, &nfs_enable_uidtostring, 0, "Make nfs always send numeric owner_names"); +SYSCTL_INT(_vfs_nfs, OID_AUTO, suppress_32bits_warning, CTLFLAG_RW, + &nfs_suppress_32bits_warning, 0, "Suppress \"> 32 bits\" warnings"); /* * This array of structures indicates, for V4: @@ -836,7 +839,8 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp, static size_t count64fileid; static struct timeval last64mountfileid; static size_t count64mountfileid; - static struct timeval warninterval = { 60, 0 }; + struct timeval warninterval = + { nfs_suppress_32bits_warning ? 86400 : 60, 0 }; if (compare) { retnotsup = 0; From owner-svn-src-stable-11@freebsd.org Sat Dec 16 00:47:46 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 725F7E9161B; Sat, 16 Dec 2017 00:47:46 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3B45B6D8EC; Sat, 16 Dec 2017 00:47:46 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBG0ljqn082586; Sat, 16 Dec 2017 00:47:45 GMT (envelope-from cperciva@FreeBSD.org) Received: (from cperciva@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBG0ljHu082585; Sat, 16 Dec 2017 00:47:45 GMT (envelope-from cperciva@FreeBSD.org) Message-Id: <201712160047.vBG0ljHu082585@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cperciva set sender to cperciva@FreeBSD.org using -f From: Colin Percival Date: Sat, 16 Dec 2017 00:47: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: r326892 - stable/11/release/tools X-SVN-Group: stable-11 X-SVN-Commit-Author: cperciva X-SVN-Commit-Paths: stable/11/release/tools X-SVN-Commit-Revision: 326892 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: Sat, 16 Dec 2017 00:47:46 -0000 Author: cperciva Date: Sat Dec 16 00:47:45 2017 New Revision: 326892 URL: https://svnweb.freebsd.org/changeset/base/326892 Log: MFC r326565: Make EC2 instances use Amazon's NTP service for time synchronization. Relnotes: EC2 instances now keep their clocks synchronized using the Amazon Time Sync Service (aka. NTP). Modified: stable/11/release/tools/ec2.conf Directory Properties: stable/11/ (props changed) Modified: stable/11/release/tools/ec2.conf ============================================================================== --- stable/11/release/tools/ec2.conf Sat Dec 16 00:44:11 2017 (r326891) +++ stable/11/release/tools/ec2.conf Sat Dec 16 00:47:45 2017 (r326892) @@ -9,7 +9,7 @@ export VM_EXTRA_PACKAGES="ec2-scripts firstboot-freebsd-update firstboot-pkgs dual-dhclient" # Set to a list of third-party software to enable in rc.conf(5). -export VM_RC_LIST="ec2_configinit ec2_fetchkey ec2_ephemeralswap ec2_loghostkey firstboot_freebsd_update firstboot_pkgs" +export VM_RC_LIST="ec2_configinit ec2_fetchkey ec2_ephemeralswap ec2_loghostkey firstboot_freebsd_update firstboot_pkgs ntpd" # Build with a 2 GB UFS partition; the growfs rc.d script will expand # the partition to fill the root disk after the EC2 instance is launched. @@ -80,6 +80,11 @@ vm_extra_pre_umount() { # Load the kernel module for the Amazon "Elastic Network Adapter" echo 'if_ena_load="YES"' >> ${DESTDIR}/boot/loader.conf + + # Use the NTP service provided by Amazon + sed -i '' -e 's/^pool/#pool/' \ + -e 's/^#server.*/server 169.254.169.123 iburst/' \ + ${DESTDIR}/etc/ntp.conf # The first time the AMI boots, the installed "first boot" scripts # should be allowed to run: From owner-svn-src-stable-11@freebsd.org Sat Dec 16 07:04:27 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 98BAAE9F805; Sat, 16 Dec 2017 07:04:27 +0000 (UTC) (envelope-from herbert@mailbox.org) Received: from mx1.mailbox.org (mx1.mailbox.org [80.241.60.212]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.mailbox.org", Issuer "SwissSign Server Silver CA 2014 - G22" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 561237A684; Sat, 16 Dec 2017 07:04:26 +0000 (UTC) (envelope-from herbert@mailbox.org) Received: from smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id 80C0847191; Sat, 16 Dec 2017 07:57:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mailbox.org; h= content-type:content-type:mime-version:references:in-reply-to :subject:subject:from:from:message-id:date:date:received; s= mail20150812; t=1513407452; bh=7DO3lUs+4Q/yvP39K0cFHkeN6F/D6kq5O Jw4MZXKVLg=; b=KxNnvoyxHuYb1bq7+M/Xa/Ud/aV09kthgoDWBazNc4jPgbZ0v Vdr5mKjgZvuEpQh8DHAE142SXjP4w/8J7SJTB8E9Sd1kOaWryeHFKOPuWDsgf27J U8YgZCvPTO6mxxbRLkKpMC6N3YPhTpyT6MLYZtrvKc+2h4uz0UCZXmccd+kfwgEA lee3ttI8pBP14DqlCnNmO7WVCDAgV+/MtJFKFDB62Jnysa3CNX0rEK6GwpC4PNXt tU08z/xUxMsyR4u36DGDtAkeD+ReD0AmIU8scMPRwXlnDRxJEAddeMyfMrYMNxow sXPI+KTKooVaGEExsqcS0yYPLC1ikrCgwW23g== X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter02.heinlein-hosting.de (spamfilter02.heinlein-hosting.de [80.241.56.116]) (amavisd-new, port 10030) with ESMTP id oT7YXqGbAsvu; Sat, 16 Dec 2017 07:57:32 +0100 (CET) Date: Sat, 16 Dec 2017 07:57:30 +0100 Message-ID: <871sjvgnxh.wl-herbert@mailbox.org> From: "Herbert J. Skuhra" To: Ngie Cooper 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: r323304 - stable/11/share/man/man5 In-Reply-To: <201709080451.v884pGhH036463@repo.freebsd.org> References: <201709080451.v884pGhH036463@repo.freebsd.org> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-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: Sat, 16 Dec 2017 07:04:27 -0000 On Fri, 08 Sep 2017 06:51:16 +0200, Ngie Cooper wrote: > > Author: ngie > Date: Fri Sep 8 04:51:16 2017 > New Revision: 323304 > URL: https://svnweb.freebsd.org/changeset/base/323304 > > Log: > Regenerate src.conf(5) based on recent changes to src.opts.mk, etc. > > Modified: > stable/11/share/man/man5/src.conf.5 > > Modified: stable/11/share/man/man5/src.conf.5 > ============================================================================== > --- stable/11/share/man/man5/src.conf.5 Fri Sep 8 04:48:25 2017 (r323303) > +++ stable/11/share/man/man5/src.conf.5 Fri Sep 8 04:51:16 2017 (r323304) > @@ -1,6 +1,6 @@ > .\" DO NOT EDIT-- this file is generated by tools/build/options/makeman. > .\" $FreeBSD$ > -.Dd August 16, 2017 > +.Dd September 7, 2017 > .Dt SRC.CONF 5 > .Os > .Sh NAME > @@ -1150,6 +1150,12 @@ and remove > entries. > .It Va WITHOUT_NLS > Set to not build NLS catalogs. > +When set, it enforces these options: > +.Pp > +.Bl -item -compact > +.It > +.Va WITHOUT_NLS_CATALOGS > +.El > .It Va WITHOUT_NLS_CATALOGS > Set to not build NLS catalog support for > .Xr csh 1 . > @@ -1237,6 +1243,42 @@ and related files. > Set to not build > .Xr ppp 8 > and related programs. > +.It Va WITHOUT_PROFILE > +Set to not build profiled libraries for use with > +.Xr gprof 8 . > +.Pp > +This is a default setting on > +mips/mips64el and mips/mips64. > +.It Va WITH_PROFILE > +Set to build profiled libraries for use with > +.Xr gprof 8 . > +.Pp > +This is a default setting on > +amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mipsn32, pc98/i386, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64. > +.It Va WITHOUT_PROFILE > +Set to not build profiled libraries for use with > +.Xr gprof 8 . > +.Pp > +This is a default setting on > +mips/mips64el. > +.It Va WITH_PROFILE > +Set to build profiled libraries for use with > +.Xr gprof 8 . > +.Pp > +This is a default setting on > +amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mips64, mips/mipsn32, pc98/i386, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64. > +.It Va WITHOUT_PROFILE > +Set to not build profiled libraries for use with > +.Xr gprof 8 . > +.Pp > +This is a default setting on > +mips/mips64. > +.It Va WITH_PROFILE > +Set to build profiled libraries for use with > +.Xr gprof 8 . > +.Pp > +This is a default setting on > +amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mipsn32, pc98/i386, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64. > .It Va WITHOUT_PROFILE > Set to not build profiled libraries for use with > .Xr gprof 8 . Here something went wrong: multiple (WITH|WITHOUT)_PROFILE entries. -- Herbert From owner-svn-src-stable-11@freebsd.org Sat Dec 16 15:45:19 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DF9EBE8642A; Sat, 16 Dec 2017 15:45:19 +0000 (UTC) (envelope-from olgeni@olgeni.com) Received: from olgeni.olgeni.com (olgeni.olgeni.com [31.171.246.156]) by mx1.freebsd.org (Postfix) with ESMTP id 3858068C83; Sat, 16 Dec 2017 15:45:19 +0000 (UTC) (envelope-from olgeni@olgeni.com) Received: from olgeni (unknown [82.84.97.113]) by olgeni.olgeni.com (Postfix) with ESMTPSA id CE014D791D; Sat, 16 Dec 2017 16:45:11 +0100 (CET) Date: Sat, 16 Dec 2017 16:45:11 +0100 (CET) From: Jimmy Olgeni X-X-Sender: olgeni@olgeni.olgeni To: Baptiste Daroussin cc: Peter Jeremy , svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-11@freebsd.org Subject: Re: svn commit: r326619 - stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs In-Reply-To: <20171213185214.GA12026@server.rulingia.com> Message-ID: References: <201712061001.vB6A12Ot032201@repo.freebsd.org> <20171213185214.GA12026@server.rulingia.com> User-Agent: Alpine 2.21 (BSF 202 2017-01-01) X-OpenPGP-KeyID: 0x90B7A98E6450AE47 X-OpenPGP-Fingerprint: 7133 AB4D DFC8 0A0D F891 B0D2 90B7 A98E 6450 AE47 X-OpenPGP-URL: http://olgeni.olgeni.com/~olgeni/pgp/olgeni@olgeni.com MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII 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: Sat, 16 Dec 2017 15:45:20 -0000 Hi, On Thu, 14 Dec 2017, Peter Jeremy wrote: > On 2017-Dec-06 10:01:02 +0000, Baptiste Daroussin wrote: > >Author: bapt > >Date: Wed Dec 6 10:01:02 2017 > >New Revision: 326619 > >URL: https://svnweb.freebsd.org/changeset/base/326619 > > > >Log: > > MFC r325851: > > > > remove the poor emulation of the IllumOS needfree global variable to prevent > > the ARC reclaim thread running longer than needed. > > > > This change appears to break the backpressure mechanism that forces > ARC to release wired memory. Running FreeBSD/amd64 r326743, I found > that my system was thrashing badly with almost all memory (~31GB out > of 32GB) wired (including 19GB ARC, 7GB VBox guests). Running a tool > that just allocates and dirties a large amount of memory had no effect > on the ARC size. Reverting this change only restores normal behaviour > where ARC will shrink under pressure. Are there any updates on this? -- jimmy From owner-svn-src-stable-11@freebsd.org Sat Dec 16 18:54:11 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 19294E8B1A6; Sat, 16 Dec 2017 18:54:11 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pg0-x234.google.com (mail-pg0-x234.google.com [IPv6:2607:f8b0:400e:c05::234]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DA4A46E626; Sat, 16 Dec 2017 18:54:10 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pg0-x234.google.com with SMTP id q20so7609585pgv.2; Sat, 16 Dec 2017 10:54:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=JB7TVAVkSz7+grAglQkaB29NqGwfPROfjfI9eFbKhaU=; b=ssPqaqrRskxI8vBpbDMJ1/zj2m/E+eCtkAou7wPoqPZvLE3DS1bs/HWz3ujAPoziE3 yVDVbJmXXdd44FuSdAhPvv1S2T2ct/cK4lSdgkYB2d3yBDVcJPq3ZHXeu7EFzahEUx8p ShKfolR24LfY8GRswf0KSFh2pvPZ6aDvYBsZsY/uDMEM6qC/Edc27f/n5fHD+dhV77RR 4dkSDNbmrQJhese6lRl+9cb8L4Jh8aP8ZskRMy+FcsocdxyGOPFzo8br70gLkRIj3Z4k vvEvYvlEwiLrMQnlo2yI1i8hKmtmaeFOKZ5pmto7tALZTppAkm0F367m7+d/hAFOGkb9 DYhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=JB7TVAVkSz7+grAglQkaB29NqGwfPROfjfI9eFbKhaU=; b=VyWWVz3O8p6q8CpXnOgAaO+1KtxTHOkmJKPkMjTdzJnXyxdTIs9uDyNZIcqwhKZ7vS PMsbXLMhnkM+1yDPLDpogMwg1u2lrVBelX90orH1G6NDTj+SKJxlxj+0TrZHVLEuSmpF 1YhpZj67Mpz1WK99Sydmc+8o4wtxTEvSaxagfl2uRcilFJOQ+1OmuUn5IzXtcz2fMMu+ ZLuHqtacAm4aPeh9CgpJV2pBbnRh05jkGo9G9ncswxud9x1dNMvzB1Ksb5B3ba5AtpD4 /w+FX85EPV4+2nag79REJTbmY5Vd9EtiW8hNGwmJipmANwikMAM91Wugb+wHleb7hBAP 7LRA== X-Gm-Message-State: AKGB3mLLr70fjr6xQ8jbLNZcK6LPmFIb5vUbSEeSQXpBF2u8xJkSapGq n0PRHh6Kbmwge5eqJDG0e2akq/znQ4c= X-Google-Smtp-Source: ACJfBoub8d9iXZJxOhu6Rln//zpkbVXhOIlBvDRs48rYsulrmW8VabcQumNh4pgB2CJg6mETSh+Q1w== X-Received: by 10.99.176.3 with SMTP id h3mr15777649pgf.207.1513450449928; Sat, 16 Dec 2017 10:54:09 -0800 (PST) Received: from ?IPv6:2607:fb90:780a:e3f7:54ab:dadf:d7d3:b76f? ([2607:fb90:780a:e3f7:54ab:dadf:d7d3:b76f]) by smtp.gmail.com with ESMTPSA id 84sm18846764pfp.180.2017.12.16.10.54.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 16 Dec 2017 10:54:09 -0800 (PST) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (1.0) Subject: Re: svn commit: r323304 - stable/11/share/man/man5 From: Ngie Cooper X-Mailer: iPhone Mail (15C114) In-Reply-To: <871sjvgnxh.wl-herbert@mailbox.org> Date: Sat, 16 Dec 2017 10:54:08 -0800 Cc: Ngie Cooper , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <1F39F6D2-97FA-4173-B62D-44B8D95A90A5@gmail.com> References: <201709080451.v884pGhH036463@repo.freebsd.org> <871sjvgnxh.wl-herbert@mailbox.org> To: "Herbert J. Skuhra" 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: Sat, 16 Dec 2017 18:54:11 -0000 > On Dec 15, 2017, at 22:57, Herbert J. Skuhra wrote: >=20 >> On Fri, 08 Sep 2017 06:51:16 +0200, Ngie Cooper wrote: >>=20 >> Author: ngie >> Date: Fri Sep 8 04:51:16 2017 >> New Revision: 323304 >> URL: https://svnweb.freebsd.org/changeset/base/323304 >>=20 >> Log: >> Regenerate src.conf(5) based on recent changes to src.opts.mk, etc. >>=20 >> Modified: >> stable/11/share/man/man5/src.conf.5 >>=20 >> Modified: stable/11/share/man/man5/src.conf.5 >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D >> --- stable/11/share/man/man5/src.conf.5 Fri Sep 8 04:48:25 2017 (r= 323303) >> +++ stable/11/share/man/man5/src.conf.5 Fri Sep 8 04:51:16 2017 (r= 323304) >> @@ -1,6 +1,6 @@ >> .\" DO NOT EDIT-- this file is generated by tools/build/options/makeman. >> .\" $FreeBSD$ >> -.Dd August 16, 2017 >> +.Dd September 7, 2017 >> .Dt SRC.CONF 5 >> .Os >> .Sh NAME >> @@ -1150,6 +1150,12 @@ and remove >> entries. >> .It Va WITHOUT_NLS >> Set to not build NLS catalogs. >> +When set, it enforces these options: >> +.Pp >> +.Bl -item -compact >> +.It >> +.Va WITHOUT_NLS_CATALOGS >> +.El >> .It Va WITHOUT_NLS_CATALOGS >> Set to not build NLS catalog support for >> .Xr csh 1 . >> @@ -1237,6 +1243,42 @@ and related files. >> Set to not build >> .Xr ppp 8 >> and related programs. >> +.It Va WITHOUT_PROFILE >> +Set to not build profiled libraries for use with >> +.Xr gprof 8 . >> +.Pp >> +This is a default setting on >> +mips/mips64el and mips/mips64. >> +.It Va WITH_PROFILE >> +Set to build profiled libraries for use with >> +.Xr gprof 8 . >> +.Pp >> +This is a default setting on >> +amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386, mi= ps/mipsel, mips/mips, mips/mipsn32, pc98/i386, powerpc/powerpc, powerpc/powe= rpc64 and sparc64/sparc64. >> +.It Va WITHOUT_PROFILE >> +Set to not build profiled libraries for use with >> +.Xr gprof 8 . >> +.Pp >> +This is a default setting on >> +mips/mips64el. >> +.It Va WITH_PROFILE >> +Set to build profiled libraries for use with >> +.Xr gprof 8 . >> +.Pp >> +This is a default setting on >> +amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386, mi= ps/mipsel, mips/mips, mips/mips64, mips/mipsn32, pc98/i386, powerpc/powerpc,= powerpc/powerpc64 and sparc64/sparc64. >> +.It Va WITHOUT_PROFILE >> +Set to not build profiled libraries for use with >> +.Xr gprof 8 . >> +.Pp >> +This is a default setting on >> +mips/mips64. >> +.It Va WITH_PROFILE >> +Set to build profiled libraries for use with >> +.Xr gprof 8 . >> +.Pp >> +This is a default setting on >> +amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386, mi= ps/mipsel, mips/mips, mips/mips64el, mips/mipsn32, pc98/i386, powerpc/powerp= c, powerpc/powerpc64 and sparc64/sparc64. >> .It Va WITHOUT_PROFILE >> Set to not build profiled libraries for use with >> .Xr gprof 8 . >=20 > Here something went wrong: multiple (WITH|WITHOUT)_PROFILE entries. Herbert, Please file a bug. Cheers, -Enji PS I=E2=80=99m no longer a committer, so my ability to act on freebsd things= which I=E2=80=99m CCed on is diminished.=