svn commit: r320705 - head/sys/dev/qlxgbe

2017-07-05 Thread David C Somayajulu 
Author: davidcs
Date: Thu Jul  6 05:16:06 2017
New Revision: 320705
URL: https://svnweb.freebsd.org/changeset/base/320705

Log:
  Release mtx hw_lock before calling pause() in qla_stop() and
  qla_error_recovery()
  
  MFC after: 5 days

Modified:
  head/sys/dev/qlxgbe/ql_os.c

Modified: head/sys/dev/qlxgbe/ql_os.c
==
--- head/sys/dev/qlxgbe/ql_os.c Thu Jul  6 04:56:23 2017(r320704)
+++ head/sys/dev/qlxgbe/ql_os.c Thu Jul  6 05:16:06 2017(r320705)
@@ -1519,8 +1519,11 @@ qla_stop(qla_host_t *ha)
 
ha->flags.qla_watchdog_pause = 1;
 
-   while (!ha->qla_watchdog_paused)
+   while (!ha->qla_watchdog_paused) {
+   QLA_UNLOCK(ha);
qla_mdelay(__func__, 1);
+   QLA_LOCK(ha);
+   }
 
ha->flags.qla_interface_up = 0;
 
@@ -1915,7 +1918,10 @@ qla_error_recovery(void *context, int pending)
if (ha->flags.qla_interface_up) {
 
ha->hw.imd_compl = 1;
+
+   QLA_UNLOCK(ha);
qla_mdelay(__func__, 300);
+   QLA_LOCK(ha);
 
ifp->if_drv_flags &= ~(IFF_DRV_OACTIVE | IFF_DRV_RUNNING);
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r320704 - head/sys/mips/atheros

2017-07-05 Thread Adrian Chadd 
Author: adrian
Date: Thu Jul  6 04:56:23 2017
New Revision: 320704
URL: https://svnweb.freebsd.org/changeset/base/320704

Log:
  [ar724x] put in explicit memory barriers now that read/write register no 
longer
  implicitly do them.
  
  They were removed as part of my "fix this to actually work" a few commits
  ago in this file.
  
  Tested:
  
  * AP93, AR7240 + AR9280 PCI

Modified:
  head/sys/mips/atheros/ar724x_pci.c

Modified: head/sys/mips/atheros/ar724x_pci.c
==
--- head/sys/mips/atheros/ar724x_pci.c  Thu Jul  6 04:30:06 2017
(r320703)
+++ head/sys/mips/atheros/ar724x_pci.c  Thu Jul  6 04:56:23 2017
(r320704)
@@ -104,10 +104,12 @@ ar724x_pci_write(uint32_t reg, uint32_t offset, uint32
else
mask = 0x;
 
+   rmb();
val = ATH_READ_REG(reg + (offset & ~3));
val &= ~(mask << shift);
val |= ((data & mask) << shift);
ATH_WRITE_REG(reg + (offset & ~3), val);
+   wmb();
 
dprintf("%s: %#x/%#x addr=%#x, data=%#x(%#x), bytes=%d\n", __func__, 
reg, reg + (offset & ~3), offset, data, val, bytes);
@@ -133,6 +135,7 @@ ar724x_pci_read_config(device_t dev, u_int bus, u_int 
dprintf("%s: tag (%x, %x, %x) reg %d(%d)\n", __func__, bus, slot,
func, reg, bytes);
 
+   rmb();
if ((bus == 0) && (slot == 0) && (func == 0))
data = ATH_READ_REG(AR724X_PCI_CFG_BASE + (reg & ~3));
else
@@ -166,6 +169,9 @@ ar724x_pci_write_config(device_t dev, u_int bus, u_int
 * map is for this device.  Without it, it'll think the memory
 * map is 32 bits wide, the PCI code will then end up thinking
 * the register window is '0' and fail to allocate resources.
+*
+* Note: Test on AR7241/AR7242/AR9344! Those use a WAR value of
+* 0x1000.
 */
if (reg == PCIR_BAR(0) && bytes == 4
&& ar71xx_soc == AR71XX_SOC_AR7240
@@ -284,6 +290,7 @@ ar724x_pci_fixup(device_t dev, long flash_addr, int le
bar0 = ar724x_pci_read_config(dev, 0, 0, 0, PCIR_BAR(0), 4);
 
/* Write temporary BAR0 to map the NIC into a fixed location */
+   /* XXX AR7240: 0x; 7241/7242/9344: 0x1000 */
ar724x_pci_write_config(dev, 0, 0, 0, PCIR_BAR(0),
AR71XX_PCI_MEM_BASE, 4);
 
@@ -299,7 +306,7 @@ ar724x_pci_fixup(device_t dev, long flash_addr, int le
val |= (*cal_data++) << 16;
 
if (bootverbose)
-   printf("0x%08x=0x%04x\n", reg, val);
+   printf("0x%08x=0x%08x\n", reg, val);
 
/* Write eeprom fixup data to device memory */
ATH_WRITE_REG(AR71XX_PCI_MEM_BASE + reg, val);
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r320703 - in head: etc/mtree share/zoneinfo share/zoneinfo/tests

2017-07-05 Thread Ngie Cooper 
Author: ngie
Date: Thu Jul  6 04:30:06 2017
New Revision: 320703
URL: https://svnweb.freebsd.org/changeset/base/320703

Log:
  Add tests to help verify Links functionality for .../contrib/tzdata/backwards
  
  MFC after:1 month
  MFC with: r320702

Added:
  head/share/zoneinfo/tests/
  head/share/zoneinfo/tests/Makefile   (contents, props changed)
  head/share/zoneinfo/tests/backward_test.sh   (contents, props changed)
  head/share/zoneinfo/tests/zoneinfo_common.sh   (contents, props changed)
Modified:
  head/etc/mtree/BSD.tests.dist
  head/share/zoneinfo/Makefile

Modified: head/etc/mtree/BSD.tests.dist
==
--- head/etc/mtree/BSD.tests.dist   Thu Jul  6 04:19:33 2017
(r320702)
+++ head/etc/mtree/BSD.tests.dist   Thu Jul  6 04:30:06 2017
(r320703)
@@ -400,6 +400,8 @@
 ..
 ..
 ..
+zoneinfo
+..
 ..
 sys
 acl

Modified: head/share/zoneinfo/Makefile
==
--- head/share/zoneinfo/MakefileThu Jul  6 04:19:33 2017
(r320702)
+++ head/share/zoneinfo/MakefileThu Jul  6 04:30:06 2017
(r320703)
@@ -131,4 +131,8 @@ afterinstall:
echo "Run tzsetup(8) manually to update /etc/localtime."; \
fi
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=   tests
+.endif
+
 .include 

Added: head/share/zoneinfo/tests/Makefile
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/share/zoneinfo/tests/Makefile  Thu Jul  6 04:30:06 2017
(r320703)
@@ -0,0 +1,20 @@
+# $FreeBSD$
+
+.include 
+
+.PATH: ${SRCTOP}/contrib/tzdata
+
+PACKAGE=   tests
+
+FILESGROUPS+=  TESTFILES
+
+.if ${MK_ZONEINFO_OLD_TIMEZONES_SUPPORT} != "no"
+ATF_TESTS_SH+= backward_test
+TESTFILES+=backward
+.endif
+
+TESTFILES+=zoneinfo_common.sh
+TESTFILESPACKAGE= ${PACKAGE}
+TESTFILESDIR=  ${TESTSDIR}
+
+.include 

Added: head/share/zoneinfo/tests/backward_test.sh
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/share/zoneinfo/tests/backward_test.sh  Thu Jul  6 04:30:06 2017
(r320703)
@@ -0,0 +1,44 @@
+#
+# Copyright (c) 2017 Ngie Cooper 
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#notice, this list of conditions and the following disclaimer in the
+#documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# $FreeBSD$
+
+atf_test_case links
+links_head()
+{
+   atf_set "descr" "Verify Links directives in contrib/tzdata/backward"
+}
+
+links_body()
+{
+   verify_Links $(atf_get_srcdir)/backward
+}
+
+atf_init_test_cases()
+{
+   . "$(dirname "$0")/zoneinfo_common.sh"
+
+   atf_add_test_case links
+}

Added: head/share/zoneinfo/tests/zoneinfo_common.sh
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/share/zoneinfo/tests/zoneinfo_common.shThu Jul  6 04:30:06 
2017(r320703)
@@ -0,0 +1,54 @@
+#!/bin/sh
+#
+# Copyright (c) 2017 Ngie Cooper 
+# 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

svn commit: r320702 - in head: share/mk share/zoneinfo tools/build/options

2017-07-05 Thread Ngie Cooper 
Author: ngie
Date: Thu Jul  6 04:19:33 2017
New Revision: 320702
URL: https://svnweb.freebsd.org/changeset/base/320702

Log:
  Formalize LEAPSECONDS and OLDTIMEZONES in share/zoneinfo/... as
  `MK_ZONEINFO_LEAPSECONDS_SUPPORT == yes` and
  `MK_ZONEINFO_OLD_TIMEZONES_SUPPORT == yes`.
  
  Keep `LEAPSECONDS` and `OLDTIMEZONES` for backwards compatibility,
  but print out a warning notifying users that they should use the new
  variables, in an effort to migrate them to the variables. This is being
  done mostly for automated build tools, etc, that might rely on these
  variables being set. The variables will be removed in the future on
  ^/head, e.g., after ^/stable/12 is cut.
  
  MFC after:  1 month
  Relnotes:   yes
  Reviewed by:  bdrewery
  Differential Revision:D11376

Added:
  head/tools/build/options/WITH_ZONEINFO_LEAPSECONDS_SUPPORT   (contents, props 
changed)
 - copied, changed from r320396, head/tools/build/options/WITHOUT_ZONEINFO
  head/tools/build/options/WITH_ZONEINFO_OLD_TIMEZONES_SUPPORT   (contents, 
props changed)
 - copied, changed from r320396, head/tools/build/options/WITHOUT_ZONEINFO
Modified:
  head/share/mk/src.opts.mk
  head/share/zoneinfo/Makefile

Modified: head/share/mk/src.opts.mk
==
--- head/share/mk/src.opts.mk   Thu Jul  6 04:15:30 2017(r320701)
+++ head/share/mk/src.opts.mk   Thu Jul  6 04:19:33 2017(r320702)
@@ -190,6 +190,8 @@ __DEFAULT_NO_OPTIONS = \
 SHARED_TOOLCHAIN \
 SORT_THREADS \
 SVN \
+ZONEINFO_LEAPSECONDS_SUPPORT \
+ZONEINFO_OLD_TIMEZONES_SUPPORT \
 
 
 #
@@ -385,6 +387,11 @@ MK_AUTHPF:=no
 
 .if ${MK_TESTS} == "no"
 MK_DTRACE_TESTS:= no
+.endif
+
+.if ${MK_ZONEINFO} == "no"
+MK_ZONEINFO_LEAPSECONDS_SUPPORT:= no
+MK_ZONEINFO_OLD_TIMEZONES_SUPPORT:= no
 .endif
 
 .if ${MK_CROSS_COMPILER} == "no"

Modified: head/share/zoneinfo/Makefile
==
--- head/share/zoneinfo/MakefileThu Jul  6 04:15:30 2017
(r320701)
+++ head/share/zoneinfo/MakefileThu Jul  6 04:19:33 2017
(r320702)
@@ -28,12 +28,24 @@
 # $ svn commit # Commit message: "MFV of tzdata2008X"
 #
 
+.include 
+
 CLEANFILES+=   yearistype
 CLEANDIRS+=builddir
 CONTRIBDIR=${SRCTOP}/contrib/tzdata/
 .PATH: ${CONTRIBDIR}
 
 .if defined(LEAPSECONDS)
+.warning "Using backwards compatibility variable for LEAPSECONDS; please use 
WITH_ZONEINFO_LEAPSECONDS_SUPPORT instead"
+MK_ZONEINFO_LEAPSECONDS_SUPPORT= yes
+.endif
+
+.if defined(OLDTIMEZONES)
+.warning "Using backwards compatibility variable for OLDTIMEZONES; please use 
WITH_ZONEINFO_OLD_TIMEZONES_SUPPORT instead"
+MK_ZONEINFO_OLD_TIMEZONES_SUPPORT= yes
+.endif
+
+.if ${MK_ZONEINFO_LEAPSECONDS_SUPPORT} != "no"
 LEAPFILE=  -L ${CONTRIBDIR}leapseconds
 .else
 LEAPFILE=
@@ -43,7 +55,7 @@ TZFILES=  africa antarctica asia australasia etcetera e
factory northamerica southamerica
 POSIXRULES=America/New_York
 
-.if defined(OLDTIMEZONES)
+.if ${MK_ZONEINFO_OLD_TIMEZONES_SUPPORT} != "no"
 TZFILES+=  backward systemv
 .endif
 
@@ -67,7 +79,7 @@ TZBUILDSUBDIRS=   \
Pacific \
SystemV
 
-.if defined(OLDTIMEZONES)
+.if ${MK_ZONEINFO_OLD_TIMEZONES_SUPPORT} != "no"
 TZBUILDSUBDIRS+= US Mexico Chile Canada Brazil
 .endif
 

Copied and modified: head/tools/build/options/WITH_ZONEINFO_LEAPSECONDS_SUPPORT 
(from r320396, head/tools/build/options/WITHOUT_ZONEINFO)
==
--- head/tools/build/options/WITHOUT_ZONEINFO   Tue Jun 27 06:02:50 2017
(r320396, copy source)
+++ head/tools/build/options/WITH_ZONEINFO_LEAPSECONDS_SUPPORT  Thu Jul  6 
04:19:33 2017(r320702)
@@ -1,2 +1,2 @@
 .\" $FreeBSD$
-Set to not build the timezone database.
+Set to build leapsecond information in to the timezone database.

Copied and modified: 
head/tools/build/options/WITH_ZONEINFO_OLD_TIMEZONES_SUPPORT (from r320396, 
head/tools/build/options/WITHOUT_ZONEINFO)
==
--- head/tools/build/options/WITHOUT_ZONEINFO   Tue Jun 27 06:02:50 2017
(r320396, copy source)
+++ head/tools/build/options/WITH_ZONEINFO_OLD_TIMEZONES_SUPPORTThu Jul 
 6 04:19:33 2017(r320702)
@@ -1,2 +1,3 @@
 .\" $FreeBSD$
-Set to not build the timezone database.
+Set to build backward compatibility timezone aliases in to the timezone
+database.
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r320701 - in head: bin sbin usr.bin usr.sbin

2017-07-05 Thread Ngie Cooper 
Author: ngie
Date: Thu Jul  6 04:15:30 2017
New Revision: 320701
URL: https://svnweb.freebsd.org/changeset/base/320701

Log:
  Remove SUBDIR ordering/uniquifying in *bin/Makefile
  
  After the addition of SUBDIR.yes, uniquifying/ordering the SUBDIRs doesn't
  make a whole lot of sense, and it's in effect a half measure.
  
  Ordering SUBDIR (after adding SUBDIR.yes to it) in bsd.subdir.mk is a
  separate change that warrants more discussion/testing, because while
  the SUBDIR_PARALLEL work largely fixed dependency ordering for SUBDIRs,
  there might be downstream FreeBSD consumers that rely on the SUBDIR
  ordering.
  
  MFC after:2 months
  Reviewed by:  bdrewery
  Differential Revision:D11398

Modified:
  head/bin/Makefile
  head/sbin/Makefile
  head/usr.bin/Makefile
  head/usr.sbin/Makefile

Modified: head/bin/Makefile
==
--- head/bin/Makefile   Thu Jul  6 04:06:25 2017(r320700)
+++ head/bin/Makefile   Thu Jul  6 04:15:30 2017(r320701)
@@ -47,8 +47,6 @@ SUBDIR.${MK_TESTS}+=  tests
 
 .include 
 
-SUBDIR:=   ${SUBDIR:O}
-
 SUBDIR_PARALLEL=
 
 .include 

Modified: head/sbin/Makefile
==
--- head/sbin/Makefile  Thu Jul  6 04:06:25 2017(r320700)
+++ head/sbin/Makefile  Thu Jul  6 04:15:30 2017(r320701)
@@ -93,8 +93,6 @@ SUBDIR.${MK_TESTS}+=  tests
 
 .include 
 
-SUBDIR:=   ${SUBDIR:O}
-
 SUBDIR_PARALLEL=
 
 .include 

Modified: head/usr.bin/Makefile
==
--- head/usr.bin/Makefile   Thu Jul  6 04:06:25 2017(r320700)
+++ head/usr.bin/Makefile   Thu Jul  6 04:15:30 2017(r320701)
@@ -306,8 +306,6 @@ SUBDIR+=mkesdb_static
 
 .include 
 
-SUBDIR:=   ${SUBDIR:O:u}
-
 SUBDIR_PARALLEL=
 
 .include 

Modified: head/usr.sbin/Makefile
==
--- head/usr.sbin/Makefile  Thu Jul  6 04:06:25 2017(r320700)
+++ head/usr.sbin/Makefile  Thu Jul  6 04:15:30 2017(r320701)
@@ -218,8 +218,6 @@ SUBDIR.${MK_TESTS}+=tests
 
 .include 
 
-SUBDIR:=   ${SUBDIR:O}
-
 SUBDIR_PARALLEL=
 
 .include 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r320700 - head/sys/mips/conf

2017-07-05 Thread Adrian Chadd 
Author: adrian
Date: Thu Jul  6 04:06:25 2017
New Revision: 320700
URL: https://svnweb.freebsd.org/changeset/base/320700

Log:
  [ar71xx] Start migrating the AR934x based boards over to the new world order.
  
  This unifies the PCI hints with the AHB/NOR hint syntax.
  
  Tested:
  
  * DIR825C1, AR9344 SoC / 2x2 2G + AR9580 PCI 2x2 5G

Modified:
  head/sys/mips/conf/AR934X_BASE.hints
  head/sys/mips/conf/std.AR934X

Modified: head/sys/mips/conf/AR934X_BASE.hints
==
--- head/sys/mips/conf/AR934X_BASE.hintsThu Jul  6 04:03:21 2017
(r320699)
+++ head/sys/mips/conf/AR934X_BASE.hintsThu Jul  6 04:06:25 2017
(r320700)
@@ -9,6 +9,10 @@
 hint.apb.0.at="nexus0"
 hint.apb.0.irq=4
 
+# ART calibration data mapping device
+hint.ar71xx_caldata.0.at="nexus0"
+hint.ar71xx_caldata.0.order=0
+
 # uart0
 hint.uart.0.at="apb0"
 # NB: This isn't an ns8250 UART
@@ -46,6 +50,13 @@ hint.ath.0.device_id=0x0031
 # Set this to define where the ath calibration data
 # should be fetched from in physical memory.
 # hint.ath.0.eepromaddr=0x1fff1000
+
+# Where the ART is - last 64k in the first 8MB of flash
+#hint.ar71xx_caldata.0.map.0.ath_fixup_addr=0x1fff
+#hint.ar71xx_caldata.0.map.0.ath_fixup_size=16384
+
+# And now tell the ath(4) driver where to look!
+#hint.ath.0.eeprom_firmware="ar71xx_caldata.0.map.0.eeprom_firmware"
 
 # SPI flash
 hint.spi.0.at="nexus0"

Modified: head/sys/mips/conf/std.AR934X
==
--- head/sys/mips/conf/std.AR934X   Thu Jul  6 04:03:21 2017
(r320699)
+++ head/sys/mips/conf/std.AR934X   Thu Jul  6 04:06:25 2017
(r320700)
@@ -51,7 +51,16 @@ options  NO_FFS_SNAPSHOT # We don't require 
snapshot 
 include"std.AR_MIPS_BASE"
 makeoptionsMODULES_OVERRIDE+="hwpmc_mips24k"
 
+# EEPROM caldata for AHB connected device
+optionsAR71XX_ATH_EEPROM
+device ar71xx_caldata
+device firmware
+
+# Support AR9340 support in AR9300 HAL
 optionsAH_SUPPORT_AR9340
+
+# Support EEPROM caldata in AHB devices
+optionsATH_EEPROM_FIRMWARE
 
 device pci
 device ar724x_pci
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r320698 - head/sys/fs/nfs

2017-07-05 Thread Rick Macklem 
Author: rmacklem
Date: Thu Jul  6 00:53:12 2017
New Revision: 320698
URL: https://svnweb.freebsd.org/changeset/base/320698

Log:
  Add support for AF_LOCAL socket upcalls to the nfsuserd daemon.
  
  This patch adds support for AF_LOCAL socket upcalls to an nfsuserd daemon
  that supports them. A future patch to the nfsuserd daemon will use AF_LOCAL
  sockets to avoid a problem when using upcalls to 127.0.0.1 if jails are
  in use.
  
  Suggested by: dfr
  PR:   205193

Modified:
  head/sys/fs/nfs/nfs_commonkrpc.c
  head/sys/fs/nfs/nfs_commonport.c
  head/sys/fs/nfs/nfs_commonsubs.c
  head/sys/fs/nfs/nfs_var.h

Modified: head/sys/fs/nfs/nfs_commonkrpc.c
==
--- head/sys/fs/nfs/nfs_commonkrpc.cThu Jul  6 00:43:43 2017
(r320697)
+++ head/sys/fs/nfs/nfs_commonkrpc.cThu Jul  6 00:53:12 2017
(r320698)
@@ -199,6 +199,8 @@ newnfs_connect(struct nfsmount *nmp, struct nfssockreq
nconf = getnetconfigent("udp");
else
nconf = getnetconfigent("tcp");
+   else if (saddr->sa_family == AF_LOCAL)
+   nconf = getnetconfigent("local");
else
if (nrp->nr_sotype == SOCK_DGRAM)
nconf = getnetconfigent("udp6");

Modified: head/sys/fs/nfs/nfs_commonport.c
==
--- head/sys/fs/nfs/nfs_commonport.cThu Jul  6 00:43:43 2017
(r320697)
+++ head/sys/fs/nfs/nfs_commonport.cThu Jul  6 00:53:12 2017
(r320698)
@@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$");
  */
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -618,11 +619,30 @@ nfssvc_call(struct thread *p, struct nfssvc_args *uap,
goto out;
} else if (uap->flag & NFSSVC_NFSUSERDPORT) {
u_short sockport;
+   struct sockaddr *sad;
+   struct sockaddr_un *sun;
 
-   error = copyin(uap->argp, (caddr_t),
-   sizeof (u_short));
-   if (!error)
-   error = nfsrv_nfsuserdport(sockport, p);
+   if ((uap->flag & NFSSVC_NEWSTRUCT) != 0) {
+   /* New nfsuserd using an AF_LOCAL socket. */
+   sun = malloc(sizeof(struct sockaddr_un), M_SONAME,
+   M_WAITOK | M_ZERO);
+   error = copyinstr(uap->argp, sun->sun_path,
+   sizeof(sun->sun_path), NULL);
+   if (error != 0) {
+   free(sun, M_SONAME);
+   return (error);
+   }
+   sun->sun_family = AF_LOCAL;
+   sun->sun_len = SUN_LEN(sun);
+   sockport = 0;
+   sad = (struct sockaddr *)sun;
+   } else {
+   error = copyin(uap->argp, (caddr_t),
+   sizeof (u_short));
+   sad = NULL;
+   }
+   if (error == 0)
+   error = nfsrv_nfsuserdport(sad, sockport, p);
} else if (uap->flag & NFSSVC_NFSUSERDDELPORT) {
nfsrv_nfsuserddelport();
error = 0;

Modified: head/sys/fs/nfs/nfs_commonsubs.c
==
--- head/sys/fs/nfs/nfs_commonsubs.cThu Jul  6 00:43:43 2017
(r320697)
+++ head/sys/fs/nfs/nfs_commonsubs.cThu Jul  6 00:53:12 2017
(r320698)
@@ -3052,7 +3052,7 @@ nfsrv_cmpmixedcase(u_char *cp, u_char *cp2, int len)
  * Set the port for the nfsuserd.
  */
 APPLESTATIC int
-nfsrv_nfsuserdport(u_short port, NFSPROC_T *p)
+nfsrv_nfsuserdport(struct sockaddr *sad, u_short port, NFSPROC_T *p)
 {
struct nfssockreq *rp;
struct sockaddr_in *ad;
@@ -3062,6 +3062,7 @@ nfsrv_nfsuserdport(u_short port, NFSPROC_T *p)
if (nfsrv_nfsuserd) {
NFSUNLOCKNAMEID();
error = EPERM;
+   NFSSOCKADDRFREE(sad);
goto out;
}
nfsrv_nfsuserd = 1;
@@ -3071,16 +3072,24 @@ nfsrv_nfsuserdport(u_short port, NFSPROC_T *p)
 */
rp = _nfsuserdsock;
rp->nr_client = NULL;
-   rp->nr_sotype = SOCK_DGRAM;
-   rp->nr_soproto = IPPROTO_UDP;
-   rp->nr_lock = (NFSR_RESERVEDPORT | NFSR_LOCALHOST);
rp->nr_cred = NULL;
-   NFSSOCKADDRALLOC(rp->nr_nam);
-   NFSSOCKADDRSIZE(rp->nr_nam, sizeof (struct sockaddr_in));
-   ad = NFSSOCKADDR(rp->nr_nam, struct sockaddr_in *);
-   ad->sin_family = AF_INET;
-   ad->sin_addr.s_addr = htonl((u_int32_t)0x7f01); /* 127.0.0.1 */
-   ad->sin_port = port;
+   rp->nr_lock = (NFSR_RESERVEDPORT | NFSR_LOCALHOST);
+   if (sad != NULL) {
+   /* Use the AF_LOCAL socket address passed in. */
+

Re: svn commit: r320644 - in head: bin/rcp libexec/rlogind libexec/rshd usr.bin/rlogin usr.bin/rsh usr.bin/ruptime usr.bin/rwho usr.sbin/rwhod

2017-07-05 Thread Cy Schubert 
In message <201707052040.v65keuru056...@pdx.rh.cn85.dnsmgr.net>, "Rodney W. 
Gri
mes" writes:
> > writes:
> > > Author: allanjude
> > > Date: Tue Jul  4 15:44:30 2017
> > > New Revision: 320644
> > > URL: https://svnweb.freebsd.org/changeset/base/320644
> > > 
> > > Log:
> > >   Add deprecation notices for all rcmd tools
> > >   
> > >   Submitted by:   bcr
> > >   Reviewed by:emaste, bapt, jhl
> > >   MFC after:  immediate
> > >   Relnotes:   yes
> > >   Differential Revision:  https://reviews.freebsd.org/D11471
> > > 
> > > Modified:
> > >   head/bin/rcp/rcp.1
> > >   head/libexec/rlogind/rlogind.8
> > >   head/libexec/rshd/rshd.8
> > >   head/usr.bin/rlogin/rlogin.1
> > >   head/usr.bin/rsh/rsh.1
> > >   head/usr.bin/ruptime/ruptime.1
> > >   head/usr.bin/rwho/rwho.1
> > >   head/usr.sbin/rwhod/rwhod.8
> > > 
> > 
> > I'll go ahead and create a legacy port in the same vein as rdist, uucp, and
>  
> > other retired FreeBSD software.
> > 
> > My plan is to create a local git repo which can either be downloaded 
> > directly by the port and checked out into $WRKDIR directly or host it on 
> > github.
> > 
> > The port should probably include a warning to use Kerberos or SSH instead.
> > 
> > I haven't figured out how to clone cherrypicked bits from svn to git 
> > (though cloning a complete svn repo is easy).
> 
> I believe this has already been done in ports/*/bsdrcmds

ok, good stuff. Thanks for the update.


-- 
Cheers,
Cy Schubert 
FreeBSD UNIX:     Web:  http://www.FreeBSD.org

The need of the many outweighs the greed of the few.


___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r320644 - in head: bin/rcp libexec/rlogind libexec/rshd usr.bin/rlogin usr.bin/rsh usr.bin/ruptime usr.bin/rwho usr.sbin/rwhod

2017-07-05 Thread Rodney W. Grimes 
> writes:
> > Author: allanjude
> > Date: Tue Jul  4 15:44:30 2017
> > New Revision: 320644
> > URL: https://svnweb.freebsd.org/changeset/base/320644
> > 
> > Log:
> >   Add deprecation notices for all rcmd tools
> >   
> >   Submitted by: bcr
> >   Reviewed by:  emaste, bapt, jhl
> >   MFC after:immediate
> >   Relnotes: yes
> >   Differential Revision:https://reviews.freebsd.org/D11471
> > 
> > Modified:
> >   head/bin/rcp/rcp.1
> >   head/libexec/rlogind/rlogind.8
> >   head/libexec/rshd/rshd.8
> >   head/usr.bin/rlogin/rlogin.1
> >   head/usr.bin/rsh/rsh.1
> >   head/usr.bin/ruptime/ruptime.1
> >   head/usr.bin/rwho/rwho.1
> >   head/usr.sbin/rwhod/rwhod.8
> > 
> 
> I'll go ahead and create a legacy port in the same vein as rdist, uucp, and 
> other retired FreeBSD software.
> 
> My plan is to create a local git repo which can either be downloaded 
> directly by the port and checked out into $WRKDIR directly or host it on 
> github.
> 
> The port should probably include a warning to use Kerberos or SSH instead.
> 
> I haven't figured out how to clone cherrypicked bits from svn to git 
> (though cloning a complete svn repo is easy).

I believe this has already been done in ports/*/bsdrcmds


-- 
Rod Grimes rgri...@freebsd.org
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r320674 - head/usr.sbin/bsdinstall/scripts

2017-07-05 Thread Bartek Rutkowski 

> There are two options '9' now
> 
> -- 
> Renato Botelho

Yes, I am aware of it, something in my merge must have go wrong. I'll fix it 
first thing in the morning, because I've had a long day and I don't want to 
cause any more issues. If someone else feels like correcting it in meantime - 
you're more than welcome.

Kind regards,
Bartek Rutkowski
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r320674 - head/usr.sbin/bsdinstall/scripts

2017-07-05 Thread Bartek Rutkowski 

> On 5 Jul 2017, at 21:05, Konstantin Belousov  wrote:
> 
> On Wed, Jul 05, 2017 at 08:52:37PM +0100, Bartek Rutkowski wrote:
>> 
>>> On 5 Jul 2017, at 18:15, Konstantin Belousov  wrote:
>>> 
>>> On Wed, Jul 05, 2017 at 01:37:27PM +, Bartek Rutkowski wrote:
 This patch adds new bsdinstall option to hardening section that allows 
 users
 to change this behaviour to secure one and updates stack guard option so it
 would set the value of relevant sysctl to 512 (2MB)
>>> What ?!
>> 
>> What 'What?!'?
> 
> This is absurd change.  You are tweaking knobs which you have no idea about,
> and you did not tested this.

I welcome any constructive criticism, explanations, explanations. Feel free to 
send them anytime - discussing in such tone makes you less likely to be given 
proper attention.

Kind regards,
Bartek Rutkowski

___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r320674 - head/usr.sbin/bsdinstall/scripts

2017-07-05 Thread Konstantin Belousov 
On Wed, Jul 05, 2017 at 08:52:37PM +0100, Bartek Rutkowski wrote:
> 
> > On 5 Jul 2017, at 18:15, Konstantin Belousov  wrote:
> > 
> > On Wed, Jul 05, 2017 at 01:37:27PM +, Bartek Rutkowski wrote:
> >>  This patch adds new bsdinstall option to hardening section that allows 
> >> users
> >>  to change this behaviour to secure one and updates stack guard option so 
> >> it
> >>  would set the value of relevant sysctl to 512 (2MB)
> > What ?!
> 
> What 'What?!'?

This is absurd change.  You are tweaking knobs which you have no idea about,
and you did not tested this.
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r320644 - in head: bin/rcp libexec/rlogind libexec/rshd usr.bin/rlogin usr.bin/rsh usr.bin/ruptime usr.bin/rwho usr.sbin/rwhod

2017-07-05 Thread Cy Schubert 
In message <201707041544.v64fiu3k078...@repo.freebsd.org>, Allan Jude 
writes:
> Author: allanjude
> Date: Tue Jul  4 15:44:30 2017
> New Revision: 320644
> URL: https://svnweb.freebsd.org/changeset/base/320644
> 
> Log:
>   Add deprecation notices for all rcmd tools
>   
>   Submitted by:   bcr
>   Reviewed by:emaste, bapt, jhl
>   MFC after:  immediate
>   Relnotes:   yes
>   Differential Revision:  https://reviews.freebsd.org/D11471
> 
> Modified:
>   head/bin/rcp/rcp.1
>   head/libexec/rlogind/rlogind.8
>   head/libexec/rshd/rshd.8
>   head/usr.bin/rlogin/rlogin.1
>   head/usr.bin/rsh/rsh.1
>   head/usr.bin/ruptime/ruptime.1
>   head/usr.bin/rwho/rwho.1
>   head/usr.sbin/rwhod/rwhod.8
> 

I'll go ahead and create a legacy port in the same vein as rdist, uucp, and 
other retired FreeBSD software.

My plan is to create a local git repo which can either be downloaded 
directly by the port and checked out into $WRKDIR directly or host it on 
github.

The port should probably include a warning to use Kerberos or SSH instead.

I haven't figured out how to clone cherrypicked bits from svn to git 
(though cloning a complete svn repo is easy).


-- 
Cheers,
Cy Schubert 
FreeBSD UNIX:     Web:  http://www.FreeBSD.org

The need of the many outweighs the greed of the few.


___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r320696 - head/etc/rc.d

2017-07-05 Thread Kristof Provost 
Author: kp
Date: Wed Jul  5 20:00:58 2017
New Revision: 320696
URL: https://svnweb.freebsd.org/changeset/base/320696

Log:
  Allow ipsec to run in vnet jails
  
  ipsec is usable in vnet jails, so allow it to run there.
  
  PR:   211364
  Submitted by: Matthias Meyser 

Modified:
  head/etc/rc.d/ipsec

Modified: head/etc/rc.d/ipsec
==
--- head/etc/rc.d/ipsec Wed Jul  5 19:43:16 2017(r320695)
+++ head/etc/rc.d/ipsec Wed Jul  5 20:00:58 2017(r320696)
@@ -6,7 +6,7 @@
 # PROVIDE: ipsec
 # REQUIRE: FILESYSTEMS
 # BEFORE:  DAEMON mountcritremote
-# KEYWORD: nojail
+# KEYWORD: nojailvnet
 
 . /etc/rc.subr
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r320674 - head/usr.sbin/bsdinstall/scripts

2017-07-05 Thread Bartek Rutkowski 

> On 5 Jul 2017, at 18:15, Konstantin Belousov  wrote:
> 
> On Wed, Jul 05, 2017 at 01:37:27PM +, Bartek Rutkowski wrote:
>>  This patch adds new bsdinstall option to hardening section that allows users
>>  to change this behaviour to secure one and updates stack guard option so it
>>  would set the value of relevant sysctl to 512 (2MB)
> What ?!

What 'What?!'?

Kind regards,
Bartek Rutkowski
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r320692 - head

2017-07-05 Thread Conrad Meyer 
On Wed, Jul 5, 2017 at 12:24 PM, Bryan Drewery  wrote:
> Author: bdrewery
> Date: Wed Jul  5 19:24:38 2017
> New Revision: 320692
> URL: https://svnweb.freebsd.org/changeset/base/320692
>
> Log:
>   Fix create-kernel-packages with multiple BUILDKERNELS after r320284
>
>   Submitted by: Kyle Evans 

Now: kev...@freebsd.org :-)
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r320695 - head/sys/conf

2017-07-05 Thread Bryan Drewery 
Author: bdrewery
Date: Wed Jul  5 19:43:16 2017
New Revision: 320695
URL: https://svnweb.freebsd.org/changeset/base/320695

Log:
  Fix out-of-tree kernel builds after r320275 when bsd.linker.mk not yet 
installed.
  
  Submitted by: bde

Modified:
  head/sys/conf/kern.pre.mk
  head/sys/conf/kmod.mk

Modified: head/sys/conf/kern.pre.mk
==
--- head/sys/conf/kern.pre.mk   Wed Jul  5 19:25:09 2017(r320694)
+++ head/sys/conf/kern.pre.mk   Wed Jul  5 19:43:16 2017(r320695)
@@ -114,7 +114,7 @@ DEFINED_PROF=   ${PROF}
 # can override the others.
 CFLAGS+=   ${CONF_CFLAGS}
 
-.if ${LINKER_FEATURES:Mbuild-id}
+.if defined(LINKER_FEATURES) && ${LINKER_FEATURES:Mbuild-id}
 LDFLAGS+=  -Wl,--build-id=sha1
 .endif
 

Modified: head/sys/conf/kmod.mk
==
--- head/sys/conf/kmod.mk   Wed Jul  5 19:25:09 2017(r320694)
+++ head/sys/conf/kmod.mk   Wed Jul  5 19:43:16 2017(r320695)
@@ -125,7 +125,7 @@ CFLAGS.gcc+= --param large-function-growth=1000
 CFLAGS+=   -fno-common
 LDFLAGS+=  -d -warn-common
 
-.if ${LINKER_FEATURES:Mbuild-id}
+.if defined(LINKER_FEATURES) && ${LINKER_FEATURES:Mbuild-id}
 LDFLAGS+=  -Wl,--build-id=sha1
 .endif
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r320284 - head

2017-07-05 Thread Bryan Drewery 
On 6/26/17 3:34 PM, Ngie Cooper wrote:
> On Mon, Jun 26, 2017 at 12:37 PM, Kyle Evans  wrote:
>> Hi,
>>
>> This broke my setup that builds my 7 different kernels due to duplicate
>> target errors. This seems to do what I want:
>> https://files.kyle-evans.net/freebsd/fix-packages.diff =)
> 
> :ShipIt:!
> 

Thanks, committed.

-- 
Regards,
Bryan Drewery



signature.asc
Description: OpenPGP digital signature

Re: svn commit: r320674 - head/usr.sbin/bsdinstall/scripts

2017-07-05 Thread Renato Botelho 
On 05/07/17 10:37, Bartek Rutkowski wrote:
> Author: robak (ports committer)
> Date: Wed Jul  5 13:37:27 2017
> New Revision: 320674
> URL: https://svnweb.freebsd.org/changeset/base/320674
> 
> Log:
>   Add option to bsdinstall to disable insecure console, update stack guard 
> option
>   
>   This patch adds new bsdinstall option to hardening section that allows users
>   to change this behaviour to secure one and updates stack guard option so it
>   would set the value of relevant sysctl to 512 (2MB)
>   
>   Submitted by:   Bartek Rutkowski
>   Reviewed by:adrian, bapt, emaste
>   Approved by:bapt, emaste
>   MFC after:  1 day
>   Sponsored by:   Pixeware LTD
>   Differential Revision:  https://reviews.freebsd.org/D9700
> 
> Modified:
>   head/usr.sbin/bsdinstall/scripts/config
>   head/usr.sbin/bsdinstall/scripts/hardening
> 
> Modified: head/usr.sbin/bsdinstall/scripts/config
> ==
> --- head/usr.sbin/bsdinstall/scripts/config   Wed Jul  5 13:13:38 2017
> (r320673)
> +++ head/usr.sbin/bsdinstall/scripts/config   Wed Jul  5 13:37:27 2017
> (r320674)
> @@ -35,6 +35,11 @@ rm $BSDINSTALL_TMPETC/rc.conf.*
>  cat $BSDINSTALL_CHROOT/etc/sysctl.conf $BSDINSTALL_TMPETC/sysctl.conf.* >> 
> $BSDINSTALL_TMPETC/sysctl.conf
>  rm $BSDINSTALL_TMPETC/sysctl.conf.*
>  
> +if [ -f $BSDINSTALL_TMPTEC/ttys.hardening ]; then
> + cat $BSDINSTALL_TMPTEC/ttys.hardening > $BSDINSTALL_TMPTEC/ttys
> + rm $BSDINSTALL_TMPTEC/ttys.hardening
> +fi
> +
>  cp $BSDINSTALL_TMPETC/* $BSDINSTALL_CHROOT/etc
>  
>  cat $BSDINSTALL_TMPBOOT/loader.conf.* >> $BSDINSTALL_TMPBOOT/loader.conf
> 
> Modified: head/usr.sbin/bsdinstall/scripts/hardening
> ==
> --- head/usr.sbin/bsdinstall/scripts/hardeningWed Jul  5 13:13:38 
> 2017(r320673)
> +++ head/usr.sbin/bsdinstall/scripts/hardeningWed Jul  5 13:37:27 
> 2017(r320674)
> @@ -42,10 +42,11 @@ FEATURES=$( dialog --backtitle "FreeBSD Installer" \
>   "3 read_msgbuf" "Disable reading kernel message buffer for unprivileged 
> users" ${read_msgbuf:-off} \
>   "4 proc_debug" "Disable process debugging facilities for unprivileged 
> users" ${proc_debug:-off} \
>   "5 random_pid" "Randomize the PID of newly created processes" 
> ${random_pid:-off} \
> - "6 stack_guard" "Insert stack guard page ahead of the growable 
> segments" ${stack_guard:-off} \
> + "6 stack_guard" "Set stack guard buffer size to 2MB" 
> ${stack_guard:-off} \
>   "7 clear_tmp" "Clean the /tmp filesystem on system startup" 
> ${clear_tmp:-off} \
>   "8 disable_syslogd" "Disable opening Syslogd network socket (disables 
> remote logging)" ${disable_syslogd:-off} \
>   "9 disable_sendmail" "Disable Sendmail service" 
> ${disable_sendmail:-off} \
> + "9 secure_console" "Enable console password prompt" 
> ${secure_console:-off} \

There are two options '9' now

-- 
Renato Botelho
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r320688 - in head/sys: conf dev/ixgbe modules/ix modules/ixv

2017-07-05 Thread Eric Joyner 
Author: erj
Date: Wed Jul  5 17:27:03 2017
New Revision: 320688
URL: https://svnweb.freebsd.org/changeset/base/320688

Log:
  ixgbe(4): Update HEAD (p3) to 3.2.12-k
  
  Includes:
  
  - Support for X550EM devices.
  - Support for Bypass adapters.
  - Flow Director code moved to separate files
  - SR-IOV code moved to separate files
  - Netmap code moved to separate files
  
  Differential Revision:https://reviews.freebsd.org/D11232
  Submitted by: Jeb Cramer 
  Reviewed by:  erj@
  Tested by:Jeff Pieper 
  Sponsored by: Intel Corporation

Added:
  head/sys/dev/ixgbe/if_bypass.c   (contents, props changed)
  head/sys/dev/ixgbe/if_fdir.c   (contents, props changed)
  head/sys/dev/ixgbe/if_sriov.c   (contents, props changed)
  head/sys/dev/ixgbe/ixgbe_bypass.h   (contents, props changed)
  head/sys/dev/ixgbe/ixgbe_fdir.h   (contents, props changed)
  head/sys/dev/ixgbe/ixgbe_features.h   (contents, props changed)
  head/sys/dev/ixgbe/ixgbe_netmap.c   (contents, props changed)
  head/sys/dev/ixgbe/ixgbe_netmap.h   (contents, props changed)
  head/sys/dev/ixgbe/ixgbe_rss.h   (contents, props changed)
  head/sys/dev/ixgbe/ixgbe_sriov.h   (contents, props changed)
Modified:
  head/sys/conf/files
  head/sys/dev/ixgbe/if_ix.c
  head/sys/dev/ixgbe/if_ixv.c
  head/sys/dev/ixgbe/ix_txrx.c
  head/sys/dev/ixgbe/ixgbe.h
  head/sys/dev/ixgbe/ixgbe_82598.c
  head/sys/dev/ixgbe/ixgbe_82598.h
  head/sys/dev/ixgbe/ixgbe_82599.c
  head/sys/dev/ixgbe/ixgbe_82599.h
  head/sys/dev/ixgbe/ixgbe_api.c
  head/sys/dev/ixgbe/ixgbe_api.h
  head/sys/dev/ixgbe/ixgbe_common.c
  head/sys/dev/ixgbe/ixgbe_common.h
  head/sys/dev/ixgbe/ixgbe_dcb.c
  head/sys/dev/ixgbe/ixgbe_dcb.h
  head/sys/dev/ixgbe/ixgbe_dcb_82598.c
  head/sys/dev/ixgbe/ixgbe_dcb_82598.h
  head/sys/dev/ixgbe/ixgbe_dcb_82599.c
  head/sys/dev/ixgbe/ixgbe_dcb_82599.h
  head/sys/dev/ixgbe/ixgbe_mbx.c
  head/sys/dev/ixgbe/ixgbe_mbx.h
  head/sys/dev/ixgbe/ixgbe_osdep.c
  head/sys/dev/ixgbe/ixgbe_osdep.h
  head/sys/dev/ixgbe/ixgbe_phy.c
  head/sys/dev/ixgbe/ixgbe_phy.h
  head/sys/dev/ixgbe/ixgbe_type.h
  head/sys/dev/ixgbe/ixgbe_vf.c
  head/sys/dev/ixgbe/ixgbe_vf.h
  head/sys/dev/ixgbe/ixgbe_x540.c
  head/sys/dev/ixgbe/ixgbe_x540.h
  head/sys/dev/ixgbe/ixgbe_x550.c
  head/sys/dev/ixgbe/ixgbe_x550.h
  head/sys/modules/ix/Makefile
  head/sys/modules/ixv/Makefile

Modified: head/sys/conf/files
==
--- head/sys/conf/files Wed Jul  5 17:06:29 2017(r320687)
+++ head/sys/conf/files Wed Jul  5 17:27:03 2017(r320688)
@@ -2130,6 +2130,14 @@ dev/ixgbe/if_ix.coptional ix inet \
compile-with "${NORMAL_C} -I$S/dev/ixgbe -DSMP"
 dev/ixgbe/if_ixv.c optional ixv inet \
compile-with "${NORMAL_C} -I$S/dev/ixgbe -DSMP"
+dev/ixgbe/if_bypass.c  optional ix inet \
+   compile-with "${NORMAL_C} -I$S/dev/ixgbe"
+dev/ixgbe/ixgbe_netmap.c   optional ix inet \
+   compile-with "${NORMAL_C} -I$S/dev/ixgbe"
+dev/ixgbe/if_fdir.coptional ix inet | ixv inet \
+   compile-with "${NORMAL_C} -I$S/dev/ixgbe"
+dev/ixgbe/if_sriov.c   optional ix inet | ixv inet \
+   compile-with "${NORMAL_C} -I$S/dev/ixgbe"
 dev/ixgbe/ix_txrx.coptional ix inet | ixv inet \
compile-with "${NORMAL_C} -I$S/dev/ixgbe"
 dev/ixgbe/ixgbe_osdep.coptional ix inet | ixv inet \

Added: head/sys/dev/ixgbe/if_bypass.c
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/sys/dev/ixgbe/if_bypass.c  Wed Jul  5 17:27:03 2017
(r320688)
@@ -0,0 +1,808 @@
+/**
+
+  Copyright (c) 2001-2017, Intel 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.
+
+   3. Neither the name of the Intel Corporation nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+  LIABLE FOR ANY DIRECT, INDIRECT,

Re: svn commit: r320674 - head/usr.sbin/bsdinstall/scripts

2017-07-05 Thread Konstantin Belousov 
On Wed, Jul 05, 2017 at 01:37:27PM +, Bartek Rutkowski wrote:
>   This patch adds new bsdinstall option to hardening section that allows users
>   to change this behaviour to secure one and updates stack guard option so it
>   would set the value of relevant sysctl to 512 (2MB)
What ?!
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r320686 - head/release

2017-07-05 Thread Glen Barber 
Author: gjb
Date: Wed Jul  5 16:55:45 2017
New Revision: 320686
URL: https://svnweb.freebsd.org/changeset/base/320686

Log:
  Fix the ftp-stage target for RPI3 images by loosening the
  constraints on the TARGET and TARGET_ARCH variables.
  
  MFC after:3 days
  Sponsored by: The FreeBSD Foundation

Modified:
  head/release/Makefile.mirrors

Modified: head/release/Makefile.mirrors
==
--- head/release/Makefile.mirrors   Wed Jul  5 16:39:29 2017
(r320685)
+++ head/release/Makefile.mirrors   Wed Jul  5 16:55:45 2017
(r320686)
@@ -21,7 +21,7 @@ STAGE_TARGETS?=   iso-images-stage
 .endif
 
 .if (defined(EMBEDDED_TARGET) && !empty(EMBEDDED_TARGET)) || 
(defined(EMBEDDEDBUILD) && !empty(EMBEDDEDBUILD))
-. if ${TARGET} == "arm" || ${EMBEDDED_TARGET} == "arm"
+. if ${TARGET:Marm*} != "" || ${EMBEDDED_TARGET:Marm*} != ""
 EMBEDDED=  1
 . endif
 .endif
@@ -57,7 +57,7 @@ TLD?= ${FTPDIR}/releases
 .endif
 
 .if defined(EMBEDDED) && !empty(EMBEDDED)
-. if ${TARGET} == "arm" && ${TARGET_ARCH} == "armv6"
+. if ${TARGET:Marm*} != "" && (${TARGET_ARCH} == "armv6" || ${TARGET_ARCH} == 
"aarch64")
 .  if !defined(BOARDNAME) && empty(BOARDNAME)
 BOARDNAME:=${KERNCONF}
 .  else
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r320683 - head/usr.sbin/diskinfo

2017-07-05 Thread Alexander Motin 
Author: mav
Date: Wed Jul  5 16:20:22 2017
New Revision: 320683
URL: https://svnweb.freebsd.org/changeset/base/320683

Log:
  Add naive benchmark for SSDs in ZFS SLOG role.
  
  ZFS SLOGs have very specific access pattern with many cache flushes,
  which none of benchmarks I know can simulate.  Since SSD vendors rarely
  specify cache flush time, this measurement can be useful to explain why
  some ZFS pools are slower then expected.  This test writes data chunks
  of different size followed by cache flush, alike to what ZFS SLOG does,
  and measures average time.
  
  To illustrate, here is result for 6 years old SATA Intel 710 Series SSD:
  
  Synchronous random writes:
   0.5 kbytes:138.3 usec/IO =  3.5 Mbytes/s
 1 kbytes:137.7 usec/IO =  7.1 Mbytes/s
 2 kbytes:151.1 usec/IO = 12.9 Mbytes/s
 4 kbytes:158.2 usec/IO = 24.7 Mbytes/s
 8 kbytes:175.6 usec/IO = 44.5 Mbytes/s
16 kbytes:210.1 usec/IO = 74.4 Mbytes/s
32 kbytes:274.2 usec/IO =114.0 Mbytes/s
64 kbytes:416.5 usec/IO =150.1 Mbytes/s
   128 kbytes:776.6 usec/IO =161.0 Mbytes/s
   256 kbytes:   1503.1 usec/IO =166.3 Mbytes/s
   512 kbytes:   2968.7 usec/IO =168.4 Mbytes/s
  1024 kbytes:   5866.8 usec/IO =170.5 Mbytes/s
  2048 kbytes:  11696.6 usec/IO =171.0 Mbytes/s
  4096 kbytes:  23329.6 usec/IO =171.5 Mbytes/s
  8192 kbytes:  46779.5 usec/IO =171.0 Mbytes/s
  
  , and much newer and supposedly much faster NVMe Samsung 950 PRO SSD:
  
  Synchronous random writes:
   0.5 kbytes:   2092.9 usec/IO =  0.2 Mbytes/s
 1 kbytes:   2013.1 usec/IO =  0.5 Mbytes/s
 2 kbytes:   2014.8 usec/IO =  1.0 Mbytes/s
 4 kbytes:   2090.7 usec/IO =  1.9 Mbytes/s
 8 kbytes:   2044.5 usec/IO =  3.8 Mbytes/s
16 kbytes:   2084.8 usec/IO =  7.5 Mbytes/s
32 kbytes:   2137.1 usec/IO = 14.6 Mbytes/s
64 kbytes:   2173.4 usec/IO = 28.8 Mbytes/s
   128 kbytes:   2923.9 usec/IO = 42.8 Mbytes/s
   256 kbytes:   3085.3 usec/IO = 81.0 Mbytes/s
   512 kbytes:   3112.2 usec/IO =160.7 Mbytes/s
  1024 kbytes:   2430.6 usec/IO =411.4 Mbytes/s
  2048 kbytes:   3788.9 usec/IO =527.9 Mbytes/s
  4096 kbytes:   6198.0 usec/IO =645.4 Mbytes/s
  8192 kbytes:  10764.9 usec/IO =743.2 Mbytes/s
  
  While the first one obviously has maximal throughput limitations, the
  second one has so high cache flush latency (about 2 millisecond), that
  it makes one almost useless in SLOG role, despite of its good throughput
  numbers.  Power loss protection is out of scope of this test, but I
  suspect it can be related.
  
  MFC after:2 weeks
  Sponsored by: iXsystems, Inc.

Modified:
  head/usr.sbin/diskinfo/diskinfo.8
  head/usr.sbin/diskinfo/diskinfo.c

Modified: head/usr.sbin/diskinfo/diskinfo.8
==
--- head/usr.sbin/diskinfo/diskinfo.8   Wed Jul  5 16:10:30 2017
(r320682)
+++ head/usr.sbin/diskinfo/diskinfo.8   Wed Jul  5 16:20:22 2017
(r320683)
@@ -1,5 +1,6 @@
 .\"
 .\" Copyright (c) 2003 Poul-Henning Kamp
+.\" Copyright (c) 2017 Alexander Motin 
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -28,7 +29,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 1, 2017
+.Dd July 4, 2017
 .Dt DISKINFO 8
 .Os
 .Sh NAME
@@ -36,7 +37,7 @@
 .Nd get information about disk device
 .Sh SYNOPSIS
 .Nm
-.Op Fl citv
+.Op Fl citSvw
 .Ar disk ...
 .Nm
 .Op Fl p
@@ -64,9 +65,16 @@ This is a string that identifies the physical path to 
 storage enclosure.
 .It Fl s
 Return the disk serial number
+.It Fl S
+Perform synchronous random write test (ZFS SLOG test),
+measuring time required to write data blocks of different size and
+flush disk cache.
+Blocks of more then 128KB are written with multiple parallel operations.
 .It Fl t
 Perform a simple and rather naive benchmark of the disks seek
 and transfer performance.
+.It Fl w
+Allow disruptive write tests.
 .El
 .Pp
 If given no arguments, the output will be a single line per specified device

Modified: head/usr.sbin/diskinfo/diskinfo.c
==
--- head/usr.sbin/diskinfo/diskinfo.c   Wed Jul  5 16:10:30 2017
(r320682)
+++ head/usr.sbin/diskinfo/diskinfo.c   Wed Jul  5 16:20:22 2017
(r320683)
@@ -1,6 +1,7 @@
 /*-
  * Copyright (c) 2003 Poul-Henning Kamp
  * Copyright (c) 2015 Spectra Logic Corporation
+ * Copyright (c) 2017 Alexander Motin 
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -40,6 +41,7 @@
 #include 
 #include

svn commit: r320682 - head/sys/netinet

2017-07-05 Thread Jonathan T. Looney 
Author: jtl
Date: Wed Jul  5 16:10:30 2017
New Revision: 320682
URL: https://svnweb.freebsd.org/changeset/base/320682

Log:
  Don't overpromote values when calculating len in tcp_output().
  
  sbavail() returns u_int and sendwin is a uint32_t. Therefore, min() (which
  operates on two u_int values) is able to correctly calculate the minimum
  of these two arguments.
  
  Reported by:  rrs
  MFC after:1 week
  Sponsored by: Netflix

Modified:
  head/sys/netinet/tcp_output.c

Modified: head/sys/netinet/tcp_output.c
==
--- head/sys/netinet/tcp_output.c   Wed Jul  5 15:59:52 2017
(r320681)
+++ head/sys/netinet/tcp_output.c   Wed Jul  5 16:10:30 2017
(r320682)
@@ -386,7 +386,7 @@ after_sack_rexmit:
 */
if (sack_rxmit == 0) {
if (sack_bytes_rxmt == 0)
-   len = ((int32_t)ulmin(sbavail(>so_snd), sendwin) -
+   len = ((int32_t)min(sbavail(>so_snd), sendwin) -
off);
else {
int32_t cwin;
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r320659 - head/usr.sbin/nfsuserd

2017-07-05 Thread Konstantin Belousov 
On Wed, Jul 05, 2017 at 11:58:56AM +, Rick Macklem wrote:
> Well, I know nothing about jails, so I can't answer either of these.
> All I can tell you is that 127.0.0.1 no longer works as localhost when
> jails are run for some situations which I don't understand and that
> breaks the nfsuserd upcall. (Something about 127.0.0.1 being replaced
> by the first IP# for the net interface when jails are running?)
When a jailed process uses a local address, the address is effectively
replaced by the jailed address, as you noted above.

> 
> The patches in PR#205193 change nfsuserd to use a local socket,
> which fixes this problem. However, the original poster of the PR had
> hangs when using the patches which was never resolved (I couldn't
> reproduce the hang).
So consider the issue not reproducable and test it in wild by committing
to HEAD.  Ability to do such kind of experiment is one of the reasons why
do we have HEAD and separate release branches.


> --> It has been a couple of years, but I recall that the hang was in the
>   unix socket code, so I believed it was caused by having mutiple
>   processes trying to use the socket concurrently.
>   --> The original poster never confirmed if using a single daemon
> avoided the hang.
> As such I am stuck until someone can test the patches? rick
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r320678 - head/etc/root

2017-07-05 Thread Edward Tomasz Napierala 
Author: trasz
Date: Wed Jul  5 15:42:33 2017
New Revision: 320678
URL: https://svnweb.freebsd.org/changeset/base/320678

Log:
  Fix typo introduced in r320672 - check for existence of the right file.
  
  Reported by:  rpokala@
  MFC after:2 weeks

Modified:
  head/etc/root/dot.profile

Modified: head/etc/root/dot.profile
==
--- head/etc/root/dot.profile   Wed Jul  5 15:34:06 2017(r320677)
+++ head/etc/root/dot.profile   Wed Jul  5 15:42:33 2017(r320678)
@@ -13,4 +13,4 @@ export PAGER
 if [ -x /usr/bin/resizewin ] ; then /usr/bin/resizewin -z ; fi
 
 # Uncomment to display a random cookie on each login.
-# if [ -x /usr/bin/resizewin ] ; then /usr/bin/fortune -s ; fi
+# if [ -x /usr/bin/fortune ] ; then /usr/bin/fortune -s ; fi
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r320675 - in head/gnu/usr.bin/gdb: gdb kgdb

2017-07-05 Thread John Baldwin 
Author: jhb
Date: Wed Jul  5 15:23:30 2017
New Revision: 320675
URL: https://svnweb.freebsd.org/changeset/base/320675

Log:
  Add deprecation notices for gdb and kgdb.
  
  Even though gdb and kgdb may not be removed for 12.0 on some architectures,
  the notice is unconditional as these tools will likely be removed at some
  point in the future when adequate replacements are available (gdb in ports
  or lldb in base).
  
  Reviewed by:  emaste
  MFC after:3 days
  Differential Revision:https://reviews.freebsd.org/D11477

Modified:
  head/gnu/usr.bin/gdb/gdb/gdb.1
  head/gnu/usr.bin/gdb/kgdb/kgdb.1

Modified: head/gnu/usr.bin/gdb/gdb/gdb.1
==
--- head/gnu/usr.bin/gdb/gdb/gdb.1  Wed Jul  5 13:37:27 2017
(r320674)
+++ head/gnu/usr.bin/gdb/gdb/gdb.1  Wed Jul  5 15:23:30 2017
(r320675)
@@ -44,6 +44,11 @@ gdb \- The GNU Debugger
 .IR core \||\| procID\c
 \&\|]\&\|]
 .ad b
+.SH DEPRECATION NOTICE
+This version of gdb is deprecated and will be removed from future versions
+of the FreeBSD base system.
+A newer version of gdb is available from ports or packages
+(devel/gdb).
 .SH DESCRIPTION
 The purpose of a debugger such as GDB is to allow you to see what is
 going on ``inside'' another program while it executes\(em\ what another

Modified: head/gnu/usr.bin/gdb/kgdb/kgdb.1
==
--- head/gnu/usr.bin/gdb/kgdb/kgdb.1Wed Jul  5 13:37:27 2017
(r320674)
+++ head/gnu/usr.bin/gdb/kgdb/kgdb.1Wed Jul  5 15:23:30 2017
(r320675)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 11, 2006
+.Dd July 5, 2017
 .Dt KGDB 1
 .Os
 .Sh NAME
@@ -40,6 +40,16 @@
 .Op Fl d Ar crashdir
 .Op Fl c Ar core | Fl n Ar dumpnr | Fl r Ar device
 .Op Ar kernel Op Ar core
+.Sh DEPRECATION NOTICE
+This version of
+.Nm
+is deprecated and will be removed from future versions of the
+.Fx
+base system.
+A newer version of
+.Nm
+is available from ports or packages
+(devel/gdb).
 .Sh DESCRIPTION
 The
 .Nm
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r320674 - head/usr.sbin/bsdinstall/scripts

2017-07-05 Thread Bartek Rutkowski 
Author: robak (ports committer)
Date: Wed Jul  5 13:37:27 2017
New Revision: 320674
URL: https://svnweb.freebsd.org/changeset/base/320674

Log:
  Add option to bsdinstall to disable insecure console, update stack guard 
option
  
  This patch adds new bsdinstall option to hardening section that allows users
  to change this behaviour to secure one and updates stack guard option so it
  would set the value of relevant sysctl to 512 (2MB)
  
  Submitted by: Bartek Rutkowski
  Reviewed by:  adrian, bapt, emaste
  Approved by:  bapt, emaste
  MFC after:1 day
  Sponsored by: Pixeware LTD
  Differential Revision:https://reviews.freebsd.org/D9700

Modified:
  head/usr.sbin/bsdinstall/scripts/config
  head/usr.sbin/bsdinstall/scripts/hardening

Modified: head/usr.sbin/bsdinstall/scripts/config
==
--- head/usr.sbin/bsdinstall/scripts/config Wed Jul  5 13:13:38 2017
(r320673)
+++ head/usr.sbin/bsdinstall/scripts/config Wed Jul  5 13:37:27 2017
(r320674)
@@ -35,6 +35,11 @@ rm $BSDINSTALL_TMPETC/rc.conf.*
 cat $BSDINSTALL_CHROOT/etc/sysctl.conf $BSDINSTALL_TMPETC/sysctl.conf.* >> 
$BSDINSTALL_TMPETC/sysctl.conf
 rm $BSDINSTALL_TMPETC/sysctl.conf.*
 
+if [ -f $BSDINSTALL_TMPTEC/ttys.hardening ]; then
+   cat $BSDINSTALL_TMPTEC/ttys.hardening > $BSDINSTALL_TMPTEC/ttys
+   rm $BSDINSTALL_TMPTEC/ttys.hardening
+fi
+
 cp $BSDINSTALL_TMPETC/* $BSDINSTALL_CHROOT/etc
 
 cat $BSDINSTALL_TMPBOOT/loader.conf.* >> $BSDINSTALL_TMPBOOT/loader.conf

Modified: head/usr.sbin/bsdinstall/scripts/hardening
==
--- head/usr.sbin/bsdinstall/scripts/hardening  Wed Jul  5 13:13:38 2017
(r320673)
+++ head/usr.sbin/bsdinstall/scripts/hardening  Wed Jul  5 13:37:27 2017
(r320674)
@@ -42,10 +42,11 @@ FEATURES=$( dialog --backtitle "FreeBSD Installer" \
"3 read_msgbuf" "Disable reading kernel message buffer for unprivileged 
users" ${read_msgbuf:-off} \
"4 proc_debug" "Disable process debugging facilities for unprivileged 
users" ${proc_debug:-off} \
"5 random_pid" "Randomize the PID of newly created processes" 
${random_pid:-off} \
-   "6 stack_guard" "Insert stack guard page ahead of the growable 
segments" ${stack_guard:-off} \
+   "6 stack_guard" "Set stack guard buffer size to 2MB" 
${stack_guard:-off} \
"7 clear_tmp" "Clean the /tmp filesystem on system startup" 
${clear_tmp:-off} \
"8 disable_syslogd" "Disable opening Syslogd network socket (disables 
remote logging)" ${disable_syslogd:-off} \
"9 disable_sendmail" "Disable Sendmail service" 
${disable_sendmail:-off} \
+   "9 secure_console" "Enable console password prompt" 
${secure_console:-off} \
 2>&1 1>&3 )
 exec 3>&-
 
@@ -69,7 +70,7 @@ for feature in $FEATURES; do
echo kern.randompid=$(jot -r 1 ) >> 
$BSDINSTALL_TMPETC/sysctl.conf.hardening
fi
if [ "$feature" = "stack_guard" ]; then
-   echo security.bsd.stack_guard_page=1 >> 
$BSDINSTALL_TMPETC/sysctl.conf.hardening
+   echo security.bsd.stack_guard_page=512 >> 
$BSDINSTALL_TMPETC/sysctl.conf.hardening
fi
if [ "$feature" = "clear_tmp" ]; then
echo 'clear_tmp_enable="YES"' >> 
$BSDINSTALL_TMPETC/rc.conf.hardening
@@ -79,6 +80,9 @@ for feature in $FEATURES; do
fi
if [ "$feature" = "disable_sendmail" ]; then
echo 'sendmail_enable="NONE"' >> 
$BSDINSTALL_TMPETC/rc.conf.hardening
+   fi
+   if [ "$feature" = "secure_console" ]; then
+   sed "s/unknown  off secure/unknown  off insecure/g" 
$BSDINSTALL_CHROOT/etc/ttys > $BSDINSTALL_TMPETC/ttys.hardening
fi
 done
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r320673 - head/lib/libgcc_s

2017-07-05 Thread Ed Maste 
Author: emaste
Date: Wed Jul  5 13:13:38 2017
New Revision: 320673
URL: https://svnweb.freebsd.org/changeset/base/320673

Log:
  Sort entries in libgcc_s Version.map

Modified:
  head/lib/libgcc_s/Version.map

Modified: head/lib/libgcc_s/Version.map
==
--- head/lib/libgcc_s/Version.map   Wed Jul  5 13:08:07 2017
(r320672)
+++ head/lib/libgcc_s/Version.map   Wed Jul  5 13:13:38 2017
(r320673)
@@ -48,9 +48,9 @@ global:
__moddi3;
__modti3;
__muldi3;
+   __multi3;
__mulvdi3;
__mulvsi3;
-   __multi3;
__negdi2;
__negti2;
__negvdi2;
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r320672 - in head: etc/root share/skel

2017-07-05 Thread Edward Tomasz Napierala 
Author: trasz
Date: Wed Jul  5 13:08:07 2017
New Revision: 320672
URL: https://svnweb.freebsd.org/changeset/base/320672

Log:
  Cosmetic tweaks to the default shell rc files, mostly comments.
  
  MFC after:2 weeks

Modified:
  head/etc/root/dot.login
  head/etc/root/dot.profile
  head/share/skel/dot.login
  head/share/skel/dot.profile

Modified: head/etc/root/dot.login
==
--- head/etc/root/dot.login Wed Jul  5 10:43:27 2017(r320671)
+++ head/etc/root/dot.login Wed Jul  5 13:08:07 2017(r320672)
@@ -2,11 +2,11 @@
 #
 # .login - csh login script, read by login shell, after `.cshrc' at login.
 #
-# see also csh(1), environ(7).
+# See also csh(1), environ(7).
 #
 
 # Query terminal size; useful for serial lines.
 if ( -x /usr/bin/resizewin ) /usr/bin/resizewin -z
 
-# Uncomment to display a random cookie each login:
+# Uncomment to display a random cookie on each login.
 # if ( -x /usr/bin/fortune ) /usr/bin/fortune -s

Modified: head/etc/root/dot.profile
==
--- head/etc/root/dot.profile   Wed Jul  5 10:43:27 2017(r320671)
+++ head/etc/root/dot.profile   Wed Jul  5 13:08:07 2017(r320672)
@@ -9,4 +9,8 @@ export TERM
 PAGER=more
 export PAGER
 
+# Query terminal size; useful for serial lines.
 if [ -x /usr/bin/resizewin ] ; then /usr/bin/resizewin -z ; fi
+
+# Uncomment to display a random cookie on each login.
+# if [ -x /usr/bin/resizewin ] ; then /usr/bin/fortune -s ; fi

Modified: head/share/skel/dot.login
==
--- head/share/skel/dot.login   Wed Jul  5 10:43:27 2017(r320671)
+++ head/share/skel/dot.login   Wed Jul  5 13:08:07 2017(r320672)
@@ -2,8 +2,11 @@
 #
 # .login - csh login script, read by login shell, after `.cshrc' at login.
 #
-# see also csh(1), environ(7).
+# See also csh(1), environ(7).
 #
 
+# Query terminal size; useful for serial lines.
 if ( -x /usr/bin/resizewin ) /usr/bin/resizewin -z
+
+# Display a random cookie on each login.
 if ( -x /usr/bin/fortune ) /usr/bin/fortune freebsd-tips

Modified: head/share/skel/dot.profile
==
--- head/share/skel/dot.profile Wed Jul  5 10:43:27 2017(r320671)
+++ head/share/skel/dot.profile Wed Jul  5 13:08:07 2017(r320672)
@@ -24,4 +24,5 @@ ENV=$HOME/.shrc; export ENV
 # Query terminal size; useful for serial lines.
 if [ -x /usr/bin/resizewin ] ; then /usr/bin/resizewin -z ; fi
 
+# Display a random cookie on each login.
 if [ -x /usr/bin/fortune ] ; then /usr/bin/fortune freebsd-tips ; fi
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r320659 - head/usr.sbin/nfsuserd

2017-07-05 Thread Harry Schmalzbauer 
 Bezüglich Rick Macklem's Nachricht vom 05.07.2017 13:58 (localtime):
> Well, I know nothing about jails, so I can't answer either of these.
> All I can tell you is that 127.0.0.1 no longer works as localhost when
> jails are run for some situations which I don't understand and that
> breaks the nfsuserd upcall. (Something about 127.0.0.1 being replaced
> by the first IP# for the net interface when jails are running?)

This was changed with https://svnweb.freebsd.org/changeset/base/316313
(and https://svnweb.freebsd.org/changeset/base/316328 for IPv6) if I
don't confuse things here.
Haven't had time to read/test NFS+jail, but it was on my "things to
solve" list and the mentioned two commits made me thinking there's
already a solution.

-harry

___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r320659 - head/usr.sbin/nfsuserd

2017-07-05 Thread Rick Macklem 
Well, I know nothing about jails, so I can't answer either of these.
All I can tell you is that 127.0.0.1 no longer works as localhost when
jails are run for some situations which I don't understand and that
breaks the nfsuserd upcall. (Something about 127.0.0.1 being replaced
by the first IP# for the net interface when jails are running?)

The patches in PR#205193 change nfsuserd to use a local socket,
which fixes this problem. However, the original poster of the PR had
hangs when using the patches which was never resolved (I couldn't
reproduce the hang).
--> It has been a couple of years, but I recall that the hang was in the
  unix socket code, so I believed it was caused by having mutiple
  processes trying to use the socket concurrently.
  --> The original poster never confirmed if using a single daemon
avoided the hang.
As such I am stuck until someone can test the patches? rick

From: Olivier Cochard-Labbé 
Sent: Wednesday, July 5, 2017 1:10:28 AM
To: Rick Macklem
Cc: svn-src-head; svn-src-all; src-committers; Konstantin Belousov
Subject: Re: svn commit: r320659 - head/usr.sbin/nfsuserd

On Wed, Jul 5, 2017 at 7:06 AM, Konstantin Belousov 
> wrote:
On Tue, Jul 04, 2017 at 10:20:30PM +, Rick Macklem wrote:
> +Since the kernel communicates with the
> +.Nm
> +daemon via an upcall that uses the IP address 127.0.0.1, it does not work 
> correctly when
> +.Xr jail 8
> +are used and can crash the system.

Does it indeed break when jails are used, or does it break when the daemon
is started in a jail ?


​And does it break on a jail/vnet too ?

___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r320671 - head/share/man/man4

2017-07-05 Thread Edward Tomasz Napierala 
Author: trasz
Date: Wed Jul  5 10:43:27 2017
New Revision: 320671
URL: https://svnweb.freebsd.org/changeset/base/320671

Log:
  Use more canonical .Dt for vt(4).
  
  MFC after:2 weeks

Modified:
  head/share/man/man4/vt.4

Modified: head/share/man/man4/vt.4
==
--- head/share/man/man4/vt.4Wed Jul  5 10:37:37 2017(r320670)
+++ head/share/man/man4/vt.4Wed Jul  5 10:43:27 2017(r320671)
@@ -25,7 +25,7 @@
 .\" $FreeBSD$
 .\"
 .Dd July 19, 2016
-.Dt "VIRTUAL TERMINALS" 4
+.Dt "VT" 4
 .Os
 .Sh NAME
 .Nm vt
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r320670 - in head: etc/root share/skel

2017-07-05 Thread Edward Tomasz Napierala 
Author: trasz
Date: Wed Jul  5 10:37:37 2017
New Revision: 320670
URL: https://svnweb.freebsd.org/changeset/base/320670

Log:
  Run "resizewin -z" from the default shell profile files. This makes
  the terminal work properly out of the box when logging over a serial
  line, which is quite important for the user experience on boards like
  Raspberry Pi.  It doesn't affect cases where the terminal size is
  already non-zero, such as SSH or vt(4) sessions.
  
  Note that this doesn't handle a scenario pointed out by rgrimes@:
  when the terminal is resized after login, the terminal size won't
  get updated even after logging out and back in.
  
  Reviewed by:  imp
  Obtained from:CheriBSD
  Sponsored by: DARPA, AFRL
  Differential Revision:https://reviews.freebsd.org/D10642

Modified:
  head/etc/root/dot.login
  head/etc/root/dot.profile
  head/share/skel/dot.login
  head/share/skel/dot.profile

Modified: head/etc/root/dot.login
==
--- head/etc/root/dot.login Wed Jul  5 10:29:05 2017(r320669)
+++ head/etc/root/dot.login Wed Jul  5 10:37:37 2017(r320670)
@@ -5,5 +5,8 @@
 # see also csh(1), environ(7).
 #
 
+# Query terminal size; useful for serial lines.
+if ( -x /usr/bin/resizewin ) /usr/bin/resizewin -z
+
 # Uncomment to display a random cookie each login:
 # if ( -x /usr/bin/fortune ) /usr/bin/fortune -s

Modified: head/etc/root/dot.profile
==
--- head/etc/root/dot.profile   Wed Jul  5 10:29:05 2017(r320669)
+++ head/etc/root/dot.profile   Wed Jul  5 10:37:37 2017(r320670)
@@ -8,3 +8,5 @@ TERM=${TERM:-xterm}
 export TERM
 PAGER=more
 export PAGER
+
+if [ -x /usr/bin/resizewin ] ; then /usr/bin/resizewin -z ; fi

Modified: head/share/skel/dot.login
==
--- head/share/skel/dot.login   Wed Jul  5 10:29:05 2017(r320669)
+++ head/share/skel/dot.login   Wed Jul  5 10:37:37 2017(r320670)
@@ -5,4 +5,5 @@
 # see also csh(1), environ(7).
 #
 
+if ( -x /usr/bin/resizewin ) /usr/bin/resizewin -z
 if ( -x /usr/bin/fortune ) /usr/bin/fortune freebsd-tips

Modified: head/share/skel/dot.profile
==
--- head/share/skel/dot.profile Wed Jul  5 10:29:05 2017(r320669)
+++ head/share/skel/dot.profile Wed Jul  5 10:37:37 2017(r320670)
@@ -21,4 +21,7 @@ PAGER=more;   export PAGER
 # set ENV to a file invoked each time sh is started for interactive use.
 ENV=$HOME/.shrc; export ENV
 
+# Query terminal size; useful for serial lines.
+if [ -x /usr/bin/resizewin ] ; then /usr/bin/resizewin -z ; fi
+
 if [ -x /usr/bin/fortune ] ; then /usr/bin/fortune freebsd-tips ; fi
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r320669 - in head/sys/arm: arm conf

2017-07-05 Thread Andrew Turner 
Author: andrew
Date: Wed Jul  5 10:29:05 2017
New Revision: 320669
URL: https://svnweb.freebsd.org/changeset/base/320669

Log:
  Make MULTIDELAY a requirement in the MPCore Timer driver when using
  PLATFORM. This will help with removing the MULTIDELAY option, enabling
  it when PLATFORM is enabled.

Modified:
  head/sys/arm/arm/mpcore_timer.c
  head/sys/arm/conf/PANDABOARD
  head/sys/arm/conf/VYBRID
  head/sys/arm/conf/ZEDBOARD

Modified: head/sys/arm/arm/mpcore_timer.c
==
--- head/sys/arm/arm/mpcore_timer.c Wed Jul  5 09:27:18 2017
(r320668)
+++ head/sys/arm/arm/mpcore_timer.c Wed Jul  5 10:29:05 2017
(r320669)
@@ -71,6 +71,10 @@ __FBSDID("$FreeBSD$");
 
 #include 
 
+#if defined(PLATFORM) && !defined(MULTIDELAY)
+#error The MPCore Timer driver requires MULTIDELAY when building with PLATFORM
+#endif
+
 /* Private (per-CPU) timer register map */
 #define PRV_TIMER_LOAD 0x
 #define PRV_TIMER_COUNT0x0004

Modified: head/sys/arm/conf/PANDABOARD
==
--- head/sys/arm/conf/PANDABOARDWed Jul  5 09:27:18 2017
(r320668)
+++ head/sys/arm/conf/PANDABOARDWed Jul  5 10:29:05 2017
(r320669)
@@ -34,6 +34,7 @@ makeoptions   MODULES_EXTRA=dtb/omap4
 
 optionsSCHED_ULE   # ULE scheduler
 optionsPLATFORM
+optionsMULTIDELAY
 optionsSMP # Enable multiple cores
 
 # NFS root from boopt/dhcp

Modified: head/sys/arm/conf/VYBRID
==
--- head/sys/arm/conf/VYBRIDWed Jul  5 09:27:18 2017(r320668)
+++ head/sys/arm/conf/VYBRIDWed Jul  5 10:29:05 2017(r320669)
@@ -26,6 +26,7 @@ makeoptions   WERROR="-Werror"
 
 optionsSCHED_4BSD  # 4BSD scheduler
 optionsPLATFORM# Platform based SoC
+optionsMULTIDELAY
 #options   NANDFS  # NAND Filesystem
 #options   SMP # Enable multiple cores
 

Modified: head/sys/arm/conf/ZEDBOARD
==
--- head/sys/arm/conf/ZEDBOARD  Wed Jul  5 09:27:18 2017(r320668)
+++ head/sys/arm/conf/ZEDBOARD  Wed Jul  5 10:29:05 2017(r320669)
@@ -28,6 +28,7 @@ makeoptions   MODULES_EXTRA="dtb/zynq"
 
 optionsSCHED_ULE   # ULE scheduler
 optionsPLATFORM# Platform based SoC
+optionsMULTIDELAY
 #options   NFSSD   # Network Filesystem Server
 optionsSMP # Enable multiple cores
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r320668 - in head/sys/arm: arm conf

2017-07-05 Thread Andrew Turner 
Author: andrew
Date: Wed Jul  5 09:27:18 2017
New Revision: 320668
URL: https://svnweb.freebsd.org/changeset/base/320668

Log:
  Require the ARM Generic Timer driver is built for MULTIDELAY on 32bit arm.
  As this driver is also used for DELAY on arm64 we need to keep the existing
  DELAY code for it to use.

Modified:
  head/sys/arm/arm/generic_timer.c
  head/sys/arm/conf/EXYNOS5.common

Modified: head/sys/arm/arm/generic_timer.c
==
--- head/sys/arm/arm/generic_timer.cWed Jul  5 06:32:53 2017
(r320667)
+++ head/sys/arm/arm/generic_timer.cWed Jul  5 09:27:18 2017
(r320668)
@@ -57,7 +57,7 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 
-#ifdef MULTIDELAY
+#if defined(__arm__)
 #include  /* For arm_set_delay */
 #endif
 
@@ -72,6 +72,10 @@ __FBSDID("$FreeBSD$");
 #include 
 #endif
 
+#if defined(__arm__) && !defined(MULTIDELAY)
+#error The generic timer requires MULTIDELAY on 32bit arm
+#endif
+
 #defineGT_CTRL_ENABLE  (1 << 0)
 #defineGT_CTRL_INT_MASK(1 << 1)
 #defineGT_CTRL_INT_STAT(1 << 2)
@@ -427,7 +431,7 @@ arm_tmr_attach(device_t dev)
sc->et.et_priv = sc;
et_register(>et);
 
-#ifdef MULTIDELAY
+#if defined(__arm__)
arm_set_delay(arm_tmr_do_delay, sc);
 #endif
 
@@ -505,7 +509,7 @@ arm_tmr_do_delay(int usec, void *arg)
}
 }
 
-#ifndef MULTIDELAY
+#if defined(__aarch64__)
 void
 DELAY(int usec)
 {

Modified: head/sys/arm/conf/EXYNOS5.common
==
--- head/sys/arm/conf/EXYNOS5.commonWed Jul  5 06:32:53 2017
(r320667)
+++ head/sys/arm/conf/EXYNOS5.commonWed Jul  5 09:27:18 2017
(r320668)
@@ -23,6 +23,7 @@ makeoptions   WERROR="-Werror"
 include"std.armv6"
 optionsSCHED_ULE   # ULE scheduler
 optionsPLATFORM# Platform based SoC
+optionsMULTIDELAY
 optionsPREEMPTION  # Enable kernel thread preemption
 optionsINET# InterNETworking
 optionsINET6   # IPv6 communications protocols
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r320665 - head/libexec/rtld-elf

2017-07-05 Thread Xin LI 
Author: delphij
Date: Wed Jul  5 06:12:21 2017
New Revision: 320665
URL: https://svnweb.freebsd.org/changeset/base/320665

Log:
  In open_binary_fd: when using buffer size for strl* and snprintf,
  always use >= instead of > to avoid truncation.
  
  Reviewed by:  kib
  Differential Revision:https://reviews.freebsd.org/D11474
  MFC after:3 days

Modified:
  head/libexec/rtld-elf/rtld.c

Modified: head/libexec/rtld-elf/rtld.c
==
--- head/libexec/rtld-elf/rtld.cWed Jul  5 05:50:36 2017
(r320664)
+++ head/libexec/rtld-elf/rtld.cWed Jul  5 06:12:21 2017
(r320665)
@@ -5300,14 +5300,14 @@ open_binary_fd(const char *argv0, bool search_in_path)
fd = -1;
errno = ENOENT;
while ((pe = strsep(, ":")) != NULL) {
-   if (strlcpy(binpath, pe, sizeof(binpath)) >
+   if (strlcpy(binpath, pe, sizeof(binpath)) >=
sizeof(binpath))
continue;
if (binpath[0] != '\0' &&
-   strlcat(binpath, "/", sizeof(binpath)) >
+   strlcat(binpath, "/", sizeof(binpath)) >=
sizeof(binpath))
continue;
-   if (strlcat(binpath, argv0, sizeof(binpath)) >
+   if (strlcat(binpath, argv0, sizeof(binpath)) >=
sizeof(binpath))
continue;
fd = open(binpath, O_RDONLY | O_CLOEXEC | O_VERIFY);
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"