Re: CVS commit: src/sys/kern

[Manuel Bouyer]

On Fri, Mar 09, 2018 at 08:43:57PM +0100, Joerg Sonnenberger wrote:
> > In this case pcu_valid should be 0, unless pcu is used for something else
> > than FPU.
> > What is happening exactly ? Is it a kernel panic ? do you have a stack
> > trace ?
> 
> OK, so there are two different error modes depending on the specific
> kernel version. For latest current, boot the install kernel and run
> newfs:
> 
> # newfs ld0a
> /dev/rld0a: 7443.8MB (15244992 sectors) block size 16384, fragment size
> 2048 using 41 cylinder groups of 181.56MB, 11620 blks, 22912 inodes.
> Stopped in pid 9.1 (newfs) at   8797f0: illegal instruction 879810
> db> bt
> 0x01304be0: at mi_switch+0x218
> 0x01304c20: at sleepq_block+0xd8
> 0x01304c50: at cv_wait+0xfc
> 0x01304c80: at physio_wait+0x50
> 0x01304ca0: at physio+0x35c
> 0x01304d20: at spec_write+0xd8
> 0x01304d90: at VOP_WRITE+0x3c
> 0x01304dc0: at vn_write+0x140
> 0x01304df0: at dofilewrite+0xbc
> 0x01304e60: at sys_pwrite+0xe0
> 0x01304ea0: at syscall+0x2e0
> 0x01304f20: user SC trap #174 by 0x1969628: srr1=0x2d230 r1=0x5e40 
> cr=0x24004882 xer=0 ctr=0

I don't understand this. Isn't 8797f0 a userland address ?
If so why does it cause a panic ?

-- 
Manuel Bouyer 
 NetBSD: 26 ans d'experience feront toujours la difference
--

CVS commit: src/usr.bin/printf

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon Mar 12 09:29:43 UTC 2018

Modified Files:
src/usr.bin/printf: printf.1

Log Message:
Remove Tn.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/usr.bin/printf/printf.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/printf/printf.1
diff -u src/usr.bin/printf/printf.1:1.26 src/usr.bin/printf/printf.1:1.27
--- src/usr.bin/printf/printf.1:1.26	Mon Mar 12 00:42:05 2018
+++ src/usr.bin/printf/printf.1	Mon Mar 12 09:29:43 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: printf.1,v 1.26 2018/03/12 00:42:05 dholland Exp $
+.\"	$NetBSD: printf.1,v 1.27 2018/03/12 09:29:43 wiz Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -70,8 +70,7 @@ otherwise it is evaluated as a C constan
 .It
 A leading plus or minus sign is allowed.
 .It
-If the leading character is a single or double quote, the value is the
-.Tn ASCII
+If the leading character is a single or double quote, the value is the ASCII
 code of the next character.
 .El
 .Pp
@@ -127,13 +126,11 @@ character.
 .It Cm \e\e
 Write a backslash character.
 .It Cm \e Ns Ar num
-Write an 8\-bit character whose
-.Tn ASCII
+Write an 8\-bit character whose ASCII
 value is the 1\-, 2\-, or 3\-digit octal number
 .Ar num .
 .It Cm \ex Ns Ar xx
-Write an 8\-bit character whose
-.Tn ASCII
+Write an 8\-bit character whose ASCII
 value is the 1\- or 2\-digit hexadecimal number
 .Ar xx .
 .El
@@ -309,10 +306,8 @@ to ignore any remaining characters in th
 any remaining string operands, and any additional characters in
 the format operand.
 .It Cm \e0 Ns Ar num
-Write an 8\-bit character whose
-.Tn ASCII
-value is the 1\-, 2\-, or 3\-digit
-octal number
+Write an 8\-bit character whose ASCII value is the 1\-, 2\-, or
+3\-digit octal number
 .Ar num .
 .It Cm \e^ Ns Ar c
 Write the control character
@@ -384,10 +379,8 @@ are optional in POSIX.
 The behaviour of the %B format and the \e', \e", \exxx, \ee and
 \e[M][\-|^]c escape sequences are undefined in POSIX.
 .Sh BUGS
-Since the floating point numbers are translated from
-.Tn ASCII
-to floating-point and
-then back again, floating-point precision may be lost.
+Since the floating point numbers are translated from ASCII to
+floating-point and then back again, floating-point precision may be lost.
 .Pp
 Hexadecimal character constants are restricted to, and should be specified
 as, two character constants.

CVS commit: src/usr.bin/printf

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon Mar 12 09:29:43 UTC 2018

Modified Files:
src/usr.bin/printf: printf.1

Log Message:
Remove Tn.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/usr.bin/printf/printf.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/arch/x86

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Mar 12 07:12:54 UTC 2018

Modified Files:
src/sys/arch/x86/include: specialreg.h
src/sys/arch/x86/x86: identcpu.c

Log Message:
s/CLFUSH/CLFLUSH/
No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.114 src/sys/arch/x86/include/specialreg.h
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/x86/x86/identcpu.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/x86/include/specialreg.h
diff -u src/sys/arch/x86/include/specialreg.h:1.113 src/sys/arch/x86/include/specialreg.h:1.114
--- src/sys/arch/x86/include/specialreg.h:1.113	Thu Mar  8 04:15:11 2018
+++ src/sys/arch/x86/include/specialreg.h	Mon Mar 12 07:12:54 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: specialreg.h,v 1.113 2018/03/08 04:15:11 msaitoh Exp $	*/
+/*	$NetBSD: specialreg.h,v 1.114 2018/03/12 07:12:54 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -250,7 +250,7 @@
 
 /* CPUID Fn0001 %ebx */
 #define	CPUID_BRAND_INDEX	__BITS(7,0)
-#define	CPUID_CLFUSH_SIZE	__BITS(15,8)
+#define	CPUID_CLFLUSH_SIZE	__BITS(15,8)
 #define	CPUID_HTT_CORES		__BITS(23,16)
 #define	CPUID_LOCAL_APIC_ID	__BITS(31,24)
 

Index: src/sys/arch/x86/x86/identcpu.c
diff -u src/sys/arch/x86/x86/identcpu.c:1.69 src/sys/arch/x86/x86/identcpu.c:1.70
--- src/sys/arch/x86/x86/identcpu.c:1.69	Fri Feb  9 18:45:55 2018
+++ src/sys/arch/x86/x86/identcpu.c	Mon Mar 12 07:12:54 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: identcpu.c,v 1.69 2018/02/09 18:45:55 maxv Exp $	*/
+/*	$NetBSD: identcpu.c,v 1.70 2018/03/12 07:12:54 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.69 2018/02/09 18:45:55 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.70 2018/03/12 07:12:54 msaitoh Exp $");
 
 #include "opt_xen.h"
 
@@ -842,7 +842,7 @@ cpu_probe(struct cpu_info *ci)
 		/* CLFLUSH line size is next 8 bits */
 		if (ci->ci_feat_val[0] & CPUID_CFLUSH)
 			ci->ci_cflush_lsize
