CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: christos Date: Tue Dec 25 07:52:53 UTC 2018 Modified Files: src/distrib/sets/lists/debug: mi Log Message: - add missing test - fix typos To generate a diff of this commit: cvs rdiff -u -r1.271 -r1.272 src/distrib/sets/lists/debug/mi 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/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.271 src/distrib/sets/lists/debug/mi:1.272 --- src/distrib/sets/lists/debug/mi:1.271 Tue Dec 18 13:11:34 2018 +++ src/distrib/sets/lists/debug/mi Tue Dec 25 02:52:53 2018 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.271 2018/12/18 18:11:34 kamil Exp $ +# $NetBSD: mi,v 1.272 2018/12/25 07:52:53 christos Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib comp-sys-usr compatdir ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile @@ -2334,6 +2334,7 @@ ./usr/libdata/debug/usr/tests/rump/rumpkern/t_modcmd.debug tests-syscall-debug debug,atf,rump ./usr/libdata/debug/usr/tests/rump/rumpkern/t_modlinkset.debug tests-syscall-debug debug,atf,rump ./usr/libdata/debug/usr/tests/rump/rumpkern/t_signals.debug tests-syscall-debug debug,atf,rump +./usr/libdata/debug/usr/tests/rump/rumpkern/t_threadpool.debug tests-sys-debug debug,atf ./usr/libdata/debug/usr/tests/rump/rumpkern/t_threads.debug tests-syscall-debug debug,atf,rump ./usr/libdata/debug/usr/tests/rump/rumpkern/t_tsleep.debug tests-syscall-debug debug,atf,rump ./usr/libdata/debug/usr/tests/rump/rumpkern/t_vm.debug tests-syscall-debug debug,atf,rump @@ -2341,15 +2342,15 @@ ./usr/libdata/debug/usr/tests/rump/rumpvfs/t_basic.debug tests-syscall-debug debug,atf,rump ./usr/libdata/debug/usr/tests/rump/rumpvfs/t_etfs.debug tests-syscall-debug debug,atf,rump ./usr/libdata/debug/usr/tests/rump/rumpvfs/t_p2kifs.debug tests-syscall-debug debug,atf,rump -./usr/libdata/debug/usr/tests/sys tests-syys-debug debug,atf,compattestfile -./usr/libdata/debug/usr/tests/sys/net tests-syys-debug debug,atf,compattestfile -./usr/libdata/debug/usr/tests/sys/net/t_print.debug tests-syys-debug debug,atf,compattestfile -./usr/libdata/debug/usr/tests/sys/netatalktests-syys-debug debug,atf,compattestfile -./usr/libdata/debug/usr/tests/sys/netatalk/t_print.debug tests-syys-debug debug,atf,compattestfile -./usr/libdata/debug/usr/tests/sys/netinettests-syys-debug debug,atf,compattestfile -./usr/libdata/debug/usr/tests/sys/netinet/t_print.debug tests-syys-debug debug,atf,compattestfile -./usr/libdata/debug/usr/tests/sys/netinet6tests-syys-debug debug,atf,compattestfile -./usr/libdata/debug/usr/tests/sys/netinet6/t_print.debug tests-syys-debug debug,atf,compattestfile +./usr/libdata/debug/usr/tests/sys tests-sys-debug debug,atf,compattestfile +./usr/libdata/debug/usr/tests/sys/net tests-sys-debug debug,atf,compattestfile +./usr/libdata/debug/usr/tests/sys/net/t_print.debug tests-sys-debug debug,atf,compattestfile +./usr/libdata/debug/usr/tests/sys/netatalktests-sys-debug debug,atf,compattestfile +./usr/libdata/debug/usr/tests/sys/netatalk/t_print.debug tests-sys-debug debug,atf,compattestfile +./usr/libdata/debug/usr/tests/sys/netinettests-sys-debug debug,atf,compattestfile +./usr/libdata/debug/usr/tests/sys/netinet/t_print.debug tests-sys-debug debug,atf,compattestfile +./usr/libdata/debug/usr/tests/sys/netinet6tests-sys-debug debug,atf,compattestfile +./usr/libdata/debug/usr/tests/sys/netinet6/t_print.debug tests-sys-debug debug,atf,compattestfile ./usr/libdata/debug/usr/tests/syscall/t_access.debug tests-obsolete obsolete,compattestfile ./usr/libdata/debug/usr/tests/syscall/t_chroot.debug tests-obsolete obsolete,compattestfile ./usr/libdata/debug/usr/tests/syscall/t_cmsg.debug tests-obsolete obsolete,compattestfile
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Tue Dec 25 07:41:21 UTC 2018
Modified Files:
src/sys/dev/pci: if_wmvar.h
Log Message:
Add comment.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/pci/if_wmvar.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/dev/pci/if_wmvar.h
diff -u src/sys/dev/pci/if_wmvar.h:1.41 src/sys/dev/pci/if_wmvar.h:1.42
--- src/sys/dev/pci/if_wmvar.h:1.41 Thu Dec 20 09:32:13 2018
+++ src/sys/dev/pci/if_wmvar.h Tue Dec 25 07:41:21 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wmvar.h,v 1.41 2018/12/20 09:32:13 msaitoh Exp $ */
+/* $NetBSD: if_wmvar.h,v 1.42 2018/12/25 07:41:21 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -166,17 +166,17 @@ typedef enum {
WMPHY_M88,
WMPHY_IGP,
WMPHY_IGP_2,
- WMPHY_GG82563,
- WMPHY_IGP_3,
- WMPHY_IFE,
- WMPHY_BM,
- WMPHY_82577,
- WMPHY_82578,
- WMPHY_82579, /* with PCH2 */
- WMPHY_I217, /* with PCH_LPT, PCH_SPT, PCH_CNP */
- WMPHY_82580,
+ WMPHY_GG82563, /* 82563: 80003 */
+ WMPHY_IGP_3, /* 82566: 82575, 82576, ICH8, ICH9 */
+ WMPHY_IFE, /* 82562 */
+ WMPHY_BM, /* 82567: ICH8 ICH9 ICH10 */
+ WMPHY_82577, /* 82577: PCH */
+ WMPHY_82578, /* 82578: PCH */
+ WMPHY_82579, /* 82579: PCH2 */
+ WMPHY_I217, /* I217: _LPT, I218: _LPT, I219: _SPT _CNP */
+ WMPHY_82580, /* 82580: 82580 or I350 */
WMPHY_VF,
- WMPHY_I210
+ WMPHY_I210 /* I210: I210 I211 */
} wm_phy_type;
CVS commit: src/sys/arch
Module Name:src Committed By: cherry Date: Tue Dec 25 06:50:12 UTC 2018 Modified Files: src/sys/arch/amd64/amd64: genassym.cf lock_stubs.S spl.S vector.S src/sys/arch/i386/i386: genassym.cf spl.S vector.S src/sys/arch/x86/include: cpu.h src/sys/arch/x86/isa: isa_machdep.c src/sys/arch/x86/x86: i8259.c intr.c src/sys/arch/xen/conf: files.xen src/sys/arch/xen/include: intr.h src/sys/arch/xen/x86: hypervisor_machdep.c xen_intr.c src/sys/arch/xen/xen: clock.c evtchn.c xenevt.c Log Message: Excise XEN specific code out of x86/x86/intr.c into xen/x86/xen_intr.c While at it, separate the source function tracking so that the interrupt paths are truly independant. Use weak symbol exporting to provision for future PVHVM co-existence of both files, but with independant paths. Introduce assembler code such that in a unified scenario, native interrupts get first priority in spllower(), followed by XEN event callbacks. IPL management and semantics are unchanged - native handlers and xen callbacks are expected to maintain their ipl related semantics. In summary, after this commit, native and XEN now have completely unrelated interrupt handling mechanisms, including intr_establish_xname() and assembler stubs and intr handler management. Happy Christmas! To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 src/sys/arch/amd64/amd64/genassym.cf cvs rdiff -u -r1.29 -r1.30 src/sys/arch/amd64/amd64/lock_stubs.S cvs rdiff -u -r1.36 -r1.37 src/sys/arch/amd64/amd64/spl.S cvs rdiff -u -r1.64 -r1.65 src/sys/arch/amd64/amd64/vector.S cvs rdiff -u -r1.107 -r1.108 src/sys/arch/i386/i386/genassym.cf cvs rdiff -u -r1.43 -r1.44 src/sys/arch/i386/i386/spl.S cvs rdiff -u -r1.78 -r1.79 src/sys/arch/i386/i386/vector.S cvs rdiff -u -r1.100 -r1.101 src/sys/arch/x86/include/cpu.h cvs rdiff -u -r1.42 -r1.43 src/sys/arch/x86/isa/isa_machdep.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/x86/x86/i8259.c cvs rdiff -u -r1.140 -r1.141 src/sys/arch/x86/x86/intr.c cvs rdiff -u -r1.173 -r1.174 src/sys/arch/xen/conf/files.xen cvs rdiff -u -r1.50 -r1.51 src/sys/arch/xen/include/intr.h cvs rdiff -u -r1.33 -r1.34 src/sys/arch/xen/x86/hypervisor_machdep.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/xen/x86/xen_intr.c cvs rdiff -u -r1.75 -r1.76 src/sys/arch/xen/xen/clock.c cvs rdiff -u -r1.82 -r1.83 src/sys/arch/xen/xen/evtchn.c cvs rdiff -u -r1.52 -r1.53 src/sys/arch/xen/xen/xenevt.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/amd64/amd64/genassym.cf diff -u src/sys/arch/amd64/amd64/genassym.cf:1.70 src/sys/arch/amd64/amd64/genassym.cf:1.71 --- src/sys/arch/amd64/amd64/genassym.cf:1.70 Sun Aug 12 15:31:01 2018 +++ src/sys/arch/amd64/amd64/genassym.cf Tue Dec 25 06:50:11 2018 @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.70 2018/08/12 15:31:01 maxv Exp $ +# $NetBSD: genassym.cf,v 1.71 2018/12/25 06:50:11 cherry Exp $ # # Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -248,12 +248,14 @@ define CPU_INFO_CURPRIORITY offsetof(str define CPU_INFO_FPCURLWP offsetof(struct cpu_info, ci_fpcurlwp) define CPU_INFO_GDT offsetof(struct cpu_info, ci_gdt) +define CPU_INFO_ILEVEL offsetof(struct cpu_info, ci_ilevel) +define CPU_INFO_IDEPTH offsetof(struct cpu_info, ci_idepth) +if !defined(XEN) define CPU_INFO_IPENDING offsetof(struct cpu_info, ci_ipending) define CPU_INFO_IMASK offsetof(struct cpu_info, ci_imask) define CPU_INFO_IUNMASK offsetof(struct cpu_info, ci_iunmask) -define CPU_INFO_ILEVEL offsetof(struct cpu_info, ci_ilevel) -define CPU_INFO_IDEPTH offsetof(struct cpu_info, ci_idepth) define CPU_INFO_ISOURCES offsetof(struct cpu_info, ci_isources) +endif define CPU_INFO_MTX_COUNT offsetof(struct cpu_info, ci_mtx_count) define CPU_INFO_MTX_OLDSPL offsetof(struct cpu_info, ci_mtx_oldspl) define CPU_INFO_CPUID offsetof(struct cpu_info, ci_cpuid) @@ -352,6 +354,10 @@ define BST_TYPE offsetof(struct bus_spa ifdef XEN define CPU_INFO_VCPU offsetof(struct cpu_info, ci_vcpu) +define CPU_INFO_XPENDING offsetof(struct cpu_info, ci_xpending) +define CPU_INFO_XMASK offsetof(struct cpu_info, ci_xmask) +define CPU_INFO_XUNMASK offsetof(struct cpu_info, ci_xunmask) +define CPU_INFO_XSOURCES offsetof(struct cpu_info, ci_xsources) define EVTCHN_UPCALL_MASK offsetof(struct vcpu_info, evtchn_upcall_mask) define XEN_PT_BASE offsetof(struct start_info, pt_base) define XEN_NR_PT_FRAMES offsetof(struct start_info, nr_pt_frames) Index: src/sys/arch/amd64/amd64/lock_stubs.S diff -u src/sys/arch/amd64/amd64/lock_stubs.S:1.29 src/sys/arch/amd64/amd64/lock_stubs.S:1.30 --- src/sys/arch/amd64/amd64/lock_stubs.S:1.29 Sat Jul 14 14:29:40 2018 +++ src/sys/arch/amd64/amd64/lock_stubs.S Tue Dec 25 06:50:11 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: lock_stubs.S,v 1.29 2018/07/14 14:29:40 maxv Exp $ */ +/* $NetBSD: lock_stubs.S,v 1.30 2018/12/25
CVS commit: src/sys/kern
Module Name:src
Committed By: thorpej
Date: Tue Dec 25 05:44:13 UTC 2018
Modified Files:
src/sys/kern: kern_threadpool.c
Log Message:
Ho ho ho! We can suppress that warning with __diagused! Merry Christmas!
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/kern/kern_threadpool.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_threadpool.c
diff -u src/sys/kern/kern_threadpool.c:1.2 src/sys/kern/kern_threadpool.c:1.3
--- src/sys/kern/kern_threadpool.c:1.2 Tue Dec 25 02:17:07 2018
+++ src/sys/kern/kern_threadpool.c Tue Dec 25 05:44:13 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_threadpool.c,v 1.2 2018/12/25 02:17:07 kre Exp $ */
+/* $NetBSD: kern_threadpool.c,v 1.3 2018/12/25 05:44:13 thorpej Exp $ */
/*-
* Copyright (c) 2014, 2018 The NetBSD Foundation, Inc.
@@ -81,7 +81,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_threadpool.c,v 1.2 2018/12/25 02:17:07 kre Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_threadpool.c,v 1.3 2018/12/25 05:44:13 thorpej Exp $");
#include
#include
@@ -102,20 +102,13 @@ __KERNEL_RCSID(0, "$NetBSD: kern_threadp
static ONCE_DECL(threadpool_init_once)
-#ifdef DIAGNOSTIC
#define THREADPOOL_INIT() \
do {\
- int threadpool_init_error =\
+ int threadpool_init_error __diagused = \
RUN_ONCE(_init_once, threadpools_init); \
KASSERT(threadpool_init_error == 0); \
} while (/*CONSTCOND*/0)
-#else
-#define THREADPOOL_INIT() \
-do {\
- RUN_ONCE(_init_once, threadpools_init); \
-} while (/*CONSTCOND*/0)
-#endif
-
+
/* Data structures */
@@ -731,7 +724,7 @@ threadpool_job_hold(threadpool_job_impl_
return EBUSY;
} while (atomic_cas_uint(>job_refcnt, refcnt, (refcnt + 1))
!= refcnt);
-
+
return 0;
}
CVS commit: src
Module Name:src
Committed By: knakahara
Date: Tue Dec 25 03:54:44 UTC 2018
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/net/if_ipsec: Makefile
Added Files:
src/tests/net/if_ipsec: t_ipsec_natt.sh
Log Message:
Add ATF for NAT-T enabled ipsecif(4).
To generate a diff of this commit:
cvs rdiff -u -r1.800 -r1.801 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.1 -r1.2 src/tests/net/if_ipsec/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/net/if_ipsec/t_ipsec_natt.sh
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/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.800 src/distrib/sets/lists/tests/mi:1.801
--- src/distrib/sets/lists/tests/mi:1.800 Mon Dec 24 21:42:05 2018
+++ src/distrib/sets/lists/tests/mi Tue Dec 25 03:54:44 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.800 2018/12/24 21:42:05 thorpej Exp $
+# $NetBSD: mi,v 1.801 2018/12/25 03:54:44 knakahara Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -3336,6 +3336,7 @@
./usr/tests/net/if_ipsec/Atffile tests-net-tests atf,rump
./usr/tests/net/if_ipsec/Kyuafile tests-net-tests atf,rump,kyua
./usr/tests/net/if_ipsec/t_ipsec tests-net-tests atf,rump
+./usr/tests/net/if_ipsec/t_ipsec_natt tests-net-tests atf,rump
./usr/tests/net/if_l2tptests-net-tests compattestfile,atf
./usr/tests/net/if_l2tp/Atffile tests-net-tests atf,rump
./usr/tests/net/if_l2tp/Kyuafile tests-net-tests atf,rump,kyua
Index: src/tests/net/if_ipsec/Makefile
diff -u src/tests/net/if_ipsec/Makefile:1.1 src/tests/net/if_ipsec/Makefile:1.2
--- src/tests/net/if_ipsec/Makefile:1.1 Wed Jan 10 11:06:06 2018
+++ src/tests/net/if_ipsec/Makefile Tue Dec 25 03:54:44 2018
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2018/01/10 11:06:06 knakahara Exp $
+# $NetBSD: Makefile,v 1.2 2018/12/25 03:54:44 knakahara Exp $
#
.include
TESTSDIR= ${TESTSBASE}/net/if_ipsec
-.for name in ipsec
+.for name in ipsec ipsec_natt
TESTS_SH+= t_${name}
TESTS_SH_SRC_t_${name}= ../net_common.sh t_${name}.sh \
../ipsec/common.sh ../ipsec/algorithms.sh
Added files:
Index: src/tests/net/if_ipsec/t_ipsec_natt.sh
diff -u /dev/null src/tests/net/if_ipsec/t_ipsec_natt.sh:1.1
--- /dev/null Tue Dec 25 03:54:44 2018
+++ src/tests/net/if_ipsec/t_ipsec_natt.sh Tue Dec 25 03:54:44 2018
@@ -0,0 +1,441 @@
+# $NetBSD: t_ipsec_natt.sh,v 1.1 2018/12/25 03:54:44 knakahara Exp $
+#
+# Copyright (c) 2018 Internet Initiative Japan Inc.
+# 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+SOCK_LOCAL=unix://ipsec_natt_local
+SOCK_NAT=unix://ipsec_natt_nat
+SOCK_REMOTE=unix://ipsec_natt_remote
+BUS_LOCAL=./bus_ipsec_natt_local
+BUS_NAT=./bus_ipsec_natt_nat
+
+DEBUG=${DEBUG:-false}
+HIJACKING_NPF="${HIJACKING},blanket=/dev/npf"
+
+setup_servers()
+{
+
+ rump_server_crypto_start $SOCK_LOCAL netipsec ipsec
+ rump_server_npf_start $SOCK_NAT
+ rump_server_crypto_start $SOCK_REMOTE netipsec ipsec
+ rump_server_add_iface $SOCK_LOCAL shmif0 $BUS_LOCAL
+ rump_server_add_iface $SOCK_NAT shmif0 $BUS_LOCAL
+ rump_server_add_iface $SOCK_NAT shmif1 $BUS_NAT
+ rump_server_add_iface $SOCK_REMOTE shmif0 $BUS_NAT
+}
+
+setup_ipsecif()
+{
+ local sock=$1
+ local ifid=$2
+ local src_ip=$3
+ local src_port=$4
+ local dst_ip=$5
+ local dst_port=$6
+ local ipsecif_ip=$7
+ local peer_ip=$8
+
+ export RUMP_SERVER=$sock
+ atf_check -s exit:0 rump.ifconfig ipsec$ifid create
+ atf_check -s exit:0 rump.ifconfig ipsec$ifid link0 # enable NAT-T
+ atf_check -s exit:0 rump.ifconfig ipsec$ifid tunnel ${src_ip},${src_port} ${dst_ip},${dst_port}
+ atf_check -s exit:0 rump.ifconfig
CVS commit: src/usr.bin/vmstat
Module Name:src Committed By: sevan Date: Tue Dec 25 03:38:59 UTC 2018 Modified Files: src/usr.bin/vmstat: vmstat.1 Log Message: Remove reference to Installing and Operating 4.3BSD paper, at present it's not possible to find a paper titled as such with sections starting with "Interpreting system activity". There is a "Monitoring System Performance" section present from the 4.1BSD Installing and Operating paper up to and including the 4.4BSD paper. The advice in this section has not aged very well. >From "Installing and Operating 4.3BSD-tahoe UNIX on the VAX": "Cumulatively on one of our large machines we average about 60-100 context switches and interrupts per second and about 70-120 system calls per second" To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/usr.bin/vmstat/vmstat.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/vmstat/vmstat.1 diff -u src/usr.bin/vmstat/vmstat.1:1.23 src/usr.bin/vmstat/vmstat.1:1.24 --- src/usr.bin/vmstat/vmstat.1:1.23 Thu Dec 13 01:29:10 2018 +++ src/usr.bin/vmstat/vmstat.1 Tue Dec 25 03:38:59 2018 @@ -1,4 +1,4 @@ -.\" $NetBSD: vmstat.1,v 1.23 2018/12/13 01:29:10 sevan Exp $ +.\" $NetBSD: vmstat.1,v 1.24 2018/12/25 03:38:59 sevan Exp $ .\" .\" Copyright (c) 2000, 2007 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -53,7 +53,7 @@ .\" .\" @(#)vmstat.8 8.1 (Berkeley) 6/6/93 .\" -.Dd December 13, 2018 +.Dd December 25, 2018 .Dt VMSTAT 1 .Os .Sh NAME @@ -300,11 +300,6 @@ apparent which are recomputed every seco .Xr iostat 8 , .Xr pstat 8 , .Xr kernhist 9 -.Pp -The sections starting with -.Dq Interpreting system activity -in -.%T Installing and Operating 4.3BSD . .Sh BUGS The .Fl c
CVS commit: src/tests/net/if_ipsec
Module Name:src
Committed By: knakahara
Date: Tue Dec 25 03:28:29 UTC 2018
Modified Files:
src/tests/net/if_ipsec: t_ipsec.sh
Log Message:
reduce debug messages when $DEBUG is not true.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 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.4 src/tests/net/if_ipsec/t_ipsec.sh:1.5
--- src/tests/net/if_ipsec/t_ipsec.sh:1.4 Tue Mar 13 03:50:26 2018
+++ src/tests/net/if_ipsec/t_ipsec.sh Tue Dec 25 03:28:29 2018
@@ -1,4 +1,4 @@
-# $NetBSD: t_ipsec.sh,v 1.4 2018/03/13 03:50:26 knakahara Exp $
+# $NetBSD: t_ipsec.sh,v 1.5 2018/12/25 03:28:29 knakahara Exp $
#
# Copyright (c) 2017 Internet Initiative Japan Inc.
# All rights reserved.
@@ -105,7 +105,7 @@ setup_router()
atf_check -s exit:0 rump.ifconfig shmif0 inet ${lan} netmask 0xff00
fi
atf_check -s exit:0 rump.ifconfig shmif0 up
- rump.ifconfig shmif0
+ $DEBUG && rump.ifconfig shmif0
if [ ${wan_mode} = "ipv6" ]; then
atf_check -s exit:0 rump.ifconfig shmif1 inet6 ${wan}
@@ -113,7 +113,7 @@ setup_router()
atf_check -s exit:0 rump.ifconfig shmif1 inet ${wan} netmask 0xff00
fi
atf_check -s exit:0 rump.ifconfig shmif1 up
- rump.ifconfig shmif1
+ $DEBUG && rump.ifconfig shmif1
unset RUMP_SERVER
}
@@ -247,8 +247,8 @@ setup_if_ipsec()
atf_check -s exit:0 -o ignore rump.route add -inet ${peernet} ${addr}
fi
- rump.ifconfig ipsec0
- rump.route -nL show
+ $DEBUG && rump.ifconfig ipsec0
+ $DEBUG && rump.route -nL show
}
setup_if_ipsec_sa()
@@ -426,7 +426,7 @@ setup_dummy_if_ipsec()
atf_check -s exit:0 rump.ifconfig ipsec1 inet ${addr}/32 ${remote}
fi
- rump.ifconfig ipsec1
+ $DEBUG && rump.ifconfig ipsec1
unset RUMP_SERVER
}
@@ -569,7 +569,7 @@ setup_recursive_if_ipsec()
setup_if_ipsec_sa $sock ${src} ${dst} ${inner} ${proto} ${algo} ${dir}
export RUMP_SERVER=${sock}
- rump.ifconfig ${ipsec}
+ $DEBUG && rump.ifconfig ${ipsec}
unset RUMP_SERVER
}
@@ -680,7 +680,7 @@ test_ping_success()
mode=$1
export RUMP_SERVER=$SOCK1
- rump.ifconfig -v ipsec0
+ $DEBUG && rump.ifconfig -v ipsec0
if [ ${mode} = "ipv6" ]; then
# XXX
# rump.ping6 rarely fails with the message that
@@ -694,10 +694,10 @@ test_ping_success()
rump.ping -n -w $TIMEOUT -c 1 -I $ROUTER1_LANIP \
$ROUTER2_LANIP
fi
- rump.ifconfig -v ipsec0
+ $DEBUG && rump.ifconfig -v ipsec0
export RUMP_SERVER=$SOCK2
- rump.ifconfig -v ipsec0
+ $DEBUG && rump.ifconfig -v ipsec0
if [ ${mode} = "ipv6" ]; then
atf_check -s exit:0 -o ignore \
rump.ping6 -n -X $TIMEOUT -c 1 -S $ROUTER2_LANIP6 \
@@ -707,7 +707,7 @@ test_ping_success()
rump.ping -n -w $TIMEOUT -c 1 -I $ROUTER2_LANIP \
$ROUTER1_LANIP
fi
- rump.ifconfig -v ipsec0
+ $DEBUG && rump.ifconfig -v ipsec0
unset RUMP_SERVER
}
@@ -726,12 +726,12 @@ test_change_tunnel_duplicate()
newdst=$ROUTER2_WANIP_DUMMY
fi
export RUMP_SERVER=$SOCK1
- rump.ifconfig -v ipsec0
- rump.ifconfig -v ipsec1
+ $DEBUG && rump.ifconfig -v ipsec0
+ $DEBUG && rump.ifconfig -v ipsec1
atf_check -s exit:0 -e match:SIOCSLIFPHYADDR \
rump.ifconfig ipsec0 tunnel ${newsrc} ${newdst}
- rump.ifconfig -v ipsec0
- rump.ifconfig -v ipsec1
+ $DEBUG && rump.ifconfig -v ipsec0
+ $DEBUG && rump.ifconfig -v ipsec1
if [ ${mode} = "ipv6" ]; then
newsrc=$ROUTER2_WANIP6_DUMMY
@@ -741,12 +741,12 @@ test_change_tunnel_duplicate()
newdst=$ROUTER1_WANIP_DUMMY
fi
export RUMP_SERVER=$SOCK2
- rump.ifconfig -v ipsec0
- rump.ifconfig -v ipsec1
+ $DEBUG && rump.ifconfig -v ipsec0
+ $DEBUG && rump.ifconfig -v ipsec1
atf_check -s exit:0 -e match:SIOCSLIFPHYADDR \
rump.ifconfig ipsec0 tunnel ${newsrc} ${newdst}
- rump.ifconfig -v ipsec0
- rump.ifconfig -v ipsec1
+ $DEBUG && rump.ifconfig -v ipsec0
+ $DEBUG && rump.ifconfig -v ipsec1
unset RUMP_SERVER
}
@@ -765,10 +765,10 @@ test_change_tunnel_success()
newdst=$ROUTER2_WANIP_DUMMY
fi
export RUMP_SERVER=$SOCK1
- rump.ifconfig -v ipsec0
+ $DEBUG && rump.ifconfig -v ipsec0
atf_check -s exit:0 \
rump.ifconfig ipsec0 tunnel ${newsrc} ${newdst}
- rump.ifconfig -v ipsec0
+ $DEBUG && rump.ifconfig -v ipsec0
if [ ${mode} = "ipv6" ]; then
newsrc=$ROUTER2_WANIP6_DUMMY
@@ -778,10 +778,10 @@ test_change_tunnel_success()
newdst=$ROUTER1_WANIP_DUMMY
fi
export RUMP_SERVER=$SOCK2
- rump.ifconfig -v ipsec0
+ $DEBUG && rump.ifconfig -v ipsec0
atf_check -s exit:0 \
rump.ifconfig ipsec0 tunnel ${newsrc} ${newdst}
- rump.ifconfig -v ipsec0
+ $DEBUG && rump.ifconfig -v ipsec0
unset RUMP_SERVER
}
CVS commit: src/sys/kern
Module Name:src
Committed By: kre
Date: Tue Dec 25 02:17:07 UTC 2018
Modified Files:
src/sys/kern: kern_threadpool.c
Log Message:
Fix !DIAGNOSTIC builds.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/kern/kern_threadpool.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_threadpool.c
diff -u src/sys/kern/kern_threadpool.c:1.1 src/sys/kern/kern_threadpool.c:1.2
--- src/sys/kern/kern_threadpool.c:1.1 Mon Dec 24 16:58:54 2018
+++ src/sys/kern/kern_threadpool.c Tue Dec 25 02:17:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_threadpool.c,v 1.1 2018/12/24 16:58:54 thorpej Exp $ */
+/* $NetBSD: kern_threadpool.c,v 1.2 2018/12/25 02:17:07 kre Exp $ */
/*-
* Copyright (c) 2014, 2018 The NetBSD Foundation, Inc.
@@ -81,7 +81,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_threadpool.c,v 1.1 2018/12/24 16:58:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_threadpool.c,v 1.2 2018/12/25 02:17:07 kre Exp $");
#include
#include
@@ -102,13 +102,20 @@ __KERNEL_RCSID(0, "$NetBSD: kern_threadp
static ONCE_DECL(threadpool_init_once)
+#ifdef DIAGNOSTIC
#define THREADPOOL_INIT() \
do {\
int threadpool_init_error =\
RUN_ONCE(_init_once, threadpools_init); \
KASSERT(threadpool_init_error == 0); \
} while (/*CONSTCOND*/0)
-
+#else
+#define THREADPOOL_INIT() \
+do {\
+ RUN_ONCE(_init_once, threadpools_init); \
+} while (/*CONSTCOND*/0)
+#endif
+
/* Data structures */
@@ -724,7 +731,7 @@ threadpool_job_hold(threadpool_job_impl_
return EBUSY;
} while (atomic_cas_uint(>job_refcnt, refcnt, (refcnt + 1))
!= refcnt);
-
+
return 0;
}
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Tue Dec 25 00:35:26 UTC 2018
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
back to binutils 227: constructors in ifconfig are broken.
To generate a diff of this commit:
cvs rdiff -u -r1.1086 -r1.1087 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1086 src/share/mk/bsd.own.mk:1.1087
--- src/share/mk/bsd.own.mk:1.1086 Mon Dec 24 16:51:57 2018
+++ src/share/mk/bsd.own.mk Mon Dec 24 19:35:26 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1086 2018/12/24 21:51:57 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.1087 2018/12/25 00:35:26 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -150,7 +150,7 @@ EXTERNAL_GDB_SUBDIR= /does/not/exist
# What binutils is used?
#
.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386"
-HAVE_BINUTILS?= 231
+HAVE_BINUTILS?= 227
.else
HAVE_BINUTILS?= 227
.endif
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: mrg Date: Mon Dec 24 22:47:19 UTC 2018 Modified Files: src/sys/compat/netbsd32: files.netbsd32 Log Message: quotactl is always included, regardless of options QUOTA. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/sys/compat/netbsd32/files.netbsd32 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/files.netbsd32 diff -u src/sys/compat/netbsd32/files.netbsd32:1.41 src/sys/compat/netbsd32/files.netbsd32:1.42 --- src/sys/compat/netbsd32/files.netbsd32:1.41 Mon Dec 24 21:27:05 2018 +++ src/sys/compat/netbsd32/files.netbsd32 Mon Dec 24 22:47:19 2018 @@ -1,4 +1,4 @@ -# $NetBSD: files.netbsd32,v 1.41 2018/12/24 21:27:05 mrg Exp $ +# $NetBSD: files.netbsd32,v 1.42 2018/12/24 22:47:19 mrg Exp $ # # config file description for machine-independent netbsd32 compat code. # included by ports that need it. @@ -24,7 +24,7 @@ file compat/netbsd32/netbsd32_mqueue.c c file compat/netbsd32/netbsd32_nfssvc.c compat_netbsd32 & nfsserver file compat/netbsd32/netbsd32_ptrace.c compat_netbsd32 & ptrace file compat/netbsd32/netbsd32_rlimit.c compat_netbsd32 -file compat/netbsd32/netbsd32_quota.c compat_netbsd32 & quota +file compat/netbsd32/netbsd32_quota.c compat_netbsd32 file compat/netbsd32/netbsd32_select.c compat_netbsd32 file compat/netbsd32/netbsd32_sem.c compat_netbsd32 file compat/netbsd32/netbsd32_signal.c compat_netbsd32
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: cherry
Date: Mon Dec 24 22:05:45 UTC 2018
Modified Files:
src/sys/arch/x86/x86: intr.c mp.c x86_machdep.c
Log Message:
Towards bifurcating XEN and native interrupt related functions,
this is a preliminary cleanup sweep.
Move functions related to MP bus probe and scanning to x86/mp.c
Move generic platform pic search function to x86/x86_machdep.c
To generate a diff of this commit:
cvs rdiff -u -r1.139 -r1.140 src/sys/arch/x86/x86/intr.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/x86/x86/mp.c
cvs rdiff -u -r1.120 -r1.121 src/sys/arch/x86/x86/x86_machdep.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/x86/intr.c
diff -u src/sys/arch/x86/x86/intr.c:1.139 src/sys/arch/x86/x86/intr.c:1.140
--- src/sys/arch/x86/x86/intr.c:1.139 Mon Dec 24 14:55:41 2018
+++ src/sys/arch/x86/x86/intr.c Mon Dec 24 22:05:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.139 2018/12/24 14:55:41 cherry Exp $ */
+/* $NetBSD: intr.c,v 1.140 2018/12/24 22:05:45 cherry Exp $ */
/*
* Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -133,7 +133,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.139 2018/12/24 14:55:41 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.140 2018/12/24 22:05:45 cherry Exp $");
#include "opt_intrdebug.h"
#include "opt_multiprocessor.h"
@@ -220,13 +220,6 @@ static SIMPLEQ_HEAD(, intrsource) io_int
static kmutex_t intr_distribute_lock;
-#if NIOAPIC > 0 || NACPICA > 0
-static int intr_scan_bus(int, int, intr_handle_t *);
-#if NPCI > 0
-static int intr_find_pcibridge(int, pcitag_t *, pci_chipset_tag_t *);
-#endif
-#endif
-
#if !defined(XEN)
static int intr_allocate_slot_cpu(struct cpu_info *, struct pic *, int, int *,
struct intrsource *);
@@ -374,123 +367,6 @@ intr_calculatemasks(struct cpu_info *ci)
}
/*
- * List to keep track of PCI buses that are probed but not known
- * to the firmware. Used to
- *
- * XXX should maintain one list, not an array and a linked list.
- */
-#if (NPCI > 0) && ((NIOAPIC > 0) || NACPICA > 0)
-struct intr_extra_bus {
- int bus;
- pcitag_t *pci_bridge_tag;
- pci_chipset_tag_t pci_chipset_tag;
- LIST_ENTRY(intr_extra_bus) list;
-};
-
-LIST_HEAD(, intr_extra_bus) intr_extra_buses =
-LIST_HEAD_INITIALIZER(intr_extra_buses);
-
-
-void
-intr_add_pcibus(struct pcibus_attach_args *pba)
-{
- struct intr_extra_bus *iebp;
-
- iebp = kmem_alloc(sizeof(*iebp), KM_SLEEP);
- iebp->bus = pba->pba_bus;
- iebp->pci_chipset_tag = pba->pba_pc;
- iebp->pci_bridge_tag = pba->pba_bridgetag;
- LIST_INSERT_HEAD(_extra_buses, iebp, list);
-}
-
-static int
-intr_find_pcibridge(int bus, pcitag_t *pci_bridge_tag,
- pci_chipset_tag_t *pc)
-{
- struct intr_extra_bus *iebp;
- struct mp_bus *mpb;
-
- if (bus < 0)
- return ENOENT;
-
- if (bus < mp_nbus) {
- mpb = _busses[bus];
- if (mpb->mb_pci_bridge_tag == NULL)
- return ENOENT;
- *pci_bridge_tag = *mpb->mb_pci_bridge_tag;
- *pc = mpb->mb_pci_chipset_tag;
- return 0;
- }
-
- LIST_FOREACH(iebp, _extra_buses, list) {
- if (iebp->bus == bus) {
- if (iebp->pci_bridge_tag == NULL)
-return ENOENT;
- *pci_bridge_tag = *iebp->pci_bridge_tag;
- *pc = iebp->pci_chipset_tag;
- return 0;
- }
- }
- return ENOENT;
-}
-#endif
-
-#if NIOAPIC > 0 || NACPICA > 0
-/*
- * 'pin' argument pci bus_pin encoding of a device/pin combination.
- */
-int
-intr_find_mpmapping(int bus, int pin, intr_handle_t *handle)
-{
-
-#if NPCI > 0
- while (intr_scan_bus(bus, pin, handle) != 0) {
- int dev, func;
- pcitag_t pci_bridge_tag;
- pci_chipset_tag_t pc;
-
- if (intr_find_pcibridge(bus, _bridge_tag, ) != 0)
- return ENOENT;
- dev = pin >> 2;
- pin = pin & 3;
- pin = PPB_INTERRUPT_SWIZZLE(pin + 1, dev) - 1;
- pci_decompose_tag(pc, pci_bridge_tag, , , );
- pin |= (dev << 2);
- }
- return 0;
-#else
- return intr_scan_bus(bus, pin, handle);
-#endif
-}
-
-static int
-intr_scan_bus(int bus, int pin, intr_handle_t *handle)
-{
- struct mp_intr_map *mip, *intrs;
-
- if (bus < 0 || bus >= mp_nbus)
- return ENOENT;
-
- intrs = mp_busses[bus].mb_intrs;
- if (intrs == NULL)
- return ENOENT;
-
- for (mip = intrs; mip != NULL; mip = mip->next) {
- if (mip->bus_pin == pin) {
-#if NACPICA > 0
- if (mip->linkdev != NULL)
-if (mpacpi_findintr_linkdev(mip) != 0)
- continue;
-#endif
- *handle = mip->ioapic_ih;
- return 0;
- }
- }
- return ENOENT;
-}
-#endif
-
-/*
* Create an interrupt id such as "ioapic0 pin 9". This interrupt id is used
* by MI code and intrctl(8).
*/
@@ -852,23 +728,6 @@ intr_biglock_wrapper(void *vp)
#endif /* MULTIPROCESSOR */
#endif /* XEN */
-#if defined(DOM0OPS) || !defined(XEN)
-struct pic *
-intr_findpic(int num)
-{
-#if NIOAPIC > 0
- struct ioapic_softc *pic;
-
- pic = ioapic_find_bybase(num);
- if (pic != NULL)
- return >sc_pic;
-#endif
- if (num < NUM_LEGACY_IRQS)
- return _pic;
-
- return NULL;
-}
-#endif
CVS commit: src/lib
Module Name:src
Committed By: mrg
Date: Mon Dec 24 22:02:32 UTC 2018
Modified Files:
src/lib: Makefile
Log Message:
move sqlite earlier in its section. my build often sits with only 3
processes active here for quite some time otherwise.
To generate a diff of this commit:
cvs rdiff -u -r1.265 -r1.266 src/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/Makefile
diff -u src/lib/Makefile:1.265 src/lib/Makefile:1.266
--- src/lib/Makefile:1.265 Tue Nov 13 09:24:37 2018
+++ src/lib/Makefile Mon Dec 24 22:02:32 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.265 2018/11/13 09:24:37 martin Exp $
+# $NetBSD: Makefile,v 1.266 2018/12/24 22:02:32 mrg Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include
@@ -54,6 +54,8 @@ SUBDIR+= libskey
SUBDIR+= libnvmm
.endif
+SUBDIR+= ../external/public-domain/sqlite/lib
+
.if (${MKMDNS} != "no")
SUBDIR+= ../external/apache2/mDNSResponder/lib
.endif
@@ -82,8 +84,6 @@ SUBDIR+=../external/cddl/osnet/l
SUBDIR+= ../external/mit/expat/lib
-SUBDIR+= ../external/public-domain/sqlite/lib
-
SUBDIR+= ../external/gpl2/libmalloc
.if (${MKGCC} != "no")
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Mon Dec 24 21:51:57 UTC 2018
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Switch x86 to binutils 2.31.1
To generate a diff of this commit:
cvs rdiff -u -r1.1085 -r1.1086 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1085 src/share/mk/bsd.own.mk:1.1086
--- src/share/mk/bsd.own.mk:1.1085 Mon Dec 3 14:15:35 2018
+++ src/share/mk/bsd.own.mk Mon Dec 24 16:51:57 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1085 2018/12/03 19:15:35 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.1086 2018/12/24 21:51:57 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -149,7 +149,11 @@ EXTERNAL_GDB_SUBDIR= /does/not/exist
#
# What binutils is used?
#
+.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386"
+HAVE_BINUTILS?= 231
+.else
HAVE_BINUTILS?= 227
+.endif
.if ${HAVE_BINUTILS} == 231
EXTERNAL_BINUTILS_SUBDIR= binutils
CVS commit: src/sys/arch/amd64/amd64
Module Name:src Committed By: christos Date: Mon Dec 24 21:48:53 UTC 2018 Modified Files: src/sys/arch/amd64/amd64: kobj_machdep.c Log Message: Treat R_X86_64_PLT32 relocation as R_X86_64_PC32 for binutils-2.31 See: https://lore.kernel.org/patchwork/patch/892629/ To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/amd64/amd64/kobj_machdep.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/amd64/amd64/kobj_machdep.c diff -u src/sys/arch/amd64/amd64/kobj_machdep.c:1.6 src/sys/arch/amd64/amd64/kobj_machdep.c:1.7 --- src/sys/arch/amd64/amd64/kobj_machdep.c:1.6 Fri Nov 3 05:59:08 2017 +++ src/sys/arch/amd64/amd64/kobj_machdep.c Mon Dec 24 16:48:52 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: kobj_machdep.c,v 1.6 2017/11/03 09:59:08 maxv Exp $ */ +/* $NetBSD: kobj_machdep.c,v 1.7 2018/12/24 21:48:52 christos Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -55,7 +55,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kobj_machdep.c,v 1.6 2017/11/03 09:59:08 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kobj_machdep.c,v 1.7 2018/12/24 21:48:52 christos Exp $"); #define ELFSIZE ARCH_ELFSIZE @@ -119,6 +119,7 @@ kobj_reloc(kobj_t ko, uintptr_t relocbas break; case R_X86_64_PC32: /* S + A - P */ + case R_X86_64_PLT32: error = kobj_sym_lookup(ko, symidx, ); if (error) return -1;
CVS commit: src
Module Name:src
Committed By: thorpej
Date: Mon Dec 24 21:42:05 UTC 2018
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/rump/kernspace: Makefile kernspace.h
src/tests/rump/rumpkern: Makefile
Added Files:
src/tests/rump/kernspace: threadpool.c
src/tests/rump/rumpkern: t_threadpool.c
Log Message:
Add rump-based test cases for threadpool(9).
To generate a diff of this commit:
cvs rdiff -u -r1.799 -r1.800 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.6 -r1.7 src/tests/rump/kernspace/Makefile \
src/tests/rump/kernspace/kernspace.h
cvs rdiff -u -r0 -r1.1 src/tests/rump/kernspace/threadpool.c
cvs rdiff -u -r1.16 -r1.17 src/tests/rump/rumpkern/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/rump/rumpkern/t_threadpool.c
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/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.799 src/distrib/sets/lists/tests/mi:1.800
--- src/distrib/sets/lists/tests/mi:1.799 Mon Dec 24 16:58:54 2018
+++ src/distrib/sets/lists/tests/mi Mon Dec 24 21:42:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.799 2018/12/24 16:58:54 thorpej Exp $
+# $NetBSD: mi,v 1.800 2018/12/24 21:42:05 thorpej Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -3468,6 +3468,7 @@
./usr/tests/rump/rumpkern/t_modlinkset tests-rump-tests atf,rump
./usr/tests/rump/rumpkern/t_signals tests-rump-tests atf,rump
./usr/tests/rump/rumpkern/t_sp tests-rump-tests atf,rump
+./usr/tests/rump/rumpkern/t_threadpool tests-rump-tests atf,rump
./usr/tests/rump/rumpkern/t_threads tests-rump-tests atf,rump
./usr/tests/rump/rumpkern/t_tsleep tests-rump-tests atf,rump
./usr/tests/rump/rumpkern/t_vm tests-rump-tests atf,rump
Index: src/tests/rump/kernspace/Makefile
diff -u src/tests/rump/kernspace/Makefile:1.6 src/tests/rump/kernspace/Makefile:1.7
--- src/tests/rump/kernspace/Makefile:1.6 Fri Sep 29 12:42:36 2017
+++ src/tests/rump/kernspace/Makefile Mon Dec 24 21:42:05 2018
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2017/09/29 12:42:36 maya Exp $
+# $NetBSD: Makefile,v 1.7 2018/12/24 21:42:05 thorpej Exp $
#
.include
LIB= kernspace
-SRCS= thread.c busypage.c tsleep.c alloc.c lockme.c workqueue.c sendsig.c
+SRCS= thread.c threadpool.c busypage.c tsleep.c alloc.c lockme.c \
+ workqueue.c sendsig.c
RUMPTOP=${NETBSDSRCDIR}/sys/rump
Index: src/tests/rump/kernspace/kernspace.h
diff -u src/tests/rump/kernspace/kernspace.h:1.6 src/tests/rump/kernspace/kernspace.h:1.7
--- src/tests/rump/kernspace/kernspace.h:1.6 Thu Dec 28 07:10:25 2017
+++ src/tests/rump/kernspace/kernspace.h Mon Dec 24 21:42:05 2018
@@ -1,7 +1,7 @@
-/* $NetBSD: kernspace.h,v 1.6 2017/12/28 07:10:25 ozaki-r Exp $ */
+/* $NetBSD: kernspace.h,v 1.7 2018/12/24 21:42:05 thorpej Exp $ */
/*-
- * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * Copyright (c) 2010, 2018 The NetBSD Foundation, Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -46,4 +46,10 @@ void rumptest_workqueue_wait(void);
void rumptest_sendsig(char *);
void rumptest_localsig(int);
+void rumptest_threadpool_unbound_lifecycle(void);
+void rumptest_threadpool_percpu_lifecycle(void);
+void rumptest_threadpool_unbound_schedule(void);
+void rumptest_threadpool_percpu_schedule(void);
+void rumptest_threadpool_job_cancel(void);
+
#endif /* _TESTS_RUMP_KERNSPACE_KERNSPACE_H_ */
Index: src/tests/rump/rumpkern/Makefile
diff -u src/tests/rump/rumpkern/Makefile:1.16 src/tests/rump/rumpkern/Makefile:1.17
--- src/tests/rump/rumpkern/Makefile:1.16 Fri Sep 29 12:42:37 2017
+++ src/tests/rump/rumpkern/Makefile Mon Dec 24 21:42:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2017/09/29 12:42:37 maya Exp $
+# $NetBSD: Makefile,v 1.17 2018/12/24 21:42:05 thorpej Exp $
.include
@@ -11,6 +11,7 @@ TESTS_C+= t_modcmd
TESTS_C+= t_modlinkset
TESTS_C+= t_signals
TESTS_C+= t_threads
+TESTS_C+= t_threadpool
TESTS_C+= t_tsleep
TESTS_C+= t_workqueue
TESTS_C+= t_vm
Added files:
Index: src/tests/rump/kernspace/threadpool.c
diff -u /dev/null src/tests/rump/kernspace/threadpool.c:1.1
--- /dev/null Mon Dec 24 21:42:05 2018
+++ src/tests/rump/kernspace/threadpool.c Mon Dec 24 21:42:05 2018
@@ -0,0 +1,234 @@
+/* $NetBSD: threadpool.c,v 1.1 2018/12/24 21:42:05 thorpej Exp $ */
+
+/*-
+ * Copyright (c) 2018 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe.
+ *
+ * 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
CVS commit: src/sys/sys
Module Name:src Committed By: thorpej Date: Mon Dec 24 21:40:48 UTC 2018 Modified Files: src/sys/sys: threadpool.h Log Message: Don't need here. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/sys/threadpool.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/threadpool.h diff -u src/sys/sys/threadpool.h:1.1 src/sys/sys/threadpool.h:1.2 --- src/sys/sys/threadpool.h:1.1 Mon Dec 24 16:58:54 2018 +++ src/sys/sys/threadpool.h Mon Dec 24 21:40:48 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: threadpool.h,v 1.1 2018/12/24 16:58:54 thorpej Exp $ */ +/* $NetBSD: threadpool.h,v 1.2 2018/12/24 21:40:48 thorpej Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -39,7 +39,6 @@ #include #include #include -#include typedef struct threadpool threadpool_t; typedef struct threadpool_percpu threadpool_percpu_t;
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: mrg
Date: Mon Dec 24 21:27:37 UTC 2018
Modified Files:
src/sys/compat/netbsd32: netbsd32_syscall.h netbsd32_syscallargs.h
netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c
netbsd32_systrace_args.c
Log Message:
regen.
To generate a diff of this commit:
cvs rdiff -u -r1.138 -r1.139 src/sys/compat/netbsd32/netbsd32_syscall.h
cvs rdiff -u -r1.137 -r1.138 src/sys/compat/netbsd32/netbsd32_syscallargs.h \
src/sys/compat/netbsd32/netbsd32_syscalls.c
cvs rdiff -u -r1.17 -r1.18 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.136 -r1.137 src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.28 -r1.29 src/sys/compat/netbsd32/netbsd32_systrace_args.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_syscall.h
diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.138 src/sys/compat/netbsd32/netbsd32_syscall.h:1.139
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.138 Fri Aug 10 21:47:15 2018
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Mon Dec 24 21:27:37 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.138 2018/08/10 21:47:15 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.139 2018/12/24 21:27:37 mrg Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.123 2018/07/31 21:00:02 rjs Exp
+ * created from NetBSD: syscalls.master,v 1.124 2018/12/24 21:27:06 mrg Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
@@ -73,8 +73,8 @@
/* syscall: "getpid" ret: "pid_t" args: */
#define NETBSD32_SYS_getpid 20
-/* syscall: "netbsd32_mount" ret: "int" args: "netbsd32_charp" "netbsd32_charp" "int" "netbsd32_voidp" */
-#define NETBSD32_SYS_netbsd32_mount 21
+/* syscall: "compat_40_netbsd32_mount" ret: "int" args: "netbsd32_charp" "netbsd32_charp" "int" "netbsd32_voidp" */
+#define NETBSD32_SYS_compat_40_netbsd32_mount 21
/* syscall: "netbsd32_unmount" ret: "int" args: "netbsd32_charp" "int" */
#define NETBSD32_SYS_netbsd32_unmount 22
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.137 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.138
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.137 Fri Aug 10 21:47:15 2018
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Mon Dec 24 21:27:37 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.137 2018/08/10 21:47:15 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.138 2018/12/24 21:27:37 mrg Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.123 2018/07/31 21:00:02 rjs Exp
+ * created from NetBSD: syscalls.master,v 1.124 2018/12/24 21:27:06 mrg Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
@@ -144,13 +144,13 @@ struct compat_43_netbsd32_olseek_args {
};
check_syscall_args(compat_43_netbsd32_olseek)
-struct netbsd32_mount_args {
+struct compat_40_netbsd32_mount_args {
syscallarg(netbsd32_charp) type;
syscallarg(netbsd32_charp) path;
syscallarg(int) flags;
syscallarg(netbsd32_voidp) data;
};
-check_syscall_args(netbsd32_mount)
+check_syscall_args(compat_40_netbsd32_mount)
struct netbsd32_unmount_args {
syscallarg(netbsd32_charp) path;
@@ -2663,7 +2663,7 @@ int compat_43_netbsd32_olseek(struct lwp
int sys_getpid(struct lwp *, const void *, register_t *);
-int netbsd32_mount(struct lwp *, const struct netbsd32_mount_args *, register_t *);
+int compat_40_netbsd32_mount(struct lwp *, const struct compat_40_netbsd32_mount_args *, register_t *);
int netbsd32_unmount(struct lwp *, const struct netbsd32_unmount_args *, register_t *);
Index: src/sys/compat/netbsd32/netbsd32_syscalls.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.137 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.138
--- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.137 Mon Dec 24 21:27:06 2018
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c Mon Dec 24 21:27:37 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.137 2018/12/24 21:27:06 mrg Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.138 2018/12/24 21:27:37 mrg Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.123 2018/07/31 21:00:02 rjs Exp
+ * created from NetBSD: syscalls.master,v 1.124 2018/12/24 21:27:06 mrg Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.137 2018/12/24 21:27:06 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.138 2018/12/24 21:27:37 mrg Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
Index: src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.17
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: mrg
Date: Mon Dec 24 21:27:06 UTC 2018
Modified Files:
src/sys/compat/netbsd32: files.netbsd32 netbsd32_netbsd.c
netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c
netbsd32_systrace_args.c syscalls.master
Added Files:
src/sys/compat/netbsd32: netbsd32_compat_40.c netbsd32_fd.c
netbsd32_vm.c
Log Message:
move mmap(), compat 40 mount(), pipe() and getfh() into their own files
as the implementation is non trivial or is compat. mark old mount()
properly instead of manually #if'ing ito to ENOSYS.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/compat/netbsd32/files.netbsd32
cvs rdiff -u -r0 -r1.2 src/sys/compat/netbsd32/netbsd32_compat_40.c
cvs rdiff -u -r0 -r1.1 src/sys/compat/netbsd32/netbsd32_fd.c \
src/sys/compat/netbsd32/netbsd32_vm.c
cvs rdiff -u -r1.221 -r1.222 src/sys/compat/netbsd32/netbsd32_netbsd.c
cvs rdiff -u -r1.136 -r1.137 src/sys/compat/netbsd32/netbsd32_syscalls.c
cvs rdiff -u -r1.16 -r1.17 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.135 -r1.136 src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.27 -r1.28 src/sys/compat/netbsd32/netbsd32_systrace_args.c
cvs rdiff -u -r1.123 -r1.124 src/sys/compat/netbsd32/syscalls.master
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/files.netbsd32
diff -u src/sys/compat/netbsd32/files.netbsd32:1.40 src/sys/compat/netbsd32/files.netbsd32:1.41
--- src/sys/compat/netbsd32/files.netbsd32:1.40 Mon Dec 24 20:44:39 2018
+++ src/sys/compat/netbsd32/files.netbsd32 Mon Dec 24 21:27:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.netbsd32,v 1.40 2018/12/24 20:44:39 mrg Exp $
+# $NetBSD: files.netbsd32,v 1.41 2018/12/24 21:27:05 mrg Exp $
#
# config file description for machine-independent netbsd32 compat code.
# included by ports that need it.
@@ -13,6 +13,7 @@ file compat/netbsd32/netbsd32_exec_aout.
file compat/netbsd32/netbsd32_netbsd.c compat_netbsd32
file compat/netbsd32/netbsd32_event.c compat_netbsd32
file compat/netbsd32/netbsd32_execve.c compat_netbsd32
+file compat/netbsd32/netbsd32_fd.c compat_netbsd32
file compat/netbsd32/netbsd32_fs.c compat_netbsd32
file compat/netbsd32/netbsd32_ioctl.c compat_netbsd32
file compat/netbsd32/netbsd32_ipc.c compat_netbsd32
@@ -31,6 +32,7 @@ file compat/netbsd32/netbsd32_socket.c c
file compat/netbsd32/netbsd32_sysctl.c compat_netbsd32
file compat/netbsd32/netbsd32_time.c compat_netbsd32
file compat/netbsd32/netbsd32_wait.c compat_netbsd32
+file compat/netbsd32/netbsd32_vm.c compat_netbsd32
file compat/netbsd32/netbsd32_sysent.c compat_netbsd32
file compat/netbsd32/netbsd32_syscalls.c compat_netbsd32 & syscall_debug
@@ -42,6 +44,7 @@ file compat/netbsd32/netbsd32_compat_14.
file compat/netbsd32/netbsd32_compat_20.c compat_netbsd32 & compat_20
file compat/netbsd32/netbsd32_compat_30.c compat_netbsd32 & compat_30
file compat/netbsd32/netbsd32_compat_43.c compat_netbsd32 & (compat_43 | compat_sunos | compat_linux32)
+file compat/netbsd32/netbsd32_compat_40.c compat_netbsd32 & compat_40
file compat/netbsd32/netbsd32_compat_50.c compat_netbsd32 & compat_50
file compat/netbsd32/netbsd32_compat_50_sysv.c compat_netbsd32 & compat_50 &
(sysvmsg | sysvsem | sysvshm)
Index: src/sys/compat/netbsd32/netbsd32_netbsd.c
diff -u src/sys/compat/netbsd32/netbsd32_netbsd.c:1.221 src/sys/compat/netbsd32/netbsd32_netbsd.c:1.222
--- src/sys/compat/netbsd32/netbsd32_netbsd.c:1.221 Mon Dec 24 20:44:39 2018
+++ src/sys/compat/netbsd32/netbsd32_netbsd.c Mon Dec 24 21:27:05 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_netbsd.c,v 1.221 2018/12/24 20:44:39 mrg Exp $ */
+/* $NetBSD: netbsd32_netbsd.c,v 1.222 2018/12/24 21:27:05 mrg Exp $ */
/*
* Copyright (c) 1998, 2001, 2008, 2018 Matthew R. Green
@@ -27,15 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.221 2018/12/24 20:44:39 mrg Exp $");
-
-/*
- * below are all the standard NetBSD system calls, in the 32bit
- * environment, with the necessary conversions to 64bit before calling
- * the real syscall. anything that needs special attention is handled
- * elsewhere - this file should only contain structure assignment and
- * calls to the original function.
- */
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.222 2018/12/24 21:27:05 mrg Exp $");
/*
* below are all the standard NetBSD system calls, in the 32bit
@@ -73,13 +65,11 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_net
#include
#include
#include
-#include
#include
#include
#include
#include
#include
-#include
#include
#include
@@ -365,30 +355,6 @@ netbsd32_break(struct lwp *l, const stru
return sys_obreak(l, , retval);
}
-// XXX move into compat_40
-int
-netbsd32_mount(struct lwp *l, const struct netbsd32_mount_args *uap, register_t *retval)
-{
-#ifdef COMPAT_40
-
CVS commit: src/sys/arch/xen/conf
Module Name:src Committed By: cherry Date: Mon Dec 24 21:15:59 UTC 2018 Modified Files: src/sys/arch/xen/conf: files.xen Log Message: Do not include files for MSI support on XEN dom0. We do not support MSI as of now. To generate a diff of this commit: cvs rdiff -u -r1.172 -r1.173 src/sys/arch/xen/conf/files.xen 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/xen/conf/files.xen diff -u src/sys/arch/xen/conf/files.xen:1.172 src/sys/arch/xen/conf/files.xen:1.173 --- src/sys/arch/xen/conf/files.xen:1.172 Sat Dec 22 07:45:58 2018 +++ src/sys/arch/xen/conf/files.xen Mon Dec 24 21:15:59 2018 @@ -1,4 +1,4 @@ -# $NetBSD: files.xen,v 1.172 2018/12/22 07:45:58 cherry Exp $ +# $NetBSD: files.xen,v 1.173 2018/12/24 21:15:59 cherry Exp $ # NetBSD: files.x86,v 1.10 2003/10/08 17:30:00 bouyer Exp # NetBSD: files.i386,v 1.254 2004/03/25 23:32:10 jmc Exp @@ -381,8 +381,6 @@ file arch/xen/xen/privcmd.c dom0ops file arch/xen/x86/xen_shm_machdep.c dom0ops file arch/x86/pci/pci_machdep.c hypervisor & pci & dom0ops file arch/x86/pci/pci_intr_machdep.c hypervisor & pci -file arch/x86/pci/pci_msi_machdep.c hypervisor & pci -file arch/x86/pci/msipic.c hypervisor & pci file arch/x86/isa/isa_machdep.c hypervisor & dom0ops file arch/xen/xen/xenevt.c xenevt & dom0ops file arch/xen/xen/xennetback_xenbus.c xvif
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: mrg
Date: Mon Dec 24 20:44:39 UTC 2018
Modified Files:
src/sys/compat/netbsd32: files.netbsd32 netbsd32_netbsd.c
Added Files:
src/sys/compat/netbsd32: netbsd32_quota.c netbsd32_rlimit.c
Log Message:
move rlimit and quota code into their own modules.
(netbsd32_netbsd.c should have only simple shims. anything more
than copying arguments from one args struct to the other should
not be placed in this file. still a couple more to move out.)
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/compat/netbsd32/files.netbsd32
cvs rdiff -u -r1.220 -r1.221 src/sys/compat/netbsd32/netbsd32_netbsd.c
cvs rdiff -u -r0 -r1.1 src/sys/compat/netbsd32/netbsd32_quota.c \
src/sys/compat/netbsd32/netbsd32_rlimit.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/files.netbsd32
diff -u src/sys/compat/netbsd32/files.netbsd32:1.39 src/sys/compat/netbsd32/files.netbsd32:1.40
--- src/sys/compat/netbsd32/files.netbsd32:1.39 Wed Oct 19 09:44:01 2016
+++ src/sys/compat/netbsd32/files.netbsd32 Mon Dec 24 20:44:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.netbsd32,v 1.39 2016/10/19 09:44:01 skrll Exp $
+# $NetBSD: files.netbsd32,v 1.40 2018/12/24 20:44:39 mrg Exp $
#
# config file description for machine-independent netbsd32 compat code.
# included by ports that need it.
@@ -22,6 +22,8 @@ file compat/netbsd32/netbsd32_mod.c com
file compat/netbsd32/netbsd32_mqueue.c compat_netbsd32 & mqueue
file compat/netbsd32/netbsd32_nfssvc.c compat_netbsd32 & nfsserver
file compat/netbsd32/netbsd32_ptrace.c compat_netbsd32 & ptrace
+file compat/netbsd32/netbsd32_rlimit.c compat_netbsd32
+file compat/netbsd32/netbsd32_quota.c compat_netbsd32 & quota
file compat/netbsd32/netbsd32_select.c compat_netbsd32
file compat/netbsd32/netbsd32_sem.c compat_netbsd32
file compat/netbsd32/netbsd32_signal.c compat_netbsd32
Index: src/sys/compat/netbsd32/netbsd32_netbsd.c
diff -u src/sys/compat/netbsd32/netbsd32_netbsd.c:1.220 src/sys/compat/netbsd32/netbsd32_netbsd.c:1.221
--- src/sys/compat/netbsd32/netbsd32_netbsd.c:1.220 Mon Dec 24 20:39:17 2018
+++ src/sys/compat/netbsd32/netbsd32_netbsd.c Mon Dec 24 20:44:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_netbsd.c,v 1.220 2018/12/24 20:39:17 mrg Exp $ */
+/* $NetBSD: netbsd32_netbsd.c,v 1.221 2018/12/24 20:44:39 mrg Exp $ */
/*
* Copyright (c) 1998, 2001, 2008, 2018 Matthew R. Green
@@ -27,7 +27,15 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.220 2018/12/24 20:39:17 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.221 2018/12/24 20:44:39 mrg Exp $");
+
+/*
+ * below are all the standard NetBSD system calls, in the 32bit
+ * environment, with the necessary conversions to 64bit before calling
+ * the real syscall. anything that needs special attention is handled
+ * elsewhere - this file should only contain structure assignment and
+ * calls to the original function.
+ */
/*
* below are all the standard NetBSD system calls, in the 32bit
@@ -1206,100 +1214,7 @@ netbsd32_rmdir(struct lwp *l, const stru
return sys_rmdir(l, , retval);
}
-int
-netbsd32___quotactl(struct lwp *l, const struct netbsd32___quotactl_args *uap, register_t *retval)
-{
- /* {
- syscallarg(const netbsd32_charp) path;
- syscallarg(netbsd32_voidp) args;
- } */
- struct netbsd32_quotactlargs args32;
- struct quotactl_args args;
- int error;
-
- error = copyin(SCARG_P32(uap, args), , sizeof(args32));
- if (error) {
- return error;
- }
-
- args.qc_op = args32.qc_op;
- switch (args.qc_op) {
- case QUOTACTL_STAT:
- args.u.stat.qc_info = NETBSD32PTR64(args32.u.stat.qc_info);
- break;
- case QUOTACTL_IDTYPESTAT:
- args.u.idtypestat.qc_idtype = args32.u.idtypestat.qc_idtype;
- args.u.idtypestat.qc_info =
- NETBSD32PTR64(args32.u.idtypestat.qc_info);
- break;
- case QUOTACTL_OBJTYPESTAT:
- args.u.objtypestat.qc_objtype =
- args32.u.objtypestat.qc_objtype;
- args.u.objtypestat.qc_info =
- NETBSD32PTR64(args32.u.objtypestat.qc_info);
- break;
- case QUOTACTL_GET:
- args.u.get.qc_key = NETBSD32PTR64(args32.u.get.qc_key);
- args.u.get.qc_val = NETBSD32PTR64(args32.u.get.qc_val);
- break;
- case QUOTACTL_PUT:
- args.u.put.qc_key = NETBSD32PTR64(args32.u.put.qc_key);
- args.u.put.qc_val = NETBSD32PTR64(args32.u.put.qc_val);
- break;
- case QUOTACTL_DEL:
- args.u.del.qc_key = NETBSD32PTR64(args32.u.del.qc_key);
- break;
- case QUOTACTL_CURSOROPEN:
- args.u.cursoropen.qc_cursor =
- NETBSD32PTR64(args32.u.cursoropen.qc_cursor);
- break;
- case QUOTACTL_CURSORCLOSE:
- args.u.cursorclose.qc_cursor =
- NETBSD32PTR64(args32.u.cursorclose.qc_cursor);
- break;
- case QUOTACTL_CURSORSKIPIDTYPE:
- args.u.cursorskipidtype.qc_cursor =
- NETBSD32PTR64(args32.u.cursorskipidtype.qc_cursor);
- args.u.cursorskipidtype.qc_idtype =
-
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: mrg
Date: Mon Dec 24 20:39:17 UTC 2018
Modified Files:
src/sys/compat/netbsd32: netbsd32_netbsd.c
Log Message:
fix style consistency.
remove obsolete comments or commented code.
NFC.
To generate a diff of this commit:
cvs rdiff -u -r1.219 -r1.220 src/sys/compat/netbsd32/netbsd32_netbsd.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_netbsd.c
diff -u src/sys/compat/netbsd32/netbsd32_netbsd.c:1.219 src/sys/compat/netbsd32/netbsd32_netbsd.c:1.220
--- src/sys/compat/netbsd32/netbsd32_netbsd.c:1.219 Mon Dec 24 20:27:57 2018
+++ src/sys/compat/netbsd32/netbsd32_netbsd.c Mon Dec 24 20:39:17 2018
@@ -1,7 +1,7 @@
-/* $NetBSD: netbsd32_netbsd.c,v 1.219 2018/12/24 20:27:57 mrg Exp $ */
+/* $NetBSD: netbsd32_netbsd.c,v 1.220 2018/12/24 20:39:17 mrg Exp $ */
/*
- * Copyright (c) 1998, 2001, 2008 Matthew R. Green
+ * Copyright (c) 1998, 2001, 2008, 2018 Matthew R. Green
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -27,7 +27,15 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.219 2018/12/24 20:27:57 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.220 2018/12/24 20:39:17 mrg Exp $");
+
+/*
+ * below are all the standard NetBSD system calls, in the 32bit
+ * environment, with the necessary conversions to 64bit before calling
+ * the real syscall. anything that needs special attention is handled
+ * elsewhere - this file should only contain structure assignment and
+ * calls to the original function.
+ */
#if defined(_KERNEL_OPT)
#include "opt_ddb.h"
@@ -42,7 +50,6 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_net
#include
#include
#include
-//#define msg __msg /* Don't ask me! */
#include
#include
#include
@@ -166,13 +173,6 @@ struct emul emul_netbsd32 = {
#endif
};
-/*
- * below are all the standard NetBSD system calls, in the 32bit
- * environment, with the necessary conversions to 64bit before
- * calling the real syscall. anything that needs special
- * attention is handled elsewhere.
- */
-
int
netbsd32_exit(struct lwp *l, const struct netbsd32_exit_args *uap, register_t *retval)
{
@@ -257,7 +257,7 @@ netbsd32_link(struct lwp *l, const struc
NETBSD32TOP_UAP(path, const char);
NETBSD32TOP_UAP(link, const char);
- return (sys_link(l, , retval));
+ return sys_link(l, , retval);
}
int
@@ -270,7 +270,7 @@ netbsd32_unlink(struct lwp *l, const str
NETBSD32TOP_UAP(path, const char);
- return (sys_unlink(l, , retval));
+ return sys_unlink(l, , retval);
}
int
@@ -283,7 +283,7 @@ netbsd32_chdir(struct lwp *l, const stru
NETBSD32TOP_UAP(path, const char);
- return (sys_chdir(l, , retval));
+ return sys_chdir(l, , retval);
}
int
@@ -296,7 +296,7 @@ netbsd32_fchdir(struct lwp *l, const str
NETBSD32TO64_UAP(fd);
- return (sys_fchdir(l, , retval));
+ return sys_fchdir(l, , retval);
}
int
@@ -324,7 +324,7 @@ netbsd32_chmod(struct lwp *l, const stru
NETBSD32TOP_UAP(path, const char);
NETBSD32TO64_UAP(mode);
- return (sys_chmod(l, , retval));
+ return sys_chmod(l, , retval);
}
int
@@ -341,7 +341,7 @@ netbsd32_chown(struct lwp *l, const stru
NETBSD32TO64_UAP(uid);
NETBSD32TO64_UAP(gid);
- return (sys_chown(l, , retval));
+ return sys_chown(l, , retval);
}
int
@@ -353,9 +353,11 @@ netbsd32_break(struct lwp *l, const stru
struct sys_obreak_args ua;
NETBSD32TOP_UAP(nsize, char);
- return (sys_obreak(l, , retval));
+
+ return sys_obreak(l, , retval);
}
+// XXX move into compat_40
int
netbsd32_mount(struct lwp *l, const struct netbsd32_mount_args *uap, register_t *retval)
{
@@ -372,7 +374,8 @@ netbsd32_mount(struct lwp *l, const stru
NETBSD32TOP_UAP(path, const char);
NETBSD32TO64_UAP(flags);
NETBSD32TOP_UAP(data, void);
- return (compat_40_sys_mount(l, , retval));
+
+ return compat_40_sys_mount(l, , retval);
#else
return ENOSYS;
#endif
@@ -389,7 +392,8 @@ netbsd32_unmount(struct lwp *l, const st
NETBSD32TOP_UAP(path, const char);
NETBSD32TO64_UAP(flags);
- return (sys_unmount(l, , retval));
+
+ return sys_unmount(l, , retval);
}
int
@@ -401,7 +405,8 @@ netbsd32_setuid(struct lwp *l, const str
struct sys_setuid_args ua;
NETBSD32TO64_UAP(uid);
- return (sys_setuid(l, , retval));
+
+ return sys_setuid(l, , retval);
}
int
@@ -417,7 +422,8 @@ netbsd32_accept(struct lwp *l, const str
NETBSD32TO64_UAP(s);
NETBSD32TOP_UAP(name, struct sockaddr);
NETBSD32TOP_UAP(anamelen, socklen_t);
- return (sys_accept(l, , retval));
+
+ return sys_accept(l, , retval);
}
int
@@ -434,7 +440,8 @@ netbsd32_getpeername(struct lwp *l, cons
NETBSD32TOP_UAP(asa, struct sockaddr);
NETBSD32TOP_UAP(alen, socklen_t);
/* NB: do the protocol specific sockaddrs need to be converted? */
- return (sys_getpeername(l, , retval));
+
+ return sys_getpeername(l, , retval);
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: mrg
Date: Mon Dec 24 20:27:57 UTC 2018
Modified Files:
src/sys/compat/netbsd32: netbsd32_netbsd.c
Log Message:
pset_create() takes a pointer so it needs special handling.
To generate a diff of this commit:
cvs rdiff -u -r1.218 -r1.219 src/sys/compat/netbsd32/netbsd32_netbsd.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_netbsd.c
diff -u src/sys/compat/netbsd32/netbsd32_netbsd.c:1.218 src/sys/compat/netbsd32/netbsd32_netbsd.c:1.219
--- src/sys/compat/netbsd32/netbsd32_netbsd.c:1.218 Fri Aug 10 21:44:58 2018
+++ src/sys/compat/netbsd32/netbsd32_netbsd.c Mon Dec 24 20:27:57 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_netbsd.c,v 1.218 2018/08/10 21:44:58 pgoyette Exp $ */
+/* $NetBSD: netbsd32_netbsd.c,v 1.219 2018/12/24 20:27:57 mrg Exp $ */
/*
* Copyright (c) 1998, 2001, 2008 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.218 2018/08/10 21:44:58 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.219 2018/12/24 20:27:57 mrg Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ddb.h"
@@ -2796,8 +2796,11 @@ netbsd32_pset_create(struct lwp *l,
/* {
syscallarg(netbsd32_psetidp_t) psid;
}; */
+ struct sys_pset_create_args ua;
- return sys_pset_create(l, (const void *)uap, retval);
+ NETBSD32TOP_UAP(psid, psetid_t);
+
+ return sys_pset_create(l, , retval);
}
int
CVS commit: src/distrib/ofppc/ramdisks/common
Module Name:src
Committed By: mrg
Date: Mon Dec 24 20:11:23 UTC 2018
Modified Files:
src/distrib/ofppc/ramdisks/common: Makefile.ramdisk
Log Message:
set MAKEDEVTARGETS=ramdisk so that the ramdisk /dev/ is populated.
from PR#51659.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/distrib/ofppc/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/ofppc/ramdisks/common/Makefile.ramdisk
diff -u src/distrib/ofppc/ramdisks/common/Makefile.ramdisk:1.8 src/distrib/ofppc/ramdisks/common/Makefile.ramdisk:1.9
--- src/distrib/ofppc/ramdisks/common/Makefile.ramdisk:1.8 Tue Oct 16 08:23:21 2012
+++ src/distrib/ofppc/ramdisks/common/Makefile.ramdisk Mon Dec 24 20:11:22 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ramdisk,v 1.8 2012/10/16 08:23:21 apb Exp $
+# $NetBSD: Makefile.ramdisk,v 1.9 2018/12/24 20:11:22 mrg Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -17,6 +17,7 @@ CRUNCHBIN= ramdiskbin
LISTS?= ${.CURDIR}/list
LISTS+= ${OFPPCCOMMON}/list.ramdisk
MTREECONF= ${DISTRIBDIR}/common/mtree.common ${.CURDIR}/../common/mtree.ramdisk
+MAKEDEVTARGETS= ramdisk
IMAGEENDIAN= le
IMAGEDEPENDS+= ${CRUNCHBIN} \
dot.profile \
CVS commit: src/sys/arch/i386/stand/efiboot
Module Name:src
Committed By: christos
Date: Mon Dec 24 18:21:50 UTC 2018
Modified Files:
src/sys/arch/i386/stand/efiboot/bootia32: ldscript
src/sys/arch/i386/stand/efiboot/bootx64: ldscript
Log Message:
Avoid error with new binutils:
error: PHDR segment not covered by LOAD segment
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/i386/stand/efiboot/bootia32/ldscript
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/i386/stand/efiboot/bootx64/ldscript
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/efiboot/bootia32/ldscript
diff -u src/sys/arch/i386/stand/efiboot/bootia32/ldscript:1.1 src/sys/arch/i386/stand/efiboot/bootia32/ldscript:1.2
--- src/sys/arch/i386/stand/efiboot/bootia32/ldscript:1.1 Tue Jan 24 06:09:14 2017
+++ src/sys/arch/i386/stand/efiboot/bootia32/ldscript Mon Dec 24 13:21:50 2018
@@ -1,7 +1,14 @@
-/* $NetBSD: ldscript,v 1.1 2017/01/24 11:09:14 nonaka Exp $ */
+/* $NetBSD: ldscript,v 1.2 2018/12/24 18:21:50 christos Exp $ */
OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
OUTPUT_ARCH(i386)
ENTRY(_start)
+
+PHDRS
+{
+ text PT_LOAD;
+ headers PT_PHDR FILEHDR PHDRS;
+}
+
SECTIONS
{
. = 0;
@@ -13,7 +20,7 @@ SECTIONS
*(.text)
*(.text.*)
*(.gnu.linkonce.t.*)
- }
+ } :text
. = ALIGN(4096);
.sdata :
{
Index: src/sys/arch/i386/stand/efiboot/bootx64/ldscript
diff -u src/sys/arch/i386/stand/efiboot/bootx64/ldscript:1.1 src/sys/arch/i386/stand/efiboot/bootx64/ldscript:1.2
--- src/sys/arch/i386/stand/efiboot/bootx64/ldscript:1.1 Tue Jan 24 06:09:14 2017
+++ src/sys/arch/i386/stand/efiboot/bootx64/ldscript Mon Dec 24 13:21:50 2018
@@ -1,8 +1,15 @@
-/* $NetBSD: ldscript,v 1.1 2017/01/24 11:09:14 nonaka Exp $ */
+/* $NetBSD: ldscript,v 1.2 2018/12/24 18:21:50 christos Exp $ */
/* Same as elf_x86_64_fbsd_efi.lds, except for OUTPUT_FORMAT below - KEEP IN SYNC */
OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64")
OUTPUT_ARCH(i386:x86-64)
ENTRY(_start)
+
+PHDRS
+{
+ text PT_LOAD;
+ headers PT_PHDR FILEHDR PHDRS;
+}
+
SECTIONS
{
. = 0;
@@ -19,7 +26,7 @@ SECTIONS
*(.text)
*(.text.*)
*(.gnu.linkonce.t.*)
- }
+ } :text
. = ALIGN(4096);
.reloc :
{
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: christos Date: Mon Dec 24 17:44:40 UTC 2018 Modified Files: src/sys/dev/acpi: com_acpi.c Log Message: - fix compilation on 32 bit systems. - wrap long lines To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sys/dev/acpi/com_acpi.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/acpi/com_acpi.c diff -u src/sys/dev/acpi/com_acpi.c:1.37 src/sys/dev/acpi/com_acpi.c:1.38 --- src/sys/dev/acpi/com_acpi.c:1.37 Fri Dec 21 09:51:47 2018 +++ src/sys/dev/acpi/com_acpi.c Mon Dec 24 12:44:40 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: com_acpi.c,v 1.37 2018/12/21 14:51:47 jmcneill Exp $ */ +/* $NetBSD: com_acpi.c,v 1.38 2018/12/24 17:44:40 christos Exp $ */ /* * Copyright (c) 2002 Jared D. McNeill @@ -26,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: com_acpi.c,v 1.37 2018/12/21 14:51:47 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: com_acpi.c,v 1.38 2018/12/24 17:44:40 christos Exp $"); #include #include @@ -163,7 +163,8 @@ com_acpi_attach(device_t parent, device_ } } - rv = acpi_dsd_integer(aa->aa_node->ad_handle, "clock-frequency", _freq); + rv = acpi_dsd_integer(aa->aa_node->ad_handle, "clock-frequency", + _freq); if (ACPI_SUCCESS(rv)) sc->sc_frequency = clock_freq; else @@ -172,7 +173,8 @@ com_acpi_attach(device_t parent, device_ com_attach_subr(sc); if (!ISSET(sc->sc_hwflags, COM_HW_POLL)) - asc->sc_ih = acpi_intr_establish(self, (uint64_t)aa->aa_node->ad_handle, + asc->sc_ih = acpi_intr_establish(self, + (intptr_t)aa->aa_node->ad_handle, IPL_SERIAL, true, comintr, sc, device_xname(self)); if (!pmf_device_register(self, NULL, com_resume))
CVS commit: src/doc
Module Name:src Committed By: thorpej Date: Mon Dec 24 16:59:40 UTC 2018 Modified Files: src/doc: CHANGES Log Message: Note threadpool(9). To generate a diff of this commit: cvs rdiff -u -r1.2471 -r1.2472 src/doc/CHANGES 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 diff -u src/doc/CHANGES:1.2471 src/doc/CHANGES:1.2472 --- src/doc/CHANGES:1.2471 Sun Dec 23 16:29:10 2018 +++ src/doc/CHANGES Mon Dec 24 16:59:40 2018 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2471 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2472 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -270,3 +270,4 @@ Changes from NetBSD 8.0 to NetBSD 9.0: network: Add SIOCSETHERCAP ioctl. [msaitoh 20181221] byacc: Update to 20180609. [christos 20181223] flex(1): Import flex-2.6.4 [christos 20181223] + threadpool(9): Added threadpool(9) API [thorpej 20181224]
CVS commit: src
Module Name:src Committed By: thorpej Date: Mon Dec 24 16:58:54 UTC 2018 Modified Files: src/distrib/sets/lists/comp: mi src/distrib/sets/lists/tests: mi module.mi src/share/man/man9: Makefile src/sys/kern: files.kern src/sys/rump/librump/rumpkern: Makefile.rumpkern src/sys/sys: param.h src/tests/kernel: Makefile Added Files: src/share/man/man9: threadpool.9 src/sys/kern: kern_threadpool.c src/sys/sys: threadpool.h src/tests/kernel: t_threadpool.sh src/tests/kernel/threadpool_tester: Makefile threadpool_tester.c Log Message: Add threadpool(9), an abstraction that provides shared pools of kernel threads running at specific priorities, with support for unbound pools and per-cpu pools. Written by riastradh@, and based on the May 2014 draft, with a few changes by me: - Working on the assumption that a relative few priorities will actually be used, reduce the memory footprint by using linked lists, rather than 2 large (and mostly empty) tables. The performance impact is essentially nil, since these lists are consulted only when pools are created (and destroyed, for DIAGNOSTIC checks), and the lists will have at most 225 entries. - Make threadpool job object, which the caller must allocate storage for, really opaque. - Use typedefs for the threadpool types, to reduce the verbosity of the API somewhat. - Fix a bunch of pool / worker thread / job object lifecycle bugs. Also include an ATF unit test, written by me, that exercises the basics of the API by loading a kernel module that exposes several sysctls that allow the ATF test script to create and destroy threadpools, schedule a basic job, and verify that it ran. And thus NetBSD 8.99.29 has arrived. To generate a diff of this commit: cvs rdiff -u -r1.2244 -r1.2245 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.798 -r1.799 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.13 -r1.14 src/distrib/sets/lists/tests/module.mi cvs rdiff -u -r1.433 -r1.434 src/share/man/man9/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man9/threadpool.9 cvs rdiff -u -r1.28 -r1.29 src/sys/kern/files.kern cvs rdiff -u -r0 -r1.1 src/sys/kern/kern_threadpool.c cvs rdiff -u -r1.172 -r1.173 src/sys/rump/librump/rumpkern/Makefile.rumpkern cvs rdiff -u -r1.573 -r1.574 src/sys/sys/param.h cvs rdiff -u -r0 -r1.1 src/sys/sys/threadpool.h cvs rdiff -u -r1.54 -r1.55 src/tests/kernel/Makefile cvs rdiff -u -r0 -r1.1 src/tests/kernel/t_threadpool.sh cvs rdiff -u -r0 -r1.1 src/tests/kernel/threadpool_tester/Makefile \ src/tests/kernel/threadpool_tester/threadpool_tester.c 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/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.2244 src/distrib/sets/lists/comp/mi:1.2245 --- src/distrib/sets/lists/comp/mi:1.2244 Sat Dec 22 14:39:47 2018 +++ src/distrib/sets/lists/comp/mi Mon Dec 24 16:58:53 2018 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.2244 2018/12/22 14:39:47 maxv Exp $ +# $NetBSD: mi,v 1.2245 2018/12/24 16:58:53 thorpej Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. ./etc/mtree/set.compcomp-sys-root @@ -11825,6 +11825,19 @@ ./usr/share/man/cat9/tc_syncbus.0 comp-sys-catman .cat ./usr/share/man/cat9/tc_wmb.0 comp-sys-catman .cat ./usr/share/man/cat9/tcp_congctl.0 comp-sys-catman .cat +./usr/share/man/cat9/threadpool.0 comp-sys-catman .cat +./usr/share/man/cat9/threadpool_get.0 comp-sys-catman .cat +./usr/share/man/cat9/threadpool_put.0 comp-sys-catman .cat +./usr/share/man/cat9/threadpool_percpu_get.0 comp-sys-catman .cat +./usr/share/man/cat9/threadpool_percpu_put.0 comp-sys-catman .cat +./usr/share/man/cat9/threadpool_percpu_ref.0 comp-sys-catman .cat +./usr/share/man/cat9/threadpool_percpu_ref_remote.0 comp-sys-catman .cat +./usr/share/man/cat9/threadpool_job_init.0 comp-sys-catman .cat +./usr/share/man/cat9/threadpool_job_destroy.0 comp-sys-catman .cat +./usr/share/man/cat9/threadpool_job_done.0 comp-sys-catman .cat +./usr/share/man/cat9/threadpool_schedule_job.0 comp-sys-catman .cat +./usr/share/man/cat9/threadpool_cancel_job.0 comp-sys-catman .cat +./usr/share/man/cat9/threadpool_cancel_job_async.0 comp-sys-catman .cat ./usr/share/man/cat9/tick.0 comp-sys-catman .cat ./usr/share/man/cat9/tickadj.0 comp-sys-catman .cat ./usr/share/man/cat9/time.0 comp-obsolete obsolete @@ -19645,6 +19658,19 @@ ./usr/share/man/html9/tc_syncbus.html comp-sys-htmlman html ./usr/share/man/html9/tc_wmb.html comp-sys-htmlman html ./usr/share/man/html9/tcp_congctl.html comp-sys-htmlman html +./usr/share/man/html9/threadpool.html comp-sys-htmlman html +./usr/share/man/html9/threadpool_get.html comp-sys-htmlman html +./usr/share/man/html9/threadpool_put.html comp-sys-htmlman html +./usr/share/man/html9/threadpool_percpu_get.html comp-sys-htmlman html
CVS commit: src/sys/sys
Module Name:src
Committed By: maxv
Date: Mon Dec 24 16:04:14 UTC 2018
Modified Files:
src/sys/sys: verified_exec.h
Log Message:
Remove unused macros.
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/sys/verified_exec.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/verified_exec.h
diff -u src/sys/sys/verified_exec.h:1.58 src/sys/sys/verified_exec.h:1.59
--- src/sys/sys/verified_exec.h:1.58 Fri Nov 19 06:44:34 2010
+++ src/sys/sys/verified_exec.h Mon Dec 24 16:04:14 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: verified_exec.h,v 1.58 2010/11/19 06:44:34 dholland Exp $ */
+/* $NetBSD: verified_exec.h,v 1.59 2018/12/24 16:04:14 maxv Exp $ */
/*-
* Copyright (c) 2005, 2006 Elad Efrat
@@ -77,26 +77,6 @@ struct vm_page;
#if defined(_KERNEL) && !defined(HAVE_NBTOOL_CONFIG_H)
-#if NVERIEXEC > 0
-/* FUTURE: remove this macro entirely - dholland 20100215 */
-#define VERIEXEC_PATH_GET(from, cto, to) \
- do { \
- to = NULL; \
- cto = from; \
- } \
- } while (/*CONSTCOND*/0)
-#define VERIEXEC_PATH_PUT(to) \
- do { \
- (void)(to); \
- } while (/*CONSTCOND*/0)
-#else
-#define VERIEXEC_PATH_GET(from, cto, to) \
- cto = from
-#define VERIEXEC_PATH_PUT(to) \
- (void)to
-
-#endif
-
/*
* Fingerprint operations vector for Veriexec.
* Function types: init, update, final.
CVS commit: src/sys/netipsec
Module Name:src
Committed By: maxv
Date: Mon Dec 24 15:57:15 UTC 2018
Modified Files:
src/sys/netipsec: keysock.c keysock.h
Log Message:
Remove unused function.
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sys/netipsec/keysock.c
cvs rdiff -u -r1.11 -r1.12 src/sys/netipsec/keysock.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/netipsec/keysock.c
diff -u src/sys/netipsec/keysock.c:1.66 src/sys/netipsec/keysock.c:1.67
--- src/sys/netipsec/keysock.c:1.66 Thu Nov 8 04:30:38 2018
+++ src/sys/netipsec/keysock.c Mon Dec 24 15:57:15 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: keysock.c,v 1.66 2018/11/08 04:30:38 roy Exp $ */
+/* $NetBSD: keysock.c,v 1.67 2018/12/24 15:57:15 maxv Exp $ */
/* $FreeBSD: keysock.c,v 1.3.2.1 2003/01/24 05:11:36 sam Exp $ */
/* $KAME: keysock.c,v 1.25 2001/08/13 20:07:41 itojun Exp $ */
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: keysock.c,v 1.66 2018/11/08 04:30:38 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: keysock.c,v 1.67 2018/12/24 15:57:15 maxv Exp $");
/* This code has derived from sys/net/rtsock.c on FreeBSD2.2.5 */
@@ -218,98 +218,6 @@ key_sendup0(
return error;
}
-/* XXX this interface should be obsoleted. */
-int
-key_sendup(struct socket *so, struct sadb_msg *msg, u_int len,
- int target) /*target of the resulting message*/
-{
- struct mbuf *m, *n, *mprev;
- int tlen;
-
- KASSERT(so != NULL);
- KASSERT(msg != NULL);
-
- if (KEYDEBUG_ON(KEYDEBUG_KEY_DUMP)) {
- printf("key_sendup: \n");
- kdebug_sadb(msg);
- }
-
- /*
- * we increment statistics here, just in case we have ENOBUFS
- * in this function.
- */
- {
- uint64_t *ps = PFKEY_STAT_GETREF();
- ps[PFKEY_STAT_IN_TOTAL]++;
- ps[PFKEY_STAT_IN_BYTES] += len;
- ps[PFKEY_STAT_IN_MSGTYPE + msg->sadb_msg_type]++;
- PFKEY_STAT_PUTREF();
- }
-
- /*
- * Get mbuf chain whenever possible (not clusters),
- * to save socket buffer. We'll be generating many SADB_ACQUIRE
- * messages to listening key sockets. If we simply allocate clusters,
- * sbappendaddr() will raise ENOBUFS due to too little sbspace().
- * sbspace() computes # of actual data bytes AND mbuf region.
- *
- * TODO: SADB_ACQUIRE filters should be implemented.
- */
- tlen = len;
- m = mprev = NULL;
- while (tlen > 0) {
- int mlen;
- if (tlen == len) {
- MGETHDR(n, M_DONTWAIT, MT_DATA);
- mlen = MHLEN;
- } else {
- MGET(n, M_DONTWAIT, MT_DATA);
- mlen = MLEN;
- }
- if (!n) {
- PFKEY_STATINC(PFKEY_STAT_IN_NOMEM);
- return ENOBUFS;
- }
- n->m_len = mlen;
- if (tlen >= MCLBYTES) { /*XXX better threshold? */
- MCLGET(n, M_DONTWAIT);
- if ((n->m_flags & M_EXT) == 0) {
-m_free(n);
-m_freem(m);
-PFKEY_STATINC(PFKEY_STAT_IN_NOMEM);
-return ENOBUFS;
- }
- n->m_len = MCLBYTES;
- }
-
- if (tlen < n->m_len)
- n->m_len = tlen;
- n->m_next = NULL;
- if (m == NULL)
- m = mprev = n;
- else {
- mprev->m_next = n;
- mprev = n;
- }
- tlen -= n->m_len;
- n = NULL;
- }
- m->m_pkthdr.len = len;
- m_reset_rcvif(m);
- m_copyback(m, 0, len, msg);
-
- /* avoid duplicated statistics */
- {
- uint64_t *ps = PFKEY_STAT_GETREF();
- ps[PFKEY_STAT_IN_TOTAL]--;
- ps[PFKEY_STAT_IN_BYTES] -= len;
- ps[PFKEY_STAT_IN_MSGTYPE + msg->sadb_msg_type]--;
- PFKEY_STAT_PUTREF();
- }
-
- return key_sendup_mbuf(so, m, target);
-}
-
/* so can be NULL if target != KEY_SENDUP_ONE */
static int
_key_sendup_mbuf(struct socket *so, struct mbuf *m,
Index: src/sys/netipsec/keysock.h
diff -u src/sys/netipsec/keysock.h:1.11 src/sys/netipsec/keysock.h:1.12
--- src/sys/netipsec/keysock.h:1.11 Thu Apr 19 08:27:39 2018
+++ src/sys/netipsec/keysock.h Mon Dec 24 15:57:15 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: keysock.h,v 1.11 2018/04/19 08:27:39 maxv Exp $ */
+/* $NetBSD: keysock.h,v 1.12 2018/12/24 15:57:15 maxv Exp $ */
/* $FreeBSD: keysock.h,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $ */
/* $KAME: keysock.h,v 1.8 2000/03/27 05:11:06 sumikawa Exp $ */
@@ -74,8 +74,7 @@ struct keycb {
void key_init_so(void);
-int key_sendup (struct socket *, struct sadb_msg *, u_int, int);
-int key_sendup_mbuf (struct socket *, struct mbuf *, int);
+int key_sendup_mbuf(struct socket *, struct mbuf *, int);
#endif /* _KERNEL */
#endif /* !_NETIPSEC_KEYSOCK_H_ */
CVS commit: src/sys/arch
Module Name:src
Committed By: cherry
Date: Mon Dec 24 14:55:42 UTC 2018
Modified Files:
src/sys/arch/x86/x86: intr.c
src/sys/arch/xen/include: intr.h
src/sys/arch/xen/x86: xen_intr.c xen_ipi.c
src/sys/arch/xen/xen: clock.c if_xennet_xenbus.c pciback.c xbd_xenbus.c
xbdback_xenbus.c xencons.c xenevt.c xennetback_xenbus.c
xpci_xenbus.c
src/sys/arch/xen/xenbus: xenbus_comms.c
Log Message:
Bifurcate the interrupt establish functions between XEN and non-XEN
Thus intr_establish_xname() becomes xen_intr_establish_xname() etc.
One consequence of this is that dom0 devices expect the native
function calls to be available and we thus provide weak aliasing for
dom0 builds to succeed. XEN and non-XEN devices are distinguished by
the PIC they are established on. XEN interrupts are exclusively
established on xen_pic, while dom0 interrupts are established on
natively available PICs.
This allows us an orthogonal path to xen device management (eg:
xenstore events) in XENPVHVM, without having to worry about unifying
the vector entry paths, etc., which is quite challenging.
To generate a diff of this commit:
cvs rdiff -u -r1.138 -r1.139 src/sys/arch/x86/x86/intr.c
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/xen/include/intr.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/xen/x86/xen_intr.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/xen/x86/xen_ipi.c
cvs rdiff -u -r1.74 -r1.75 src/sys/arch/xen/xen/clock.c
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/xen/xen/if_xennet_xenbus.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/xen/xen/pciback.c
cvs rdiff -u -r1.90 -r1.91 src/sys/arch/xen/xen/xbd_xenbus.c
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/xen/xen/xbdback_xenbus.c
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/xen/xen/xencons.c
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/xen/xen/xenevt.c
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/xen/xen/xennetback_xenbus.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/xen/xen/xpci_xenbus.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/xen/xenbus/xenbus_comms.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/x86/intr.c
diff -u src/sys/arch/x86/x86/intr.c:1.138 src/sys/arch/x86/x86/intr.c:1.139
--- src/sys/arch/x86/x86/intr.c:1.138 Sun Dec 23 12:11:40 2018
+++ src/sys/arch/x86/x86/intr.c Mon Dec 24 14:55:41 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.138 2018/12/23 12:11:40 jdolecek Exp $ */
+/* $NetBSD: intr.c,v 1.139 2018/12/24 14:55:41 cherry Exp $ */
/*
* Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -133,7 +133,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.138 2018/12/23 12:11:40 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.139 2018/12/24 14:55:41 cherry Exp $");
#include "opt_intrdebug.h"
#include "opt_multiprocessor.h"
@@ -1207,117 +1207,12 @@ intr_num_handlers(struct intrsource *isp
return num;
}
-#else /* XEN */
-void *
-intr_establish(int legacy_irq, struct pic *pic, int pin,
-int type, int level, int (*handler)(void *), void *arg,
-bool known_mpsafe)
-{
-
- return intr_establish_xname(legacy_irq, pic, pin, type, level,
- handler, arg, known_mpsafe, "XEN");
-}
-
-void *
-intr_establish_xname(int legacy_irq, struct pic *pic, int pin,
-int type, int level, int (*handler)(void *), void *arg,
-bool known_mpsafe, const char *xname)
-{
- const char *intrstr;
- char intrstr_buf[INTRIDBUF];
-
- if (pic->pic_type == PIC_XEN) {
- struct intrhand *rih;
-
- /*
- * event_set_handler interprets `level != IPL_VM' to
- * mean MP-safe, so we require the caller to match that
- * for the moment.
- */
- KASSERT(known_mpsafe == (level != IPL_VM));
-
- intrstr = intr_create_intrid(legacy_irq, pic, pin, intrstr_buf,
- sizeof(intrstr_buf));
-
- event_set_handler(pin, handler, arg, level, intrstr, xname);
-
- rih = kmem_zalloc(sizeof(*rih), cold ? KM_NOSLEEP : KM_SLEEP);
- if (rih == NULL) {
- printf("%s: can't allocate handler info\n", __func__);
- return NULL;
- }
-
- /*
- * XXX:
- * This is just a copy for API conformance.
- * The real ih is lost in the innards of
- * event_set_handler(); where the details of
- * biglock_wrapper etc are taken care of.
- * All that goes away when we nuke event_set_handler()
- * et. al. and unify with x86/intr.c
- */
- rih->ih_pin = pin; /* port */
- rih->ih_fun = rih->ih_realfun = handler;
- rih->ih_arg = rih->ih_realarg = arg;
- rih->pic_type = pic->pic_type;
- return rih;
- } /* Else we assume pintr */
-
-#if NPCI > 0 || NISA > 0
- struct pintrhand *pih;
- int gsi;
- int vector, evtchn;
-
- KASSERTMSG(legacy_irq == -1 || (0 <= legacy_irq && legacy_irq < NUM_XEN_IRQS),
- "bad legacy IRQ value: %d", legacy_irq);
- KASSERTMSG(!(legacy_irq == -1 && pic == _pic),
- "non-legacy IRQon i8259 ");
-
- gsi = xen_pic_to_gsi(pic, pin);
-
- intrstr = intr_create_intrid(gsi, pic, pin, intrstr_buf,
-
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: christos Date: Mon Dec 24 13:31:22 UTC 2018 Modified Files: src/distrib/sets/lists/debug: md.amd64 Log Message: add missing test To generate a diff of this commit: cvs rdiff -u -r1.103 -r1.104 src/distrib/sets/lists/debug/md.amd64 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/debug/md.amd64 diff -u src/distrib/sets/lists/debug/md.amd64:1.103 src/distrib/sets/lists/debug/md.amd64:1.104 --- src/distrib/sets/lists/debug/md.amd64:1.103 Sun Nov 11 07:03:08 2018 +++ src/distrib/sets/lists/debug/md.amd64 Mon Dec 24 08:31:22 2018 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.103 2018/11/11 12:03:08 maxv Exp $ +# $NetBSD: md.amd64,v 1.104 2018/12/24 13:31:22 christos Exp $ ./usr/lib/i386/12.202++_g.a comp-c-debuglib debuglib,compat,12.202xx ./usr/lib/i386/libi386_g.a comp-c-debuglib debuglib,compat ./usr/lib/i386/libiberty_g.a comp-obsolete obsolete @@ -24,3 +24,4 @@ ./usr/libdata/debug/usr/tests/kernel/arch/x86/t_ptrace_wait6.debug tests-obsolete obsolete ./usr/libdata/debug/usr/tests/kernel/arch/x86/t_ptrace_waitid.debug tests-obsolete obsolete ./usr/libdata/debug/usr/tests/kernel/arch/x86/t_ptrace_waitpid.debug tests-obsolete obsolete +./usr/libdata/debug/usr/tests/lib/libnvmm/h_mem_assist.debug tests-lib-debug debug,atf
CVS commit: src/sys/external/bsd/drm2/nouveau
Module Name:src Committed By: mrg Date: Mon Dec 24 08:40:33 UTC 2018 Modified Files: src/sys/external/bsd/drm2/nouveau: nouveau_pci.c Log Message: don't attach to new turing based nouveau cards. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/external/bsd/drm2/nouveau/nouveau_pci.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/external/bsd/drm2/nouveau/nouveau_pci.c diff -u src/sys/external/bsd/drm2/nouveau/nouveau_pci.c:1.22 src/sys/external/bsd/drm2/nouveau/nouveau_pci.c:1.23 --- src/sys/external/bsd/drm2/nouveau/nouveau_pci.c:1.22 Mon Dec 24 08:26:04 2018 +++ src/sys/external/bsd/drm2/nouveau/nouveau_pci.c Mon Dec 24 08:40:33 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: nouveau_pci.c,v 1.22 2018/12/24 08:26:04 mrg Exp $ */ +/* $NetBSD: nouveau_pci.c,v 1.23 2018/12/24 08:40:33 mrg Exp $ */ /*- * Copyright (c) 2015 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: nouveau_pci.c,v 1.22 2018/12/24 08:26:04 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nouveau_pci.c,v 1.23 2018/12/24 08:40:33 mrg Exp $"); #include #include @@ -98,7 +98,7 @@ nouveau_pci_match(device_t parent, cfdat #define IS_BETWEEN(x,y) \ (PCI_PRODUCT(pa->pa_id) >= (x) && PCI_PRODUCT(pa->pa_id) <= (y)) /* - * NetBSD drm2 doesn't support Pascal-based cards: + * NetBSD drm2 doesn't support Pascal, Volta or Turing based cards: * 0x1580-0x15ff GP100 * 0x1b00-0x1b7f GP102 * 0x1b80-0x1bff GP104 @@ -106,6 +106,9 @@ nouveau_pci_match(device_t parent, cfdat * 0x1c80-0x1cff GP107 * 0x1d00-0x1d7f GP108 * 0x1d80-0x1dff GV100 + * 0x1e00-0x1e7f TU102 + * 0x1e80-0x1eff TU104 + * 0x1f00-0x1f7f TU106 */ if (IS_BETWEEN(0x1580, 0x15ff) || @@ -114,7 +117,10 @@ nouveau_pci_match(device_t parent, cfdat IS_BETWEEN(0x1c00, 0x1c7f) || IS_BETWEEN(0x1c80, 0x1cff) || IS_BETWEEN(0x1d00, 0x1d7f) || - IS_BETWEEN(0x1d80, 0x1dff)) + IS_BETWEEN(0x1d80, 0x1dff) || + IS_BETWEEN(0x1e00, 0x1e7f) || + IS_BETWEEN(0x1e80, 0x1eff) || + IS_BETWEEN(0x1f00, 0x1f7f)) return 0; #undef IS_BETWEEN
CVS commit: src/etc/mtree
Module Name:src Committed By: plunky Date: Mon Dec 24 08:31:08 UTC 2018 Modified Files: src/etc/mtree: NetBSD.dist.base Log Message: remove lwresd as now obsolete To generate a diff of this commit: cvs rdiff -u -r1.181 -r1.182 src/etc/mtree/NetBSD.dist.base Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.base diff -u src/etc/mtree/NetBSD.dist.base:1.181 src/etc/mtree/NetBSD.dist.base:1.182 --- src/etc/mtree/NetBSD.dist.base:1.181 Wed Dec 19 13:57:44 2018 +++ src/etc/mtree/NetBSD.dist.base Mon Dec 24 08:31:08 2018 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.base,v 1.181 2018/12/19 13:57:44 maxv Exp $ +# $NetBSD: NetBSD.dist.base,v 1.182 2018/12/24 08:31:08 plunky Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -1266,7 +1266,6 @@ ./var/chroot/named/usr/libexec ./var/chroot/named/var ./var/chroot/named/var/run mode=0775 gname=named -./var/chroot/named/var/run/lwresd mode=0775 gname=named ./var/chroot/named/var/run/named mode=0775 gname=named ./var/chroot/named/var/tmp mode=01775 gname=named ./var/chroot/nsd mode=0755 uname=_nsd gname=_nsd @@ -1318,7 +1317,6 @@ ./var/preserve ./var/quotas gname=operator mode=0750 ./var/run -./var/run/lwresd mode=0775 gname=named ./var/run/named mode=0775 gname=named ./var/rwho uname=_rwhod gname=_rwhod ./var/shm mode=01777
CVS commit: src/sys/external/bsd/drm2/nouveau
Module Name:src Committed By: mrg Date: Mon Dec 24 08:26:04 UTC 2018 Modified Files: src/sys/external/bsd/drm2/nouveau: nouveau_pci.c Log Message: this works well enough to start and have basic accel only on GTX 750, so enable those cards. maybe can enable some pascal cards too. thanks to fly for fixing nouveau drm2 so it was worth trying :-) To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/external/bsd/drm2/nouveau/nouveau_pci.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/external/bsd/drm2/nouveau/nouveau_pci.c diff -u src/sys/external/bsd/drm2/nouveau/nouveau_pci.c:1.21 src/sys/external/bsd/drm2/nouveau/nouveau_pci.c:1.22 --- src/sys/external/bsd/drm2/nouveau/nouveau_pci.c:1.21 Tue Aug 28 03:34:07 2018 +++ src/sys/external/bsd/drm2/nouveau/nouveau_pci.c Mon Dec 24 08:26:04 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: nouveau_pci.c,v 1.21 2018/08/28 03:34:07 riastradh Exp $ */ +/* $NetBSD: nouveau_pci.c,v 1.22 2018/12/24 08:26:04 mrg Exp $ */ /*- * Copyright (c) 2015 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: nouveau_pci.c,v 1.21 2018/08/28 03:34:07 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nouveau_pci.c,v 1.22 2018/12/24 08:26:04 mrg Exp $"); #include #include @@ -98,13 +98,6 @@ nouveau_pci_match(device_t parent, cfdat #define IS_BETWEEN(x,y) \ (PCI_PRODUCT(pa->pa_id) >= (x) && PCI_PRODUCT(pa->pa_id) <= (y)) /* - * NetBSD drm2 needs missing-so-far firmware for Maxwell-based cards: - * 0x1380-0x13bf GM107 - */ - if (IS_BETWEEN(0x1380, 0x13bf)) - return 0; - - /* * NetBSD drm2 doesn't support Pascal-based cards: * 0x1580-0x15ff GP100 * 0x1b00-0x1b7f GP102
