CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Fri Sep 16 05:42:59 UTC 2016 Modified Files: src/sys/dev/pci: pcidevs.h pcidevs_data.h Log Message: regen. To generate a diff of this commit: cvs rdiff -u -r1.1256 -r1.1257 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1255 -r1.1256 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Fri Sep 16 05:42:22 UTC 2016 Modified Files: src/sys/dev/pci: pcidevs Log Message: - Add ASMEDIA ASM1083/1085/1142 - Add AMD RADEON 34xx HD Audio - Add some Intel Core i7-6xxxK devices from "Intel Core i7 Processor Family for LGA2011-v3 Socket Datasheet - Volume 2 of 2: Registers" - Add "Core i7-6xxxK" to some Intel devices' description. To generate a diff of this commit: cvs rdiff -u -r1.1264 -r1.1265 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Fri Sep 16 05:42:22 UTC 2016 Modified Files: src/sys/dev/pci: pcidevs Log Message: - Add ASMEDIA ASM1083/1085/1142 - Add AMD RADEON 34xx HD Audio - Add some Intel Core i7-6xxxK devices from "Intel Core i7 Processor Family for LGA2011-v3 Socket Datasheet - Volume 2 of 2: Registers" - Add "Core i7-6xxxK" to some Intel devices' description. To generate a diff of this commit: cvs rdiff -u -r1.1264 -r1.1265 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1264 src/sys/dev/pci/pcidevs:1.1265 --- src/sys/dev/pci/pcidevs:1.1264 Thu Sep 1 10:20:26 2016 +++ src/sys/dev/pci/pcidevs Fri Sep 16 05:42:22 2016 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1264 2016/09/01 10:20:26 msaitoh Exp $ +$NetBSD: pcidevs,v 1.1265 2016/09/16 05:42:22 msaitoh Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -1192,7 +1192,9 @@ product ASMEDIA ASM1061_02 0x0602 ASM106 product ASMEDIA ASM1061_11 0x0611 ASM1061 AHCI SATA III Controller product ASMEDIA ASM1061_12 0x0612 ASM1061 AHCI SATA III Controller product ASMEDIA ASM1042 0x1042 ASM1042 USB 3.0 Host Controller +product ASMEDIA ASM1083 0x1080 ASM1083/1085 PCIe-PCI Bridge product ASMEDIA ASM1042A 0x1142 ASM1042A USB 3.0 Host Controller +product ASMEDIA ASM1142 0x1242 ASM1142 USB 3.1 Host Controller /* Asustek products */ product ASUSTEK HFCPCI 0x0675 ISDN @@ -1551,6 +1553,7 @@ product ATI RADEON_HD7340 0x9808 Radeon product ATI RADEON_HDMI_DP_AUDIO 0x9840 HDMI/DP Audio product ATI RADEON_R2_R3_R3E_R4 0x9854 Radeon R2/R3/R4 Graphics product ATI RADEON_HD2600_HD 0xaa08 Radeon HD2600 HD Audio Controller +product ATI RADEON_HD34XX_HDA 0xaa28 Radeon HD 34xx HD Audio Controller product ATI RADEON_HD4350_HD 0xaa38 Radeon HD4350 HD Audio Controller product ATI RADEON_HD5600_HDMI 0xaa60 Redwood HDMI Audio product ATI RADEON_HD54XX_HDA 0xaa68 Radeon HD 54xx Audio @@ -3697,7 +3700,7 @@ product INTEL XE5_V3_PCIE_3_1 0x2f08 Xeo product INTEL XE5_V3_PCIE_3_2 0x2f09 Xeon E5 v3 PCIe Root Port product INTEL XE5_V3_PCIE_3_3 0x2f0a Xeon E5 v3 PCIe Root Port product INTEL XE5_V3_PCIE_3_4 0x2f0b Xeon E5 v3 PCIe Root Port -product INTEL XE5_V3_R2PCIE_1 0x2f1d Xeon E5 v3 Integrated IO Ring Interface +product INTEL XE5_V3_R2PCIE_1 0x2f1d Xeon E5 v3/Core i7-6xxxK Integrated IO Ring Interface product INTEL XE5_V3_UBOX_1 0x2f1e Xeon E5 v3 Scratchpad and Semaphores product INTEL XE5_V3_UBOX_3 0x2f1f Xeon E5 v3 Scratchpad and Semaphores product INTEL XE5_V3_QDT_CH0 0x2f20 Xeon E5 v3 QDT DMA Channel 0 @@ -3715,9 +3718,9 @@ product INTEL XE5_V3_IIO_IOAPIC 0x2f2c X product INTEL XE5_V3_HA 0x2f30 Xeon E5 v3 Home Agent product INTEL XE5_V3_QPI_LINK2 0x2f32 Xeon E5 v3 QPI Link 0 product INTEL XE5_V3_QPI_LINK3 0x2f33 Xeon E5 v3 QPI Link 1 -product INTEL XE5_V3_R2PCIE_2 0x2f34 Xeon E5 v3 PCIe Ring Performance Monitoring -product INTEL XE5_V3_RQPI_PM_1 0x2f36 Xeon E5 v3 QPI Ring Performance Monitoring -product INTEL XE5_V3_RQPI_PM_2 0x2f37 Xeon E5 v3 QPI Ring Interface Monitoring +product INTEL XE5_V3_R2PCIE_2 0x2f34 Xeon E5 v3/Core i7-6xxxK PCIe Ring Performance Monitoring +product INTEL XE5_V3_RQPI_PM_1 0x2f36 Xeon E5 v3/Core i7-6xxxK QPI Ring Performance Monitoring +product INTEL XE5_V3_RQPI_PM_2 0x2f37 Xeon E5 v3/Core i7-6xxxK QPI Ring Interface Monitoring product INTEL XE5_V3_IMC1_MAIN 0x2f68 Xeon E5 v3 IMC Main product INTEL XE5_V3_IMC1_TADR1 0x2f6a Xeon E5 v3 IMC Ch 0-1 Target Address Decode Registers product INTEL XE5_V3_IMC1_TADR2 0x2f6b Xeon E5 v3 IMC Ch 0-1 Target Address Decode Registers @@ -3725,7 +3728,7 @@ product INTEL XE5_V3_IMC0_RAS 0x2f71 Xeo product INTEL XE5_V3_IMC1_RAS 0x2f79 Xeon E5 v3 IMC Ras Registers product INTEL XE5_V3_UBOX_2 0x2f7d Xeon E5 v3 Scratchpad and Semaphores product INTEL XE5_V3_QPI_LINK0 0x2f80 Xeon E5 v3 QPI Link 0 -product INTEL XE5_V3_RQPI_RING 0x2f81 Xeon E5 v3 QPI Ring Interface +product INTEL XE5_V3_RQPI_RING 0x2f81 Xeon E5 v3/Core i7-6xxxK QPI Ring Interface product INTEL XE5_V3_QPI_LINK4 0x2f83 Xeon E5 v3 QPI Link 0 product INTEL XE5_V3_QPI_LINK1 0x2f90 Xeon E5 v3 QPI Link 1 product INTEL XE5_V3_PCU_1 0x2f98 Xeon E5 v3 Power Control Unit @@ -4004,16 +4007,18 @@ product INTEL EP80579_LAN_1 0x5040 EP805 product INTEL EP80579_LAN_2 0x5044 EP80579 LAN product INTEL EP80579_LAN_3 0x5048 EP80579 LAN product INTEL 80312_ATU 0x530d 80310 ATU -product INTEL XEOND_HB_DMI2 0x6f00 Xeon-D Host Bridge (DMI2) +product INTEL XEOND_HB_DMI2 0x6f00 Core i7-6xxxK/Xeon-D Host Bridge (DMI2) product INTEL XEOND_HB_PCIE 0x6f01 Xeon-D Host Bridge (PCIe) product INTEL XEOND_PCIE_1 0x6f02 Xeon-D PCIe Root Port (x8 or x4 max) product INTEL XEOND_PCIE_2 0x6f03 Xeon-D PCIe Root Port (x8 or x4 max) -product INTEL XEOND_PCIE_3 0x6f04 Xeon-D PCIe Root Port -product INTEL XEOND_PCIE_5 0x6f06 Xeon-D PCIe Root
CVS commit: src
Module Name:src Committed By: pgoyette Date: Fri Sep 16 03:10:45 UTC 2016 Modified Files: src/external/cddl/osnet/dev/fbt: fbt.c src/sys/kern: files.kern src/sys/modules/dtrace/fbt: Makefile src/sys/net: files.net src/sys/sys: param.h Log Message: Move kern_ctf.c into the dtrace_fbt module (the only place it is used) rather than including in kernels with KDTRACE_HOOKS defined. Update the dtrace_fbt module to depend on the zlib module. Bump kernel version to avoid module mismatch. Welcome to 7.99.38 ! To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/external/cddl/osnet/dev/fbt/fbt.c cvs rdiff -u -r1.11 -r1.12 src/sys/kern/files.kern cvs rdiff -u -r1.5 -r1.6 src/sys/modules/dtrace/fbt/Makefile cvs rdiff -u -r1.10 -r1.11 src/sys/net/files.net cvs rdiff -u -r1.503 -r1.504 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: pgoyette
Date: Fri Sep 16 03:10:45 UTC 2016
Modified Files:
src/external/cddl/osnet/dev/fbt: fbt.c
src/sys/kern: files.kern
src/sys/modules/dtrace/fbt: Makefile
src/sys/net: files.net
src/sys/sys: param.h
Log Message:
Move kern_ctf.c into the dtrace_fbt module (the only place it is used)
rather than including in kernels with KDTRACE_HOOKS defined. Update
the dtrace_fbt module to depend on the zlib module.
Bump kernel version to avoid module mismatch.
Welcome to 7.99.38 !
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/external/cddl/osnet/dev/fbt/fbt.c
cvs rdiff -u -r1.11 -r1.12 src/sys/kern/files.kern
cvs rdiff -u -r1.5 -r1.6 src/sys/modules/dtrace/fbt/Makefile
cvs rdiff -u -r1.10 -r1.11 src/sys/net/files.net
cvs rdiff -u -r1.503 -r1.504 src/sys/sys/param.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dev/fbt/fbt.c
diff -u src/external/cddl/osnet/dev/fbt/fbt.c:1.19 src/external/cddl/osnet/dev/fbt/fbt.c:1.20
--- src/external/cddl/osnet/dev/fbt/fbt.c:1.19 Sun Jul 17 02:09:10 2016
+++ src/external/cddl/osnet/dev/fbt/fbt.c Fri Sep 16 03:10:45 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: fbt.c,v 1.19 2016/07/17 02:09:10 pgoyette Exp $ */
+/* $NetBSD: fbt.c,v 1.20 2016/09/16 03:10:45 pgoyette Exp $ */
/*
* CDDL HEADER START
@@ -2141,4 +2141,4 @@ fbt_open(dev_t dev, int flags, int mode,
return (0);
}
-MODULE(MODULE_CLASS_MISC, dtrace_fbt, "dtrace");
+MODULE(MODULE_CLASS_MISC, dtrace_fbt, "dtrace,zlib");
Index: src/sys/kern/files.kern
diff -u src/sys/kern/files.kern:1.11 src/sys/kern/files.kern:1.12
--- src/sys/kern/files.kern:1.11 Sat Apr 9 06:21:16 2016
+++ src/sys/kern/files.kern Fri Sep 16 03:10:45 2016
@@ -1,4 +1,4 @@
-# $NetBSD: files.kern,v 1.11 2016/04/09 06:21:16 riastradh Exp $
+# $NetBSD: files.kern,v 1.12 2016/09/16 03:10:45 pgoyette Exp $
#
# kernel sources
@@ -33,7 +33,10 @@ file kern/kern_clock.c kern
file kern/kern_condvar.c kern
file kern/kern_core.c coredump
file kern/kern_cpu.c kern
-file kern/kern_ctf.c kdtrace_hooks
+
+#kern/kern_ctf.c is only needed as part of dtrace_fbt module
+#file kern/kern_ctf.c kdtrace_hooks
+
file kern/kern_descrip.c kern
file kern/kern_event.c kern
file kern/kern_exec.c kern
Index: src/sys/modules/dtrace/fbt/Makefile
diff -u src/sys/modules/dtrace/fbt/Makefile:1.5 src/sys/modules/dtrace/fbt/Makefile:1.6
--- src/sys/modules/dtrace/fbt/Makefile:1.5 Thu Sep 18 19:45:24 2014
+++ src/sys/modules/dtrace/fbt/Makefile Fri Sep 16 03:10:45 2016
@@ -7,7 +7,11 @@
KMOD= dtrace_fbt
SRCS= fbt.c
-CPPFLAGS+= -I${NETBSDSRCDIR}/external/cddl/osnet/sys \
+.PATH: ${S}/kern
+
+SRCS+= kern_ctf.c
+
+CPPFLAGS.fbt.c+= -I${NETBSDSRCDIR}/external/cddl/osnet/sys \
-I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common
CPPFLAGS+= -Wno-unknown-pragmas
Index: src/sys/net/files.net
diff -u src/sys/net/files.net:1.10 src/sys/net/files.net:1.11
--- src/sys/net/files.net:1.10 Wed Aug 10 05:56:30 2016
+++ src/sys/net/files.net Fri Sep 16 03:10:45 2016
@@ -1,4 +1,4 @@
-# $NetBSD: files.net,v 1.10 2016/08/10 05:56:30 knakahara Exp $
+# $NetBSD: files.net,v 1.11 2016/09/16 03:10:45 pgoyette Exp $
# XXX CLEANUP
define net
@@ -49,7 +49,7 @@ file net/route.c net
file net/rtbl.c net
file net/rtsock.c net
file net/slcompress.c sl | ppp | strip | (irip & irip_vj)
-file net/zlib.c (ppp & ppp_deflate) | swcrypto | vnd_compression | kdtrace_hooks
+file net/zlib.c (ppp & ppp_deflate) | swcrypto | vnd_compression
file netinet/accf_data.c accf_data
file netinet/accf_http.c accf_http
file netinet/cpu_in_cksum.c (inet | inet6) & !cpu_in_cksum
Index: src/sys/sys/param.h
diff -u src/sys/sys/param.h:1.503 src/sys/sys/param.h:1.504
--- src/sys/sys/param.h:1.503 Tue Sep 13 07:41:18 2016
+++ src/sys/sys/param.h Fri Sep 16 03:10:45 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.503 2016/09/13 07:41:18 martin Exp $ */
+/* $NetBSD: param.h,v 1.504 2016/09/16 03:10:45 pgoyette Exp $ */
/*-
* Copyright (c) 1982, 1986, 1989, 1993
@@ -67,7 +67,7 @@
* 2.99.9 (299000900)
*/
-#define __NetBSD_Version__ 799003700 /* NetBSD 7.99.37 */
+#define __NetBSD_Version__ 799003800 /* NetBSD 7.99.38 */
#define __NetBSD_Prereq__(M,m,p) (M) * 1) + \
(m) * 100) + (p) * 100) <= __NetBSD_Version__)
CVS commit: src/tests/net/ndp
Module Name:src Committed By: ozaki-r Date: Fri Sep 16 00:50:43 UTC 2016 Modified Files: src/tests/net/ndp: t_dad.sh Log Message: Ignore case in duplicated To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/tests/net/ndp/t_dad.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/net/ndp
Module Name:src Committed By: ozaki-r Date: Fri Sep 16 00:50:43 UTC 2016 Modified Files: src/tests/net/ndp: t_dad.sh Log Message: Ignore case in duplicated To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/tests/net/ndp/t_dad.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/net/ndp/t_dad.sh diff -u src/tests/net/ndp/t_dad.sh:1.6 src/tests/net/ndp/t_dad.sh:1.7 --- src/tests/net/ndp/t_dad.sh:1.6 Fri Sep 16 00:14:33 2016 +++ src/tests/net/ndp/t_dad.sh Fri Sep 16 00:50:43 2016 @@ -1,4 +1,4 @@ -# $NetBSD: t_dad.sh,v 1.6 2016/09/16 00:14:33 ozaki-r Exp $ +# $NetBSD: t_dad.sh,v 1.7 2016/09/16 00:50:43 ozaki-r Exp $ # # Copyright (c) 2015 The NetBSD Foundation, Inc. # All rights reserved. @@ -35,6 +35,8 @@ SOCKPEER=unix://commsock2 DEBUG=false +duplicated="[Dd][Uu][Pp][Ll][Ii][Cc][Aa][Tt][Ee][Dd]" + atf_test_case dad_basic cleanup atf_test_case dad_duplicated cleanup @@ -180,8 +182,8 @@ dad_duplicated_body() export RUMP_SERVER=$SOCKLOCAL # The primary address isn't marked as duplicated - atf_check -s exit:0 -o not-match:'DUPLICATED' \ - -x "rump.ifconfig shmif0 |grep $localip1" + atf_check -s exit:0 -o not-match:"$localip1.+$duplicated" \ + rump.ifconfig shmif0 # # Add a new address duplicated with the peer server @@ -190,14 +192,14 @@ dad_duplicated_body() atf_check -s exit:0 sleep 1 # The new address is marked as duplicated - atf_check -s exit:0 -o match:'DUPLICATED' \ - -x "rump.ifconfig shmif0 |grep $peerip" + atf_check -s exit:0 -o match:"$peerip.+$duplicated" \ + rump.ifconfig shmif0 # A unique address isn't marked as duplicated atf_check -s exit:0 rump.ifconfig shmif0 inet6 $localip2 atf_check -s exit:0 sleep 1 - atf_check -s exit:0 -o not-match:'DUPLICATED' \ - -x "rump.ifconfig shmif0 |grep $localip2" + atf_check -s exit:0 -o not-match:"$localip2.+$duplicated" \ + rump.ifconfig shmif0 } cleanup()
CVS commit: src/tests/net/net
Module Name:src Committed By: ozaki-r Date: Fri Sep 16 00:44:14 UTC 2016 Modified Files: src/tests/net/net: t_ipv6_lifetime.sh Log Message: Ignore case in deprecated To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/net/net/t_ipv6_lifetime.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/net/net/t_ipv6_lifetime.sh diff -u src/tests/net/net/t_ipv6_lifetime.sh:1.2 src/tests/net/net/t_ipv6_lifetime.sh:1.3 --- src/tests/net/net/t_ipv6_lifetime.sh:1.2 Wed Aug 10 21:33:52 2016 +++ src/tests/net/net/t_ipv6_lifetime.sh Fri Sep 16 00:44:14 2016 @@ -1,4 +1,4 @@ -# $NetBSD: t_ipv6_lifetime.sh,v 1.2 2016/08/10 21:33:52 kre Exp $ +# $NetBSD: t_ipv6_lifetime.sh,v 1.3 2016/09/16 00:44:14 ozaki-r Exp $ # # Copyright (c) 2015 The NetBSD Foundation, Inc. # All rights reserved. @@ -33,6 +33,8 @@ BUS=./bus DEBUG=false +deprecated="[Dd][Ee][Pp][Rr][Ee][Cc][Aa][Tt][Ee][Dd]" + atf_test_case basic cleanup basic_head() @@ -69,7 +71,7 @@ basic_body() atf_check -s exit:0 sleep $(($time + $bonus)) $DEBUG && rump.ifconfig -L shmif0 # Should remain but marked as deprecated - atf_check -s exit:0 -o match:'deprecated' rump.ifconfig -L shmif0 + atf_check -s exit:0 -o match:"$ip.+$deprecated" rump.ifconfig -L shmif0 atf_check -s exit:0 rump.ifconfig shmif0 inet6 $ip delete # Setting only a valid lifetime (invalid) @@ -96,7 +98,7 @@ basic_body() atf_check -s exit:0 sleep $(($time + $bonus)) $DEBUG && rump.ifconfig -L shmif0 # Should remain but marked as deprecated - atf_check -s exit:0 -o match:'deprecated' rump.ifconfig -L shmif0 + atf_check -s exit:0 -o match:"$ip.+$deprecated" rump.ifconfig -L shmif0 atf_check -s exit:0 sleep $(($time + $bonus)) $DEBUG && rump.ifconfig -L shmif0 # Shouldn't remain anymore
CVS commit: src/tests/net/net
Module Name:src Committed By: ozaki-r Date: Fri Sep 16 00:44:14 UTC 2016 Modified Files: src/tests/net/net: t_ipv6_lifetime.sh Log Message: Ignore case in deprecated To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/net/net/t_ipv6_lifetime.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/net/ndp
Module Name:src Committed By: ozaki-r Date: Fri Sep 16 00:14:33 UTC 2016 Modified Files: src/tests/net/ndp: t_dad.sh Log Message: Adjust for new ifconfig output And use -o match to provide informative error messages. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/tests/net/ndp/t_dad.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/net/ndp/t_dad.sh diff -u src/tests/net/ndp/t_dad.sh:1.5 src/tests/net/ndp/t_dad.sh:1.6 --- src/tests/net/ndp/t_dad.sh:1.5 Wed Aug 10 23:07:57 2016 +++ src/tests/net/ndp/t_dad.sh Fri Sep 16 00:14:33 2016 @@ -1,4 +1,4 @@ -# $NetBSD: t_dad.sh,v 1.5 2016/08/10 23:07:57 kre Exp $ +# $NetBSD: t_dad.sh,v 1.6 2016/09/16 00:14:33 ozaki-r Exp $ # # Copyright (c) 2015 The NetBSD Foundation, Inc. # All rights reserved. @@ -180,7 +180,8 @@ dad_duplicated_body() export RUMP_SERVER=$SOCKLOCAL # The primary address isn't marked as duplicated - atf_check -s not-exit:0 -x "rump.ifconfig shmif0 |grep $localip1 |grep -q duplicated" + atf_check -s exit:0 -o not-match:'DUPLICATED' \ + -x "rump.ifconfig shmif0 |grep $localip1" # # Add a new address duplicated with the peer server @@ -189,12 +190,14 @@ dad_duplicated_body() atf_check -s exit:0 sleep 1 # The new address is marked as duplicated - atf_check -s exit:0 -x "rump.ifconfig shmif0 |grep $peerip |grep -q duplicated" + atf_check -s exit:0 -o match:'DUPLICATED' \ + -x "rump.ifconfig shmif0 |grep $peerip" # A unique address isn't marked as duplicated atf_check -s exit:0 rump.ifconfig shmif0 inet6 $localip2 atf_check -s exit:0 sleep 1 - atf_check -s not-exit:0 -x "rump.ifconfig shmif0 |grep $localip2 |grep -q duplicated" + atf_check -s exit:0 -o not-match:'DUPLICATED' \ + -x "rump.ifconfig shmif0 |grep $localip2" } cleanup()
CVS commit: src/share/man/man9
Module Name:src Committed By: jdolecek Date: Thu Sep 15 21:47:26 UTC 2016 Modified Files: src/share/man/man9: bus_space.9 Log Message: update manpage with reality WRT BUS_SPACE_BARRIER_SYNC and BUS_SPACE_BARRIER_X_BEFORE_Y flags To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/share/man/man9/bus_space.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/bus_space.9 diff -u src/share/man/man9/bus_space.9:1.48 src/share/man/man9/bus_space.9:1.49 --- src/share/man/man9/bus_space.9:1.48 Wed Jun 1 08:17:33 2016 +++ src/share/man/man9/bus_space.9 Thu Sep 15 21:47:26 2016 @@ -1,4 +1,4 @@ -.\" $NetBSD: bus_space.9,v 1.48 2016/06/01 08:17:33 wiz Exp $ +.\" $NetBSD: bus_space.9,v 1.49 2016/09/15 21:47:26 jdolecek Exp $ .\" .\" Copyright (c) 1997 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -1360,22 +1360,17 @@ The .Fa flags argument controls what types of operations are to be ordered. Supported flags are: -.Bl -tag -width BUS_SPACE_BARRIER_WRITE_BEFORE_WRITE -offset indent -.It Dv BUS_SPACE_BARRIER_READ_BEFORE_READ -Force all reads before the barrier to complete before any reads -after the barrier may be issued. -.It Dv BUS_SPACE_BARRIER_READ_BEFORE_WRITE -Force all reads before the barrier to complete before any writes -after the barrier may be issued. -.It Dv BUS_SPACE_BARRIER_WRITE_BEFORE_READ -Force all writes before the barrier to complete before any reads +.Bl -tag -width BUS_SPACE_BARRIER_WRITE -offset indent +.It Dv BUS_SPACE_BARRIER_READ +Force all +.Xr bus_space 9 +operations before the barrier to complete before any reads after the barrier may be issued. -.It Dv BUS_SPACE_BARRIER_WRITE_BEFORE_WRITE -Force all writes before the barrier to complete before any writes +.It Dv BUS_SPACE_BARRIER_WRITE +Force all +.Xr bus_space 9 +operations before the barrier to complete before any writes after the barrier may be issued. -.It Dv BUS_SPACE_BARRIER_SYNC -Force all memory operations and any pending exceptions to be -completed before any instructions after the barrier may be issued. .El .Pp Those flags can be combined (or-ed together) to enforce ordering on @@ -1400,11 +1395,11 @@ those two data bytes back would be: * space. */ bus_space_write_1(t, h, 0, data0); -bus_space_barrier(t, h, 0, 1, BUS_SPACE_BARRIER_WRITE_BEFORE_WRITE); /* 1 */ +bus_space_barrier(t, h, 0, 1, BUS_SPACE_BARRIER_WRITE); /* 1 */ bus_space_write_1(t, h, 0, data1); -bus_space_barrier(t, h, 0, 2, BUS_SPACE_BARRIER_WRITE_BEFORE_READ); /* 2 */ +bus_space_barrier(t, h, 0, 2, BUS_SPACE_BARRIER_WRITE); /* 2 */ ndata1 = bus_space_read_1(t, h, 1); -bus_space_barrier(t, h, 1, 1, BUS_SPACE_BARRIER_READ_BEFORE_READ); /* 3 */ +bus_space_barrier(t, h, 1, 1, BUS_SPACE_BARRIER_READ); /* 3 */ ndata0 = bus_space_read_1(t, h, 1); /* data0 == ndata0, data1 == ndata1 */ .Ed @@ -1429,14 +1424,6 @@ minimum number of bus space locations. It is correct (and often easier) to make barrier operations cover the device's whole range of bus space, that is, to specify an offset of zero and the size of the whole region. -.Pp -The following barrier operations are obsolete and should be removed -from existing code: -.Bl -tag -width BUS_SPACE_BARRIER_WRITE -offset indent -.It Dv BUS_SPACE_BARRIER_READ -Synchronize read operations. -.It Dv BUS_SPACE_BARRIER_WRITE -Synchronize write operations. .El .El .Sh REGION OPERATIONS
CVS commit: src/share/man/man9
Module Name:src Committed By: jdolecek Date: Thu Sep 15 21:47:26 UTC 2016 Modified Files: src/share/man/man9: bus_space.9 Log Message: update manpage with reality WRT BUS_SPACE_BARRIER_SYNC and BUS_SPACE_BARRIER_X_BEFORE_Y flags To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/share/man/man9/bus_space.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: jdolecek Date: Thu Sep 15 21:45:37 UTC 2016 Modified Files: src/sys/arch/ia64/include: bus.h src/sys/arch/mips/atheros/dev: argpio.c src/sys/arch/mips/include: bus_space_defs.h src/sys/dev/ic: atppcreg.h rtw.c rtwreg.h rtwvar.h sl811hs.c Log Message: remove last isolated islands using BUS_SPACE_BARRIER_SYNC and BUS_SPACE_BARRIER_X_BEFORE_X - these were only ever defined for mips and ia64, and never actually implemented even there To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/ia64/include/bus.h cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mips/atheros/dev/argpio.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/include/bus_space_defs.h cvs rdiff -u -r1.5 -r1.6 src/sys/dev/ic/atppcreg.h cvs rdiff -u -r1.123 -r1.124 src/sys/dev/ic/rtw.c cvs rdiff -u -r1.28 -r1.29 src/sys/dev/ic/rtwreg.h cvs rdiff -u -r1.43 -r1.44 src/sys/dev/ic/rtwvar.h cvs rdiff -u -r1.94 -r1.95 src/sys/dev/ic/sl811hs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: jdolecek
Date: Thu Sep 15 21:45:37 UTC 2016
Modified Files:
src/sys/arch/ia64/include: bus.h
src/sys/arch/mips/atheros/dev: argpio.c
src/sys/arch/mips/include: bus_space_defs.h
src/sys/dev/ic: atppcreg.h rtw.c rtwreg.h rtwvar.h sl811hs.c
Log Message:
remove last isolated islands using BUS_SPACE_BARRIER_SYNC and
BUS_SPACE_BARRIER_X_BEFORE_X - these were only ever defined for mips and ia64,
and never actually implemented even there
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/ia64/include/bus.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mips/atheros/dev/argpio.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/include/bus_space_defs.h
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/ic/atppcreg.h
cvs rdiff -u -r1.123 -r1.124 src/sys/dev/ic/rtw.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/ic/rtwreg.h
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/ic/rtwvar.h
cvs rdiff -u -r1.94 -r1.95 src/sys/dev/ic/sl811hs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/ia64/include/bus.h
diff -u src/sys/arch/ia64/include/bus.h:1.1 src/sys/arch/ia64/include/bus.h:1.2
--- src/sys/arch/ia64/include/bus.h:1.1 Mon Jul 20 04:41:37 2009
+++ src/sys/arch/ia64/include/bus.h Thu Sep 15 21:45:37 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.1 2009/07/20 04:41:37 kiyohara Exp $ */
+/* $NetBSD: bus.h,v 1.2 2016/09/15 21:45:37 jdolecek Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -957,17 +957,9 @@ ia64_bus_space_copy_region_8(bus_space_t
#define bus_space_barrier(t, h, o, l, f) \
ia64_bus_space_barrier((t), (h), (o), (l), (f))
-
#define BUS_SPACE_BARRIER_READ 0x01
#define BUS_SPACE_BARRIER_WRITE 0x02
-/* XXX to be investigated: are these used? */
-#define BUS_SPACE_BARRIER_READ_BEFORE_READ 0x04
-#define BUS_SPACE_BARRIER_READ_BEFORE_WRITE 0x08
-#define BUS_SPACE_BARRIER_WRITE_BEFORE_READ 0x10
-#define BUS_SPACE_BARRIER_WRITE_BEFORE_WRITE 0x20
-#define BUS_SPACE_BARRIER_SYNC 0x40
-
static __inline void
ia64_bus_space_barrier(bus_space_tag_t t, bus_space_handle_t handle,
bus_size_t offset, bus_size_t length, int flags)
Index: src/sys/arch/mips/atheros/dev/argpio.c
diff -u src/sys/arch/mips/atheros/dev/argpio.c:1.6 src/sys/arch/mips/atheros/dev/argpio.c:1.7
--- src/sys/arch/mips/atheros/dev/argpio.c:1.6 Sun Jul 17 01:29:25 2011
+++ src/sys/arch/mips/atheros/dev/argpio.c Thu Sep 15 21:45:37 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: argpio.c,v 1.6 2011/07/17 01:29:25 dyoung Exp $ */
+/* $NetBSD: argpio.c,v 1.7 2016/09/15 21:45:37 jdolecek Exp $ */
/*-
* Copyright (c) 2006 Garrett D'Amore
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: argpio.c,v 1.6 2011/07/17 01:29:25 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: argpio.c,v 1.7 2016/09/15 21:45:37 jdolecek Exp $");
#include
#include
@@ -91,7 +91,7 @@ CFATTACH_DECL_NEW(argpio, sizeof (struct
#define GETREG(sc, o) bus_space_read_4(sc->sc_st, sc->sc_sh, o)
#define PUTREG(sc, o, v) bus_space_write_4(sc->sc_st, sc->sc_sh, o, v)
#define FLUSH(sc) bus_space_barrier(sc->sc_st, sc->sc_sh, \
-0, 12, BUS_SPACE_BARRIER_SYNC)
+0, 12, BUS_SPACE_BARRIER_READ|BUS_SPACE_BARRIER_WRITE)
int
argpio_match(device_t parent, cfdata_t match, void *aux)
Index: src/sys/arch/mips/include/bus_space_defs.h
diff -u src/sys/arch/mips/include/bus_space_defs.h:1.2 src/sys/arch/mips/include/bus_space_defs.h:1.3
--- src/sys/arch/mips/include/bus_space_defs.h:1.2 Mon Jul 11 16:15:35 2016
+++ src/sys/arch/mips/include/bus_space_defs.h Thu Sep 15 21:45:37 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space_defs.h,v 1.2 2016/07/11 16:15:35 matt Exp $ */
+/* $NetBSD: bus_space_defs.h,v 1.3 2016/09/15 21:45:37 jdolecek Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -333,15 +333,6 @@ struct mips_bus_space_translation {
#define BUS_SPACE_BARRIER_READ 0x01
#define BUS_SPACE_BARRIER_WRITE 0x02
-/*
- * New style.
- */
-#define BUS_SPACE_BARRIER_SYNC 0x03
-#define BUS_SPACE_BARRIER_READ_BEFORE_READ BUS_SPACE_BARRIER_READ
-#define BUS_SPACE_BARRIER_READ_BEFORE_WRITE BUS_SPACE_BARRIER_READ
-#define BUS_SPACE_BARRIER_WRITE_BEFORE_READ BUS_SPACE_BARRIER_WRITE
-#define BUS_SPACE_BARRIER_WRITE_BEFORE_WRITE BUS_SPACE_BARRIER_WRITE
-
#endif /* _KERNEL */
#endif /* _MIPS_BUS_SPACE_DEFS_H_ */
Index: src/sys/dev/ic/atppcreg.h
diff -u src/sys/dev/ic/atppcreg.h:1.5 src/sys/dev/ic/atppcreg.h:1.6
--- src/sys/dev/ic/atppcreg.h:1.5 Sun Dec 11 12:21:25 2005
+++ src/sys/dev/ic/atppcreg.h Thu Sep 15 21:45:37 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: atppcreg.h,v 1.5 2005/12/11 12:21:25 christos Exp $ */
+/* $NetBSD: atppcreg.h,v 1.6 2016/09/15 21:45:37 jdolecek Exp $ */
/*-
* Copyright (c) 2001 Alcove - Nicolas Souchu
@@ -187,24 +187,6 @@
(atppc)->sc_ioh, 0, IO_LPTSIZE, BUS_SPACE_BARRIER_WRITE | \
BUS_SPACE_BARRIER_READ)
-/* These are
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: jdolecek Date: Thu Sep 15 20:03:36 UTC 2016 Modified Files: src/sys/arch/i386/conf: MODULAR Log Message: COMPAT_FREEBSD was dropped from GENERIC in rev. 1.1125, no need to disable in MODULAR any more To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/i386/conf/MODULAR Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: jdolecek Date: Thu Sep 15 20:03:36 UTC 2016 Modified Files: src/sys/arch/i386/conf: MODULAR Log Message: COMPAT_FREEBSD was dropped from GENERIC in rev. 1.1125, no need to disable in MODULAR any more To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/i386/conf/MODULAR Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/MODULAR diff -u src/sys/arch/i386/conf/MODULAR:1.2 src/sys/arch/i386/conf/MODULAR:1.3 --- src/sys/arch/i386/conf/MODULAR:1.2 Sat Mar 10 21:51:53 2012 +++ src/sys/arch/i386/conf/MODULAR Thu Sep 15 20:03:36 2016 @@ -1,4 +1,4 @@ -# $NetBSD: MODULAR,v 1.2 2012/03/10 21:51:53 joerg Exp $ +# $NetBSD: MODULAR,v 1.3 2016/09/15 20:03:36 jdolecek Exp $ # # MODULAR kernel # This kernel config prefers loading kernel drivers from file system. @@ -18,7 +18,6 @@ no options COMPAT_OSSAUDIO # OSS (Voxwa no options COMPAT_SVR4 # binary compatibility with SVR4 no options COMPAT_IBCS2 # binary compatibility with SCO and ISC no options COMPAT_LINUX # binary compatibility with Linux -no options COMPAT_FREEBSD # binary compatibility with FreeBSD # build non boot critical file systems as modules #
CVS commit: src/distrib/notes/macppc
Module Name:src Committed By: scole Date: Thu Sep 15 19:27:47 UTC 2016 Modified Files: src/distrib/notes/macppc: contents hardware Log Message: updates for PPC601 support being added To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/distrib/notes/macppc/contents cvs rdiff -u -r1.48 -r1.49 src/distrib/notes/macppc/hardware Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes/macppc
Module Name:src Committed By: scole Date: Thu Sep 15 19:27:47 UTC 2016 Modified Files: src/distrib/notes/macppc: contents hardware Log Message: updates for PPC601 support being added To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/distrib/notes/macppc/contents cvs rdiff -u -r1.48 -r1.49 src/distrib/notes/macppc/hardware Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/macppc/contents diff -u src/distrib/notes/macppc/contents:1.11 src/distrib/notes/macppc/contents:1.12 --- src/distrib/notes/macppc/contents:1.11 Tue May 19 19:30:28 2015 +++ src/distrib/notes/macppc/contents Thu Sep 15 19:27:47 2016 @@ -1,6 +1,6 @@ -.\" $NetBSD: contents,v 1.11 2015/05/19 19:30:28 snj Exp $ +.\" $NetBSD: contents,v 1.12 2016/09/15 19:27:47 scole Exp $ .\" -.\" Copyright (c) 1999-2005 The NetBSD Foundation, Inc. +.\" Copyright (c) 1999-2016 The NetBSD Foundation, Inc. .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -62,6 +62,11 @@ A gzipped .Nx kernel containing code for everything supported in this release. . +. It Pa netbsd-GENERIC_601.gz +A gzipped +.Nx +kernel containing code for PowerPC 601 machines. +. . It Pa netbsd-GENERIC.MP.gz . A gzipped @@ -191,7 +196,17 @@ kernel named .Pa /netbsd . You .Em must -install this distribution set. +install this distribution set unless you have a PowerPC 601 machine. +.It Sy kern-GENERIC_601 +This set contains a +.Nx*M +\*V +.Li GENERIC_601 +kernel named +.Pa /netbsd . +You +.Em must +install this distribution set if you have a PowerPC 601 machine. .It Sy kern-GENERIC.MP This set contains a .Nx*M Index: src/distrib/notes/macppc/hardware diff -u src/distrib/notes/macppc/hardware:1.48 src/distrib/notes/macppc/hardware:1.49 --- src/distrib/notes/macppc/hardware:1.48 Tue May 19 19:30:28 2015 +++ src/distrib/notes/macppc/hardware Thu Sep 15 19:27:47 2016 @@ -1,4 +1,4 @@ -.\"$NetBSD: hardware,v 1.48 2015/05/19 19:30:28 snj Exp $ +.\"$NetBSD: hardware,v 1.49 2016/09/15 19:27:47 scole Exp $ . Currently, .Nx*M @@ -34,15 +34,6 @@ Open Firmware version 2.4 is slightly di Open Firmware version 3 is altogether different, but easier to set up for .Nx . .Pp -At present, -.Nx*M -does not support the PPC 601 microprocessor, which means that the -PowerMacintosh 7200 and 7500 models are not supported. -The PowerMacintosh 7500 may be upgraded to a PPC 604, G3 -or G4 microprocessor via a daughtercard replacement, in which case -.Nx -will run on this system. -.Pp The minimal configuration requires 16 MB of RAM and 160 MB of disk space. To install the entire system requires considerably more, plus space for the swap partition (usually the RAM size, unless you've got a lot of RAM). @@ -58,7 +49,7 @@ version: .It Em "Open Firmware 1.0.5" .Pp .(bullet -compact -Apple PowerMacintosh (7300, 7500 (with CPU upgrade), 7600, 8500, 8600, 9500, +Apple PowerMacintosh (7200, 7300, 7500, 7600, 8500, 8600, 9500, and 9600) .It Apple Workgroup Server 8550 @@ -150,9 +141,6 @@ G5 models are supported as a 32-bit port . .Ss2 Unsupported models .(bullet -compact -offset indent -Systems with Open Firmware, but using a PPC 601 microprocessor -(PowerMacintosh 7200 and 7500 (without CPU upgrade)) -.It Systems with a PowerPC microprocessor, but lacking Open Firmware .(bullet -compact Apple PowerBook (1400, 2300, and 5300) @@ -179,7 +167,8 @@ part of the upgrade) CPU upgrades .(bullet -compact Only one CPU in a multiprocessor system is supported with the GENERIC kernel. -All CPUs are supported with the GENERIC.MP kernel. +For the 601, only one CPU is supported with the GENERIC_601 kernel. +All CPUs (except the 601) are supported with the GENERIC.MP kernel. .It Most CPU upgrades are supported. Some older models will not automatically enable the L2 and/or L3 caches on @@ -355,9 +344,12 @@ systems is reported to have the same pro PCI frame buffers which have Open Firmware support (ATI, IMS, Matrox, and NVIDIA have several models which work) .It +Valkyrie and Platinum framebuffer drivers +.Pq Em valkyriefb and Em platinumfb +.It Full wscons capabilities, such as virtual terminals and color text are available. (Note however that switching between virtual terminals -while running an X session is not supported at present.) +while running an X session may not be supported by all drivers.) .bullet) .It Audio
CVS commit: src/sys/kern
Module Name:src
Committed By: christos
Date: Thu Sep 15 18:40:34 UTC 2016
Modified Files:
src/sys/kern: exec_elf.c
Log Message:
oops removed too much
To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/sys/kern/exec_elf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/exec_elf.c
diff -u src/sys/kern/exec_elf.c:1.86 src/sys/kern/exec_elf.c:1.87
--- src/sys/kern/exec_elf.c:1.86 Thu Sep 15 13:45:44 2016
+++ src/sys/kern/exec_elf.c Thu Sep 15 14:40:34 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_elf.c,v 1.86 2016/09/15 17:45:44 christos Exp $ */
+/* $NetBSD: exec_elf.c,v 1.87 2016/09/15 18:40:34 christos Exp $ */
/*-
* Copyright (c) 1994, 2000, 2005, 2015 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include
-__KERNEL_RCSID(1, "$NetBSD: exec_elf.c,v 1.86 2016/09/15 17:45:44 christos Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exec_elf.c,v 1.87 2016/09/15 18:40:34 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_pax.h"
@@ -114,6 +114,7 @@ static void elf_free_emul_arg(void *);
#define DPRINTF(a, ...) printf("%s: " a "\n", __func__, ##__VA_ARGS__)
#else
#define DPRINTF(a, ...)
+#endif
/* round up and down to page boundaries. */
#define ELF_ROUND(a, b) (((a) + (b) - 1) & ~((b) - 1))
CVS commit: src/sys/kern
Module Name:src Committed By: christos Date: Thu Sep 15 18:40:34 UTC 2016 Modified Files: src/sys/kern: exec_elf.c Log Message: oops removed too much To generate a diff of this commit: cvs rdiff -u -r1.86 -r1.87 src/sys/kern/exec_elf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: roy
Date: Thu Sep 15 18:25:45 UTC 2016
Modified Files:
src/sys/netinet: ip_output.c
src/sys/netinet6: ip6_output.c
Log Message:
Ensure that packets are sent from a valid address.
If the packet is TCP and the address is detached or tentative then
it's just dropped, otherwise an error is returned.
This is needed because you can bind to a valid address and it can then
become invalid.
This satisfies RFC 4862 section 5.5.4.
To generate a diff of this commit:
cvs rdiff -u -r1.260 -r1.261 src/sys/netinet/ip_output.c
cvs rdiff -u -r1.173 -r1.174 src/sys/netinet6/ip6_output.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/ip_output.c
diff -u src/sys/netinet/ip_output.c:1.260 src/sys/netinet/ip_output.c:1.261
--- src/sys/netinet/ip_output.c:1.260 Mon Aug 1 03:15:30 2016
+++ src/sys/netinet/ip_output.c Thu Sep 15 18:25:45 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_output.c,v 1.260 2016/08/01 03:15:30 ozaki-r Exp $ */
+/* $NetBSD: ip_output.c,v 1.261 2016/09/15 18:25:45 roy Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.260 2016/08/01 03:15:30 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.261 2016/09/15 18:25:45 roy Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -153,6 +153,7 @@ static struct mbuf *ip_insertoptions(str
static struct ifnet *ip_multicast_if(struct in_addr *, int *);
static void ip_mloopback(struct ifnet *, struct mbuf *,
const struct sockaddr_in *);
+static int ip_ifaddrvalid(const struct in_ifaddr *);
extern pfil_head_t *inet_pfil_hook; /* XXX */
@@ -607,14 +608,31 @@ sendit:
m->m_pkthdr.csum_data |= hlen << 16;
-#if IFA_STATS
/*
* search for the source address structure to
* maintain output statistics.
*/
KASSERT(ia == NULL);
ia = in_get_ia_psref(ip->ip_src, _ia);
-#endif
+
+ /* Ensure we only sent from a valid address. */
+ if ((ia != NULL || (flags & IP_FORWARDING) == 0) &&
+ (error = ip_ifaddrvalid(ia)) != 0)
+ {
+ arplog(LOG_ERR,
+ "refusing to send from invalid address %s (pid %d)\n",
+ in_fmtaddr(ip->ip_src), curproc->p_pid);
+ IP_STATINC(IP_STAT_ODROPPED);
+ if (error == 1 && ip->ip_p == IPPROTO_TCP)
+ /* Address exists, but is tentative or detached.
+ * We can't send from it because it's invalid,
+ * so we drop the packet and continue ...
+ * TCP will timeout eventually. */
+ error = 0;
+ else
+ error = EADDRNOTAVAIL;
+ goto bad;
+ }
/* Maybe skip checksums on loopback interfaces. */
if (IN_NEED_CHECKSUM(ifp, M_CSUM_IPv4)) {
@@ -1850,3 +1868,26 @@ ip_mloopback(struct ifnet *ifp, struct m
KERNEL_UNLOCK_ONE(NULL);
#endif
}
+
+/*
+ * Ensure sending address is valid.
+ * Returns 0 on success, -1 if an error should be sent back or 1
+ * if the packet could be dropped without error (protocol dependent).
+ */
+static int
+ip_ifaddrvalid(const struct in_ifaddr *ia)
+{
+
+ if (ia == NULL)
+ return -1;
+
+ if (ia->ia_addr.sin_addr.s_addr == INADDR_ANY)
+ return 0;
+
+ if (ia->ia4_flags & IN_IFF_DUPLICATED)
+ return -1;
+ else if (ia->ia4_flags & (IN_IFF_TENTATIVE | IN_IFF_DETACHED))
+ return 1;
+
+ return 0;
+}
Index: src/sys/netinet6/ip6_output.c
diff -u src/sys/netinet6/ip6_output.c:1.173 src/sys/netinet6/ip6_output.c:1.174
--- src/sys/netinet6/ip6_output.c:1.173 Mon Aug 1 03:15:31 2016
+++ src/sys/netinet6/ip6_output.c Thu Sep 15 18:25:45 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_output.c,v 1.173 2016/08/01 03:15:31 ozaki-r Exp $ */
+/* $NetBSD: ip6_output.c,v 1.174 2016/09/15 18:25:45 roy Exp $ */
/* $KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.173 2016/08/01 03:15:31 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.174 2016/09/15 18:25:45 roy Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -77,6 +77,7 @@ __KERNEL_RCSID(0, "$NetBSD: ip6_output.c
#include
#include
#include
+#include
#include
#include
#include
@@ -135,6 +136,7 @@ static int ip6_splithdr(struct mbuf *, s
static int ip6_getpmtu(struct route *, struct route *, struct ifnet *,
const struct in6_addr *, u_long *, int *);
static int copypktopts(struct ip6_pktopts *, struct ip6_pktopts *, int);
+static int ip6_ifaddrvalid(const struct in6_addr *);
#ifdef RFC2292
static int ip6_pcbopts(struct ip6_pktopts **, struct socket *, struct sockopt *);
@@ -550,6 +552,22 @@ ip6_output(
/* scope check is done. */
+ /* Ensure we only sent from a valid address. */
+ if ((error = ip6_ifaddrvalid()) != 0) {
+ nd6log(LOG_ERR,
+ "refusing to send from invalid address %s (pid %d)\n",
+ ip6_sprintf(), curproc->p_pid);
+ if (error == 1 && ip6->ip6_nxt == IPPROTO_TCP)
+ /* Address exists, but is tentative or
CVS commit: src/sys
Module Name:src Committed By: roy Date: Thu Sep 15 18:25:45 UTC 2016 Modified Files: src/sys/netinet: ip_output.c src/sys/netinet6: ip6_output.c Log Message: Ensure that packets are sent from a valid address. If the packet is TCP and the address is detached or tentative then it's just dropped, otherwise an error is returned. This is needed because you can bind to a valid address and it can then become invalid. This satisfies RFC 4862 section 5.5.4. To generate a diff of this commit: cvs rdiff -u -r1.260 -r1.261 src/sys/netinet/ip_output.c cvs rdiff -u -r1.173 -r1.174 src/sys/netinet6/ip6_output.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/netinet
Module Name:src
Committed By: roy
Date: Thu Sep 15 18:17:30 UTC 2016
Modified Files:
src/sys/netinet: if_arp.c in_var.h
Log Message:
Allow arplog to be used outside of if_arp.c
To generate a diff of this commit:
cvs rdiff -u -r1.223 -r1.224 src/sys/netinet/if_arp.c
cvs rdiff -u -r1.81 -r1.82 src/sys/netinet/in_var.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/if_arp.c
diff -u src/sys/netinet/if_arp.c:1.223 src/sys/netinet/if_arp.c:1.224
--- src/sys/netinet/if_arp.c:1.223 Wed Sep 7 13:01:39 2016
+++ src/sys/netinet/if_arp.c Thu Sep 15 18:17:29 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_arp.c,v 1.223 2016/09/07 13:01:39 roy Exp $ */
+/* $NetBSD: if_arp.c,v 1.224 2016/09/15 18:17:29 roy Exp $ */
/*-
* Copyright (c) 1998, 2000, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.223 2016/09/07 13:01:39 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.224 2016/09/15 18:17:29 roy Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -149,12 +149,10 @@ static int arp_maxhold = 1; /* number of
int ip_dad_count = PROBE_NUM;
#ifdef ARP_DEBUG
-static int arp_debug = 1;
+int arp_debug = 1;
#else
-static int arp_debug = 0;
+int arp_debug = 0;
#endif
-#define arplog(level, fmt, args...) \
- do { if (arp_debug) log(level, "%s: " fmt, __func__, ##args);} while (0)
static void arp_init(void);
Index: src/sys/netinet/in_var.h
diff -u src/sys/netinet/in_var.h:1.81 src/sys/netinet/in_var.h:1.82
--- src/sys/netinet/in_var.h:1.81 Tue Sep 13 00:45:15 2016
+++ src/sys/netinet/in_var.h Thu Sep 15 18:17:29 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: in_var.h,v 1.81 2016/09/13 00:45:15 christos Exp $ */
+/* $NetBSD: in_var.h,v 1.82 2016/09/15 18:17:29 roy Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -378,6 +378,9 @@ struct in_multi {
extern pktqueue_t *ip_pktq;
extern int ip_dad_count; /* Duplicate Address Detection probes */
+extern int arp_debug;
+#define arplog(level, fmt, args...) \
+ do { if (arp_debug) log(level, "%s: " fmt, __func__, ##args);} while (0)
/*
* Structure used by functions below to remember position when stepping
CVS commit: src/sys/netinet
Module Name:src Committed By: roy Date: Thu Sep 15 18:17:30 UTC 2016 Modified Files: src/sys/netinet: if_arp.c in_var.h Log Message: Allow arplog to be used outside of if_arp.c To generate a diff of this commit: cvs rdiff -u -r1.223 -r1.224 src/sys/netinet/if_arp.c cvs rdiff -u -r1.81 -r1.82 src/sys/netinet/in_var.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: christos Date: Thu Sep 15 17:45:44 UTC 2016 Modified Files: src/sys/kern: exec_elf.c Log Message: Add debugging. To generate a diff of this commit: cvs rdiff -u -r1.85 -r1.86 src/sys/kern/exec_elf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src
Committed By: christos
Date: Thu Sep 15 17:45:44 UTC 2016
Modified Files:
src/sys/kern: exec_elf.c
Log Message:
Add debugging.
To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sys/kern/exec_elf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/exec_elf.c
diff -u src/sys/kern/exec_elf.c:1.85 src/sys/kern/exec_elf.c:1.86
--- src/sys/kern/exec_elf.c:1.85 Wed May 25 13:25:32 2016
+++ src/sys/kern/exec_elf.c Thu Sep 15 13:45:44 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_elf.c,v 1.85 2016/05/25 17:25:32 christos Exp $ */
+/* $NetBSD: exec_elf.c,v 1.86 2016/09/15 17:45:44 christos Exp $ */
/*-
* Copyright (c) 1994, 2000, 2005, 2015 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include
-__KERNEL_RCSID(1, "$NetBSD: exec_elf.c,v 1.85 2016/05/25 17:25:32 christos Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exec_elf.c,v 1.86 2016/09/15 17:45:44 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_pax.h"
@@ -110,6 +110,11 @@ int netbsd_elf_probe(struct lwp *, struc
static void elf_free_emul_arg(void *);
+#ifdef DEBUG_ELF
+#define DPRINTF(a, ...) printf("%s: " a "\n", __func__, ##__VA_ARGS__)
+#else
+#define DPRINTF(a, ...)
+
/* round up and down to page boundaries. */
#define ELF_ROUND(a, b) (((a) + (b) - 1) & ~((b) - 1))
#define ELF_TRUNC(a, b) ((a) & ~((b) - 1))
@@ -259,22 +264,30 @@ elf_check_header(Elf_Ehdr *eh)
{
if (memcmp(eh->e_ident, ELFMAG, SELFMAG) != 0 ||
- eh->e_ident[EI_CLASS] != ELFCLASS)
+ eh->e_ident[EI_CLASS] != ELFCLASS) {
+ DPRINTF("bad magic %#x%x%x", eh->e_ident[0], eh->e_ident[1],
+ eh->e_ident[2]);
return ENOEXEC;
+ }
switch (eh->e_machine) {
ELFDEFNNAME(MACHDEP_ID_CASES)
default:
+ DPRINTF("bad machine %#x", eh->e_machine);
return ENOEXEC;
}
- if (ELF_EHDR_FLAGS_OK(eh) == 0)
+ if (ELF_EHDR_FLAGS_OK(eh) == 0) {
+ DPRINTF("bad flags %#x", eh->e_flags);
return ENOEXEC;
+ }
- if (eh->e_shnum > ELF_MAXSHNUM || eh->e_phnum > ELF_MAXPHNUM)
+ if (eh->e_shnum > ELF_MAXSHNUM || eh->e_phnum > ELF_MAXPHNUM) {
+ DPRINTF("bad shnum/phnum %#x/%#x", eh->e_shnum, eh->e_phnum);
return ENOEXEC;
+ }
return 0;
}
@@ -451,6 +464,7 @@ elf_load_interp(struct lwp *l, struct ex
if ((error = elf_check_header()) != 0)
goto bad;
if (eh.e_type != ET_DYN || eh.e_phnum == 0) {
+ DPRINTF("bad interpreter type %#x", eh.e_type);
error = ENOEXEC;
goto bad;
}
@@ -495,6 +509,7 @@ elf_load_interp(struct lwp *l, struct ex
}
if (base_ph == NULL) {
+ DPRINTF("no interpreter loadable sections");
error = ENOEXEC;
goto bad;
}
@@ -616,19 +631,25 @@ exec_elf_makecmds(struct lwp *l, struct
struct elf_args *ap;
bool is_dyn = false;
- if (epp->ep_hdrvalid < sizeof(Elf_Ehdr))
+ if (epp->ep_hdrvalid < sizeof(Elf_Ehdr)) {
+ DPRINTF("small header %#x", epp->ep_hdrvalid);
return ENOEXEC;
+ }
if ((error = elf_check_header(eh)) != 0)
return error;
if (eh->e_type == ET_DYN)
/* PIE, and some libs have an entry point */
is_dyn = true;
- else if (eh->e_type != ET_EXEC)
+ else if (eh->e_type != ET_EXEC) {
+ DPRINTF("bad type %#x", eh->e_type);
return ENOEXEC;
+ }
- if (eh->e_phnum == 0)
+ if (eh->e_phnum == 0) {
+ DPRINTF("no program headers");
return ENOEXEC;
+ }
error = vn_marktext(epp->ep_vp);
if (error)
@@ -652,6 +673,8 @@ exec_elf_makecmds(struct lwp *l, struct
pp = [i];
if (pp->p_type == PT_INTERP) {
if (pp->p_filesz < 2 || pp->p_filesz > MAXPATHLEN) {
+DPRINTF("bad interpreter namelen %#jx",
+(uintmax_t)pp->p_filesz);
error = ENOEXEC;
goto bad;
}
@@ -661,6 +684,7 @@ exec_elf_makecmds(struct lwp *l, struct
goto bad;
/* Ensure interp is NUL-terminated and of the expected length */
if (strnlen(interp, pp->p_filesz) != pp->p_filesz - 1) {
+DPRINTF("bad interpreter name");
error = ENOEXEC;
goto bad;
}
@@ -746,6 +770,7 @@ exec_elf_makecmds(struct lwp *l, struct
if (epp->ep_vmcmds.evs_used == 0) {
/* No VMCMD; there was no PT_LOAD section, or those
* sections were empty */
+ DPRINTF("no vmcommands");
error = ENOEXEC;
goto bad;
}
@@ -769,6 +794,7 @@ exec_elf_makecmds(struct lwp *l, struct
}
if (epp->ep_vmcmds.evs_used == nused) {
/* elf_load_interp() has not set up any new VMCMD */
+ DPRINTF("no vmcommands for interpreter");
error = ENOEXEC;
goto bad;
}
@@ -839,8 +865,10 @@ netbsd_elf_signature(struct lwp *l, stru
#endif
epp->ep_pax_flags = 0;
- if (eh->e_shnum > ELF_MAXSHNUM || eh->e_shnum == 0)
+ if (eh->e_shnum > ELF_MAXSHNUM || eh->e_shnum == 0) {
+ DPRINTF("no signature %#x", eh->e_shnum);
return ENOEXEC;
+ }
shsize = eh->e_shnum * sizeof(Elf_Shdr);
sh = kmem_alloc(shsize, KM_SLEEP);
@@ -1004,6 +1032,10 @@ bad:
kmem_free(np, ELF_MAXNOTESIZE);
error = isnetbsd ? 0 : ENOEXEC;
+#ifdef DEBUG_ELF
+ if (error)
+
CVS commit: src/sys/kern
Module Name:src Committed By: christos Date: Thu Sep 15 17:44:16 UTC 2016 Modified Files: src/sys/kern: kern_exec.c Log Message: m68k binaries load @ pagesize. unbreak. To generate a diff of this commit: cvs rdiff -u -r1.436 -r1.437 src/sys/kern/kern_exec.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: christos Date: Thu Sep 15 17:44:16 UTC 2016 Modified Files: src/sys/kern: kern_exec.c Log Message: m68k binaries load @ pagesize. unbreak. To generate a diff of this commit: cvs rdiff -u -r1.436 -r1.437 src/sys/kern/kern_exec.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/kern_exec.c diff -u src/sys/kern/kern_exec.c:1.436 src/sys/kern/kern_exec.c:1.437 --- src/sys/kern/kern_exec.c:1.436 Sat Aug 6 11:13:13 2016 +++ src/sys/kern/kern_exec.c Thu Sep 15 13:44:16 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_exec.c,v 1.436 2016/08/06 15:13:13 maxv Exp $ */ +/* $NetBSD: kern_exec.c,v 1.437 2016/09/15 17:44:16 christos Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -59,7 +59,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.436 2016/08/06 15:13:13 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.437 2016/09/15 17:44:16 christos Exp $"); #include "opt_exec.h" #include "opt_execfmt.h" @@ -660,7 +660,7 @@ exec_vm_minaddr(vaddr_t va_min) * Increase va_min if we don't want NULL to be mappable by the * process. */ -#define VM_MIN_GUARD (2 * PAGE_SIZE) +#define VM_MIN_GUARD PAGE_SIZE if (user_va0_disable && (va_min < VM_MIN_GUARD)) return VM_MIN_GUARD; return va_min;
CVS commit: src/lib/libc
Module Name:src Committed By: joerg Date: Thu Sep 15 16:23:05 UTC 2016 Modified Files: src/lib/libc: shlib_version Log Message: gethostbyname_r should die. To generate a diff of this commit: cvs rdiff -u -r1.266 -r1.267 src/lib/libc/shlib_version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/shlib_version diff -u src/lib/libc/shlib_version:1.266 src/lib/libc/shlib_version:1.267 --- src/lib/libc/shlib_version:1.266 Sat Jul 9 20:15:06 2016 +++ src/lib/libc/shlib_version Thu Sep 15 16:23:05 2016 @@ -1,4 +1,4 @@ -# $NetBSD: shlib_version,v 1.266 2016/07/09 20:15:06 dholland Exp $ +# $NetBSD: shlib_version,v 1.267 2016/09/15 16:23:05 joerg Exp $ # Remember to update distrib/sets/lists/base/shl.* when changing # # things we wish to do on next major version bump: @@ -40,6 +40,7 @@ # - consolidate ownership with crt0.o and avoid common symbols # - redo stdin/stdout/stderr to not require copy relocations # - move gethostbyname to a compat library +# - remove badly hidden gethostbyname_r # - remove arc4random(3) API # - decide whether soft-float should support fenv.h, including thread-local contett # - stop all math functions from setting errno
CVS commit: src/lib/libc
Module Name:src Committed By: joerg Date: Thu Sep 15 16:23:05 UTC 2016 Modified Files: src/lib/libc: shlib_version Log Message: gethostbyname_r should die. To generate a diff of this commit: cvs rdiff -u -r1.266 -r1.267 src/lib/libc/shlib_version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4/man4.macppc
Module Name:src Committed By: wiz Date: Thu Sep 15 15:25:11 UTC 2016 Modified Files: src/share/man/man4/man4.macppc: platinumfb.4 Log Message: Sort SEE ALSO. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/man4.macppc/platinumfb.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/man4.macppc/platinumfb.4 diff -u src/share/man/man4/man4.macppc/platinumfb.4:1.3 src/share/man/man4/man4.macppc/platinumfb.4:1.4 --- src/share/man/man4/man4.macppc/platinumfb.4:1.3 Thu Sep 15 15:19:00 2016 +++ src/share/man/man4/man4.macppc/platinumfb.4 Thu Sep 15 15:25:11 2016 @@ -1,4 +1,4 @@ -.\" $NetBSD: platinumfb.4,v 1.3 2016/09/15 15:19:00 scole Exp $ +.\" $NetBSD: platinumfb.4,v 1.4 2016/09/15 15:25:11 wiz Exp $ .\" .\" Copyright (c) 2016 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -43,8 +43,8 @@ This driver should support console outpu .Pp It may be required to set the output-device to 'screen' in Open Firmware. .Sh SEE ALSO -.Xr rasops 9 , -.Xr wsdisplay 4 +.Xr wsdisplay 4 , +.Xr rasops 9 .Sh HISTORY The .Nm
CVS commit: src/share/man/man4/man4.macppc
Module Name:src Committed By: wiz Date: Thu Sep 15 15:25:11 UTC 2016 Modified Files: src/share/man/man4/man4.macppc: platinumfb.4 Log Message: Sort SEE ALSO. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/man4.macppc/platinumfb.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4/man4.macppc
Module Name:src Committed By: scole Date: Thu Sep 15 15:19:00 UTC 2016 Modified Files: src/share/man/man4/man4.macppc: platinumfb.4 Log Message: Reference rasops(9), not rasops(4) which doesn't exist To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/man4.macppc/platinumfb.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/man4.macppc/platinumfb.4 diff -u src/share/man/man4/man4.macppc/platinumfb.4:1.2 src/share/man/man4/man4.macppc/platinumfb.4:1.3 --- src/share/man/man4/man4.macppc/platinumfb.4:1.2 Thu Sep 15 09:11:47 2016 +++ src/share/man/man4/man4.macppc/platinumfb.4 Thu Sep 15 15:19:00 2016 @@ -1,4 +1,4 @@ -.\" $NetBSD: platinumfb.4,v 1.2 2016/09/15 09:11:47 wiz Exp $ +.\" $NetBSD: platinumfb.4,v 1.3 2016/09/15 15:19:00 scole Exp $ .\" .\" Copyright (c) 2016 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -43,7 +43,7 @@ This driver should support console outpu .Pp It may be required to set the output-device to 'screen' in Open Firmware. .Sh SEE ALSO -.Xr rasops 4 , +.Xr rasops 9 , .Xr wsdisplay 4 .Sh HISTORY The
CVS commit: src/share/man/man4/man4.macppc
Module Name:src Committed By: scole Date: Thu Sep 15 15:19:00 UTC 2016 Modified Files: src/share/man/man4/man4.macppc: platinumfb.4 Log Message: Reference rasops(9), not rasops(4) which doesn't exist To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/man4.macppc/platinumfb.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/net
Module Name:src
Committed By: christos
Date: Thu Sep 15 14:40:43 UTC 2016
Modified Files:
src/sys/net: if_bridge.c
Log Message:
Always do the mbuf checks. The packet filters (npf) expect the mbuf to be
pulled-up. (Krists Krilovs)
To generate a diff of this commit:
cvs rdiff -u -r1.130 -r1.131 src/sys/net/if_bridge.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_bridge.c
diff -u src/sys/net/if_bridge.c:1.130 src/sys/net/if_bridge.c:1.131
--- src/sys/net/if_bridge.c:1.130 Sun Aug 28 23:31:59 2016
+++ src/sys/net/if_bridge.c Thu Sep 15 10:40:43 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bridge.c,v 1.130 2016/08/29 03:31:59 ozaki-r Exp $ */
+/* $NetBSD: if_bridge.c,v 1.131 2016/09/15 14:40:43 christos Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -80,7 +80,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.130 2016/08/29 03:31:59 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.131 2016/09/15 14:40:43 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_bridge_ipf.h"
@@ -2557,13 +2557,13 @@ bridge_ipf(void *arg, struct mbuf **mp,
switch (ether_type)
{
case ETHERTYPE_IP :
- error = (dir == PFIL_IN) ? bridge_ip_checkbasic(mp) : 0;
+ error = bridge_ip_checkbasic(mp);
if (error == 0)
error = pfil_run_hooks(inet_pfil_hook, mp, ifp, dir);
break;
# ifdef INET6
case ETHERTYPE_IPV6 :
- error = (dir == PFIL_IN) ? bridge_ip6_checkbasic(mp) : 0;
+ error = bridge_ip6_checkbasic(mp);
if (error == 0)
error = pfil_run_hooks(inet6_pfil_hook, mp, ifp, dir);
break;
CVS commit: src/sys/net
Module Name:src Committed By: christos Date: Thu Sep 15 14:40:43 UTC 2016 Modified Files: src/sys/net: if_bridge.c Log Message: Always do the mbuf checks. The packet filters (npf) expect the mbuf to be pulled-up. (Krists Krilovs) To generate a diff of this commit: cvs rdiff -u -r1.130 -r1.131 src/sys/net/if_bridge.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man9
Module Name:src Committed By: jdolecek Date: Thu Sep 15 09:41:33 UTC 2016 Modified Files: src/share/man/man9: pci_msi.9 Log Message: fix typo in function names To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/share/man/man9/pci_msi.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/pci_msi.9 diff -u src/share/man/man9/pci_msi.9:1.11 src/share/man/man9/pci_msi.9:1.12 --- src/share/man/man9/pci_msi.9:1.11 Mon Aug 29 02:48:56 2016 +++ src/share/man/man9/pci_msi.9 Thu Sep 15 09:41:33 2016 @@ -1,4 +1,4 @@ -.\" $NetBSD: pci_msi.9,v 1.11 2016/08/29 02:48:56 knakahara Exp $ +.\" $NetBSD: pci_msi.9,v 1.12 2016/09/15 09:41:33 jdolecek Exp $ .\" .\" Copyright (c) 2015 Internet Initiative Japan Inc. .\" All rights reserved. @@ -50,7 +50,7 @@ .Fn pci_msi_alloc "const struct pci_attach_args *pa" \ "pci_intr_handle_t **ihps" "int *count" .Ft int -.Fn pci_msi_alloc_exect "const struct pci_attach_args *pa" \ +.Fn pci_msi_alloc_exact "const struct pci_attach_args *pa" \ "pci_intr_handle_t **ihps" "int count" .Ft int .Fn pci_msix_count "pci_chipset_tag_t pc" \ @@ -59,7 +59,7 @@ .Fn pci_msix_alloc "const struct pci_attach_args *pa" \ "pci_intr_handle_t **ihps" "int *count" .Ft int -.Fn pci_msix_alloc_exect "const struct pci_attach_args *pa" \ +.Fn pci_msix_alloc_exact "const struct pci_attach_args *pa" \ "pci_intr_handle_t **ihps" "int count" .Ft int .Fn pci_msix_alloc_map "const struct pci_attach_args *pa" \
CVS commit: src/share/man/man9
Module Name:src Committed By: jdolecek Date: Thu Sep 15 09:41:33 UTC 2016 Modified Files: src/share/man/man9: pci_msi.9 Log Message: fix typo in function names To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/share/man/man9/pci_msi.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4/man4.macppc
Module Name:src Committed By: wiz Date: Thu Sep 15 09:11:47 UTC 2016 Modified Files: src/share/man/man4/man4.macppc: platinumfb.4 Log Message: Use An in AUTHORS section. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man4/man4.macppc/platinumfb.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/man4.macppc/platinumfb.4 diff -u src/share/man/man4/man4.macppc/platinumfb.4:1.1 src/share/man/man4/man4.macppc/platinumfb.4:1.2 --- src/share/man/man4/man4.macppc/platinumfb.4:1.1 Wed Sep 14 20:04:22 2016 +++ src/share/man/man4/man4.macppc/platinumfb.4 Thu Sep 15 09:11:47 2016 @@ -1,4 +1,4 @@ -.\" $NetBSD: platinumfb.4,v 1.1 2016/09/14 20:04:22 scole Exp $ +.\" $NetBSD: platinumfb.4,v 1.2 2016/09/15 09:11:47 wiz Exp $ .\" .\" Copyright (c) 2016 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -53,7 +53,8 @@ device driver appeared in .Sh AUTHORS The .Nm -driver was written by Sean Cole. +driver was written by +.An Sean Cole . .Sh BUGS Early PowerMacs with the .Nm
CVS commit: src/share/man/man4/man4.macppc
Module Name:src Committed By: wiz Date: Thu Sep 15 09:11:47 UTC 2016 Modified Files: src/share/man/man4/man4.macppc: platinumfb.4 Log Message: Use An in AUTHORS section. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man4/man4.macppc/platinumfb.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/librt
Module Name:src Committed By: njoly Date: Thu Sep 15 07:53:59 UTC 2016 Modified Files: src/lib/librt: sched.3 Log Message: Fix function name macro. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/lib/librt/sched.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/librt
Module Name:src Committed By: njoly Date: Thu Sep 15 07:53:59 UTC 2016 Modified Files: src/lib/librt: sched.3 Log Message: Fix function name macro. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/lib/librt/sched.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/librt/sched.3 diff -u src/lib/librt/sched.3:1.17 src/lib/librt/sched.3:1.18 --- src/lib/librt/sched.3:1.17 Fri Aug 5 13:03:13 2016 +++ src/lib/librt/sched.3 Thu Sep 15 07:53:59 2016 @@ -1,4 +1,4 @@ -.\" $NetBSD: sched.3,v 1.17 2016/08/05 13:03:13 christos Exp $ +.\" $NetBSD: sched.3,v 1.18 2016/09/15 07:53:59 njoly Exp $ .\" .\" Copyright (c) 2008, 2016 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -64,9 +64,9 @@ .Ft int .Fn sched_yield "void" .Ft int -.fn sched_setaffinity_np "pid_t pid" "size_t size" "cpuset_t *cpuset" +.Fn sched_setaffinity_np "pid_t pid" "size_t size" "cpuset_t *cpuset" .Ft int -.fn sched_getaffinity_np "pid_t pid" "size_t size" "cpuset_t *cpuset" +.Fn sched_getaffinity_np "pid_t pid" "size_t size" "cpuset_t *cpuset" .Ft int .Fn sched_protect "int priority" .Sh DESCRIPTION
CVS commit: src
Module Name:src
Committed By: mrg
Date: Thu Sep 15 07:49:08 UTC 2016
Modified Files:
src: UPDATING
src/share/mk: bsd.own.mk
Log Message:
switch amd64, i386, shark, ofppc and macppc to xorg-server 1.18.
add a note to UPDATING about needing a clean objdir and destdir.
To generate a diff of this commit:
cvs rdiff -u -r1.272 -r1.273 src/UPDATING
cvs rdiff -u -r1.955 -r1.956 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/UPDATING
diff -u src/UPDATING:1.272 src/UPDATING:1.273
--- src/UPDATING:1.272 Mon May 30 03:11:48 2016
+++ src/UPDATING Thu Sep 15 07:49:08 2016
@@ -1,4 +1,4 @@
-$NetBSD: UPDATING,v 1.272 2016/05/30 03:11:48 dholland Exp $
+$NetBSD: UPDATING,v 1.273 2016/09/15 07:49:08 mrg Exp $
This file (UPDATING) is intended to be a brief reference to recent
changes that might cause problems in the build process, and a guide for
@@ -19,6 +19,11 @@ See also: BUILDING, build.sh, Makefile.
Recent changes:
^^^
+20160914:
+ i386, amd64, shark, ofppc and macppc have joined shark and x68k
+ ports in using xorg-server 1.18. This requires a clean destdir
+ and a clean objdir.
+
20160527:
i386 needs a full cleandir or objdir deletion because PIE has
been enabled. (see the amd64 entry two down for further info)
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.955 src/share/mk/bsd.own.mk:1.956
--- src/share/mk/bsd.own.mk:1.955 Sun Sep 11 04:59:54 2016
+++ src/share/mk/bsd.own.mk Thu Sep 15 07:49:08 2016
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.955 2016/09/11 04:59:54 tsutsui Exp $
+# $NetBSD: bsd.own.mk,v 1.956 2016/09/15 07:49:08 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1391,7 +1391,12 @@ X11SRCDIR.${_proto}proto?= ${X11SRCDIRM
.endfor
# During transition from xorg-server 1.10 to 1.18
-.if ${MACHINE} == "shark" || \
+.if \
+${MACHINE_ARCH} == "x86_64" || \
+${MACHINE_ARCH} == "i386" || \
+${MACHINE} == "ofppc" || \
+${MACHINE} == "macppc" || \
+${MACHINE} == "shark" || \
${MACHINE} == "x68k"
HAVE_XORG_SERVER_VER?=118
.else
CVS commit: src
Module Name:src Committed By: mrg Date: Thu Sep 15 07:49:08 UTC 2016 Modified Files: src: UPDATING src/share/mk: bsd.own.mk Log Message: switch amd64, i386, shark, ofppc and macppc to xorg-server 1.18. add a note to UPDATING about needing a clean objdir and destdir. To generate a diff of this commit: cvs rdiff -u -r1.272 -r1.273 src/UPDATING cvs rdiff -u -r1.955 -r1.956 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/net
Module Name:src
Committed By: knakahara
Date: Thu Sep 15 06:59:32 UTC 2016
Modified Files:
src/sys/net: if_gif.c
Log Message:
kmem_alloc(size, KM_SLEEP) return value NULL check is not required any more.
kmem_alloc(size, KM_SLEEP) is already fixed, that is, it never return NULL.
see: sys/kern/subr_kmem.c:r1.62
To generate a diff of this commit:
cvs rdiff -u -r1.122 -r1.123 src/sys/net/if_gif.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_gif.c
diff -u src/sys/net/if_gif.c:1.122 src/sys/net/if_gif.c:1.123
--- src/sys/net/if_gif.c:1.122 Thu Sep 1 06:50:09 2016
+++ src/sys/net/if_gif.c Thu Sep 15 06:59:32 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gif.c,v 1.122 2016/09/01 06:50:09 knakahara Exp $ */
+/* $NetBSD: if_gif.c,v 1.123 2016/09/15 06:59:32 knakahara Exp $ */
/* $KAME: if_gif.c,v 1.76 2001/08/20 02:01:02 kjc Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.122 2016/09/01 06:50:09 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.123 2016/09/15 06:59:32 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -991,15 +991,8 @@ gif_set_tunnel(struct ifnet *ifp, struct
/* XXX both end must be valid? (I mean, not 0.0.0.0) */
}
- if ((nsrc = sockaddr_dup(src, M_WAITOK)) == NULL) {
- error = ENOMEM;
- goto out;
- }
- if ((ndst = sockaddr_dup(dst, M_WAITOK)) == NULL) {
- sockaddr_free(nsrc);
- error = ENOMEM;
- goto out;
- }
+ nsrc = sockaddr_dup(src, M_WAITOK);
+ ndst = sockaddr_dup(dst, M_WAITOK);
gif_encap_pause(sc);
CVS commit: src/sys/net
Module Name:src Committed By: knakahara Date: Thu Sep 15 06:59:32 UTC 2016 Modified Files: src/sys/net: if_gif.c Log Message: kmem_alloc(size, KM_SLEEP) return value NULL check is not required any more. kmem_alloc(size, KM_SLEEP) is already fixed, that is, it never return NULL. see: sys/kern/subr_kmem.c:r1.62 To generate a diff of this commit: cvs rdiff -u -r1.122 -r1.123 src/sys/net/if_gif.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