-			= __SHIFTOUT(miscbytes, CPUID_CLFUSH_SIZE) << 3;
+			= __SHIFTOUT(miscbytes, CPUID_CLFLUSH_SIZE) << 3;
 		ci->ci_initapicid = __SHIFTOUT(miscbytes, CPUID_LOCAL_APIC_ID);
 	}
 

CVS commit: src/sys/arch/x86

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Mar 12 07:12:54 UTC 2018

Modified Files:
src/sys/arch/x86/include: specialreg.h
src/sys/arch/x86/x86: identcpu.c

Log Message:
s/CLFUSH/CLFLUSH/
No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.114 src/sys/arch/x86/include/specialreg.h
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/x86/x86/identcpu.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/arch/x86/include

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Mar 12 07:35:45 UTC 2018

Modified Files:
src/sys/arch/x86/include: cacheinfo.h

Log Message:
 AMD L3 cache association bitfield is not 8bit but 4bit like others association
bitfields.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/x86/include/cacheinfo.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/arch/x86/include

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Mar 12 07:35:45 UTC 2018

Modified Files:
src/sys/arch/x86/include: cacheinfo.h

Log Message:
 AMD L3 cache association bitfield is not 8bit but 4bit like others association
bitfields.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/x86/include/cacheinfo.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/arch/x86/include/cacheinfo.h
diff -u src/sys/arch/x86/include/cacheinfo.h:1.25 src/sys/arch/x86/include/cacheinfo.h:1.26
--- src/sys/arch/x86/include/cacheinfo.h:1.25	Mon Mar 12 06:20:33 2018
+++ src/sys/arch/x86/include/cacheinfo.h	Mon Mar 12 07:35:45 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: cacheinfo.h,v 1.25 2018/03/12 06:20:33 msaitoh Exp $	*/
+/*	$NetBSD: cacheinfo.h,v 1.26 2018/03/12 07:35:45 msaitoh Exp $	*/
 
 #ifndef _X86_CACHEINFO_H_
 #define _X86_CACHEINFO_H_
