CVS commit: src/doc
Module Name:src Committed By: maya Date: Tue May 14 02:53:16 UTC 2019 Modified Files: src/doc: HACKS Log Message: Add a hack entry for libpthread one section To generate a diff of this commit: cvs rdiff -u -r1.189 -r1.190 src/doc/HACKS Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: maya Date: Tue May 14 02:53:16 UTC 2019 Modified Files: src/doc: HACKS Log Message: Add a hack entry for libpthread one section To generate a diff of this commit: cvs rdiff -u -r1.189 -r1.190 src/doc/HACKS Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/HACKS diff -u src/doc/HACKS:1.189 src/doc/HACKS:1.190 --- src/doc/HACKS:1.189 Wed Apr 3 21:40:24 2019 +++ src/doc/HACKS Tue May 14 02:53:16 2019 @@ -1,4 +1,4 @@ -# $NetBSD: HACKS,v 1.189 2019/04/03 21:40:24 christos Exp $ +# $NetBSD: HACKS,v 1.190 2019/05/14 02:53:16 maya Exp $ # # This file is intended to document workarounds for currently unsolved # (mostly) compiler bugs. @@ -27,6 +27,15 @@ # # this is a comment. +hack static linking with libpthread +mdate 7 May 2019 +who maya +file lib/libpthread/Makefile 1.92 -> 1.94 +descr + To avoid some libc thread stub functions being picked up + in static builds, link pthread as one section. +kcah + hack gcc-5.3 optimizes memset+malloc -> calloc inside calloc mdate 4 May 2016 who christos
Re: CVS commit: src/sys
On Tue, May 14, 2019 at 2:31 AM Jason Thorpe wrote: > > > > > On May 13, 2019, at 7:17 AM, Greg Troxel wrote: > > > > 2) Your option 2 seems to involve two things at once: > > > > - migration to lwp_specificadata > > - using DEBUG instead of DIAGNOSTIC to control the leak check feature > > > > I do not understand why changing the nature of the implementation is > > linked to how it is enabled. > > I think Ozaki-san saying that the 3% performance hit only happens when > lwp_specificdata is used, and hence that it would need to be wrapped in DEBUG > rather than DIAGNOSTIC. > > The original negligible-impact implementation did NOT use lwp_specificdata, > and thus was fine for DIAGNOSTIC. I believe Ozaki-san's preference is to use > *this* implementation so that it can be exposed to a wider audience. The > lwp_specificdata approach was only explored after someone else suggested a > preference for it. > > At least, that's my understanding of the situation. Yes, your understanding is correct. Thank you for the clarification. ozaki-r
Re: CVS commit: src/lib/libpthread
On Tue, May 07, 2019 at 06:14:09PM +, m...@netbsd.org wrote: > Pre-emptively making a thread where people can call this an ugly hack It is, please put a note into doc/HACKS at least. Joerg
Re: CVS commit: src/sys/kern
On Tue, May 07, 2019 at 09:22:49AM +0800, Paul Goyette wrote: > Currently we have the global sysctl variable, but I wonder if it should be > made local to a particular emulation and/or to an individual process? It's a global flag because it has security impliciations. Making it per-emulation or even per-process would defeat the purpose of having it in first place. Joerg
CVS commit: src/etc/rc.d
Module Name:src Committed By: maxv Date: Mon May 13 18:53:10 UTC 2019 Modified Files: src/etc/rc.d: smtoff Log Message: Remove comment, since there is no parsing anymore. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/etc/rc.d/smtoff Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc/rc.d
Module Name:src
Committed By: maxv
Date: Mon May 13 18:53:10 UTC 2019
Modified Files:
src/etc/rc.d: smtoff
Log Message:
Remove comment, since there is no parsing anymore.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/etc/rc.d/smtoff
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/smtoff
diff -u src/etc/rc.d/smtoff:1.3 src/etc/rc.d/smtoff:1.4
--- src/etc/rc.d/smtoff:1.3 Sun May 12 11:55:47 2019
+++ src/etc/rc.d/smtoff Mon May 13 18:53:10 2019
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: smtoff,v 1.3 2019/05/12 11:55:47 kre Exp $
+# $NetBSD: smtoff,v 1.4 2019/05/13 18:53:10 maxv Exp $
#
# Public Domain.
#
@@ -46,15 +46,6 @@ GetSmtId() {
done
}
-#
-# The format of the output (without -n) would be:
-#
-# hw.ncpu = 80
-#
-# so use -n to make life easy
-#
-# Return the value.
-#
CountCPUs() {
sysctl -n hw.ncpu
}
Re: CVS commit: src/sys/arch/arm/sunxi
On Mon, May 13, 2019 at 04:55:17PM +, Manuel Bouyer wrote: > Module Name: src > Committed By: bouyer > Date: Mon May 13 16:55:17 UTC 2019 > > Modified Files: > src/sys/arch/arm/sunxi: sunxi_sata.c > > Log Message: > Use new magic values from linux for DMACR. While I couldn't measure any > significant difference with my old, slow laptop drive, linux commiter claims > a 3x write performance boost (from 40 to 120MB/s) and 200MB/s read with > a ssd. With this backported to netbsd-8 on a cubieboard2 with a (quite old) ssd: Before: /home/bouyer>dd if=/dev/zero of=test bs=1m count=2048 2048+0 records in 2048+0 records out 2147483648 bytes transferred in 69.385 secs (30950257 bytes/sec) /home/bouyer>dd if=test of=/dev/null bs=1m 2048+0 records in 2048+0 records out 2147483648 bytes transferred in 26.114 secs (82234956 bytes/sec) after /home/bouyer>dd if=/dev/zero of=test bs=1m count=2048 2048+0 records in 2048+0 records out 2147483648 bytes transferred in 44.674 secs (48070100 bytes/sec) /home/bouyer>dd if=test of=/dev/null bs=1m 2048+0 records in 2048+0 records out 2147483648 bytes transferred in 23.644 secs (90825733 bytes/sec) So it's clearly an improvement here. -- Manuel Bouyer NetBSD: 26 ans d'experience feront toujours la difference --
CVS commit: src
Module Name:src Committed By: bad Date: Mon May 13 17:55:09 UTC 2019 Modified Files: src/tests/fs/nfs: t_rquotad.sh src/tests/include/sys: Makefile src/tests/lib/librumpclient: Makefile t_exec.sh t_fd.c src/tests/lib/librumphijack: t_tcpip.sh src/tests/net: net_common.sh src/tests/net/arp: t_arp.sh src/tests/net/bpfjit: Makefile src/tests/net/icmp: Makefile t_ping2.sh src/tests/net/if: Makefile t_ifconf.sh t_ifconfig.sh src/tests/net/if_loop: Makefile src/tests/net/if_tap: t_tap.sh src/tests/net/if_tun: t_tun.sh src/tests/net/mpls: t_ldp_regen.sh t_mpls_fw.sh t_mpls_fw6.sh t_mpls_fw64.sh t_rfc4182.sh src/tests/net/net: Makefile t_ipv6address.sh src/tests/net/route: t_change.sh src/tests/rump/rumpkern: t_sp.sh src/tests/rump/rumpnet: t_shmif.sh src/tests/usr.sbin/traceroute: t_traceroute.sh src/usr.sbin/npf/npftest: Makefile Log Message: Get rid of all the -lrumpdev and -lrumpvfs that are no longer needed after moving rump's mainbus from rumpdev to rumpkern. Produces the same atf-run results as before. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/tests/fs/nfs/t_rquotad.sh cvs rdiff -u -r1.13 -r1.14 src/tests/include/sys/Makefile cvs rdiff -u -r1.9 -r1.10 src/tests/lib/librumpclient/Makefile \ src/tests/lib/librumpclient/t_exec.sh cvs rdiff -u -r1.6 -r1.7 src/tests/lib/librumpclient/t_fd.c cvs rdiff -u -r1.18 -r1.19 src/tests/lib/librumphijack/t_tcpip.sh cvs rdiff -u -r1.30 -r1.31 src/tests/net/net_common.sh cvs rdiff -u -r1.36 -r1.37 src/tests/net/arp/t_arp.sh cvs rdiff -u -r1.6 -r1.7 src/tests/net/bpfjit/Makefile cvs rdiff -u -r1.9 -r1.10 src/tests/net/icmp/Makefile cvs rdiff -u -r1.5 -r1.6 src/tests/net/icmp/t_ping2.sh cvs rdiff -u -r1.7 -r1.8 src/tests/net/if/Makefile cvs rdiff -u -r1.3 -r1.4 src/tests/net/if/t_ifconf.sh cvs rdiff -u -r1.18 -r1.19 src/tests/net/if/t_ifconfig.sh cvs rdiff -u -r1.4 -r1.5 src/tests/net/if_loop/Makefile cvs rdiff -u -r1.8 -r1.9 src/tests/net/if_tap/t_tap.sh cvs rdiff -u -r1.5 -r1.6 src/tests/net/if_tun/t_tun.sh cvs rdiff -u -r1.7 -r1.8 src/tests/net/mpls/t_ldp_regen.sh cvs rdiff -u -r1.5 -r1.6 src/tests/net/mpls/t_mpls_fw.sh cvs rdiff -u -r1.3 -r1.4 src/tests/net/mpls/t_mpls_fw6.sh \ src/tests/net/mpls/t_mpls_fw64.sh cvs rdiff -u -r1.4 -r1.5 src/tests/net/mpls/t_rfc4182.sh cvs rdiff -u -r1.21 -r1.22 src/tests/net/net/Makefile cvs rdiff -u -r1.14 -r1.15 src/tests/net/net/t_ipv6address.sh cvs rdiff -u -r1.13 -r1.14 src/tests/net/route/t_change.sh cvs rdiff -u -r1.13 -r1.14 src/tests/rump/rumpkern/t_sp.sh cvs rdiff -u -r1.3 -r1.4 src/tests/rump/rumpnet/t_shmif.sh cvs rdiff -u -r1.6 -r1.7 src/tests/usr.sbin/traceroute/t_traceroute.sh cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/npf/npftest/Makefile 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: bad
Date: Mon May 13 17:55:09 UTC 2019
Modified Files:
src/tests/fs/nfs: t_rquotad.sh
src/tests/include/sys: Makefile
src/tests/lib/librumpclient: Makefile t_exec.sh t_fd.c
src/tests/lib/librumphijack: t_tcpip.sh
src/tests/net: net_common.sh
src/tests/net/arp: t_arp.sh
src/tests/net/bpfjit: Makefile
src/tests/net/icmp: Makefile t_ping2.sh
src/tests/net/if: Makefile t_ifconf.sh t_ifconfig.sh
src/tests/net/if_loop: Makefile
src/tests/net/if_tap: t_tap.sh
src/tests/net/if_tun: t_tun.sh
src/tests/net/mpls: t_ldp_regen.sh t_mpls_fw.sh t_mpls_fw6.sh
t_mpls_fw64.sh t_rfc4182.sh
src/tests/net/net: Makefile t_ipv6address.sh
src/tests/net/route: t_change.sh
src/tests/rump/rumpkern: t_sp.sh
src/tests/rump/rumpnet: t_shmif.sh
src/tests/usr.sbin/traceroute: t_traceroute.sh
src/usr.sbin/npf/npftest: Makefile
Log Message:
Get rid of all the -lrumpdev and -lrumpvfs that are no longer needed
after moving rump's mainbus from rumpdev to rumpkern.
Produces the same atf-run results as before.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/fs/nfs/t_rquotad.sh
cvs rdiff -u -r1.13 -r1.14 src/tests/include/sys/Makefile
cvs rdiff -u -r1.9 -r1.10 src/tests/lib/librumpclient/Makefile \
src/tests/lib/librumpclient/t_exec.sh
cvs rdiff -u -r1.6 -r1.7 src/tests/lib/librumpclient/t_fd.c
cvs rdiff -u -r1.18 -r1.19 src/tests/lib/librumphijack/t_tcpip.sh
cvs rdiff -u -r1.30 -r1.31 src/tests/net/net_common.sh
cvs rdiff -u -r1.36 -r1.37 src/tests/net/arp/t_arp.sh
cvs rdiff -u -r1.6 -r1.7 src/tests/net/bpfjit/Makefile
cvs rdiff -u -r1.9 -r1.10 src/tests/net/icmp/Makefile
cvs rdiff -u -r1.5 -r1.6 src/tests/net/icmp/t_ping2.sh
cvs rdiff -u -r1.7 -r1.8 src/tests/net/if/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tests/net/if/t_ifconf.sh
cvs rdiff -u -r1.18 -r1.19 src/tests/net/if/t_ifconfig.sh
cvs rdiff -u -r1.4 -r1.5 src/tests/net/if_loop/Makefile
cvs rdiff -u -r1.8 -r1.9 src/tests/net/if_tap/t_tap.sh
cvs rdiff -u -r1.5 -r1.6 src/tests/net/if_tun/t_tun.sh
cvs rdiff -u -r1.7 -r1.8 src/tests/net/mpls/t_ldp_regen.sh
cvs rdiff -u -r1.5 -r1.6 src/tests/net/mpls/t_mpls_fw.sh
cvs rdiff -u -r1.3 -r1.4 src/tests/net/mpls/t_mpls_fw6.sh \
src/tests/net/mpls/t_mpls_fw64.sh
cvs rdiff -u -r1.4 -r1.5 src/tests/net/mpls/t_rfc4182.sh
cvs rdiff -u -r1.21 -r1.22 src/tests/net/net/Makefile
cvs rdiff -u -r1.14 -r1.15 src/tests/net/net/t_ipv6address.sh
cvs rdiff -u -r1.13 -r1.14 src/tests/net/route/t_change.sh
cvs rdiff -u -r1.13 -r1.14 src/tests/rump/rumpkern/t_sp.sh
cvs rdiff -u -r1.3 -r1.4 src/tests/rump/rumpnet/t_shmif.sh
cvs rdiff -u -r1.6 -r1.7 src/tests/usr.sbin/traceroute/t_traceroute.sh
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/npf/npftest/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/fs/nfs/t_rquotad.sh
diff -u src/tests/fs/nfs/t_rquotad.sh:1.6 src/tests/fs/nfs/t_rquotad.sh:1.7
--- src/tests/fs/nfs/t_rquotad.sh:1.6 Fri Mar 8 08:35:58 2019
+++ src/tests/fs/nfs/t_rquotad.sh Mon May 13 17:55:07 2019
@@ -1,4 +1,4 @@
-# $NetBSD: t_rquotad.sh,v 1.6 2019/03/08 08:35:58 msaitoh Exp $
+# $NetBSD: t_rquotad.sh,v 1.7 2019/05/13 17:55:07 bad Exp $
#
# Copyright (c) 2011 Manuel Bouyer
# All rights reserved.
@@ -114,7 +114,7 @@ get_nfs_quota()
unset RUMPHIJACK
unset LD_PRELOAD
- atf_check -s exit:0 rump_server -lrumpvfs -lrumpnet -lrumpdev \
+ atf_check -s exit:0 rump_server -lrumpvfs -lrumpnet \
-lrumpnet_net -lrumpnet_netinet -lrumpnet_shmif -lrumpfs_nfs\
${RUMP_SERVER}
Index: src/tests/include/sys/Makefile
diff -u src/tests/include/sys/Makefile:1.13 src/tests/include/sys/Makefile:1.14
--- src/tests/include/sys/Makefile:1.13 Mon Oct 2 04:15:56 2017
+++ src/tests/include/sys/Makefile Mon May 13 17:55:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2017/10/02 04:15:56 pgoyette Exp $
+# $NetBSD: Makefile,v 1.14 2019/05/13 17:55:08 bad Exp $
NOMAN= # defined
@@ -21,7 +21,7 @@ LDADD.t_bitops+= -lm
TESTS_C+= t_socket
CPPFLAGS.t_socket.c+= -D_KERNTYPES
LDADD.t_socket+= -lrumpnet_local -lrumpnet_net -lrumpnet
-LDADD.t_socket+= -lrumpvfs -lrump -lrumpuser -lpthread -lrumpdev
+LDADD.t_socket+= -lrumpvfs -lrump -lrumpuser -lpthread
.endif
.include
Index: src/tests/lib/librumpclient/Makefile
diff -u src/tests/lib/librumpclient/Makefile:1.9 src/tests/lib/librumpclient/Makefile:1.10
--- src/tests/lib/librumpclient/Makefile:1.9 Thu Oct 6 20:14:11 2016
+++ src/tests/lib/librumpclient/Makefile Mon May 13 17:55:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2016/10/06 20:14:11 christos Exp $
+# $NetBSD: Makefile,v 1.10 2019/05/13 17:55:08 bad Exp $
#
.include
@@ -17,8 +17,6 @@ PROGS+= h_execthr
CPPFLAGS+= -D_KERNTYPES
LDADD+= -lrumpclient
-LDADD+= -lrumpdev
-LDADD+=
CVS commit: src/sys/arch/i386/stand/dosboot
Module Name:src
Committed By: maxv
Date: Mon May 13 17:50:30 UTC 2019
Modified Files:
src/sys/arch/i386/stand/dosboot: main.c
Log Message:
Remove dead code.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/i386/stand/dosboot/main.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/i386/stand/dosboot/main.c
diff -u src/sys/arch/i386/stand/dosboot/main.c:1.32 src/sys/arch/i386/stand/dosboot/main.c:1.33
--- src/sys/arch/i386/stand/dosboot/main.c:1.32 Wed Mar 26 17:58:57 2014
+++ src/sys/arch/i386/stand/dosboot/main.c Mon May 13 17:50:30 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.32 2014/03/26 17:58:57 christos Exp $ */
+/* $NetBSD: main.c,v 1.33 2019/05/13 17:50:30 maxv Exp $ */
/*
* Copyright (c) 1996, 1997
@@ -44,10 +44,6 @@
#include
-#ifdef SUPPORT_LYNX
-extern int exec_lynx(const char*, int);
-#endif
-
int errno;
extern char bootprog_name[], bootprog_rev[], bootprog_kernrev[];
@@ -184,26 +180,11 @@ bootit(const char *filename, int howto,
printf(" (howto 0x%x)", howto);
printf("\n");
}
-#ifdef SUPPORT_LYNX
- if(exec_netbsd(filename, 0, howto, floppy, NULL) < 0)
- printf("boot netbsd: %s: %s\n", sprint_bootsel(filename),
- strerror(errno));
- else {
- printf("boot netbsd returned\n");
- return;
- }
- if (exec_lynx(filename, 0) < 0)
- printf("boot lynx: %s: %s\n", sprint_bootsel(filename),
- strerror(errno));
- else
- printf("boot lynx returned\n");
-#else
if (exec_netbsd(filename, 0, howto, floppy, NULL) < 0)
printf("boot: %s: %s\n", sprint_bootsel(filename),
strerror(errno));
else
printf("boot returned\n");
-#endif
}
static void
CVS commit: src/sys/arch/i386/stand/dosboot
Module Name:src Committed By: maxv Date: Mon May 13 17:50:30 UTC 2019 Modified Files: src/sys/arch/i386/stand/dosboot: main.c Log Message: Remove dead code. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/arch/i386/stand/dosboot/main.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/librump
Module Name:src
Committed By: bad
Date: Mon May 13 17:49:05 UTC 2019
Modified Files:
src/sys/rump/librump/rumpdev: Makefile.rumpdev
src/sys/rump/librump/rumpkern: Makefile.rumpkern
Added Files:
src/sys/rump/librump/rumpkern: MAINBUS.ioconf rump_autoconf.c
Removed Files:
src/sys/rump/librump/rumpdev: MAINBUS.ioconf autoconf.c
Log Message:
On the one thousand and ninth day rump's mainbus was moved from
rumpdev to rumpkern, liberating all rumpnet users from the need to
-lrumpdev -lrumpvfs just because a loopback interface is mandatory.
Rename rumpdev/autoconf.c to rumpkern/rump_autoconf.c to avoid
accidentally picking up e.g. sys/arch/amd64/amd64/autoconf.c through
make's .PATH.
Move rumpdev/MAINBUS.ioconf to rumpkern.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r0 src/sys/rump/librump/rumpdev/MAINBUS.ioconf
cvs rdiff -u -r1.12 -r1.13 src/sys/rump/librump/rumpdev/Makefile.rumpdev
cvs rdiff -u -r1.9 -r0 src/sys/rump/librump/rumpdev/autoconf.c
cvs rdiff -u -r0 -r1.1 src/sys/rump/librump/rumpkern/MAINBUS.ioconf \
src/sys/rump/librump/rumpkern/rump_autoconf.c
cvs rdiff -u -r1.174 -r1.175 src/sys/rump/librump/rumpkern/Makefile.rumpkern
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpdev/Makefile.rumpdev
diff -u src/sys/rump/librump/rumpdev/Makefile.rumpdev:1.12 src/sys/rump/librump/rumpdev/Makefile.rumpdev:1.13
--- src/sys/rump/librump/rumpdev/Makefile.rumpdev:1.12 Mon Oct 19 16:16:38 2015
+++ src/sys/rump/librump/rumpdev/Makefile.rumpdev Mon May 13 17:49:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpdev,v 1.12 2015/10/19 16:16:38 pooka Exp $
+# $NetBSD: Makefile.rumpdev,v 1.13 2019/05/13 17:49:05 bad Exp $
#
LIB= rumpdev
@@ -8,13 +8,10 @@ COMMENT=Rump kernel device faction
${RUMPTOP}/../kern \
${RUMPTOP}/../dev
-IOCONFDIR:= ${.PARSEDIR}
-IOCONF= MAINBUS.ioconf
-
-SRCS= rump_dev.c autoconf.c
+SRCS= rump_dev.c
# sys/kern
-SRCS+= kern_pmf.c subr_autoconf.c
+SRCS+= kern_pmf.c
# sys/dev
SRCS+= dev_verbose.c
Index: src/sys/rump/librump/rumpkern/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.174 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.175
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.174 Sun Jan 27 02:08:49 2019
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern Mon May 13 17:49:05 2019
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile.rumpkern,v 1.174 2019/01/27 02:08:49 pgoyette Exp $
+# $NetBSD: Makefile.rumpkern,v 1.175 2019/05/13 17:49:05 bad Exp $
#
-.include "${RUMPTOP}/Makefile.rump"
-
-.include
+IOCONFDIR:= ${.PARSEDIR}
+IOCONF= MAINBUS.ioconf
LIB= rump
COMMENT= Rump kernel base
@@ -31,7 +30,7 @@ SRCS+= rump.c rumpcopy.c cons.c emul.c e
signals.c sleepq.c threads.c vm.c hyperentropy.c \
accessors.c
-SRCS+= rumpkern_syscalls.c
+SRCS+= rump_autoconf.c rumpkern_syscalls.c
# autogenerated into the correct namespace
RUMPOBJ_NORENAME= rump_syscalls.o rump_syscalls.pico rump_syscalls.po
@@ -99,6 +98,7 @@ SRCS+= init_sysctl_base.c \
kern_timeout.c \
kern_uidinfo.c \
param.c \
+ subr_autoconf.c \
subr_callback.c \
subr_copy.c \
subr_cprng.c \
@@ -160,6 +160,9 @@ SRCS+= rijndael-api-fst.c
SRCS+= rijndael.c
SRCS+= cprng_fast.c
+.include "${RUMPTOP}/Makefile.rump"
+.include
+
# compat
.if !empty(RUMP_NBCOMPAT:M50)
SRCS+= kern_select_50.c
Added files:
Index: src/sys/rump/librump/rumpkern/MAINBUS.ioconf
diff -u /dev/null src/sys/rump/librump/rumpkern/MAINBUS.ioconf:1.1
--- /dev/null Mon May 13 17:49:05 2019
+++ src/sys/rump/librump/rumpkern/MAINBUS.ioconf Mon May 13 17:49:05 2019
@@ -0,0 +1,6 @@
+ioconf mainbus
+
+include "conf/files"
+include "rump/dev/files.rump"
+
+mainbus0 at root
Index: src/sys/rump/librump/rumpkern/rump_autoconf.c
diff -u /dev/null src/sys/rump/librump/rumpkern/rump_autoconf.c:1.1
--- /dev/null Mon May 13 17:49:05 2019
+++ src/sys/rump/librump/rumpkern/rump_autoconf.c Mon May 13 17:49:05 2019
@@ -0,0 +1,140 @@
+/* $NetBSD: rump_autoconf.c,v 1.1 2019/05/13 17:49:05 bad Exp $ */
+
+/*
+ * Copyright (c) 2009 Antti Kantee. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR
Re: CVS commit: src/sys
> On May 13, 2019, at 7:17 AM, Greg Troxel wrote: > > 2) Your option 2 seems to involve two things at once: > > - migration to lwp_specificadata > - using DEBUG instead of DIAGNOSTIC to control the leak check feature > > I do not understand why changing the nature of the implementation is > linked to how it is enabled. I think Ozaki-san saying that the 3% performance hit only happens when lwp_specificdata is used, and hence that it would need to be wrapped in DEBUG rather than DIAGNOSTIC. The original negligible-impact implementation did NOT use lwp_specificdata, and thus was fine for DIAGNOSTIC. I believe Ozaki-san's preference is to use *this* implementation so that it can be exposed to a wider audience. The lwp_specificdata approach was only explored after someone else suggested a preference for it. At least, that's my understanding of the situation. Now, choose wisely :-) -- thorpej
CVS commit: src/sys/arch/arm/sunxi
Module Name:src Committed By: bouyer Date: Mon May 13 16:55:17 UTC 2019 Modified Files: src/sys/arch/arm/sunxi: sunxi_sata.c Log Message: Use new magic values from linux for DMACR. While I couldn't measure any significant difference with my old, slow laptop drive, linux commiter claims a 3x write performance boost (from 40 to 120MB/s) and 200MB/s read with a ssd. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/sunxi/sunxi_sata.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/arm/sunxi/sunxi_sata.c diff -u src/sys/arch/arm/sunxi/sunxi_sata.c:1.1 src/sys/arch/arm/sunxi/sunxi_sata.c:1.2 --- src/sys/arch/arm/sunxi/sunxi_sata.c:1.1 Sat Oct 7 15:12:35 2017 +++ src/sys/arch/arm/sunxi/sunxi_sata.c Mon May 13 16:55:17 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sunxi_sata.c,v 1.1 2017/10/07 15:12:35 jmcneill Exp $ */ +/* $NetBSD: sunxi_sata.c,v 1.2 2019/05/13 16:55:17 bouyer Exp $ */ /*- * Copyright (c) 2017 Jared McNeill @@ -28,7 +28,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: sunxi_sata.c,v 1.1 2017/10/07 15:12:35 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sunxi_sata.c,v 1.2 2019/05/13 16:55:17 bouyer Exp $"); #include #include @@ -55,8 +55,8 @@ sunxi_sata_channel_start(struct ahci_sof uint32_t val; val = AHCI_READ(sc, dma_reg); - val &= ~0xff00; - val |= 0x4400; + val &= ~0x; + val |= 0x4433; AHCI_WRITE(sc, dma_reg, val); }
CVS commit: src/sys/arch/arm/sunxi
Module Name:src Committed By: bouyer Date: Mon May 13 16:55:17 UTC 2019 Modified Files: src/sys/arch/arm/sunxi: sunxi_sata.c Log Message: Use new magic values from linux for DMACR. While I couldn't measure any significant difference with my old, slow laptop drive, linux commiter claims a 3x write performance boost (from 40 to 120MB/s) and 200MB/s read with a ssd. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/sunxi/sunxi_sata.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/rpcbind
Module Name:src
Committed By: christos
Date: Mon May 13 14:29:41 UTC 2019
Modified Files:
src/usr.sbin/rpcbind: rpcbind.c
Log Message:
Don't pass an uinitialized pm_prot to rpcinfo. It expects 0 for local,
so give it 0.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/usr.sbin/rpcbind/rpcbind.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/rpcbind/rpcbind.c
diff -u src/usr.sbin/rpcbind/rpcbind.c:1.27 src/usr.sbin/rpcbind/rpcbind.c:1.28
--- src/usr.sbin/rpcbind/rpcbind.c:1.27 Thu Jan 3 14:26:50 2019
+++ src/usr.sbin/rpcbind/rpcbind.c Mon May 13 10:29:41 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rpcbind.c,v 1.27 2019/01/03 19:26:50 christos Exp $ */
+/* $NetBSD: rpcbind.c,v 1.28 2019/05/13 14:29:41 christos Exp $ */
/*-
* Copyright (c) 2009, Sun Microsystems, Inc.
@@ -635,11 +635,13 @@ init_transport(struct netconfig *nconf)
/* Let's snarf the universal address */
/* "h1.h2.h3.h4.p1.p2" */
udp_uaddr = taddr2uaddr(nconf, );
- }
+ } else if (strcmp(nconf->nc_netid, "local") == 0) {
#ifdef IPPROTO_ST
- else if (strcmp(nconf->nc_netid, "local") == 0)
pml->pml_map.pm_prot = IPPROTO_ST;
+#else
+ pml->pml_map.pm_prot = 0;
#endif
+ }
pml->pml_next = list_pml;
list_pml = pml;
CVS commit: src/usr.sbin/rpcbind
Module Name:src Committed By: christos Date: Mon May 13 14:29:41 UTC 2019 Modified Files: src/usr.sbin/rpcbind: rpcbind.c Log Message: Don't pass an uinitialized pm_prot to rpcinfo. It expects 0 for local, so give it 0. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/usr.sbin/rpcbind/rpcbind.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys
Ryota Ozaki writes: > On Sat, May 11, 2019 at 10:49 AM Greg Troxel wrote: >> >> I'm sorry for delaying this task. Finally I have benchmarked a revised >> >> patch >> >> (our benchmarking setups have been out of service for a couple of >> >> weeks...). >> >> >> >> Performance degradation of IP forwarding is 3%. Is it acceptable as >> >> DIAGNOSTIC? >> > >> > For DIAGNOSTIC should be fine. >> >> I think 3% is too much for DIAGNOSTIC. DEBUG, sure, and a specific >> option to turn it on seems fine. DIAGNOSTIC historically has been only >> for things that check invariants and assert, such that if you don't mind >> the crashes when detecting things, there is no performance reason to >> avoid it. > > So we have two options: > 1. Keep the original (enabled on DIAGNOSTIC) > - Its performance impact is negligible > 2. Migrate to use lwp_specificadata and enable the feature on DEBUG > (and something) I am not following two things: 1) You said that IP forwarding speed is reduced by 3%, and also that it is a negligble performance impact. In my view, 3% is not negligible. DIAGNOSTIC should be sufficiently small performance impact that essentially nobody wants to disable it to get better performance. I could see 0.3% as negligible. But everything adds up, so it's not just this, but the overall system with and without DIAGNOSTIC. 2) Your option 2 seems to involve two things at once: - migration to lwp_specificadata - using DEBUG instead of DIAGNOSTIC to control the leak check feature I do not understand why changing the nature of the implementation is linked to how it is enabled. Overall, I think checking features (other than simple KASSSERTs) should have their own ifdef, so people can individually enable them, and then additionally there would be "#ifdef DEBUG // #define PSREFLEAKDETECT" or something like that. > I prefer to 1. because I want the feature to be enabled by many users Sure, but many users prefer that their systems not be slowed down, too. If we add 10 more checks that each cause 3% slowdown, then we have a real problem. DIAGNOSTIC has always had the sense that it should turn undefined behavior into a panic, but not slow the system down, so that the only reason to avoid it is not liking the panics. > (I assume that users (of -current) tend to enable DIAGNOSTIC and not DEBUG). On -current, DIAGNOSTIC is on by default. When we branch 9, I expect that it will remain on until very close to release. I agree that most people do not have DEBUG on. > If the detector is not enabled, a psref leak appears as a form that is > difficult to know where the leak occurs; a fatal page fault occurs on > psref_target_destroy that is a completely different context. If > enabled, we can at least know a suspect LWP or softint handler and may > find a cause in luck. How often do these leaks happen? If DIAGNOSTIC without the new code will assert or crash on a leak, but in a non-specific way, we know they are fairly rare. People who encounter them can add the define to enable the more specific detector and continue running to catch the next leak. It seems that if leaks are common, then it should be easy to find them with a few people enabling the new detector. If they are very rare, then 3% forwarding speed is a large price to pay for finding them more specifically the first time, on systems where they are not expected to happen. Another possibility (that I don't advocate) is to set this up so that it is enabled on DIAGNOSTIC with current, but not enabled with DIAGNOSTIC on release branches. I am much more concerned with performance loss on releaes branches. Another option is to enable it in current, until the bugs are fixed and we don't see leaks, and then turn it off. Please don't take this as criticism of your new leak detector. We are getting lots of checking code to look for many kinds of problems. Some of it is expensive to varying degrees. Everyone benefits from having the bugs fixed once found, and it's hard to draw the line about what should be enabled by default.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon May 13 12:42:24 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.1 Log Message: Ticket #1263 To generate a diff of this commit: cvs rdiff -u -r1.1.2.142 -r1.1.2.143 src/doc/CHANGES-8.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon May 13 12:42:24 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.1 Log Message: Ticket #1263 To generate a diff of this commit: cvs rdiff -u -r1.1.2.142 -r1.1.2.143 src/doc/CHANGES-8.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.1 diff -u src/doc/CHANGES-8.1:1.1.2.142 src/doc/CHANGES-8.1:1.1.2.143 --- src/doc/CHANGES-8.1:1.1.2.142 Mon May 13 09:05:33 2019 +++ src/doc/CHANGES-8.1 Mon May 13 12:42:24 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.1,v 1.1.2.142 2019/05/13 09:05:33 martin Exp $ +# $NetBSD: CHANGES-8.1,v 1.1.2.143 2019/05/13 12:42:24 martin Exp $ A complete list of changes from the NetBSD 8.0 release to the NetBSD 8.1 release: @@ -3114,3 +3114,25 @@ sys/netinet6/nd6_nbr.c1.163 inet6: discard any received NA with a LL address we own. [roy, ticket #1262] +sys/dev/mii/brgphy.c1.84 +sys/dev/mii/ciphy.c1.33 via patch +sys/dev/mii/rgephy.c1.53 +sys/arch/arm/imx/if_enet.c 1.18 +sys/arch/mips/adm5120/dev/if_admsw.c 1.19-1.20 +sys/dev/pci/if_bge.c1.329 +sys/dev/pci/if_bnx.c1.81 +sys/dev/pci/if_et.c1.21 +sys/dev/pci/if_lii.c1.22 +sys/dev/pci/if_msk.c1.87 +sys/dev/pci/if_nfe.c1.68 +sys/dev/pci/if_sk.c1.95 +sys/dev/pci/if_ti.c1.107 +sys/dev/pci/if_txp.c1.52 +sys/dev/pci/if_vge.c1.69 +sys/dev/usb/if_axen.c1.38 +sys/dev/usb/if_aue.c1.149 + + Fix a bug that the duplex of manual media setting may be wrong + when the IFM_GMASK bit other than IFM_[FH]DX is set. + [msaitoh, #1263] +
CVS commit: [netbsd-8] src/sys
Module Name:src
Committed By: martin
Date: Mon May 13 12:40:13 UTC 2019
Modified Files:
src/sys/arch/arm/imx [netbsd-8]: if_enet.c
src/sys/arch/mips/adm5120/dev [netbsd-8]: if_admsw.c
src/sys/dev/mii [netbsd-8]: brgphy.c ciphy.c rgephy.c
src/sys/dev/pci [netbsd-8]: if_bge.c if_bnx.c if_et.c if_lii.c if_msk.c
if_nfe.c if_sk.c if_ti.c if_txp.c if_vge.c
src/sys/dev/usb [netbsd-8]: if_aue.c if_axen.c
Log Message:
Pull up the following, via patch, requested by msaitoh in ticket #1263:
sys/dev/mii/brgphy.c1.84
sys/dev/mii/ciphy.c 1.33 via patch
sys/dev/mii/rgephy.c1.53
sys/arch/arm/imx/if_enet.c 1.18
sys/arch/mips/adm5120/dev/if_admsw.c1.19-1.20
sys/dev/pci/if_bge.c1.329
sys/dev/pci/if_bnx.c1.81
sys/dev/pci/if_et.c 1.21
sys/dev/pci/if_lii.c1.22
sys/dev/pci/if_msk.c1.87
sys/dev/pci/if_nfe.c1.68
sys/dev/pci/if_sk.c 1.95
sys/dev/pci/if_ti.c 1.107
sys/dev/pci/if_txp.c1.52
sys/dev/pci/if_vge.c1.69
sys/dev/usb/if_axen.c 1.38
sys/dev/usb/if_aue.c1.149
Fix a bug that the duplex of manual media setting may be wrong
when the IFM_GMASK bit other than IFM_[FH]DX is set.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/arch/arm/imx/if_enet.c
cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/arch/mips/adm5120/dev/if_admsw.c
cvs rdiff -u -r1.76.20.1 -r1.76.20.2 src/sys/dev/mii/brgphy.c
cvs rdiff -u -r1.26 -r1.26.10.1 src/sys/dev/mii/ciphy.c
cvs rdiff -u -r1.40.10.1 -r1.40.10.2 src/sys/dev/mii/rgephy.c
cvs rdiff -u -r1.310.2.6 -r1.310.2.7 src/sys/dev/pci/if_bge.c
cvs rdiff -u -r1.61.8.2 -r1.61.8.3 src/sys/dev/pci/if_bnx.c
cvs rdiff -u -r1.14.8.1 -r1.14.8.2 src/sys/dev/pci/if_et.c
cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/dev/pci/if_lii.c
cvs rdiff -u -r1.54.8.1 -r1.54.8.2 src/sys/dev/pci/if_msk.c
cvs rdiff -u -r1.63.8.1 -r1.63.8.2 src/sys/dev/pci/if_nfe.c
cvs rdiff -u -r1.85 -r1.85.8.1 src/sys/dev/pci/if_sk.c
cvs rdiff -u -r1.101.8.1 -r1.101.8.2 src/sys/dev/pci/if_ti.c
cvs rdiff -u -r1.47.8.1 -r1.47.8.2 src/sys/dev/pci/if_txp.c
cvs rdiff -u -r1.60.8.1 -r1.60.8.2 src/sys/dev/pci/if_vge.c
cvs rdiff -u -r1.141.8.3 -r1.141.8.4 src/sys/dev/usb/if_aue.c
cvs rdiff -u -r1.11.8.7 -r1.11.8.8 src/sys/dev/usb/if_axen.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/arm/imx/if_enet.c
diff -u src/sys/arch/arm/imx/if_enet.c:1.10 src/sys/arch/arm/imx/if_enet.c:1.10.8.1
--- src/sys/arch/arm/imx/if_enet.c:1.10 Thu Dec 15 09:28:02 2016
+++ src/sys/arch/arm/imx/if_enet.c Mon May 13 12:40:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_enet.c,v 1.10 2016/12/15 09:28:02 ozaki-r Exp $ */
+/* $NetBSD: if_enet.c,v 1.10.8.1 2019/05/13 12:40:13 martin Exp $ */
/*
* Copyright (c) 2014 Ryo Shimizu
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_enet.c,v 1.10 2016/12/15 09:28:02 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_enet.c,v 1.10.8.1 2019/05/13 12:40:13 martin Exp $");
#include "vlan.h"
@@ -1166,7 +1166,7 @@ enet_miibus_statchg(struct ifnet *ifp)
mii->mii_media_active &= ~IFM_ETH_FMASK;
}
- if ((ife->ifm_media & IFM_GMASK) == IFM_FDX) {
+ if ((ife->ifm_media & IFM_FDX) != 0) {
tcr |= ENET_TCR_FDEN; /* full duplex */
rcr &= ~ENET_RCR_DRT;; /* enable receive on transmit */
} else {
@@ -1776,7 +1776,7 @@ enet_init_regs(struct enet_softc *sc, in
mii = >sc_mii;
ife = mii->mii_media.ifm_cur;
- if ((ife->ifm_media & IFM_GMASK) == IFM_FDX)
+ if ((ife->ifm_media & IFM_FDX) != 0)
fulldup = 1;
else
fulldup = 0;
Index: src/sys/arch/mips/adm5120/dev/if_admsw.c
diff -u src/sys/arch/mips/adm5120/dev/if_admsw.c:1.16 src/sys/arch/mips/adm5120/dev/if_admsw.c:1.16.8.1
--- src/sys/arch/mips/adm5120/dev/if_admsw.c:1.16 Thu Dec 15 09:28:03 2016
+++ src/sys/arch/mips/adm5120/dev/if_admsw.c Mon May 13 12:40:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_admsw.c,v 1.16 2016/12/15 09:28:03 ozaki-r Exp $ */
+/* $NetBSD: if_admsw.c,v 1.16.8.1 2019/05/13 12:40:13 martin Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -76,7 +76,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_admsw.c,v 1.16 2016/12/15 09:28:03 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_admsw.c,v 1.16.8.1 2019/05/13 12:40:13 martin Exp $");
#include
@@ -1232,12 +1232,12 @@ admsw_mediachange(struct ifnet *ifp)
if (IFM_SUBTYPE(ifm->ifm_media) ==
CVS commit: [netbsd-8] src/sys
Module Name:src Committed By: martin Date: Mon May 13 12:40:13 UTC 2019 Modified Files: src/sys/arch/arm/imx [netbsd-8]: if_enet.c src/sys/arch/mips/adm5120/dev [netbsd-8]: if_admsw.c src/sys/dev/mii [netbsd-8]: brgphy.c ciphy.c rgephy.c src/sys/dev/pci [netbsd-8]: if_bge.c if_bnx.c if_et.c if_lii.c if_msk.c if_nfe.c if_sk.c if_ti.c if_txp.c if_vge.c src/sys/dev/usb [netbsd-8]: if_aue.c if_axen.c Log Message: Pull up the following, via patch, requested by msaitoh in ticket #1263: sys/dev/mii/brgphy.c1.84 sys/dev/mii/ciphy.c 1.33 via patch sys/dev/mii/rgephy.c1.53 sys/arch/arm/imx/if_enet.c 1.18 sys/arch/mips/adm5120/dev/if_admsw.c1.19-1.20 sys/dev/pci/if_bge.c1.329 sys/dev/pci/if_bnx.c1.81 sys/dev/pci/if_et.c 1.21 sys/dev/pci/if_lii.c1.22 sys/dev/pci/if_msk.c1.87 sys/dev/pci/if_nfe.c1.68 sys/dev/pci/if_sk.c 1.95 sys/dev/pci/if_ti.c 1.107 sys/dev/pci/if_txp.c1.52 sys/dev/pci/if_vge.c1.69 sys/dev/usb/if_axen.c 1.38 sys/dev/usb/if_aue.c1.149 Fix a bug that the duplex of manual media setting may be wrong when the IFM_GMASK bit other than IFM_[FH]DX is set. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/arch/arm/imx/if_enet.c cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/arch/mips/adm5120/dev/if_admsw.c cvs rdiff -u -r1.76.20.1 -r1.76.20.2 src/sys/dev/mii/brgphy.c cvs rdiff -u -r1.26 -r1.26.10.1 src/sys/dev/mii/ciphy.c cvs rdiff -u -r1.40.10.1 -r1.40.10.2 src/sys/dev/mii/rgephy.c cvs rdiff -u -r1.310.2.6 -r1.310.2.7 src/sys/dev/pci/if_bge.c cvs rdiff -u -r1.61.8.2 -r1.61.8.3 src/sys/dev/pci/if_bnx.c cvs rdiff -u -r1.14.8.1 -r1.14.8.2 src/sys/dev/pci/if_et.c cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/dev/pci/if_lii.c cvs rdiff -u -r1.54.8.1 -r1.54.8.2 src/sys/dev/pci/if_msk.c cvs rdiff -u -r1.63.8.1 -r1.63.8.2 src/sys/dev/pci/if_nfe.c cvs rdiff -u -r1.85 -r1.85.8.1 src/sys/dev/pci/if_sk.c cvs rdiff -u -r1.101.8.1 -r1.101.8.2 src/sys/dev/pci/if_ti.c cvs rdiff -u -r1.47.8.1 -r1.47.8.2 src/sys/dev/pci/if_txp.c cvs rdiff -u -r1.60.8.1 -r1.60.8.2 src/sys/dev/pci/if_vge.c cvs rdiff -u -r1.141.8.3 -r1.141.8.4 src/sys/dev/usb/if_aue.c cvs rdiff -u -r1.11.8.7 -r1.11.8.8 src/sys/dev/usb/if_axen.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Mon May 13 09:21:06 UTC 2019 Modified Files: src/doc: 3RDPARTY Log Message: gdb-8.3 out. Remove BSD bind version. To generate a diff of this commit: cvs rdiff -u -r1.1619 -r1.1620 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Mon May 13 09:21:06 UTC 2019 Modified Files: src/doc: 3RDPARTY Log Message: gdb-8.3 out. Remove BSD bind version. To generate a diff of this commit: cvs rdiff -u -r1.1619 -r1.1620 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1619 src/doc/3RDPARTY:1.1620 --- src/doc/3RDPARTY:1.1619 Wed May 8 18:00:16 2019 +++ src/doc/3RDPARTY Mon May 13 09:21:06 2019 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1619 2019/05/08 18:00:16 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1620 2019/05/13 09:21:06 wiz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -120,8 +120,8 @@ Notes: bc includes dc, both of which are in the NetBSD tree. Package: bind [named and utils] -Version: 9.10.8-P1/BSD 9.14.1/MPL -Current Vers: 9.14.1/MPL +Version: 9.14.1/MPL +Current Vers: 9.14.1/MPL Maintainer: ISC Archive Site: ftp://ftp.isc.org/isc/bind9/ Home Page: http://www.isc.org/software/bind/ @@ -470,7 +470,7 @@ Before importing a new version of extern Package: gdb Version: 8.0.1 -Current Vers: 8.2.1 +Current Vers: 8.3 Maintainer: FSF Archive Site: ftp://ftp.gnu.org/gnu/gdb/ Home Page: http://www.gnu.org/software/gdb/
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon May 13 09:05:33 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.1 Log Message: Ticket #1262 To generate a diff of this commit: cvs rdiff -u -r1.1.2.141 -r1.1.2.142 src/doc/CHANGES-8.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon May 13 09:05:33 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.1 Log Message: Ticket #1262 To generate a diff of this commit: cvs rdiff -u -r1.1.2.141 -r1.1.2.142 src/doc/CHANGES-8.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.1 diff -u src/doc/CHANGES-8.1:1.1.2.141 src/doc/CHANGES-8.1:1.1.2.142 --- src/doc/CHANGES-8.1:1.1.2.141 Sun May 12 09:23:50 2019 +++ src/doc/CHANGES-8.1 Mon May 13 09:05:33 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.1,v 1.1.2.141 2019/05/12 09:23:50 martin Exp $ +# $NetBSD: CHANGES-8.1,v 1.1.2.142 2019/05/13 09:05:33 martin Exp $ A complete list of changes from the NetBSD 8.0 release to the NetBSD 8.1 release: @@ -3109,3 +3109,8 @@ sys/arch/x86/x86/cpu_ucode_intel.c 1.16 Clean up, and add sanity checks on the microcode lengths. [maxv, ticket #1261] +sys/netinet6/nd6_nbr.c1.163 + + inet6: discard any received NA with a LL address we own. + [roy, ticket #1262] +
CVS commit: [netbsd-8] src/sys/netinet6
Module Name:src
Committed By: martin
Date: Mon May 13 09:04:38 UTC 2019
Modified Files:
src/sys/netinet6 [netbsd-8]: nd6_nbr.c
Log Message:
Pull up following revision(s) (requested by roy in ticket #1262):
sys/netinet6/nd6_nbr.c: revision 1.163
inet6: discard any received NA with a LL address we own
This matches ARP behaviour.
To generate a diff of this commit:
cvs rdiff -u -r1.138.6.6 -r1.138.6.7 src/sys/netinet6/nd6_nbr.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/netinet6/nd6_nbr.c
diff -u src/sys/netinet6/nd6_nbr.c:1.138.6.6 src/sys/netinet6/nd6_nbr.c:1.138.6.7
--- src/sys/netinet6/nd6_nbr.c:1.138.6.6 Mon Apr 2 08:54:35 2018
+++ src/sys/netinet6/nd6_nbr.c Mon May 13 09:04:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6_nbr.c,v 1.138.6.6 2018/04/02 08:54:35 martin Exp $ */
+/* $NetBSD: nd6_nbr.c,v 1.138.6.7 2019/05/13 09:04:38 martin Exp $ */
/* $KAME: nd6_nbr.c,v 1.61 2001/02/10 16:06:14 jinmei Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.138.6.6 2018/04/02 08:54:35 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.138.6.7 2019/05/13 09:04:38 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -630,9 +630,26 @@ nd6_na_input(struct mbuf *m, int off, in
goto freeit;
}
- if (ndopts.nd_opts_tgt_lladdr) {
+ if (ndopts.nd_opts_tgt_lladdr != NULL) {
+ struct ifnet *ifp_ll;
+ struct psref psref_ll;
+
lladdr = (char *)(ndopts.nd_opts_tgt_lladdr + 1);
lladdrlen = ndopts.nd_opts_tgt_lladdr->nd_opt_len << 3;
+
+ if (lladdr && ((ifp->if_addrlen + 2 + 7) & ~7) != lladdrlen) {
+ nd6log(LOG_INFO, "lladdrlen mismatch for %s "
+ "(if %d, NA packet %d)\n", IN6_PRINT(ip6buf, ),
+ ifp->if_addrlen, lladdrlen - 2);
+ goto bad;
+ }
+
+ ifp_ll = if_get_bylla(lladdr, ifp->if_addrlen, _ll);
+ if (ifp_ll != NULL) {
+ /* it's from me, ignore it. */
+ if_put(ifp_ll, _ll);
+ goto freeit;
+ }
}
ifa = (struct ifaddr *)in6ifa_ifpwithaddr_psref(ifp, , _ia);
@@ -647,7 +664,8 @@ nd6_na_input(struct mbuf *m, int off, in
* Otherwise, process as defined in RFC 2461.
*/
if (ifa
- && (((struct in6_ifaddr *)ifa)->ia6_flags & IN6_IFF_TENTATIVE)) {
+ && (((struct in6_ifaddr *)ifa)->ia6_flags & IN6_IFF_TENTATIVE))
+ {
nd6_dad_na_input(ifa);
ifa_release(ifa, _ia);
ifa = NULL;
@@ -674,13 +692,6 @@ nd6_na_input(struct mbuf *m, int off, in
goto bad;
}
- if (lladdr && ((ifp->if_addrlen + 2 + 7) & ~7) != lladdrlen) {
- nd6log(LOG_INFO, "lladdrlen mismatch for %s "
- "(if %d, NA packet %d)\n", IN6_PRINT(ip6buf, ),
- ifp->if_addrlen, lladdrlen - 2);
- goto bad;
- }
-
/*
* If no neighbor cache entry is found, NA SHOULD silently be
* discarded.
CVS commit: [netbsd-8] src/sys/netinet6
Module Name:src Committed By: martin Date: Mon May 13 09:04:38 UTC 2019 Modified Files: src/sys/netinet6 [netbsd-8]: nd6_nbr.c Log Message: Pull up following revision(s) (requested by roy in ticket #1262): sys/netinet6/nd6_nbr.c: revision 1.163 inet6: discard any received NA with a LL address we own This matches ARP behaviour. To generate a diff of this commit: cvs rdiff -u -r1.138.6.6 -r1.138.6.7 src/sys/netinet6/nd6_nbr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/audio
Module Name:src
Committed By: nakayama
Date: Mon May 13 08:50:25 UTC 2019
Modified Files:
src/sys/dev/audio: audio.c
Log Message:
audio_open:
On full duplex hardware, the flags passed to hw_if->open() is always
(FREAD | FWRITE). But some devices (e.g. uaudio) check its
capabilities at open(), so unidirection devices like USB speakers
always return EACCES.
Avoid open() failure on such devices by checking the capabilities of
the device and changing the flags passed to hw_if->open().
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/audio/audio.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/dev/audio/audio.c
diff -u src/sys/dev/audio/audio.c:1.6 src/sys/dev/audio/audio.c:1.7
--- src/sys/dev/audio/audio.c:1.6 Mon May 13 07:53:56 2019
+++ src/sys/dev/audio/audio.c Mon May 13 08:50:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.6 2019/05/13 07:53:56 nakayama Exp $ */
+/* $NetBSD: audio.c,v 1.7 2019/05/13 08:50:25 nakayama Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -149,7 +149,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.6 2019/05/13 07:53:56 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.7 2019/05/13 08:50:25 nakayama Exp $");
#ifdef _KERNEL_OPT
#include "audio.h"
@@ -2046,12 +2046,17 @@ audio_open(dev_t dev, struct audio_softc
* hw_if->open() is always (FREAD | FWRITE)
* regardless of this open()'s flags.
* see also dev/isa/aria.c
+ * but ckeck its playback or recording capability.
* On half duplex hardware, the flags passed to
* hw_if->open() is either FREAD or FWRITE.
* see also arch/evbarm/mini2440/audio_mini2440.c
*/
if (fullduplex) {
hwflags = FREAD | FWRITE;
+if (!audio_can_playback(sc))
+ hwflags &= ~FWRITE;
+if (!audio_can_capture(sc))
+ hwflags &= ~FREAD;
} else {
/* Construct hwflags from af->mode. */
hwflags = 0;
CVS commit: src/sys/dev/audio
Module Name:src Committed By: nakayama Date: Mon May 13 08:50:25 UTC 2019 Modified Files: src/sys/dev/audio: audio.c Log Message: audio_open: On full duplex hardware, the flags passed to hw_if->open() is always (FREAD | FWRITE). But some devices (e.g. uaudio) check its capabilities at open(), so unidirection devices like USB speakers always return EACCES. Avoid open() failure on such devices by checking the capabilities of the device and changing the flags passed to hw_if->open(). To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/dev/audio/audio.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
Module Name:src Committed By: uki Date: Mon May 13 08:38:45 UTC 2019 Modified Files: src/distrib/sets/lists/xbase: shl.mi src/distrib/sets/lists/xcomp: shl.mi src/distrib/sets/lists/xdebug: mi shl.mi src/distrib/sets/lists/xetc: mi src/distrib/sets/lists/xserver: md.amd64 md.cats md.i386 Log Message: Change package name "-obsolete-" to "-obsolete". It is a little step. To generate a diff of this commit: cvs rdiff -u -r1.83 -r1.84 src/distrib/sets/lists/xbase/shl.mi cvs rdiff -u -r1.51 -r1.52 src/distrib/sets/lists/xcomp/shl.mi cvs rdiff -u -r1.31 -r1.32 src/distrib/sets/lists/xdebug/mi cvs rdiff -u -r1.47 -r1.48 src/distrib/sets/lists/xdebug/shl.mi cvs rdiff -u -r1.34 -r1.35 src/distrib/sets/lists/xetc/mi cvs rdiff -u -r1.106 -r1.107 src/distrib/sets/lists/xserver/md.amd64 cvs rdiff -u -r1.59 -r1.60 src/distrib/sets/lists/xserver/md.cats cvs rdiff -u -r1.123 -r1.124 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/xbase/shl.mi diff -u src/distrib/sets/lists/xbase/shl.mi:1.83 src/distrib/sets/lists/xbase/shl.mi:1.84 --- src/distrib/sets/lists/xbase/shl.mi:1.83 Tue Apr 16 21:20:51 2019 +++ src/distrib/sets/lists/xbase/shl.mi Mon May 13 08:38:45 2019 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.83 2019/04/16 21:20:51 mrg Exp $ +# $NetBSD: shl.mi,v 1.84 2019/05/13 08:38:45 uki Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -65,9 +65,9 @@ ./usr/X11R7/lib/libXaw7.so -unknown- xorg,compatx11file ./usr/X11R7/lib/libXaw7.so.10 -unknown- xorg,compatx11file ./usr/X11R7/lib/libXaw7.so.10.0 -unknown xorg,compatx11file -./usr/X11R7/lib/libXaw8.so -obsolete- obsolete -./usr/X11R7/lib/libXaw8.so.9 -obsolete- obsolete -./usr/X11R7/lib/libXaw8.so.9.0 -obsolete- obsolete +./usr/X11R7/lib/libXaw8.so xbase-obsolete obsolete +./usr/X11R7/lib/libXaw8.so.9 xbase-obsolete obsolete +./usr/X11R7/lib/libXaw8.so.9.0 xbase-obsolete obsolete ./usr/X11R7/lib/libXcomposite.so -unknown- xorg,compatx11file ./usr/X11R7/lib/libXcomposite.so.2 -unknown- xorg,compatx11file ./usr/X11R7/lib/libXcomposite.so.2.0 -unknown- xorg,compatx11file @@ -113,30 +113,30 @@ ./usr/X11R7/lib/libXmuu.so -unknown- xorg,compatx11file ./usr/X11R7/lib/libXmuu.so.2 -unknown- xorg,compatx11file ./usr/X11R7/lib/libXmuu.so.2.0 -unknown- xorg,compatx11file -./usr/X11R7/lib/libXp.so -obsolete- obsolete -./usr/X11R7/lib/libXp.so.7 -obsolete- obsolete -./usr/X11R7/lib/libXp.so.7.0 -obsolete- obsolete +./usr/X11R7/lib/libXp.so xbase-obsolete obsolete +./usr/X11R7/lib/libXp.so.7 xbase-obsolete obsolete +./usr/X11R7/lib/libXp.so.7.0 xbase-obsolete obsolete ./usr/X11R7/lib/libXpm.so -unknown- xorg,compatx11file ./usr/X11R7/lib/libXpm.so.5 -unknown- xorg,compatx11file ./usr/X11R7/lib/libXpm.so.5.0 -unknown- xorg,compatx11file ./usr/X11R7/lib/libXpresent.so -unknown- xorg,compatx11file ./usr/X11R7/lib/libXpresent.so.1 -unknown- xorg,compatx11file ./usr/X11R7/lib/libXpresent.so.1.0 -unknown- xorg,compatx11file -./usr/X11R7/lib/libXprintAppUtil.so -obsolete- obsolete -./usr/X11R7/lib/libXprintAppUtil.so.2 -obsolete- obsolete -./usr/X11R7/lib/libXprintAppUtil.so.2.0 -obsolete- obsolete -./usr/X11R7/lib/libXprintUtil.so -obsolete- obsolete -./usr/X11R7/lib/libXprintUtil.so.2 -obsolete- obsolete -./usr/X11R7/lib/libXprintUtil.so.2.0 -obsolete- obsolete +./usr/X11R7/lib/libXprintAppUtil.so xbase-obsolete obsolete +./usr/X11R7/lib/libXprintAppUtil.so.2 xbase-obsolete obsolete +./usr/X11R7/lib/libXprintAppUtil.so.2.0 xbase-obsolete obsolete +./usr/X11R7/lib/libXprintUtil.so xbase-obsolete obsolete +./usr/X11R7/lib/libXprintUtil.so.2 xbase-obsolete obsolete +./usr/X11R7/lib/libXprintUtil.so.2.0 xbase-obsolete obsolete ./usr/X11R7/lib/libXrandr.so -unknown- xorg,compatx11file ./usr/X11R7/lib/libXrandr.so.3 -unknown- xorg,compatx11file ./usr/X11R7/lib/libXrandr.so.3.2 -unknown- xorg,compatx11file ./usr/X11R7/lib/libXrender.so -unknown- xorg,compatx11file ./usr/X11R7/lib/libXrender.so.2 -unknown- xorg,compatx11file ./usr/X11R7/lib/libXrender.so.2.0 -unknown- xorg,compatx11file -./usr/X11R7/lib/libXres.so -obsolete- obsolete -./usr/X11R7/lib/libXres.so.1 -obsolete- obsolete -./usr/X11R7/lib/libXres.so.1.0 -obsolete- obsolete +./usr/X11R7/lib/libXres.so xbase-obsolete obsolete +./usr/X11R7/lib/libXres.so.1 xbase-obsolete obsolete +./usr/X11R7/lib/libXres.so.1.0 xbase-obsolete obsolete ./usr/X11R7/lib/libXss.so -unknown- xorg,compatx11file ./usr/X11R7/lib/libXss.so.2 -unknown- xorg,compatx11file ./usr/X11R7/lib/libXss.so.2.0 -unknown- xorg,compatx11file @@ -173,9 +173,9 @@ ./usr/X11R7/lib/libepoxy.so -unknown- xorg,compatx11file ./usr/X11R7/lib/libepoxy.so.0 -unknown-
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: uki Date: Mon May 13 08:38:45 UTC 2019 Modified Files: src/distrib/sets/lists/xbase: shl.mi src/distrib/sets/lists/xcomp: shl.mi src/distrib/sets/lists/xdebug: mi shl.mi src/distrib/sets/lists/xetc: mi src/distrib/sets/lists/xserver: md.amd64 md.cats md.i386 Log Message: Change package name "-obsolete-" to "-obsolete". It is a little step. To generate a diff of this commit: cvs rdiff -u -r1.83 -r1.84 src/distrib/sets/lists/xbase/shl.mi cvs rdiff -u -r1.51 -r1.52 src/distrib/sets/lists/xcomp/shl.mi cvs rdiff -u -r1.31 -r1.32 src/distrib/sets/lists/xdebug/mi cvs rdiff -u -r1.47 -r1.48 src/distrib/sets/lists/xdebug/shl.mi cvs rdiff -u -r1.34 -r1.35 src/distrib/sets/lists/xetc/mi cvs rdiff -u -r1.106 -r1.107 src/distrib/sets/lists/xserver/md.amd64 cvs rdiff -u -r1.59 -r1.60 src/distrib/sets/lists/xserver/md.cats cvs rdiff -u -r1.123 -r1.124 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/kern
Module Name:src
Committed By: hannken
Date: Mon May 13 08:17:30 UTC 2019
Modified Files:
src/sys/kern: vfs_syscalls.c
Log Message:
do_sys_mkdir(): pass the requested segment down to do_sys_mkdirat().
To generate a diff of this commit:
cvs rdiff -u -r1.527 -r1.528 src/sys/kern/vfs_syscalls.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/vfs_syscalls.c
diff -u src/sys/kern/vfs_syscalls.c:1.527 src/sys/kern/vfs_syscalls.c:1.528
--- src/sys/kern/vfs_syscalls.c:1.527 Fri Mar 1 11:06:57 2019
+++ src/sys/kern/vfs_syscalls.c Mon May 13 08:17:30 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls.c,v 1.527 2019/03/01 11:06:57 pgoyette Exp $ */
+/* $NetBSD: vfs_syscalls.c,v 1.528 2019/05/13 08:17:30 hannken Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.527 2019/03/01 11:06:57 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.528 2019/05/13 08:17:30 hannken Exp $");
#ifdef _KERNEL_OPT
#include "opt_fileassoc.h"
@@ -4538,7 +4538,7 @@ sys_mkdirat(struct lwp *l, const struct
int
do_sys_mkdir(const char *path, mode_t mode, enum uio_seg seg)
{
- return do_sys_mkdirat(NULL, AT_FDCWD, path, mode, UIO_USERSPACE);
+ return do_sys_mkdirat(NULL, AT_FDCWD, path, mode, seg);
}
static int
CVS commit: src/sys/kern
Module Name:src Committed By: hannken Date: Mon May 13 08:17:30 UTC 2019 Modified Files: src/sys/kern: vfs_syscalls.c Log Message: do_sys_mkdir(): pass the requested segment down to do_sys_mkdirat(). To generate a diff of this commit: cvs rdiff -u -r1.527 -r1.528 src/sys/kern/vfs_syscalls.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: hannken
Date: Mon May 13 08:16:56 UTC 2019
Modified Files:
src/sys/kern: vfs_trans.c
Log Message:
Walk down to the lowest mount for "fli_alias".
Address PR kern/54195 (null mounts: panic: ...).
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/kern/vfs_trans.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/vfs_trans.c
diff -u src/sys/kern/vfs_trans.c:1.59 src/sys/kern/vfs_trans.c:1.60
--- src/sys/kern/vfs_trans.c:1.59 Mon Apr 15 13:01:08 2019
+++ src/sys/kern/vfs_trans.c Mon May 13 08:16:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_trans.c,v 1.59 2019/04/15 13:01:08 hannken Exp $ */
+/* $NetBSD: vfs_trans.c,v 1.60 2019/05/13 08:16:56 hannken Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vfs_trans.c,v 1.59 2019/04/15 13:01:08 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_trans.c,v 1.60 2019/05/13 08:16:56 hannken Exp $");
/*
* File system transaction operations.
@@ -383,7 +383,9 @@ fstrans_alloc_lwp_info(struct mount *mp)
fli->fli_mount = mp;
fli->fli_mountinfo = fmi;
fmi->fmi_ref_cnt += 1;
- mp = mp->mnt_lower;
+ do {
+ mp = mp->mnt_lower;
+ } while (mp && mp->mnt_lower);
mutex_exit(_mount_lock);
if (mp) {
CVS commit: src/sys/kern
Module Name:src Committed By: hannken Date: Mon May 13 08:16:56 UTC 2019 Modified Files: src/sys/kern: vfs_trans.c Log Message: Walk down to the lowest mount for "fli_alias". Address PR kern/54195 (null mounts: panic: ...). To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/sys/kern/vfs_trans.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/sys
Module Name:src Committed By: ozaki-r Date: Mon May 13 07:54:52 UTC 2019 Modified Files: src/sys/sys: param.h Log Message: Bump the version for entry additions to IP_STAT and IP6_STAT Welcome to 8.99.40 To generate a diff of this commit: cvs rdiff -u -r1.587 -r1.588 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/sys/sys
Module Name:src Committed By: ozaki-r Date: Mon May 13 07:54:52 UTC 2019 Modified Files: src/sys/sys: param.h Log Message: Bump the version for entry additions to IP_STAT and IP6_STAT Welcome to 8.99.40 To generate a diff of this commit: cvs rdiff -u -r1.587 -r1.588 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/sys/sys/param.h diff -u src/sys/sys/param.h:1.587 src/sys/sys/param.h:1.588 --- src/sys/sys/param.h:1.587 Wed May 8 13:47:33 2019 +++ src/sys/sys/param.h Mon May 13 07:54:52 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.587 2019/05/08 13:47:33 isaki Exp $ */ +/* $NetBSD: param.h,v 1.588 2019/05/13 07:54:52 ozaki-r Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -67,7 +67,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 899003900 /* NetBSD 8.99.39 */ +#define __NetBSD_Version__ 899004000 /* NetBSD 8.99.40 */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) <= __NetBSD_Version__)
CVS commit: src/usr.bin/netstat
Module Name:src Committed By: ozaki-r Date: Mon May 13 07:48:42 UTC 2019 Modified Files: src/usr.bin/netstat: inet.c inet6.c Log Message: Show the number of packets dropped by pfil To generate a diff of this commit: cvs rdiff -u -r1.108 -r1.109 src/usr.bin/netstat/inet.c cvs rdiff -u -r1.71 -r1.72 src/usr.bin/netstat/inet6.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/netstat
Module Name:src
Committed By: ozaki-r
Date: Mon May 13 07:48:42 UTC 2019
Modified Files:
src/usr.bin/netstat: inet.c inet6.c
Log Message:
Show the number of packets dropped by pfil
To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 src/usr.bin/netstat/inet.c
cvs rdiff -u -r1.71 -r1.72 src/usr.bin/netstat/inet6.c
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/netstat/inet.c
diff -u src/usr.bin/netstat/inet.c:1.108 src/usr.bin/netstat/inet.c:1.109
--- src/usr.bin/netstat/inet.c:1.108 Thu May 3 07:13:48 2018
+++ src/usr.bin/netstat/inet.c Mon May 13 07:48:42 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: inet.c,v 1.108 2018/05/03 07:13:48 maxv Exp $ */
+/* $NetBSD: inet.c,v 1.109 2019/05/13 07:48:42 ozaki-r Exp $ */
/*
* Copyright (c) 1983, 1988, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "from: @(#)inet.c 8.4 (Berkeley) 4/20/94";
#else
-__RCSID("$NetBSD: inet.c,v 1.108 2018/05/03 07:13:48 maxv Exp $");
+__RCSID("$NetBSD: inet.c,v 1.109 2019/05/13 07:48:42 ozaki-r Exp $");
#endif
#endif /* not lint */
@@ -630,6 +630,8 @@ ip_stats(u_long off, const char *name)
p(IP_STAT_OFRAGMENTS, "\t%" PRIu64 " fragment%s created\n");
p(IP_STAT_CANTFRAG, "\t%" PRIu64 " datagram%s that can't be fragmented\n");
p(IP_STAT_BADADDR, "\t%" PRIu64 " datagram%s with bad address in header\n");
+ p(IP_STAT_PFILDROP_IN, "\t%" PRIu64 " input packet%s dropped by pfil\n");
+ p(IP_STAT_PFILDROP_OUT, "\t%" PRIu64 " output packet%s dropped by pfil\n");
#undef ps
#undef p
}
Index: src/usr.bin/netstat/inet6.c
diff -u src/usr.bin/netstat/inet6.c:1.71 src/usr.bin/netstat/inet6.c:1.72
--- src/usr.bin/netstat/inet6.c:1.71 Thu May 3 07:13:48 2018
+++ src/usr.bin/netstat/inet6.c Mon May 13 07:48:42 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: inet6.c,v 1.71 2018/05/03 07:13:48 maxv Exp $ */
+/* $NetBSD: inet6.c,v 1.72 2019/05/13 07:48:42 ozaki-r Exp $ */
/* BSDI inet.c,v 2.3 1995/10/24 02:19:29 prb Exp */
/*
@@ -64,7 +64,7 @@
#if 0
static char sccsid[] = "@(#)inet.c 8.4 (Berkeley) 4/20/94";
#else
-__RCSID("$NetBSD: inet6.c,v 1.71 2018/05/03 07:13:48 maxv Exp $");
+__RCSID("$NetBSD: inet6.c,v 1.72 2019/05/13 07:48:42 ozaki-r Exp $");
#endif
#endif /* not lint */
@@ -798,6 +798,8 @@ ip6_stats(u_long off, const char *name)
p1(IP6_STAT_FORWARD_CACHEHIT, "\t%llu forward cache hit\n");
p1(IP6_STAT_FORWARD_CACHEMISS, "\t%llu forward cache miss\n");
+ p(IP6_STAT_PFILDROP_IN, "\t%llu input packet%s dropped by pfil\n");
+ p(IP6_STAT_PFILDROP_OUT, "\t%llu output packet%s dropped by pfil\n");
#undef p
#undef p1
}
CVS commit: src/sys
Module Name:src
Committed By: ozaki-r
Date: Mon May 13 07:48:00 UTC 2019
Modified Files:
src/sys/netinet: ip_input.c ip_output.c ip_var.h
src/sys/netinet6: ip6_forward.c ip6_input.c ip6_output.c ip6_var.h
Log Message:
Count packets dropped by pfil
To generate a diff of this commit:
cvs rdiff -u -r1.388 -r1.389 src/sys/netinet/ip_input.c
cvs rdiff -u -r1.310 -r1.311 src/sys/netinet/ip_output.c
cvs rdiff -u -r1.127 -r1.128 src/sys/netinet/ip_var.h
cvs rdiff -u -r1.95 -r1.96 src/sys/netinet6/ip6_forward.c
cvs rdiff -u -r1.207 -r1.208 src/sys/netinet6/ip6_input.c
cvs rdiff -u -r1.218 -r1.219 src/sys/netinet6/ip6_output.c
cvs rdiff -u -r1.81 -r1.82 src/sys/netinet6/ip6_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/ip_input.c
diff -u src/sys/netinet/ip_input.c:1.388 src/sys/netinet/ip_input.c:1.389
--- src/sys/netinet/ip_input.c:1.388 Thu Jan 17 02:47:15 2019
+++ src/sys/netinet/ip_input.c Mon May 13 07:47:59 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_input.c,v 1.388 2019/01/17 02:47:15 knakahara Exp $ */
+/* $NetBSD: ip_input.c,v 1.389 2019/05/13 07:47:59 ozaki-r Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.388 2019/01/17 02:47:15 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.389 2019/05/13 07:47:59 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -578,6 +578,7 @@ ip_input(struct mbuf *m)
freed = pfil_run_hooks(inet_pfil_hook, , ifp, PFIL_IN) != 0;
if (freed || m == NULL) {
m = NULL;
+ IP_STATINC(IP_STAT_PFILDROP_IN);
goto out;
}
KASSERT(m->m_len >= sizeof(struct ip));
Index: src/sys/netinet/ip_output.c
diff -u src/sys/netinet/ip_output.c:1.310 src/sys/netinet/ip_output.c:1.311
--- src/sys/netinet/ip_output.c:1.310 Mon Feb 4 10:48:46 2019
+++ src/sys/netinet/ip_output.c Mon May 13 07:47:59 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_output.c,v 1.310 2019/02/04 10:48:46 mrg Exp $ */
+/* $NetBSD: ip_output.c,v 1.311 2019/05/13 07:47:59 ozaki-r Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.310 2019/02/04 10:48:46 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.311 2019/05/13 07:47:59 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -622,10 +622,10 @@ sendit:
* Run through list of hooks for output packets.
*/
error = pfil_run_hooks(inet_pfil_hook, , ifp, PFIL_OUT);
- if (error)
- goto done;
- if (m == NULL)
+ if (error || m == NULL) {
+ IP_STATINC(IP_STAT_PFILDROP_OUT);
goto done;
+ }
ip = mtod(m, struct ip *);
hlen = ip->ip_hl << 2;
Index: src/sys/netinet/ip_var.h
diff -u src/sys/netinet/ip_var.h:1.127 src/sys/netinet/ip_var.h:1.128
--- src/sys/netinet/ip_var.h:1.127 Fri Sep 14 05:09:51 2018
+++ src/sys/netinet/ip_var.h Mon May 13 07:47:59 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_var.h,v 1.127 2018/09/14 05:09:51 maxv Exp $ */
+/* $NetBSD: ip_var.h,v 1.128 2019/05/13 07:47:59 ozaki-r Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -147,8 +147,10 @@ struct ip_pktopts {
#define IP_STAT_BADADDR 29 /* invalid address on header */
#define IP_STAT_NOL2TP 30 /* no match l2tp found */
#define IP_STAT_NOIPSEC 31 /* no match ipsec(4) found */
+#define IP_STAT_PFILDROP_IN 32 /* dropped by pfil (PFIL_IN) */
+#define IP_STAT_PFILDROP_OUT 33 /* dropped by pfil (PFIL_OUT) */
-#define IP_NSTATS 32
+#define IP_NSTATS 34
#ifdef _KERNEL
Index: src/sys/netinet6/ip6_forward.c
diff -u src/sys/netinet6/ip6_forward.c:1.95 src/sys/netinet6/ip6_forward.c:1.96
--- src/sys/netinet6/ip6_forward.c:1.95 Tue May 1 07:21:39 2018
+++ src/sys/netinet6/ip6_forward.c Mon May 13 07:47:59 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_forward.c,v 1.95 2018/05/01 07:21:39 maxv Exp $ */
+/* $NetBSD: ip6_forward.c,v 1.96 2019/05/13 07:47:59 ozaki-r Exp $ */
/* $KAME: ip6_forward.c,v 1.109 2002/09/11 08:10:17 sakane Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ip6_forward.c,v 1.95 2018/05/01 07:21:39 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_forward.c,v 1.96 2019/05/13 07:47:59 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_gateway.h"
@@ -393,10 +393,14 @@ ip6_forward(struct mbuf *m, int srcrt)
* Run through list of hooks for output packets.
*/
if ((error = pfil_run_hooks(inet6_pfil_hook, , rt->rt_ifp,
- PFIL_OUT)) != 0)
+ PFIL_OUT)) != 0) {
+ IP6_STATINC(IP6_STAT_PFILDROP_OUT);
goto senderr;
- if (m == NULL)
+ }
+ if (m == NULL) {
+ IP6_STATINC(IP6_STAT_PFILDROP_OUT);
goto freecopy;
+ }
ip6 = mtod(m, struct ip6_hdr *);
error = ip6_if_output(rt->rt_ifp, origifp, m, dst, rt);
Index: src/sys/netinet6/ip6_input.c
diff -u src/sys/netinet6/ip6_input.c:1.207 src/sys/netinet6/ip6_input.c:1.208
---
Re: CVS commit: src/sys
On Sat, May 11, 2019 at 10:49 AM Greg Troxel wrote: > > Kamil Rytarowski writes: > > > On 08.05.2019 11:34, Ryota Ozaki wrote: > >> On Sat, Apr 20, 2019 at 6:45 PM Ryota Ozaki wrote: > >>> > >>> On Fri, Apr 19, 2019 at 6:49 PM Kamil Rytarowski wrote: > > On 19.04.2019 11:41, J. Hannken-Illjes wrote: > >> On 19. Apr 2019, at 03:52, Ryota Ozaki wrote: > >> > >> Module Name: src > >> Committed By:ozaki-r > >> Date:Fri Apr 19 01:52:56 UTC 2019 > >> > >> Modified Files: > >> src/sys/kern: kern_lwp.c kern_softint.c subr_psref.c > >> src/sys/rump/kern/lib/libsysproxy: sysproxy.c > >> src/sys/sys: lwp.h userret.h > >> > >> Log Message: > >> Implement a simple psref leak detector > >> > >> It detects leaks by counting up the number of held psref by an LWP and > >> checking > >> its zeroness at the end of syscalls and softint handlers. For the > >> counter, a > >> unused field of struct lwp is reused. > > > > For DIAGNOSTIC-only operations LWP specific data > > (see kern/subr_lwp_specificdata.c) is a better choice. > > > > I wanted to propose the same. An exampe of this is in KCOV. > >>> > >>> Thanks. I'll try it. (I'll be AFK for the next few days...) > >> > >> I'm sorry for delaying this task. Finally I have benchmarked a revised > >> patch > >> (our benchmarking setups have been out of service for a couple of > >> weeks...). > >> > >> Performance degradation of IP forwarding is 3%. Is it acceptable as > >> DIAGNOSTIC? > >> > > > > For DIAGNOSTIC should be fine. > > I think 3% is too much for DIAGNOSTIC. DEBUG, sure, and a specific > option to turn it on seems fine. DIAGNOSTIC historically has been only > for things that check invariants and assert, such that if you don't mind > the crashes when detecting things, there is no performance reason to > avoid it. So we have two options: 1. Keep the original (enabled on DIAGNOSTIC) - Its performance impact is negligible 2. Migrate to use lwp_specificadata and enable the feature on DEBUG (and something) I prefer to 1. because I want the feature to be enabled by many users (I assume that users (of -current) tend to enable DIAGNOSTIC and not DEBUG). If the detector is not enabled, a psref leak appears as a form that is difficult to know where the leak occurs; a fatal page fault occurs on psref_target_destroy that is a completely different context. If enabled, we can at least know a suspect LWP or softint handler and may find a cause in luck. ozaki-r