@@ -140,7 +140,7 @@ struct x86_cache_info {
 
 /* L3 Cache */
 #define AMD_L3_EDX_C_SIZE(x)		x) >> 18) & 0x) * 1024 * 512)
-#define AMD_L3_EDX_C_ASSOC(x)		 (((x) >> 12) & 0xff)
+#define AMD_L3_EDX_C_ASSOC(x)		 (((x) >> 12) & 0xf)
 #define AMD_L3_EDX_C_LPT(x)		 (((x) >> 8)  & 0xf)
 #define AMD_L3_EDX_C_LS(x)		 ( (x)& 0xff)
 

CVS commit: src/sys/arch/x86/include

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Mar 12 06:20:33 UTC 2018

Modified Files:
src/sys/arch/x86/include: cacheinfo.h

Log Message:
 Add 3way and 6way of L2 cache or TLB on AMD CPU.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/x86/include/cacheinfo.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/arch/x86/include/cacheinfo.h
diff -u src/sys/arch/x86/include/cacheinfo.h:1.24 src/sys/arch/x86/include/cacheinfo.h:1.25
--- src/sys/arch/x86/include/cacheinfo.h:1.24	Fri Mar  9 08:49:32 2018
+++ src/sys/arch/x86/include/cacheinfo.h	Mon Mar 12 06:20:33 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: cacheinfo.h,v 1.24 2018/03/09 08:49:32 msaitoh Exp $	*/
+/*	$NetBSD: cacheinfo.h,v 1.25 2018/03/12 06:20:33 msaitoh Exp $	*/
 
 #ifndef _X86_CACHEINFO_H_
 #define _X86_CACHEINFO_H_
@@ -342,7 +342,9 @@ __CI_TBL(0,   0,0,  
 #define AMD_L2CACHE_INFO { \
 __CI_TBL(0, 0x01,1, 0, 0, NULL), \
 __CI_TBL(0, 0x02,2, 0, 0, NULL), \
+__CI_TBL(0, 0x03,3, 0, 0, NULL), \
 __CI_TBL(0, 0x04,4, 0, 0, NULL), \
+__CI_TBL(0, 0x05,6, 0, 0, NULL), \
 __CI_TBL(0, 0x06,8, 0, 0, NULL), \
 __CI_TBL(0, 0x08,   16, 0, 0, NULL), \
 __CI_TBL(0, 0x0a,   32, 0, 0, NULL), \

CVS commit: src/sys/arch/x86/include

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Mar 12 06:20:33 UTC 2018

Modified Files:
src/sys/arch/x86/include: cacheinfo.h

Log Message:
 Add 3way and 6way of L2 cache or TLB on AMD CPU.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/x86/include/cacheinfo.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/net/npf

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Mon Mar 12 12:45:26 UTC 2018

Modified Files:
src/sys/net/npf: npf_alg_icmp.c

Log Message:
Remove dead branches, 'npc' can't be NULL (and it is dereferenced
earlier).


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/net/npf/npf_alg_icmp.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/npf/npf_alg_icmp.c
diff -u src/sys/net/npf/npf_alg_icmp.c:1.25 src/sys/net/npf/npf_alg_icmp.c:1.26
--- src/sys/net/npf/npf_alg_icmp.c:1.25	Sun Dec 10 00:07:36 2017
+++ src/sys/net/npf/npf_alg_icmp.c	Mon Mar 12 12:45:26 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: npf_alg_icmp.c,v 1.25 2017/12/10 00:07:36 rmind Exp $	*/
+/*	$NetBSD: npf_alg_icmp.c,v 1.26 2018/03/12 12:45:26 maxv Exp $	*/
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 
 #ifdef _KERNEL
 #include 
-__KERNEL_RCSID(0, "$NetBSD: npf_alg_icmp.c,v 1.25 2017/12/10 00:07:36 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_alg_icmp.c,v 1.26 2018/03/12 12:45:26 maxv Exp $");
 
 #include 
 #include 
@@ -135,9 +135,6 @@ npfa_icmp4_inspect(const int type, npf_c
 	case ICMP_REDIRECT:
 	case ICMP_TIMXCEED:
 	case ICMP_PARAMPROB:
-		if (npc == NULL) {
-			return false;
-		}
 		/* Should contain original IP header. */
 		if (!nbuf_advance(nbuf, offsetof(struct icmp, icmp_ip), 0)) {
 			return false;
@@ -175,9 +172,6 @@ npfa_icmp6_inspect(const int type, npf_c
 	case ICMP6_PACKET_TOO_BIG:
 	case ICMP6_TIME_EXCEEDED:
 	case ICMP6_PARAM_PROB:
-		if (npc == NULL) {
-			return false;
-		}
 		/* Should contain original IP header. */
 		if (!nbuf_advance(nbuf, sizeof(struct icmp6_hdr), 0)) {
 			return false;

CVS commit: src/lib/libukfs

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Mon Mar 12 11:56:34 UTC 2018

Modified Files:
src/lib/libukfs: ukfs.3

Log Message:
Remove exgtraneous comma


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/lib/libukfs/ukfs.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/libukfs/ukfs.3
diff -u src/lib/libukfs/ukfs.3:1.15 src/lib/libukfs/ukfs.3:1.16
--- src/lib/libukfs/ukfs.3:1.15	Thu Feb  8 09:05:17 2018
+++ src/lib/libukfs/ukfs.3	Mon Mar 12 11:56:34 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: ukfs.3,v 1.15 2018/02/08 09:05:17 dholland Exp $
+.\" $NetBSD: ukfs.3,v 1.16 2018/03/12 11:56:34 pgoyette Exp $
 .\"
 .\" Copyright (c) 2008 Antti Kantee.  All rights reserved.
 .\"
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd February 13, 2014
+.Dd March 12, 2018
 .Dt UKFS 3
 .Os
 .Sh NAME
@@ -57,7 +57,7 @@ If a lower level interface it desired,
 .Xr rump 3
 kernels should be used directly.
 However, much like system calls, the interfaces of
-.Nm ,
+.Nm
 are self-contained and require no tracking and release of resources.
 The only exception is the file system handle
 .Ft struct ukfs

CVS commit: src/lib/libukfs

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Mon Mar 12 11:56:34 UTC 2018

Modified Files:
src/lib/libukfs: ukfs.3

Log Message:
Remove exgtraneous comma


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/lib/libukfs/ukfs.3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/net/npf

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Mon Mar 12 12:45:26 UTC 2018

Modified Files:
src/sys/net/npf: npf_alg_icmp.c

Log Message:
Remove dead branches, 'npc' can't be NULL (and it is dereferenced
earlier).


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/net/npf/npf_alg_icmp.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/distrib/sets/lists

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Mar 12 18:48:49 UTC 2018

Modified Files:
src/distrib/sets/lists/xdebug: md.amd64 md.i386
src/distrib/sets/lists/xserver: md.amd64 md.i386

Log Message:
update for new amdgpu and radeon driver versions.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/distrib/sets/lists/xdebug/md.amd64
cvs rdiff -u -r1.34 -r1.35 src/distrib/sets/lists/xdebug/md.i386
cvs rdiff -u -r1.100 -r1.101 src/distrib/sets/lists/xserver/md.amd64
cvs rdiff -u -r1.117 -r1.118 src/distrib/sets/lists/xserver/md.i386

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/xdebug/md.amd64
diff -u src/distrib/sets/lists/xdebug/md.amd64:1.38 src/distrib/sets/lists/xdebug/md.amd64:1.39
--- src/distrib/sets/lists/xdebug/md.amd64:1.38	Thu Dec 15 12:56:52 2016
+++ src/distrib/sets/lists/xdebug/md.amd64	Mon Mar 12 18:48:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.38 2016/12/15 12:56:52 kre Exp $
+# $NetBSD: md.amd64,v 1.39 2018/03/12 18:48:49 mrg Exp $
 ./usr/X11R7/lib/libI810XvMC_g.a-unknown-	debuglib,xorg,compatx11file
 ./usr/X11R7/lib/libIntelXvMC_g.a			-unknown-	debuglib,xorg,compatx11file
 ./usr/X11R7/lib/libchromeXvMCPro_g.a			-unknown-	debuglib,xorg,compatx11file
@@ -74,7 +74,7 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/tdfx_dri.so.0.debug	-unknown-		obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/trident_dri.so.0.debug	-unknown-		obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/unichrome_dri.so.0.debug	-unknown-		obsolete
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/amdgpu_drv.so.1.debug	-unknown-		xorg,debug,xorg_server_ver=118
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/amdgpu_drv.so.18.debug	-unknown-		xorg,debug,xorg_server_ver=118
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug	-unknown-		xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug	-unknown-		xorg,debug,xorg_server_ver=118,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug	-unknown-		xorg,debug,xorg_server_ver=110
@@ -153,7 +153,7 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/openchrome_drv.so.0.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/r128_drv.so.6.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeon_drv.so.6.debug	-unknown-		xorg,debug,obsolete
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeon_drv.so.7.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeon_drv.so.18.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeon_drv_old.so.6.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeonhd_drv.so.1.debug	-unknown-		xorg,debug,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/s3_drv.so.0.debug	-unknown-		xorg,debug

Index: src/distrib/sets/lists/xdebug/md.i386
diff -u src/distrib/sets/lists/xdebug/md.i386:1.34 src/distrib/sets/lists/xdebug/md.i386:1.35
--- src/distrib/sets/lists/xdebug/md.i386:1.34	Mon Sep 26 22:37:31 2016
+++ src/distrib/sets/lists/xdebug/md.i386	Mon Mar 12 18:48:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.34 2016/09/26 22:37:31 mrg Exp $
+# $NetBSD: md.i386,v 1.35 2018/03/12 18:48:49 mrg Exp $
 ./usr/X11R7/lib/libI810XvMC_g.a-unknown-	debuglib,xorg
 ./usr/X11R7/lib/libIntelXvMC_g.a			-unknown-	debuglib,xorg
 ./usr/X11R7/lib/libchromeXvMCPro_g.a			-unknown-	debuglib,xorg
@@ -84,13 +84,13 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/tdfx_dri.so.0.debug	-unknown-		obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/trident_dri.so.0.debug	-unknown-		obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/unichrome_dri.so.0.debug	-unknown-		xorg,debug,obsolete
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/amdgpu_drv.so.1.debug	-unknown-		xorg,debug,xorg_server_ver=118
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/amdgpu_drv.so.18.debug	-unknown-		xorg,debug,xorg_server_ver=118
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug	-unknown-		xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug	-unknown-		xorg,debug,xorg_server_ver=118,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug	-unknown-		xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug	-unknown-		xorg,debug,xorg_server_ver=118,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ast_drv.so.1.debug	-unknown-		xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.6.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.18.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7017_drv.so.2.debug	-unknown-		

CVS commit: src/distrib/sets/lists

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Mar 12 18:48:49 UTC 2018

Modified Files:
src/distrib/sets/lists/xdebug: md.amd64 md.i386
src/distrib/sets/lists/xserver: md.amd64 md.i386

Log Message:
update for new amdgpu and radeon driver versions.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/distrib/sets/lists/xdebug/md.amd64
cvs rdiff -u -r1.34 -r1.35 src/distrib/sets/lists/xdebug/md.i386
cvs rdiff -u -r1.100 -r1.101 src/distrib/sets/lists/xserver/md.amd64
cvs rdiff -u -r1.117 -r1.118 src/distrib/sets/lists/xserver/md.i386

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/netipsec

[Kengo NAKAHARA]

Module Name:src
Committed By:   knakahara
Date:   Tue Mar 13 03:05:13 UTC 2018

Modified Files:
src/sys/netipsec: ipsecif.c

Log Message:
comment out confusing (and incorrect) code and add comment. Pointed out by 
maxv@n.o, thanks.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/netipsec/ipsecif.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/netipsec

[Kengo NAKAHARA]

Module Name:src
Committed By:   knakahara
Date:   Tue Mar 13 03:05:13 UTC 2018

Modified Files:
src/sys/netipsec: ipsecif.c

Log Message:
comment out confusing (and incorrect) code and add comment. Pointed out by 
maxv@n.o, thanks.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/netipsec/ipsecif.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/netipsec/ipsecif.c
diff -u src/sys/netipsec/ipsecif.c:1.4 src/sys/netipsec/ipsecif.c:1.5
--- src/sys/netipsec/ipsecif.c:1.4	Fri Mar  9 11:05:21 2018
+++ src/sys/netipsec/ipsecif.c	Tue Mar 13 03:05:12 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: ipsecif.c,v 1.4 2018/03/09 11:05:21 knakahara Exp $  */
+/*	$NetBSD: ipsecif.c,v 1.5 2018/03/13 03:05:12 knakahara Exp $  */
 
 /*
  * Copyright (c) 2017 Internet Initiative Japan Inc.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ipsecif.c,v 1.4 2018/03/09 11:05:21 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsecif.c,v 1.5 2018/03/13 03:05:12 knakahara Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -483,7 +483,9 @@ ipsecif6_output(struct ipsec_variant *va
 	ip6->ip6_flow	= 0;
 	ip6->ip6_vfc	&= ~IPV6_VERSION_MASK;
 	ip6->ip6_vfc	|= IPV6_VERSION;
-	ip6->ip6_plen	= htons((u_short)m->m_pkthdr.len);
+#if 0	/* ip6->ip6_plen will be filled by ip6_output */
+	ip6->ip6_plen	= htons((u_short)m->m_pkthdr.len - sizeof(*ip6));
+#endif
 	ip6->ip6_nxt	= proto;
 	ip6->ip6_hlim	= ip6_ipsec_hlim;
 	ip6->ip6_src	= sin6_src->sin6_addr;

CVS commit: src/external/gpl3

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Mar 13 03:17:02 UTC 2018

Modified Files:
src/external/gpl3/gcc: Makefile.hooks
src/external/gpl3/gcc.old: Makefile.hooks

Log Message:
fix the cleanfiles for hooks mechanism


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/Makefile.hooks
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc.old/Makefile.hooks

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/gpl3

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Mar 13 03:17:02 UTC 2018

Modified Files:
src/external/gpl3/gcc: Makefile.hooks
src/external/gpl3/gcc.old: Makefile.hooks

Log Message:
fix the cleanfiles for hooks mechanism


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/Makefile.hooks
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc.old/Makefile.hooks

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/gcc/Makefile.hooks
diff -u src/external/gpl3/gcc/Makefile.hooks:1.1 src/external/gpl3/gcc/Makefile.hooks:1.2
--- src/external/gpl3/gcc/Makefile.hooks:1.1	Sat Mar  1 10:00:31 2014
+++ src/external/gpl3/gcc/Makefile.hooks	Tue Mar 13 03:17:01 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.hooks,v 1.1 2014/03/01 10:00:31 mrg Exp $
+#	$NetBSD: Makefile.hooks,v 1.2 2018/03/13 03:17:01 mrg Exp $
 
 #
 # Makefile fragment to build genhooks and *target-hooks*.h
@@ -9,8 +9,9 @@ gen${f}.lo: ${HH} gen${f}.c
 gen${f}: gen${f}.lo ${GENPROG_ERROR_DEPENDS} 
 	${_MKTARGET_LINK}
 	${HOST_LINK.cc} -o ${.TARGET} ${.ALLSRC} ${NBCOMPATLIB} ${HOSTLIBIBERTY} ${LDFLAGS.${.TARGET}}
-CLEANFILES+=	genhooks
+CLEANFILES+=	genhooks gen${f}.lo
 .endfor
+CLEANFILES+=	${GENPROG_ERROR_DEPENDS} 
 
 # and now the outputs of genhooks
 target-hooks-def.h: genhooks

Index: src/external/gpl3/gcc.old/Makefile.hooks
diff -u src/external/gpl3/gcc.old/Makefile.hooks:1.3 src/external/gpl3/gcc.old/Makefile.hooks:1.4
--- src/external/gpl3/gcc.old/Makefile.hooks:1.3	Sun Jul 23 01:10:50 2017
+++ src/external/gpl3/gcc.old/Makefile.hooks	Tue Mar 13 03:17:01 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.hooks,v 1.3 2017/07/23 01:10:50 mrg Exp $
+#	$NetBSD: Makefile.hooks,v 1.4 2018/03/13 03:17:01 mrg Exp $
 
 #
 # Makefile fragment to build genhooks and *target-hooks*.h
@@ -9,8 +9,9 @@ gen${f}.lo: ${HH} gen${f}.c
 gen${f}: gen${f}.lo ${GENPROG_ERROR_DEPENDS} 
 	${_MKTARGET_LINK}
 	${HOST_LINK.cc} -o ${.TARGET} ${.ALLSRC} ${NBCOMPATLIB} ${HOSTLIBIBERTY} ${LDFLAGS.${.TARGET}}
-CLEANFILES+=	genhooks
+CLEANFILES+=	genhooks gen${f}.lo
 .endfor
+CLEANFILES+=	${GENPROG_ERROR_DEPENDS} 
 
 # and now the outputs of genhooks
 target-hooks-def.h: genhooks

CVS commit: src/tests/net/if_ipsec

[Kengo NAKAHARA]

Module Name:src
Committed By:   knakahara
Date:   Tue Mar 13 03:50:26 UTC 2018

Modified Files:
src/tests/net/if_ipsec: t_ipsec.sh

Log Message:
Enhance assertion ipsecif(4) ATF to avoid confusing setkey(8) error message.

When setkey(8) says "syntax error at [-E]", it must mean get_if_ipsec_unique()
failed.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/net/if_ipsec/t_ipsec.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/if_ipsec/t_ipsec.sh
diff -u src/tests/net/if_ipsec/t_ipsec.sh:1.3 src/tests/net/if_ipsec/t_ipsec.sh:1.4
--- src/tests/net/if_ipsec/t_ipsec.sh:1.3	Thu Feb  1 05:22:01 2018
+++ src/tests/net/if_ipsec/t_ipsec.sh	Tue Mar 13 03:50:26 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: t_ipsec.sh,v 1.3 2018/02/01 05:22:01 ozaki-r Exp $
+#	$NetBSD: t_ipsec.sh,v 1.4 2018/03/13 03:50:26 knakahara Exp $
 #
 # Copyright (c) 2017 Internet Initiative Japan Inc.
 # All rights reserved.
@@ -269,7 +269,9 @@ setup_if_ipsec_sa()
 	local algo_args="$(generate_algo_args $proto $algo)"
 
 	inunique=`get_if_ipsec_unique ${sock} ${dst} ${mode}`
+	atf_check -s exit:0 test "X$inunique" != "X"
 	outunique=`get_if_ipsec_unique ${sock} ${src} ${mode}`
+	atf_check -s exit:0 test "X$outunique" != "X"
 
 	if [ ${dir} = "1to2" ] ; then
 	if [ ${mode} = "ipv6" ] ; then
@@ -446,7 +448,9 @@ setup_dummy_if_ipsec_sa()
 	local algo_args="$(generate_algo_args $proto $algo)"
 
 	inunique=`get_if_ipsec_unique ${sock} ${dst} ${mode}`
+	atf_check -s exit:0 test "X$inunique" != "X"
 	outunique=`get_if_ipsec_unique ${sock} ${src} ${mode}`
+	atf_check -s exit:0 test "X$outunique" != "X"
 
 	if [ ${dir} = "1to2" ] ; then
 	inid="2"

CVS commit: src/tests/net/if_ipsec

[Kengo NAKAHARA]

Module Name:src
Committed By:   knakahara
Date:   Tue Mar 13 03:50:26 UTC 2018

Modified Files:
src/tests/net/if_ipsec: t_ipsec.sh

Log Message:
Enhance assertion ipsecif(4) ATF to avoid confusing setkey(8) error message.

When setkey(8) says "syntax error at [-E]", it must mean get_if_ipsec_unique()
failed.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/net/if_ipsec/t_ipsec.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/crypto/external/bsd/heimdal

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Mar 13 03:06:51 UTC 2018

Modified Files:
src/crypto/external/bsd/heimdal: Makefile.rules.inc

Log Message:
add *template.x to CLEANFILES.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/heimdal/Makefile.rules.inc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/heimdal/Makefile.rules.inc
diff -u src/crypto/external/bsd/heimdal/Makefile.rules.inc:1.8 src/crypto/external/bsd/heimdal/Makefile.rules.inc:1.9
--- src/crypto/external/bsd/heimdal/Makefile.rules.inc:1.8	Sat Jan 28 21:31:43 2017
+++ src/crypto/external/bsd/heimdal/Makefile.rules.inc	Tue Mar 13 03:06:51 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rules.inc,v 1.8 2017/01/28 21:31:43 christos Exp $
+# $NetBSD: Makefile.rules.inc,v 1.9 2018/03/13 03:06:51 mrg Exp $
 
 SRCS+= ${HEIMSRCS:N*.et:N*.in:N*.asn1}
 
@@ -23,6 +23,7 @@ ASN1_OPTS.${src} ?= --one-code-file
 CLEANFILES+=\
 	${src:.asn1=_asn1_files}	\
 	${src:.asn1=_asn1-template.c}	\
+	${src:.asn1=_asn1-template.x}	\
 	${ASN1_FILES.${src}}		\
 	${ASN1_FILES.${src}:.x=.c}	\
 	${src:.asn1=_asn1.h}		\

CVS commit: src/crypto/external/bsd/heimdal

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Mar 13 03:06:51 UTC 2018

Modified Files:
src/crypto/external/bsd/heimdal: Makefile.rules.inc

Log Message:
add *template.x to CLEANFILES.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/heimdal/Makefile.rules.inc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/distrib/i386/ramdisks/common

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Mar 13 02:22:43 UTC 2018

Modified Files:
src/distrib/i386/ramdisks/common: Makefile.ramdisk

Log Message:
clean up CRUNCHBIN.map


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/distrib/i386/ramdisks/common/Makefile.ramdisk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/i386/ramdisks/common/Makefile.ramdisk
diff -u src/distrib/i386/ramdisks/common/Makefile.ramdisk:1.12 src/distrib/i386/ramdisks/common/Makefile.ramdisk:1.13
--- src/distrib/i386/ramdisks/common/Makefile.ramdisk:1.12	Wed Oct  7 14:09:05 2015
+++ src/distrib/i386/ramdisks/common/Makefile.ramdisk	Tue Mar 13 02:22:43 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.ramdisk,v 1.12 2015/10/07 14:09:05 martin Exp $
+#	$NetBSD: Makefile.ramdisk,v 1.13 2018/03/13 02:22:43 mrg Exp $
 
 .include 
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -33,7 +33,8 @@ PARSELISTENV+=	BOOTMODEL=${BOOTMODEL:Q}
 # This propogates through to the link of ramdiskbin
 # The map file is useful when trying to prune the image
 LDFLAGS+=	-Wl,-Map,${CRUNCHBIN}.map,--cref
-CRUNCHENV += LDFLAGS=${LDFLAGS:Q}
+CRUNCHENV+=	LDFLAGS=${LDFLAGS:Q}
+CLEANFILES+=	${CRUNCHBIN}.map
 
 .if defined(USE_SYSINST)
 .if ${USE_SYSINST} != yes

CVS commit: src/distrib/i386/ramdisks/common

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Mar 13 02:22:43 UTC 2018

Modified Files:
src/distrib/i386/ramdisks/common: Makefile.ramdisk

Log Message:
clean up CRUNCHBIN.map


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/distrib/i386/ramdisks/common/Makefile.ramdisk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Mar 13 03:06:28 UTC 2018

Modified Files:
src: Makefile

Log Message:
include bsd.clean.mk so that we actually clean up the attempted "params"


To generate a diff of this commit:
cvs rdiff -u -r1.321 -r1.322 src/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/Makefile
diff -u src/Makefile:1.321 src/Makefile:1.322
--- src/Makefile:1.321	Wed Dec  6 19:34:00 2017
+++ src/Makefile	Tue Mar 13 03:06:28 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.321 2017/12/06 19:34:00 uwe Exp $
+#	$NetBSD: Makefile,v 1.322 2018/03/13 03:06:28 mrg Exp $
 
 #
 # This is the top-level makefile for building NetBSD. For an outline of
@@ -528,3 +528,4 @@ dependall-distrib depend-distrib all-dis
 .include 
 .include 
 .include 
+.include 

CVS commit: src

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Mar 13 03:06:28 UTC 2018

Modified Files:
src: Makefile

Log Message:
include bsd.clean.mk so that we actually clean up the attempted "params"


To generate a diff of this commit:
cvs rdiff -u -r1.321 -r1.322 src/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/gpl2/groff/bin

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Mar 13 03:03:33 UTC 2018

Modified Files:
src/external/gpl2/groff/bin/eqn: Makefile
src/external/gpl2/groff/bin/pic: Makefile
src/external/gpl2/groff/bin/refer: Makefile

Log Message:
use CLEANFILES+= not CLEANFILES= to avoid overriding what was already
setup before now.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/groff/bin/eqn/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/groff/bin/pic/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/groff/bin/refer/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl2/groff/bin/eqn/Makefile
diff -u src/external/gpl2/groff/bin/eqn/Makefile:1.2 src/external/gpl2/groff/bin/eqn/Makefile:1.3
--- src/external/gpl2/groff/bin/eqn/Makefile:1.2	Thu Jan 14 02:30:18 2016
+++ src/external/gpl2/groff/bin/eqn/Makefile	Tue Mar 13 03:03:33 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/14 02:30:18 christos Exp $
+# $NetBSD: Makefile,v 1.3 2018/03/13 03:03:33 mrg Exp $
 
 # $FreeBSD: src/gnu/usr.bin/groff/src/preproc/eqn/Makefile,v 1.4 2003/05/01 13:22:19 ru Exp $
 
@@ -15,6 +15,6 @@ SRCS=		main.cpp lex.cpp eqn.cpp \
 CPPFLAGS+=	-I${DIST_DIR} -I.
 SCRIPTS=	neqn
 MAN=		eqn.1 neqn.1
-CLEANFILES=	${SCRIPTS} ${MAN}
+CLEANFILES+=	${SCRIPTS} ${MAN}
 
 .include 

Index: src/external/gpl2/groff/bin/pic/Makefile
diff -u src/external/gpl2/groff/bin/pic/Makefile:1.2 src/external/gpl2/groff/bin/pic/Makefile:1.3
--- src/external/gpl2/groff/bin/pic/Makefile:1.2	Thu Jan 14 02:30:18 2016
+++ src/external/gpl2/groff/bin/pic/Makefile	Tue Mar 13 03:03:33 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/14 02:30:18 christos Exp $
+# $NetBSD: Makefile,v 1.3 2018/03/13 03:03:33 mrg Exp $
 
 # $FreeBSD: src/gnu/usr.bin/groff/src/preproc/pic/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $
 
@@ -12,6 +12,6 @@ PROG_CXX=	pic
 SRCS=		lex.cpp main.cpp object.cpp pic.cpp \
 		common.cpp troff.cpp tex.cpp
 CPPFLAGS+=	-I${DIST_DIR} -I.
-CLEANFILES=	${MAN}
+CLEANFILES+=	${MAN}
 
 .include 

Index: src/external/gpl2/groff/bin/refer/Makefile
diff -u src/external/gpl2/groff/bin/refer/Makefile:1.2 src/external/gpl2/groff/bin/refer/Makefile:1.3
--- src/external/gpl2/groff/bin/refer/Makefile:1.2	Thu Jan 14 02:30:18 2016
+++ src/external/gpl2/groff/bin/refer/Makefile	Tue Mar 13 03:03:33 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/14 02:30:18 christos Exp $
+# $NetBSD: Makefile,v 1.3 2018/03/13 03:03:33 mrg Exp $
 
 # $FreeBSD: src/gnu/usr.bin/groff/src/preproc/refer/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $
 
@@ -13,6 +13,6 @@ SRCS=		label.cpp command.cpp ref.cpp ref
 CFLAGS+=	-I${DIST_DIR}
 DPADD+=		${LIBBIB}
 LDADD+=		${LIBBIB}
-CLEANFILES=	${MAN}
+CLEANFILES+=	${MAN}
 
 .include 

CVS commit: src/external/gpl2/groff/bin

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Mar 13 03:03:33 UTC 2018

Modified Files:
src/external/gpl2/groff/bin/eqn: Makefile
src/external/gpl2/groff/bin/pic: Makefile
src/external/gpl2/groff/bin/refer: Makefile

Log Message:
use CLEANFILES+= not CLEANFILES= to avoid overriding what was already
setup before now.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/groff/bin/eqn/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/groff/bin/pic/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/groff/bin/refer/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/unbound/sbin

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Mar 13 03:07:51 UTC 2018

Modified Files:
src/external/bsd/unbound/sbin: Makefile.inc

Log Message:
add the generated prog.conf.5 to CLEANFILES.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/unbound/sbin/Makefile.inc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/unbound/sbin

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Mar 13 03:07:51 UTC 2018

Modified Files:
src/external/bsd/unbound/sbin: Makefile.inc

Log Message:
add the generated prog.conf.5 to CLEANFILES.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/unbound/sbin/Makefile.inc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/unbound/sbin/Makefile.inc
diff -u src/external/bsd/unbound/sbin/Makefile.inc:1.3 src/external/bsd/unbound/sbin/Makefile.inc:1.4
--- src/external/bsd/unbound/sbin/Makefile.inc:1.3	Tue Feb  6 03:30:18 2018
+++ src/external/bsd/unbound/sbin/Makefile.inc	Tue Mar 13 03:07:51 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.3 2018/02/06 03:30:18 christos Exp $
+# $NetBSD: Makefile.inc,v 1.4 2018/03/13 03:07:51 mrg Exp $
 
 .include "../Makefile.inc"
 
@@ -16,6 +16,7 @@ SRCS+=${PROG}.c
 .else
 MAN+=${PROG}.conf.5
 ${PROG}.conf.5: ${PROG}.conf.5.in __subst
+CLEANFILES+=${PROG}.conf.5
 .PATH: ${UNBOUND}/daemon ${UNBOUND}/util/shm_side
 SRCS+= acl_list.c cachedump.c daemon.c remote.c stats.c unbound.c worker.c
 SRCS+= shm_main.c

CVS commit: [pgoyette-compat] src/sys/compat/netbsd32

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Tue Mar 13 04:12:09 UTC 2018

Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_ipc.c

Log Message:
Use correct module name for dependency


To generate a diff of this commit:
cvs rdiff -u -r1.18.16.1 -r1.18.16.2 src/sys/compat/netbsd32/netbsd32_ipc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [pgoyette-compat] src/sys/compat/netbsd32

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Tue Mar 13 04:12:09 UTC 2018

Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_ipc.c

Log Message:
Use correct module name for dependency


To generate a diff of this commit:
cvs rdiff -u -r1.18.16.1 -r1.18.16.2 src/sys/compat/netbsd32/netbsd32_ipc.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/compat/netbsd32/netbsd32_ipc.c
diff -u src/sys/compat/netbsd32/netbsd32_ipc.c:1.18.16.1 src/sys/compat/netbsd32/netbsd32_ipc.c:1.18.16.2
--- src/sys/compat/netbsd32/netbsd32_ipc.c:1.18.16.1	Sat Mar 10 04:35:15 2018
+++ src/sys/compat/netbsd32/netbsd32_ipc.c	Tue Mar 13 04:12:09 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_ipc.c,v 1.18.16.1 2018/03/10 04:35:15 pgoyette Exp $	*/
+/*	$NetBSD: netbsd32_ipc.c,v 1.18.16.2 2018/03/13 04:12:09 pgoyette Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_ipc.c,v 1.18.16.1 2018/03/10 04:35:15 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_ipc.c,v 1.18.16.2 2018/03/13 04:12:09 pgoyette Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_sysv.h"
@@ -112,7 +112,7 @@ static const struct syscall_package comp
 };
 
 MODULE(MODULE_CLASS_EXEC, compat_netbsd32_sysvipc,
-"sysv_ipc,compat_netbsd32,compat_sysvipc");
+"sysv_ipc,compat_netbsd32,compat_sysv");
 
 static int
 compat_netbsd32_sysvipc_modcmd(modcmd_t cmd, void *arg)

CVS commit: src/sys/net

[Kengo NAKAHARA]

Module Name:src
Committed By:   knakahara
Date:   Tue Mar 13 02:12:05 UTC 2018

Modified Files:
src/sys/net: if_ipsec.c

Log Message:
Fix IPv6 ipsecif(4) ATF regression, sorry.

There must *not* be padding between the src sockaddr and the dst sockaddr
after struct sadb_x_policy.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/net/if_ipsec.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_ipsec.c
diff -u src/sys/net/if_ipsec.c:1.6 src/sys/net/if_ipsec.c:1.7
--- src/sys/net/if_ipsec.c:1.6	Fri Mar  9 11:03:26 2018
+++ src/sys/net/if_ipsec.c	Tue Mar 13 02:12:05 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ipsec.c,v 1.6 2018/03/09 11:03:26 knakahara Exp $  */
+/*	$NetBSD: if_ipsec.c,v 1.7 2018/03/13 02:12:05 knakahara Exp $  */
 
 /*
  * Copyright (c) 2017 Internet Initiative Japan Inc.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_ipsec.c,v 1.6 2018/03/09 11:03:26 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ipsec.c,v 1.7 2018/03/13 02:12:05 knakahara Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1310,27 +1310,37 @@ if_ipsec_unshare_sp(struct ipsec_variant
 }
 
 static inline void
-if_ipsec_add_mbuf(struct mbuf *m0, void *data, size_t len)
+if_ipsec_add_mbuf_optalign(struct mbuf *m0, void *data, size_t len, bool align)
 {
 	struct mbuf *m;
 
 	MGET(m, M_WAITOK | M_ZERO, MT_DATA);
-	m->m_len = PFKEY_ALIGN8(len);
+	if (align)
+		m->m_len = PFKEY_ALIGN8(len);
+	else
+		m->m_len = len;
 	m_copyback(m, 0, len, data);
 	m_cat(m0, m);
 }
 
 static inline void
-if_ipsec_add_mbuf_addr_port(struct mbuf *m0, struct sockaddr *addr, in_port_t port)
+if_ipsec_add_mbuf(struct mbuf *m0, void *data, size_t len)
+{
+
+	if_ipsec_add_mbuf_optalign(m0, data, len, true);
+}
+
+static inline void
+if_ipsec_add_mbuf_addr_port(struct mbuf *m0, struct sockaddr *addr, in_port_t port, bool align)
 {
 
 	if (port == 0) {
-		if_ipsec_add_mbuf(m0, addr, addr->sa_len);
+		if_ipsec_add_mbuf_optalign(m0, addr, addr->sa_len, align);
 	} else {
 		struct sockaddr addrport;
 
 		if_ipsec_set_addr_port(, addr, port);
-		if_ipsec_add_mbuf(m0, , addrport.sa_len);
+		if_ipsec_add_mbuf_optalign(m0, , addrport.sa_len, align);
 	}
 }
 
@@ -1412,10 +1422,8 @@ if_ipsec_set_sadb_x_policy(struct sadb_x
 	size = sizeof(*xpl);
 	if (policy == IPSEC_POLICY_IPSEC) {
 		size += PFKEY_ALIGN8(sizeof(*xisr));
-		if (src != NULL)
-			size += PFKEY_ALIGN8(src->sa_len);
-		if (dst != NULL)
-			size += PFKEY_ALIGN8(dst->sa_len);
+		if (src != NULL && dst != NULL)
+			size += PFKEY_ALIGN8(src->sa_len + dst->sa_len);
 	}
 	xpl->sadb_x_policy_len = PFKEY_UNIT64(size);
 	xpl->sadb_x_policy_exttype = SADB_X_EXT_POLICY;
@@ -1427,10 +1435,9 @@ if_ipsec_set_sadb_x_policy(struct sadb_x
 
 	if (policy == IPSEC_POLICY_IPSEC) {
 		xisr->sadb_x_ipsecrequest_len = PFKEY_ALIGN8(sizeof(*xisr));
-		if (src != NULL)
-			xisr->sadb_x_ipsecrequest_len += PFKEY_ALIGN8(src->sa_len);
-		if (dst != NULL)
-			xisr->sadb_x_ipsecrequest_len += PFKEY_ALIGN8(dst->sa_len);
+		if (src != NULL && dst != NULL)
+			xisr->sadb_x_ipsecrequest_len +=
+PFKEY_ALIGN8(src->sa_len + dst->sa_len);
 		xisr->sadb_x_ipsecrequest_proto = IPPROTO_ESP;
 		xisr->sadb_x_ipsecrequest_mode = IPSEC_MODE_TRANSPORT;
 		xisr->sadb_x_ipsecrequest_level = level;
@@ -1539,13 +1546,13 @@ if_ipsec_add_sp0(struct sockaddr *src, i
 	m_copyback(m, 0, sizeof(msg), );
 
 	if_ipsec_add_mbuf(m, , sizeof(xsrc));
-	if_ipsec_add_mbuf_addr_port(m, src, sport);
+	if_ipsec_add_mbuf_addr_port(m, src, sport, true);
 	padlen = PFKEY_UNUNIT64(xsrc.sadb_address_len)
 		- (sizeof(xsrc) + PFKEY_ALIGN8(src->sa_len));
 	if_ipsec_add_pad(m, padlen);
 
 	if_ipsec_add_mbuf(m, , sizeof(xdst));
-	if_ipsec_add_mbuf_addr_port(m, dst, dport);
+	if_ipsec_add_mbuf_addr_port(m, dst, dport, true);
 	padlen = PFKEY_UNUNIT64(xdst.sadb_address_len)
 		- (sizeof(xdst) + PFKEY_ALIGN8(dst->sa_len));
 	if_ipsec_add_pad(m, padlen);
@@ -1553,14 +1560,12 @@ if_ipsec_add_sp0(struct sockaddr *src, i
 	if_ipsec_add_mbuf(m, , sizeof(xpl));
 	if (policy == IPSEC_POLICY_IPSEC) {
 		if_ipsec_add_mbuf(m, , sizeof(xisr));
-		if_ipsec_add_mbuf_addr_port(m, src, sport);
-		if_ipsec_add_mbuf_addr_port(m, dst, dport);
+		if_ipsec_add_mbuf_addr_port(m, src, sport, false);
+		if_ipsec_add_mbuf_addr_port(m, dst, dport, false);
 	}
 	padlen = PFKEY_UNUNIT64(xpl.sadb_x_policy_len) - sizeof(xpl);
-	if (src != NULL)
-		padlen -= PFKEY_ALIGN8(src->sa_len);
-	if (dst != NULL)
-		padlen -= PFKEY_ALIGN8(dst->sa_len);
+	if (src != NULL && dst != NULL)
+		padlen -= PFKEY_ALIGN8(src->sa_len + dst->sa_len);
 	if_ipsec_add_pad(m, padlen);
 
 	/* key_kpi_spdadd() has already done KEY_SP_REF(). */

CVS commit: src/sys/net

[Kengo NAKAHARA]

Module Name:src
Committed By:   knakahara
Date:   Tue Mar 13 02:12:05 UTC 2018

Modified Files:
src/sys/net: if_ipsec.c

Log Message:
Fix IPv6 ipsecif(4) ATF regression, sorry.

There must *not* be padding between the src sockaddr and the dst sockaddr
after struct sadb_x_policy.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/net/if_ipsec.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/mit/xorg/lib/libXfont2

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Mar 13 02:23:29 UTC 2018

Modified Files:
src/external/mit/xorg/lib/libXfont2: Makefile

Log Message:
add missing pcfwrite.c.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libXfont2/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/lib/libXfont2/Makefile
diff -u src/external/mit/xorg/lib/libXfont2/Makefile:1.2 src/external/mit/xorg/lib/libXfont2/Makefile:1.3
--- src/external/mit/xorg/lib/libXfont2/Makefile:1.2	Sun Mar 11 10:17:10 2018
+++ src/external/mit/xorg/lib/libXfont2/Makefile	Tue Mar 13 02:23:28 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2018/03/11 10:17:10 mrg Exp $
+#	$NetBSD: Makefile,v 1.3 2018/03/13 02:23:28 mrg Exp $
 
 .include 
 
@@ -68,9 +68,11 @@ SRCS.bitmap=	\
 	bdfread.c \
 	bdfutils.c \
 	pcfread.c
+SRCS.bitmap+=	\
+	pcfwrite.c
+# SNF support not enabled
 .if 0
 SRCS.bitmap+=	\
-	pcfwrite.c \
 	snfread.c
 .endif
 .PATH:	${XFONT2DIR}/src/bitmap

CVS commit: src/external/mit/xorg/lib/libXfont2

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Mar 13 02:23:29 UTC 2018

Modified Files:
src/external/mit/xorg/lib/libXfont2: Makefile

Log Message:
add missing pcfwrite.c.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libXfont2/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/kern

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Tue Mar 13 02:24:26 UTC 2018

Modified Files:
src/sys/kern: kern_proc.c

Log Message:
Make sysctl_doeproc() more predictable

Swap the order of looking into zombie and all process lists, start now
with the zombie one. This prevents a race observed previously that the
same process could be detected on both lists during a single polling call.

While there:
 - Short-circuit break for KERN_PROC_PID, once a pid has been detected.
 - Removal of redundant "if (kbuf)" and "if (marker)" checks.
 - Update of comments regarding potential optimization, explaining why we
   don't want to it as of now. Performance gain from lookup call vs
   iteration over a list is neglible on a regular system.
 - Return ESRCH when no results have been found. This allows more easily
   to implement a retry or abandon algorithm.

This corrects races observed in the existing ATF ptrace(2) tests, related
to await_zombie(). This function was expecting to check whether a process
has been transformed into a zombie, however it was causing occasional
crashes as it was overflowing the return buffer, returning the same pid
twice: once from allproc list and the second time from zombieproc one.

Fix suggested by 
Short-circuit break suggested by 

Discussed on tech-kern.

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.210 -r1.211 src/sys/kern/kern_proc.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_proc.c
diff -u src/sys/kern/kern_proc.c:1.210 src/sys/kern/kern_proc.c:1.211
--- src/sys/kern/kern_proc.c:1.210	Sun Mar 11 15:13:05 2018
+++ src/sys/kern/kern_proc.c	Tue Mar 13 02:24:26 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_proc.c,v 1.210 2018/03/11 15:13:05 kre Exp $	*/
+/*	$NetBSD: kern_proc.c,v 1.211 2018/03/13 02:24:26 kamil Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.210 2018/03/11 15:13:05 kre Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.211 2018/03/13 02:24:26 kamil Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_kstack.h"
@@ -1674,12 +1674,16 @@ sysctl_doeproc(SYSCTLFN_ARGS)
 	marker->p_flag = PK_MARKER;
 
 	mutex_enter(proc_lock);
-	mmmbrains = false;
-	for (p = LIST_FIRST();; p = next) {
+	/*
+	 * Start with zombies to prevent reporting processes twice, in case they
+	 * are dying and being moved from the list of alive processes to zombies.
+	 */
+	mmmbrains = true;
+	for (p = LIST_FIRST();; p = next) {
 		if (p == NULL) {
-			if (!mmmbrains) {
-p = LIST_FIRST();
-mmmbrains = true;
+			if (mmmbrains) {
+p = LIST_FIRST();
+mmmbrains = false;
 			}
 			if (p == NULL)
 break;
@@ -1704,17 +1708,17 @@ sysctl_doeproc(SYSCTLFN_ARGS)
 		}
 
 		/*
-		 * TODO - make more efficient (see notes below).
-		 * do by session.
+		 * Hande all the operations in one switch on the cost of
+		 * algorithm complexity is on purpose. The win splitting this
+		 * function into several similar copies makes maintenance burden
+		 * burden, code grow and boost is neglible in practical systems.
 		 */
 		switch (op) {
 		case KERN_PROC_PID:
-			/* could do this with just a lookup */
 			match = (p->p_pid == (pid_t)arg);
 			break;
 
 		case KERN_PROC_PGRP:
-			/* could do this by traversing pgrp */
 			match = (p->p_pgrp->pg_id == (pid_t)arg);
 			break;
 
@@ -1820,10 +1824,20 @@ sysctl_doeproc(SYSCTLFN_ARGS)
 			rw_exit(>p_reflock);
 			next = LIST_NEXT(p, p_list);
 		}
+
+		/*
+		 * Short-circuit break quickly!
+		 */
+		if (op == KERN_PROC_PID)
+	break;
 	}
 	mutex_exit(proc_lock);
 
 	if (where != NULL) {
+		if (needed == 0) {
+			error = ESRCH;
+			goto out;
+		}
 		*oldlenp = dp - where;
 		if (needed > *oldlenp) {
 			error = ENOMEM;
@@ -1833,10 +1847,8 @@ sysctl_doeproc(SYSCTLFN_ARGS)
 		needed += KERN_PROCSLOP;
 		*oldlenp = needed;
 	}
-	if (kbuf)
-		kmem_free(kbuf, sizeof(*kbuf));
-	if (marker)
-		kmem_free(marker, sizeof(*marker));
+	kmem_free(kbuf, sizeof(*kbuf));
+	kmem_free(marker, sizeof(*marker));
 	sysctl_relock();
 	return 0;
  bah:
@@ -1847,10 +1859,8 @@ sysctl_doeproc(SYSCTLFN_ARGS)
  cleanup:
 	mutex_exit(proc_lock);
  out:
-	if (kbuf)
-		kmem_free(kbuf, sizeof(*kbuf));
-	if (marker)
-		kmem_free(marker, sizeof(*marker));
+	kmem_free(kbuf, sizeof(*kbuf));
+	kmem_free(marker, sizeof(*marker));
 	sysctl_relock();
 	return error;
 }

CVS commit: src/sys/kern

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Tue Mar 13 02:24:26 UTC 2018

Modified Files:
src/sys/kern: kern_proc.c

Log Message:
Make sysctl_doeproc() more predictable

Swap the order of looking into zombie and all process lists, start now
with the zombie one. This prevents a race observed previously that the
same process could be detected on both lists during a single polling call.

While there:
 - Short-circuit break for KERN_PROC_PID, once a pid has been detected.
 - Removal of redundant "if (kbuf)" and "if (marker)" checks.
 - Update of comments regarding potential optimization, explaining why we
   don't want to it as of now. Performance gain from lookup call vs
   iteration over a list is neglible on a regular system.
 - Return ESRCH when no results have been found. This allows more easily
   to implement a retry or abandon algorithm.

This corrects races observed in the existing ATF ptrace(2) tests, related
to await_zombie(). This function was expecting to check whether a process
has been transformed into a zombie, however it was causing occasional
crashes as it was overflowing the return buffer, returning the same pid
twice: once from allproc list and the second time from zombieproc one.

Fix suggested by 
Short-circuit break suggested by 

Discussed on tech-kern.

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.210 -r1.211 src/sys/kern/kern_proc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.