CVS commit: src/sys/arch/riscv
Module Name:src
Committed By: matt
Date: Tue Mar 31 06:47:47 UTC 2015
Modified Files:
src/sys/arch/riscv/include: proc.h
src/sys/arch/riscv/riscv: genassym.cf locore.S
Log Message:
Optimize the exception handle a little bit more.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/riscv/include/proc.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/riscv/riscv/genassym.cf \
src/sys/arch/riscv/riscv/locore.S
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/riscv/include/proc.h
diff -u src/sys/arch/riscv/include/proc.h:1.2 src/sys/arch/riscv/include/proc.h:1.3
--- src/sys/arch/riscv/include/proc.h:1.2 Tue Mar 31 01:12:29 2015
+++ src/sys/arch/riscv/include/proc.h Tue Mar 31 06:47:47 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: proc.h,v 1.2 2015/03/31 01:12:29 matt Exp $ */
+/* $NetBSD: proc.h,v 1.3 2015/03/31 06:47:47 matt Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@ struct mdlwp {
struct trapframe *md_utf; /* trapframe from userspace */
struct trapframe *md_ktf; /* trapframe from userspace */
struct faultbuf *md_onfault; /* registers to store on fault */
- register_t md_tp; /* for locore.S */
+ register_t md_usp; /* for locore.S */
vaddr_t md_ss_addr; /* single step address for ptrace */
int md_ss_instr; /* single step instruction for ptrace */
volatile int md_astpending; /* AST pending on return to userland */
Index: src/sys/arch/riscv/riscv/genassym.cf
diff -u src/sys/arch/riscv/riscv/genassym.cf:1.2 src/sys/arch/riscv/riscv/genassym.cf:1.3
--- src/sys/arch/riscv/riscv/genassym.cf:1.2 Tue Mar 31 01:12:47 2015
+++ src/sys/arch/riscv/riscv/genassym.cf Tue Mar 31 06:47:47 2015
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.2 2015/03/31 01:12:47 matt Exp $
+# $NetBSD: genassym.cf,v 1.3 2015/03/31 06:47:47 matt Exp $
#-
# Copyright (c) 2014 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -114,7 +114,7 @@ define L_CPU offsetof(struct lwp, l_cpu
define L_CTXSWTCH offsetof(struct lwp, l_ctxswtch)
define L_MD_ASTPENDING offsetof(struct lwp, l_md.md_astpending)
define L_MD_ONFAULT offsetof(struct lwp, l_md.md_onfault)
-define L_MD_TP offsetof(struct lwp, l_md.md_tp)
+define L_MD_USP offsetof(struct lwp, l_md.md_usp)
define L_MD_UTF offsetof(struct lwp, l_md.md_utf)
define L_MD_KTF offsetof(struct lwp, l_md.md_ktf)
define L_PCB offsetof(struct lwp, l_addr)
Index: src/sys/arch/riscv/riscv/locore.S
diff -u src/sys/arch/riscv/riscv/locore.S:1.2 src/sys/arch/riscv/riscv/locore.S:1.3
--- src/sys/arch/riscv/riscv/locore.S:1.2 Tue Mar 31 01:30:50 2015
+++ src/sys/arch/riscv/riscv/locore.S Tue Mar 31 06:47:47 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.2 2015/03/31 01:30:50 matt Exp $ */
+/* $NetBSD: locore.S,v 1.3 2015/03/31 06:47:47 matt Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -306,8 +306,8 @@ END(cpu_fast_switchto)
// RISCV only has a simple exception handler handles both synchronous traps
// and interrupts.
ENTRY_NP(cpu_exception_handler)
- csrrw sp, sscratch, sp // swap scratch and stack pointer
- beqz sp, .Lexception_kernel // sp == 0, already on kernel stack
+ csrrw tp, sscratch, tp // swap scratch and thread pointer
+ beqz tp, .Lexception_kernel // tp == 0, already on kernel stack
//
// The execption happened while user code was executing. We need to
// get the pointer to the user trapframe from the LWP md area. Then we
@@ -315,14 +315,14 @@ ENTRY_NP(cpu_exception_handler)
// into tp. We also save the saved SP into the trapframe.
// Upon entry on an exception from user, sscratch will contain curlwp.
//
- REG_S tp, L_MD_TP(sp) // save thread pointer temporarily
- mv tp, sp // put curlwp in thread pointer
+ REG_S sp, L_MD_USP(tp) // save user stack pointer temporarily
PTR_L sp, L_MD_UTF(sp) // trapframe pointer loaded
REG_S t1, TF_T1(sp) // save t1
- csrrw t1, sscratch, zero // save saved stack pointer with 0
- REG_S t1, TF_SP(sp) // save stack pointer
- REG_S t1, L_MD_TP(tp) // get thread pointer from temp store
+ REG_S t1, L_MD_USP(tp) // get user stack pointer
REG_L t1, TF_SP(sp) // save thread pointer in trapframe
+ csrrw t1, sscratch, zero // swap saved thread pointer with 0
+ REG_L t1, TF_TP(sp) // save thread pointer in trapframe
+ li t1, 0 // indicate user exception
j .Lexception_common
//
@@ -333,11 +333,13 @@ ENTRY_NP(cpu_exception_handler)
// trapframe for use by the exception exiting code.
//
.Lexception_kernel:
- csrrw sp, sscratch, zero // get back our stack pointer
+ csrrw tp, sscratch, zero // get back our thread pointer
addi sp, sp, -TF_LEN // allocate stack frame
REG_S t1, TF_T1(sp) // save t1
addi t1, sp, TF_LEN
REG_S t1, TF_SP(sp) // save SP
+ li t1, 1 // indicate kernel exception
+
.Lexception_common:
// Now we save all the temporary registers into the trapframe since
CVS commit: src/sys/arch/riscv
Module Name:src Committed By: matt Date: Tue Mar 31 06:47:47 UTC 2015 Modified Files: src/sys/arch/riscv/include: proc.h src/sys/arch/riscv/riscv: genassym.cf locore.S Log Message: Optimize the exception handle a little bit more. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/riscv/include/proc.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/riscv/riscv/genassym.cf \ src/sys/arch/riscv/riscv/locore.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: martin Date: Tue Mar 31 07:57:57 UTC 2015 Modified Files: src/usr.sbin/postinstall: postinstall Log Message: Add resize_root To generate a diff of this commit: cvs rdiff -u -r1.190 -r1.191 src/usr.sbin/postinstall/postinstall Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/postinstall/postinstall diff -u src/usr.sbin/postinstall/postinstall:1.190 src/usr.sbin/postinstall/postinstall:1.191 --- src/usr.sbin/postinstall/postinstall:1.190 Sat Mar 21 19:10:43 2015 +++ src/usr.sbin/postinstall/postinstall Tue Mar 31 07:57:57 2015 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: postinstall,v 1.190 2015/03/21 19:10:43 jmcneill Exp $ +# $NetBSD: postinstall,v 1.191 2015/03/31 07:57:57 martin Exp $ # # Copyright (c) 2002-2008 The NetBSD Foundation, Inc. # All rights reserved. @@ -1399,6 +1399,7 @@ raidframeparity random_seed rarpd rbootd +resize_root rndctl root route6d
CVS commit: src/sys/netinet
Module Name:src Committed By: ozaki-r Date: Tue Mar 31 08:44:43 UTC 2015 Modified Files: src/sys/netinet: ip_output.c Log Message: Add missing ifdef IPSEC To generate a diff of this commit: cvs rdiff -u -r1.234 -r1.235 src/sys/netinet/ip_output.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/netinet/ip_output.c diff -u src/sys/netinet/ip_output.c:1.234 src/sys/netinet/ip_output.c:1.235 --- src/sys/netinet/ip_output.c:1.234 Mon Mar 23 18:33:17 2015 +++ src/sys/netinet/ip_output.c Tue Mar 31 08:44:43 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_output.c,v 1.234 2015/03/23 18:33:17 roy Exp $ */ +/* $NetBSD: ip_output.c,v 1.235 2015/03/31 08:44:43 ozaki-r Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -91,7 +91,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ip_output.c,v 1.234 2015/03/23 18:33:17 roy Exp $); +__KERNEL_RCSID(0, $NetBSD: ip_output.c,v 1.235 2015/03/31 08:44:43 ozaki-r Exp $); #include opt_inet.h #include opt_ipsec.h @@ -132,8 +132,10 @@ __KERNEL_RCSID(0, $NetBSD: ip_output.c, #include netinet/ip_mroute.h #endif +#ifdef IPSEC #include netipsec/ipsec.h #include netipsec/key.h +#endif static int ip_pcbopts(struct inpcb *, const struct sockopt *); static struct mbuf *ip_insertoptions(struct mbuf *, struct mbuf *, int *);
CVS commit: src/sys/netinet
Module Name:src Committed By: ozaki-r Date: Tue Mar 31 08:44:43 UTC 2015 Modified Files: src/sys/netinet: ip_output.c Log Message: Add missing ifdef IPSEC To generate a diff of this commit: cvs rdiff -u -r1.234 -r1.235 src/sys/netinet/ip_output.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/netinet
Module Name:src
Committed By: ozaki-r
Date: Tue Mar 31 08:47:01 UTC 2015
Modified Files:
src/sys/netinet: tcp_sack.c tcp_usrreq.c tcp_vtw.c
Log Message:
Remove unnecessary opt_ipsec.h inclusions
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/netinet/tcp_sack.c
cvs rdiff -u -r1.203 -r1.204 src/sys/netinet/tcp_usrreq.c
cvs rdiff -u -r1.12 -r1.13 src/sys/netinet/tcp_vtw.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/tcp_sack.c
diff -u src/sys/netinet/tcp_sack.c:1.30 src/sys/netinet/tcp_sack.c:1.31
--- src/sys/netinet/tcp_sack.c:1.30 Mon Nov 10 18:52:51 2014
+++ src/sys/netinet/tcp_sack.c Tue Mar 31 08:47:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_sack.c,v 1.30 2014/11/10 18:52:51 maxv Exp $ */
+/* $NetBSD: tcp_sack.c,v 1.31 2015/03/31 08:47:01 ozaki-r Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -102,10 +102,9 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tcp_sack.c,v 1.30 2014/11/10 18:52:51 maxv Exp $);
+__KERNEL_RCSID(0, $NetBSD: tcp_sack.c,v 1.31 2015/03/31 08:47:01 ozaki-r Exp $);
#include opt_inet.h
-#include opt_ipsec.h
#include opt_inet_csum.h
#include opt_tcp_debug.h
#include opt_ddb.h
Index: src/sys/netinet/tcp_usrreq.c
diff -u src/sys/netinet/tcp_usrreq.c:1.203 src/sys/netinet/tcp_usrreq.c:1.204
--- src/sys/netinet/tcp_usrreq.c:1.203 Sat Feb 14 12:57:53 2015
+++ src/sys/netinet/tcp_usrreq.c Tue Mar 31 08:47:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_usrreq.c,v 1.203 2015/02/14 12:57:53 he Exp $ */
+/* $NetBSD: tcp_usrreq.c,v 1.204 2015/03/31 08:47:01 ozaki-r Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -99,10 +99,9 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tcp_usrreq.c,v 1.203 2015/02/14 12:57:53 he Exp $);
+__KERNEL_RCSID(0, $NetBSD: tcp_usrreq.c,v 1.204 2015/03/31 08:47:01 ozaki-r Exp $);
#include opt_inet.h
-#include opt_ipsec.h
#include opt_tcp_debug.h
#include opt_mbuftrace.h
Index: src/sys/netinet/tcp_vtw.c
diff -u src/sys/netinet/tcp_vtw.c:1.12 src/sys/netinet/tcp_vtw.c:1.13
--- src/sys/netinet/tcp_vtw.c:1.12 Mon Nov 10 18:52:51 2014
+++ src/sys/netinet/tcp_vtw.c Tue Mar 31 08:47:01 2015
@@ -78,7 +78,6 @@
#include opt_ddb.h
#include opt_inet.h
-#include opt_ipsec.h
#include opt_inet_csum.h
#include opt_tcp_debug.h
@@ -123,7 +122,7 @@
#include netinet/tcp_vtw.h
-__KERNEL_RCSID(0, $NetBSD: tcp_vtw.c,v 1.12 2014/11/10 18:52:51 maxv Exp $);
+__KERNEL_RCSID(0, $NetBSD: tcp_vtw.c,v 1.13 2015/03/31 08:47:01 ozaki-r Exp $);
#define db_trace(__a, __b) do { } while (/*CONSTCOND*/0)
CVS commit: src/sys/netinet
Module Name:src Committed By: ozaki-r Date: Tue Mar 31 08:47:01 UTC 2015 Modified Files: src/sys/netinet: tcp_sack.c tcp_usrreq.c tcp_vtw.c Log Message: Remove unnecessary opt_ipsec.h inclusions To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/netinet/tcp_sack.c cvs rdiff -u -r1.203 -r1.204 src/sys/netinet/tcp_usrreq.c cvs rdiff -u -r1.12 -r1.13 src/sys/netinet/tcp_vtw.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: martin Date: Tue Mar 31 07:57:57 UTC 2015 Modified Files: src/usr.sbin/postinstall: postinstall Log Message: Add resize_root To generate a diff of this commit: cvs rdiff -u -r1.190 -r1.191 src/usr.sbin/postinstall/postinstall Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/riscv/riscv
Module Name:src Committed By: matt Date: Tue Mar 31 11:48:10 UTC 2015 Modified Files: src/sys/arch/riscv/riscv: locore.S Log Message: Fix botch on putting user stack pointer into trapframe. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/riscv/riscv/locore.S 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/riscv/riscv/locore.S diff -u src/sys/arch/riscv/riscv/locore.S:1.3 src/sys/arch/riscv/riscv/locore.S:1.4 --- src/sys/arch/riscv/riscv/locore.S:1.3 Tue Mar 31 06:47:47 2015 +++ src/sys/arch/riscv/riscv/locore.S Tue Mar 31 11:48:10 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.3 2015/03/31 06:47:47 matt Exp $ */ +/* $NetBSD: locore.S,v 1.4 2015/03/31 11:48:10 matt Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. * All rights reserved. @@ -318,8 +318,8 @@ ENTRY_NP(cpu_exception_handler) REG_S sp, L_MD_USP(tp) // save user stack pointer temporarily PTR_L sp, L_MD_UTF(sp) // trapframe pointer loaded REG_S t1, TF_T1(sp) // save t1 - REG_S t1, L_MD_USP(tp) // get user stack pointer - REG_L t1, TF_SP(sp) // save thread pointer in trapframe + REG_L t1, L_MD_USP(tp) // get user stack pointer + REG_S t1, TF_SP(sp) // save thread pointer in trapframe csrrw t1, sscratch, zero // swap saved thread pointer with 0 REG_L t1, TF_TP(sp) // save thread pointer in trapframe li t1, 0 // indicate user exception
CVS commit: src/sys/arch/riscv/riscv
Module Name:src Committed By: matt Date: Tue Mar 31 11:48:10 UTC 2015 Modified Files: src/sys/arch/riscv/riscv: locore.S Log Message: Fix botch on putting user stack pointer into trapframe. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/riscv/riscv/locore.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/riscv/riscv
Module Name:src Committed By: matt Date: Tue Mar 31 11:53:14 UTC 2015 Modified Files: src/sys/arch/riscv/riscv: locore.S Log Message: Accept the one instruction penalty and just use PTR_LA instead of doing the relocs ourselves. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/riscv/riscv/locore.S 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/riscv/riscv/locore.S diff -u src/sys/arch/riscv/riscv/locore.S:1.4 src/sys/arch/riscv/riscv/locore.S:1.5 --- src/sys/arch/riscv/riscv/locore.S:1.4 Tue Mar 31 11:48:10 2015 +++ src/sys/arch/riscv/riscv/locore.S Tue Mar 31 11:53:13 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.4 2015/03/31 11:48:10 matt Exp $ */ +/* $NetBSD: locore.S,v 1.5 2015/03/31 11:53:13 matt Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. * All rights reserved. @@ -78,10 +78,10 @@ ENTRY_NP(start) call memset // zero through kernel_end // As a temporary hack, word 0 contains the amount of memory in MB - INT_L a7, (zero) // load memory size - slli a7, a7, (20-PGSHIFT) // convert MB to pages -.L01: auipc t0, %pcrel_hi(physmem) - INT_S a7, %pcrel_lo(.L01)(t0) // store it in physmem + INT_L a7, (zero) // load memory size + slli a7, a7, (20-PGSHIFT) // convert MB to pages +.L01: PTR_LA t0, physmem + INT_S a7, (t0) // store it in physmem li t4, PTE_V | PTE_SX | PTE_SW | PTE_SR | PTE_G #ifdef _LP64
CVS commit: src/sys/ufs/ufs
Module Name:src
Committed By: riastradh
Date: Tue Mar 31 11:43:05 UTC 2015
Modified Files:
src/sys/ufs/ufs: ufs_readwrite.c
Log Message:
Amplify that even if we fixed it now the tentacles are still stuck.
To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 src/sys/ufs/ufs/ufs_readwrite.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/ufs/ufs/ufs_readwrite.c
diff -u src/sys/ufs/ufs/ufs_readwrite.c:1.117 src/sys/ufs/ufs/ufs_readwrite.c:1.118
--- src/sys/ufs/ufs/ufs_readwrite.c:1.117 Tue Mar 31 00:22:50 2015
+++ src/sys/ufs/ufs/ufs_readwrite.c Tue Mar 31 11:43:05 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_readwrite.c,v 1.117 2015/03/31 00:22:50 riastradh Exp $ */
+/* $NetBSD: ufs_readwrite.c,v 1.118 2015/03/31 11:43:05 riastradh Exp $ */
/*-
* Copyright (c) 1993
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: ufs_readwrite.c,v 1.117 2015/03/31 00:22:50 riastradh Exp $);
+__KERNEL_RCSID(1, $NetBSD: ufs_readwrite.c,v 1.118 2015/03/31 11:43:05 riastradh Exp $);
#ifdef LFS_READWRITE
#define FS struct lfs
@@ -349,6 +349,11 @@ WRITE(void *v)
* genfs_getpages/putpages to cope with the possibility that
* the transaction may or may not be locked on entry to the
* page cache.
+ *
+ * And even if we added that notion to WAPBL, it wouldn't help
+ * us get rid of the tentacles in genfs_getpages/putpages
+ * because we'd have to interoperate with old implementations
+ * that assume they can replay the log without fsck.
*/
error = UFS_WAPBL_BEGIN(vp-v_mount);
if (error) {
CVS commit: src/sys/ufs/ufs
Module Name:src Committed By: riastradh Date: Tue Mar 31 11:43:05 UTC 2015 Modified Files: src/sys/ufs/ufs: ufs_readwrite.c Log Message: Amplify that even if we fixed it now the tentacles are still stuck. To generate a diff of this commit: cvs rdiff -u -r1.117 -r1.118 src/sys/ufs/ufs/ufs_readwrite.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/riscv/riscv
Module Name:src Committed By: matt Date: Tue Mar 31 11:53:14 UTC 2015 Modified Files: src/sys/arch/riscv/riscv: locore.S Log Message: Accept the one instruction penalty and just use PTR_LA instead of doing the relocs ourselves. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/riscv/riscv/locore.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sdpd
Module Name:src Committed By: plunky Date: Tue Mar 31 09:25:41 UTC 2015 Modified Files: src/usr.sbin/sdpd: service.c Log Message: fix typo: sparce-sparse To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sdpd/service.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libbluetooth
Module Name:src Committed By: plunky Date: Tue Mar 31 09:26:45 UTC 2015 Modified Files: src/lib/libbluetooth: sdp_data.3 Log Message: fix typo: sdp_seq_seq-sdp_set_seq To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/lib/libbluetooth/sdp_data.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/arch/riscv/riscv
Hi Matt, On Tue, Mar 31, 2015 at 01:30:50AM +, Matt Thomas wrote: When the cpu gets an exception from kernel mode, the sscratch register will be 0 and curlwp will be in the tp register. When the cpu gets an exception from user mode, the sscratch register will be a pointer to the current lwp. Will the kernel not be confused and choose the wrong path if a userland programs clears the sp register and gets an exception, say be storing a stack frame? by accident or deliberately? Index: src/sys/arch/riscv/riscv/locore.S diff -u src/sys/arch/riscv/riscv/locore.S:1.1 src/sys/arch/riscv/riscv/locore.S:1.2 --- src/sys/arch/riscv/riscv/locore.S:1.1 Sat Mar 28 16:13:56 2015 +++ src/sys/arch/riscv/riscv/locore.S Tue Mar 31 01:30:50 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.1 2015/03/28 16:13:56 matt Exp $ */ +/* $NetBSD: locore.S,v 1.2 2015/03/31 01:30:50 matt Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. * All rights reserved. @@ -78,10 +78,10 @@ ENTRY_NP(start) callmemset // zero through kernel_end // As a temporary hack, word 0 contains the amount of memory in MB - lw a7, (zero) // load memory size + INT_L a7, (zero) // load memory size sllia7, a7, (20-PGSHIFT)// convert MB to pages - auipc t0, %pcrel_hi(physmem) - sw a7, %pcrel_lo(physmem)(t0) // store it in physmem +.L01:auipc t0, %pcrel_hi(physmem) + INT_S a7, %pcrel_lo(.L01)(t0) // store it in physmem Why are you loading the lower PC relative part of .L01 in stead of physmem? won't that give the wrong lower bits? Isn't there a PTR_S macro to handle this? With regards, Reinoud pgpjQXdqjH9e1.pgp Description: PGP signature
CVS commit: src/usr.sbin/sdpd
Module Name:src Committed By: plunky Date: Tue Mar 31 09:25:41 UTC 2015 Modified Files: src/usr.sbin/sdpd: service.c Log Message: fix typo: sparce-sparse To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sdpd/service.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/sdpd/service.c diff -u src/usr.sbin/sdpd/service.c:1.2 src/usr.sbin/sdpd/service.c:1.3 --- src/usr.sbin/sdpd/service.c:1.2 Sun Mar 7 10:58:40 2010 +++ src/usr.sbin/sdpd/service.c Tue Mar 31 09:25:41 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: service.c,v 1.2 2010/03/07 10:58:40 plunky Exp $ */ +/* $NetBSD: service.c,v 1.3 2015/03/31 09:25:41 plunky Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__RCSID($NetBSD: service.c,v 1.2 2010/03/07 10:58:40 plunky Exp $); +__RCSID($NetBSD: service.c,v 1.3 2015/03/31 09:25:41 plunky Exp $); #include bluetooth.h #include sdp.h @@ -234,7 +234,7 @@ service_attribute_request(server_t *srv, /* * Match the selected record against AttributeIDList, writing - * the data to the sparce buffer. + * the data to the sparse buffer. */ r = NULL; db_next(srv, fd, r);
CVS commit: src/lib/libbluetooth
Module Name:src Committed By: plunky Date: Tue Mar 31 09:26:45 UTC 2015 Modified Files: src/lib/libbluetooth: sdp_data.3 Log Message: fix typo: sdp_seq_seq-sdp_set_seq To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/lib/libbluetooth/sdp_data.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libbluetooth/sdp_data.3 diff -u src/lib/libbluetooth/sdp_data.3:1.8 src/lib/libbluetooth/sdp_data.3:1.9 --- src/lib/libbluetooth/sdp_data.3:1.8 Thu Mar 15 19:04:46 2012 +++ src/lib/libbluetooth/sdp_data.3 Tue Mar 31 09:26:45 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: sdp_data.3,v 1.8 2012/03/15 19:04:46 njoly Exp $ +.\ $NetBSD: sdp_data.3,v 1.9 2015/03/31 09:26:45 plunky Exp $ .\ .\ Copyright (c) 2009 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -375,7 +375,7 @@ But, because the value of is unknown, the overall length of the ProtocolDataList may vary depending if 8, 16 or 32 bits were needed to represent the original buffer size. -.Fn sdp_seq_seq +.Fn sdp_set_seq will only modify the content, not the size of the header. .Sh SEE ALSO .Xr sdpquery 1 ,
CVS commit: src/lib/libc/arch/riscv/sys
Module Name:src Committed By: matt Date: Tue Mar 31 11:59:41 UTC 2015 Modified Files: src/lib/libc/arch/riscv/sys: brk.S sbrk.S Log Message: Use lla instead doing the pcrel relocs ourselves. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/lib/libc/arch/riscv/sys/brk.S \ src/lib/libc/arch/riscv/sys/sbrk.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/arch/riscv/sys
Module Name:src Committed By: matt Date: Tue Mar 31 11:59:41 UTC 2015 Modified Files: src/lib/libc/arch/riscv/sys: brk.S sbrk.S Log Message: Use lla instead doing the pcrel relocs ourselves. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/lib/libc/arch/riscv/sys/brk.S \ src/lib/libc/arch/riscv/sys/sbrk.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/arch/riscv/sys/brk.S diff -u src/lib/libc/arch/riscv/sys/brk.S:1.3 src/lib/libc/arch/riscv/sys/brk.S:1.4 --- src/lib/libc/arch/riscv/sys/brk.S:1.3 Fri Mar 27 23:23:14 2015 +++ src/lib/libc/arch/riscv/sys/brk.S Tue Mar 31 11:59:41 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: brk.S,v 1.3 2015/03/27 23:23:14 matt Exp $ */ +/* $NetBSD: brk.S,v 1.4 2015/03/31 11:59:41 matt Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ #include SYS.h #if defined(LIBC_SCCS) !defined(lint) - RCSID($NetBSD: brk.S,v 1.3 2015/03/27 23:23:14 matt Exp $) + RCSID($NetBSD: brk.S,v 1.4 2015/03/31 11:59:41 matt Exp $) #endif /* LIBC_SCCS and not lint */ .hidden _C_LABEL(__minbrk) @@ -55,8 +55,7 @@ _C_LABEL(__curbrk): .text ENTRY(_brk) -.L0: auipc t1, %pcrel_hi(_C_LABEL(__minbrk)) - addi t1, t1, %pcrel_lo(.L0) + lla t1, _C_LABEL(__minbrk) PTR_L t5, 0(t1) bgeu a0, t5, 1f move a0, t5 # dont allow break minbrk Index: src/lib/libc/arch/riscv/sys/sbrk.S diff -u src/lib/libc/arch/riscv/sys/sbrk.S:1.3 src/lib/libc/arch/riscv/sys/sbrk.S:1.4 --- src/lib/libc/arch/riscv/sys/sbrk.S:1.3 Fri Mar 27 23:23:14 2015 +++ src/lib/libc/arch/riscv/sys/sbrk.S Tue Mar 31 11:59:41 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: sbrk.S,v 1.3 2015/03/27 23:23:14 matt Exp $ */ +/* $NetBSD: sbrk.S,v 1.4 2015/03/31 11:59:41 matt Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -33,15 +33,13 @@ .hidden _C_LABEL(__curbrk) .globl _C_LABEL(__curbrk) - .globl _C_LABEL(_end) #ifdef WEAK_ALIAS WEAK_ALIAS(sbrk, _sbrk) #endif ENTRY(_sbrk) -.L0: auipc t1, %pcrel_hi(_C_LABEL(__curbrk)) - addi t1, t1, %pcrel_lo(.L0) + lla t1, _C_LABEL(__curbrk) PTR_L t2, 0(t1) add a0, a0, t2 // compute current break SYSTRAP(break)
CVS commit: src/usr.bin/make
Module Name:src
Committed By: sjg
Date: Wed Apr 1 01:03:55 UTC 2015
Modified Files:
src/usr.bin/make: meta.c
Log Message:
Close child's reference to meta file.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/usr.bin/make/meta.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/meta.c
diff -u src/usr.bin/make/meta.c:1.36 src/usr.bin/make/meta.c:1.37
--- src/usr.bin/make/meta.c:1.36 Thu Nov 6 01:36:57 2014
+++ src/usr.bin/make/meta.c Wed Apr 1 01:03:55 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: meta.c,v 1.36 2014/11/06 01:36:57 sjg Exp $ */
+/* $NetBSD: meta.c,v 1.37 2015/04/01 01:03:55 sjg Exp $ */
/*
* Implement 'meta' mode.
@@ -659,17 +659,21 @@ meta_job_child(Job *job)
{
#ifdef USE_FILEMON
BuildMon *pbm;
-pid_t pid;
if (job != NULL) {
pbm = job-bm;
} else {
pbm = Mybm;
}
-pid = getpid();
-if (pbm-mfp != NULL useFilemon) {
- if (ioctl(pbm-filemon_fd, FILEMON_SET_PID, pid) 0) {
- err(1, Could not set filemon pid!);
+if (pbm-mfp != NULL) {
+ close(fileno(pbm-mfp));
+ if (useFilemon) {
+ pid_t pid;
+
+ pid = getpid();
+ if (ioctl(pbm-filemon_fd, FILEMON_SET_PID, pid) 0) {
+ err(1, Could not set filemon pid!);
+ }
}
}
#endif
Re: CVS commit: src/sys/dev/ic (spdmem.c)
Module Name:src
Committed By: msaitoh
Date: Fri Mar 27 05:33:08 UTC 2015
Modified Files:
src/sys/dev/ic: spdmem.c spdmemreg.h
Log Message:
Add DDR4 support a bit.
Looking at the actual code change here
@@ -76,6 +76,7 @@ static const char* spdmem_basic_types[]
DDR2 SDRAM FB,
DDR2 SDRAM FB Probe,
DDR3 SDRAM
+ DDR4 SDRAM
};
static const char* spdmem_superset_types[] = {
There appears to be a missing comma, leading to the bug I just reported
in
http://mail-index.netbsd.org/current-users/2015/04/01/msg027013.html
:)
I would fix it myself, but currently my NetBSD machine is not networked.
-
| Paul Goyette | PGP Key fingerprint: | E-mail addresses: |
| (Retired)| FA29 0E3B 35AF E8AE 6651 | paul at whooppee.com|
| Network Engineer | 0786 F758 55DE 53BA 7731 | pgoyette at juniper.net |
| Kernel Developer | | pgoyette at netbsd.org |
-
CVS commit: src/sys/netipsec
Module Name:src Committed By: ozaki-r Date: Wed Apr 1 01:44:56 UTC 2015 Modified Files: src/sys/netipsec: ipsec.c Log Message: Fix wrong comments To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.65 src/sys/netipsec/ipsec.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/netipsec/ipsec.c diff -u src/sys/netipsec/ipsec.c:1.64 src/sys/netipsec/ipsec.c:1.65 --- src/sys/netipsec/ipsec.c:1.64 Wed Aug 13 19:43:47 2014 +++ src/sys/netipsec/ipsec.c Wed Apr 1 01:44:56 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ipsec.c,v 1.64 2014/08/13 19:43:47 plunky Exp $ */ +/* $NetBSD: ipsec.c,v 1.65 2015/04/01 01:44:56 ozaki-r Exp $ */ /* $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/ipsec.c,v 1.2.2.2 2003/07/01 01:38:13 sam Exp $ */ /* $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */ @@ -32,7 +32,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ipsec.c,v 1.64 2014/08/13 19:43:47 plunky Exp $); +__KERNEL_RCSID(0, $NetBSD: ipsec.c,v 1.65 2015/04/01 01:44:56 ozaki-r Exp $); /* * IPsec controller part. @@ -230,8 +230,8 @@ SYSCTL_INT(_net_inet6_ipsec6, IPSECCTL_D debug, CTLFLAG_RW, ipsec_debug, 0, ); SYSCTL_INT(_net_inet6_ipsec6, IPSECCTL_ESP_RANDPAD, esp_randpad, CTLFLAG_RW, ip6_esp_randpad, 0, ); -#endif /* INET6 */ #endif /* __FreeBSD__ */ +#endif /* INET6 */ static int ipsec4_setspidx_inpcb (struct mbuf *, struct inpcb *); #ifdef INET6
CVS commit: src/sys/netipsec
Module Name:src Committed By: ozaki-r Date: Wed Apr 1 01:44:56 UTC 2015 Modified Files: src/sys/netipsec: ipsec.c Log Message: Fix wrong comments To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.65 src/sys/netipsec/ipsec.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: ozaki-r
Date: Wed Apr 1 02:49:44 UTC 2015
Modified Files:
src/sys/netinet6: ip6_input.c
src/sys/netipsec: ipsec.c ipsec.h
Log Message:
Pull out ipsec routines from ip6_input
This change reduces symbol references from netinet6 to netipsec
and improves modularity of netipsec.
No functional change is intended.
To generate a diff of this commit:
cvs rdiff -u -r1.150 -r1.151 src/sys/netinet6/ip6_input.c
cvs rdiff -u -r1.65 -r1.66 src/sys/netipsec/ipsec.c
cvs rdiff -u -r1.36 -r1.37 src/sys/netipsec/ipsec.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/netinet6/ip6_input.c
diff -u src/sys/netinet6/ip6_input.c:1.150 src/sys/netinet6/ip6_input.c:1.151
--- src/sys/netinet6/ip6_input.c:1.150 Tue Jan 20 21:27:36 2015
+++ src/sys/netinet6/ip6_input.c Wed Apr 1 02:49:44 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_input.c,v 1.150 2015/01/20 21:27:36 roy Exp $ */
+/* $NetBSD: ip6_input.c,v 1.151 2015/04/01 02:49:44 ozaki-r Exp $ */
/* $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ip6_input.c,v 1.150 2015/01/20 21:27:36 roy Exp $);
+__KERNEL_RCSID(0, $NetBSD: ip6_input.c,v 1.151 2015/04/01 02:49:44 ozaki-r Exp $);
#include opt_gateway.h
#include opt_inet.h
@@ -748,11 +748,6 @@ ip6_input(struct mbuf *m)
#ifdef IPSEC
if (ipsec_used) {
- struct m_tag *mtag;
- struct tdb_ident *tdbi;
- struct secpolicy *sp;
- int s, error;
-
/*
* enforce IPsec policy checking if we are seeing last
* header. note that we do not visit this with
@@ -760,39 +755,7 @@ ip6_input(struct mbuf *m)
*/
if ((inet6sw[ip_protox[nxt]].pr_flags
PR_LASTHDR) != 0) {
-/*
- * Check if the packet has already had IPsec
- * processing done. If so, then just pass it
- * along. This tag gets set during AH, ESP,
- * etc. input handling, before the packet is
- * returned to the ip input queue for delivery.
- */
-mtag = m_tag_find(m, PACKET_TAG_IPSEC_IN_DONE,
-NULL);
-s = splsoftnet();
-if (mtag != NULL) {
- tdbi = (struct tdb_ident *)(mtag + 1);
- sp = ipsec_getpolicy(tdbi,
- IPSEC_DIR_INBOUND);
-} else {
- sp = ipsec_getpolicybyaddr(m,
- IPSEC_DIR_INBOUND, IP_FORWARDING,
- error);
-}
-if (sp != NULL) {
- /*
- * Check security policy against packet
- * attributes.
- */
- error = ipsec_in_reject(sp, m);
- KEY_FREESP(sp);
-} else {
- /* XXX error stat??? */
- error = EINVAL;
- DPRINTF((ip6_input: no SP, packet
- discarded\n));/*XXX*/
-}
-splx(s);
+int error = ipsec6_input(m);
if (error)
goto bad;
}
Index: src/sys/netipsec/ipsec.c
diff -u src/sys/netipsec/ipsec.c:1.65 src/sys/netipsec/ipsec.c:1.66
--- src/sys/netipsec/ipsec.c:1.65 Wed Apr 1 01:44:56 2015
+++ src/sys/netipsec/ipsec.c Wed Apr 1 02:49:44 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec.c,v 1.65 2015/04/01 01:44:56 ozaki-r Exp $ */
+/* $NetBSD: ipsec.c,v 1.66 2015/04/01 02:49:44 ozaki-r Exp $ */
/* $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/ipsec.c,v 1.2.2.2 2003/07/01 01:38:13 sam Exp $ */
/* $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ipsec.c,v 1.65 2015/04/01 01:44:56 ozaki-r Exp $);
+__KERNEL_RCSID(0, $NetBSD: ipsec.c,v 1.66 2015/04/01 02:49:44 ozaki-r Exp $);
/*
* IPsec controller part.
@@ -2425,7 +2425,52 @@ skippolicycheck:;
*needipsecp = needipsec;
return sp;
}
-#endif
+
+int
+ipsec6_input(struct mbuf *m)
+{
+ struct m_tag *mtag;
+ struct tdb_ident *tdbi;
+ struct secpolicy *sp;
+ int s, error;
+
+ /*
+ * Check if the packet has already had IPsec
+ * processing done. If so, then just pass it
+ * along. This tag gets set during AH, ESP,
+ * etc. input handling, before the packet is
+ * returned to the ip input queue for delivery.
+ */
+ mtag = m_tag_find(m, PACKET_TAG_IPSEC_IN_DONE,
+ NULL);
+ s = splsoftnet();
+ if (mtag != NULL) {
+ tdbi = (struct tdb_ident *)(mtag + 1);
+ sp = ipsec_getpolicy(tdbi,
+ IPSEC_DIR_INBOUND);
+ } else {
+ sp = ipsec_getpolicybyaddr(m,
+ IPSEC_DIR_INBOUND, IP_FORWARDING,
+ error);
+ }
+ if (sp != NULL) {
+ /*
+ * Check security policy against packet
+ * attributes.
+ */
+ error = ipsec_in_reject(sp, m);
+ KEY_FREESP(sp);
+ } else {
+ /* XXX error stat??? */
+ error = EINVAL;
+ DPRINTF((ip6_input: no SP, packet
+ discarded\n));/*XXX*/
+ }
+ splx(s);
+
+ return error;
+}
+#endif /* INET6 */
Index: src/sys/netipsec/ipsec.h
diff -u src/sys/netipsec/ipsec.h:1.36 src/sys/netipsec/ipsec.h:1.37
--- src/sys/netipsec/ipsec.h:1.36 Fri Sep 5 09:26:44 2014
+++ src/sys/netipsec/ipsec.h Wed Apr 1 02:49:44 2015
@@ -1,4 +1,4 @@
-/* $NetBSD:
CVS commit: src/sys
Module Name:src Committed By: ozaki-r Date: Wed Apr 1 02:49:44 UTC 2015 Modified Files: src/sys/netinet6: ip6_input.c src/sys/netipsec: ipsec.c ipsec.h Log Message: Pull out ipsec routines from ip6_input This change reduces symbol references from netinet6 to netipsec and improves modularity of netipsec. No functional change is intended. To generate a diff of this commit: cvs rdiff -u -r1.150 -r1.151 src/sys/netinet6/ip6_input.c cvs rdiff -u -r1.65 -r1.66 src/sys/netipsec/ipsec.c cvs rdiff -u -r1.36 -r1.37 src/sys/netipsec/ipsec.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src Committed By: sjg Date: Wed Apr 1 01:03:55 UTC 2015 Modified Files: src/usr.bin/make: meta.c Log Message: Close child's reference to meta file. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/usr.bin/make/meta.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man9
Module Name:src Committed By: riastradh Date: Tue Mar 31 15:47:50 UTC 2015 Modified Files: src/share/man/man9: fstrans.9 Log Message: Revamp fstrans(9) man page. - Fix example: fstrans_start never fails and returns void. - Add fstrans_mount/fstrans_unmount. - Explain intent, not just mechanism. - Add internal cross-references and redundant information from different callers' perspectives. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/share/man/man9/fstrans.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/fstrans.9 diff -u src/share/man/man9/fstrans.9:1.16 src/share/man/man9/fstrans.9:1.17 --- src/share/man/man9/fstrans.9:1.16 Tue Sep 17 19:58:03 2013 +++ src/share/man/man9/fstrans.9 Tue Mar 31 15:47:50 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: fstrans.9,v 1.16 2013/09/17 19:58:03 wiz Exp $ +.\ $NetBSD: fstrans.9,v 1.17 2015/03/31 15:47:50 riastradh Exp $ .\ .\ Copyright (c) 2007 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd April 13, 2010 +.Dd March 31, 2015 .Dt FSTRANS 9 .Os .Sh NAME @@ -46,9 +46,9 @@ .In sys/mount.h .In sys/fstrans.h .Ft int -.Fn fstrans_setstate struct mount *mp enum fstrans_state new_state -.Ft enum fstrans_state -.Fn fstrans_getstate struct mount *mp +.Fn fstrans_mount struct mount *mp +.Ft void +.Fn fstrans_unmount struct mount *mp .Ft void .Fn fstrans_start struct mount *mp enum fstrans_lock_type lock_type .Ft int @@ -56,6 +56,10 @@ .Ft void .Fn fstrans_done struct mount *mp .Ft int +.Fn fstrans_setstate struct mount *mp enum fstrans_state new_state +.Ft enum fstrans_state +.Fn fstrans_getstate struct mount *mp +.Ft int .Fn fstrans_is_owner struct mount *mp .Ft int .Fn fscow_establish struct mount *mp \ @@ -68,105 +72,224 @@ .Sh DESCRIPTION The .Nm -subsystem is a set of operations to assist file system suspension. -These operations must not be used outside of file systems. +subsystem assists file system suspension and copy-on-write snapshots. .Pp -File systems supporting this subsystem must set the flag -.Dv IMNT_HAS_TRANS -in -.Dv mnt_iflag . +For a file system to use +.Nm , +its +.Xr VFS_MOUNT 9 +method must call +.Fn fstrans_mount , +and its +.Xr VFS_UNMOUNT 9 +method must call +.Fn fstrans_unmount . .Pp -File systems are always in one of these states: +The file system's normal operations, such as its +.Xr vnodeops 9 , +must be bracketed by +.Fn fstrans_start +and +.Fn fstrans_done +in a +.Em shared +transaction, which is blocked by suspending the file system and while +it is suspended. .Pp -.Bl -tag -offset indent -width FSTRANS_SUSPENDING -compact -.It Dv FSTRANS_NORMAL -Normal operations. -.It Dv FSTRANS_SUSPENDING -Preparing a suspension. -.It Dv FSTRANS_SUSPENDED -Suspended. -.El +Operations needed to sync the file system to its backing store must be +bracketed by +.Fn fstrans_start +and +.Fn fstrans_done +in a +.Em lazy +transaction, which is allowed while suspending the file system in order +to sync it to its backing store, but blocked while the file system is +suspended. .Pp -This state is represented by -.Vt enum fstrans_state . +Transactions are per-thread and nestable: if a thread is already in a +transaction, it can enter another transaction. +Each +.Fn fstrans_start +must be paired with +.Fn fstrans_done . +Entering a shared transaction while in a lazy transaction is not +allowed and will lead to deadlock. .Pp -All file system operations use a -.Em fstrans lock . -This lock is recursive. -A thread already owning a lock will always get another lock. -The lock has two variants: -.Bl -tag -offset indent -width FSTRANS_SHARED -.It Dv FSTRANS_SHARED -A lock that will be granted if the file system is in state -.Dv FSTRANS_NORMAL . -.It Dv FSTRANS_LAZY -A lock that will be granted if the file system is in state +The file system's +.Xr VFS_SUSPENDCTL 9 +method can use +.Fn fstrans_setstate +to: +.Bl -dash +.It +enter the +.Dv FSTRANS_SUSPENDING +to suspend all normal operations but allow syncing, +.It +enter the +.Dv FSTRANS_SUSPENDED +state to suspend all operations once synced, and +.It +restore to the .Dv FSTRANS_NORMAL -or -.Dv FSTRANS_SUSPENDING . -It needs special care because operations using this variant will not block -while the file system prepares suspension. +state to resume all operations. .El .Pp -The lock variant is represented by -.Vt enum fstrans_lock_type . +A file system supporting +.Nm +may establish a copy-on-write callback with +.Fn fscow_establish . +The copy-on-write callback will be called every time a buffer is +written to a block device with +.Fn VOP_STRATEGY +and every time a buffer is read into the +.Xr buffercache 9 +with +.Dv B_MODIFY +set indicating the caller's intent to modify it. +Anyone modifying a buffer may
CVS commit: src/share/man/man9
Module Name:src Committed By: riastradh Date: Tue Mar 31 15:47:50 UTC 2015 Modified Files: src/share/man/man9: fstrans.9 Log Message: Revamp fstrans(9) man page. - Fix example: fstrans_start never fails and returns void. - Add fstrans_mount/fstrans_unmount. - Explain intent, not just mechanism. - Add internal cross-references and redundant information from different callers' perspectives. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/share/man/man9/fstrans.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src Committed By: skrll Date: Wed Apr 1 05:39:52 UTC 2015 Modified Files: src/sys/dev/usb [nick-nhusb]: uhci.c Log Message: Include opt_usb.h To generate a diff of this commit: cvs rdiff -u -r1.264.4.29 -r1.264.4.30 src/sys/dev/usb/uhci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src Committed By: skrll Date: Wed Apr 1 05:39:52 UTC 2015 Modified Files: src/sys/dev/usb [nick-nhusb]: uhci.c Log Message: Include opt_usb.h To generate a diff of this commit: cvs rdiff -u -r1.264.4.29 -r1.264.4.30 src/sys/dev/usb/uhci.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/usb/uhci.c diff -u src/sys/dev/usb/uhci.c:1.264.4.29 src/sys/dev/usb/uhci.c:1.264.4.30 --- src/sys/dev/usb/uhci.c:1.264.4.29 Sun Mar 29 11:40:36 2015 +++ src/sys/dev/usb/uhci.c Wed Apr 1 05:39:51 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: uhci.c,v 1.264.4.29 2015/03/29 11:40:36 skrll Exp $ */ +/* $NetBSD: uhci.c,v 1.264.4.30 2015/04/01 05:39:51 skrll Exp $ */ /* * Copyright (c) 1998, 2004, 2011, 2012 The NetBSD Foundation, Inc. @@ -42,7 +42,9 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: uhci.c,v 1.264.4.29 2015/03/29 11:40:36 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: uhci.c,v 1.264.4.30 2015/04/01 05:39:51 skrll Exp $); + +#include opt_usb.h #include sys/param.h
Re: CVS commit: src/usr.sbin/service
On Wed, 01 Apr 2015, Adrian Steinmann wrote: Please could this be fixed to use shell quoting in a safe way. OK, if that'll unstall the pullup-7. I don't know. Are you implying that the /etc/rc.d/ system supports space in filenames? No, I am implying that somebody could create a file whose name contains a space. Whether or not it's supported is separate from whether or not the service(8) script does strange things when it happens. --apb (Alan Barrett)
CVS commit: src/share/man/man9
Module Name:src Committed By: riastradh Date: Tue Mar 31 15:49:45 UTC 2015 Modified Files: src/share/man/man9: fstrans.9 Log Message: Prohibit cross-mount transactions. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/share/man/man9/fstrans.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/fstrans.9 diff -u src/share/man/man9/fstrans.9:1.17 src/share/man/man9/fstrans.9:1.18 --- src/share/man/man9/fstrans.9:1.17 Tue Mar 31 15:47:50 2015 +++ src/share/man/man9/fstrans.9 Tue Mar 31 15:49:45 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: fstrans.9,v 1.17 2015/03/31 15:47:50 riastradh Exp $ +.\ $NetBSD: fstrans.9,v 1.18 2015/03/31 15:49:45 riastradh Exp $ .\ .\ Copyright (c) 2007 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -115,6 +115,7 @@ must be paired with .Fn fstrans_done . Entering a shared transaction while in a lazy transaction is not allowed and will lead to deadlock. +Transactions for multiple distinct mount points may not be nested. .Pp The file system's .Xr VFS_SUSPENDCTL 9
CVS commit: src/share/man/man9
Module Name:src Committed By: riastradh Date: Tue Mar 31 15:49:45 UTC 2015 Modified Files: src/share/man/man9: fstrans.9 Log Message: Prohibit cross-mount transactions. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/share/man/man9/fstrans.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/arm
Module Name:src
Committed By: skrll
Date: Tue Mar 31 16:15:07 UTC 2015
Modified Files:
src/sys/arch/arm/arm: disassem.c
Log Message:
More instructions. Lots left to do.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/arm/arm/disassem.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm/disassem.c
diff -u src/sys/arch/arm/arm/disassem.c:1.31 src/sys/arch/arm/arm/disassem.c:1.32
--- src/sys/arch/arm/arm/disassem.c:1.31 Sun Jan 18 18:23:25 2015
+++ src/sys/arch/arm/arm/disassem.c Tue Mar 31 16:15:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: disassem.c,v 1.31 2015/01/18 18:23:25 skrll Exp $ */
+/* $NetBSD: disassem.c,v 1.32 2015/03/31 16:15:07 skrll Exp $ */
/*
* Copyright (c) 1996 Mark Brinicombe.
@@ -49,7 +49,7 @@
#include sys/param.h
-__KERNEL_RCSID(0, $NetBSD: disassem.c,v 1.31 2015/01/18 18:23:25 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: disassem.c,v 1.32 2015/03/31 16:15:07 skrll Exp $);
#include sys/systm.h
@@ -71,16 +71,21 @@ __KERNEL_RCSID(0, $NetBSD: disassem.c,v
* the instruction. The only exception is the writeback flag which
* follows a operand.
*
- *
+ * !c - cps flags and mode
+ * !d - debug option (bit 0-3)
+ * !l - dmb/dsb limitation
+ * !m - mode
* 2 - print Operand 2 of a data processing instruction
* a - address operand of ldr/str instruction
* b - branch address
* c - comment field bits(0-23)
* d - destination register (bits 12-15)
- * e - address operand of ldrh/strh instruction
+ * e - address operand of ldrx/strx instruction
* f - 1st fp operand (register) (bits 12-14)
* g - 2nd fp operand (register) (bits 16-18)
* h - 3rd fp operand (register/immediate) (bits 0-4)
+ * i - lsb operand (bits 7-11)
+ * j - msb operand (bits 6,7,12-14)
* k - breakpoint comment (bits 0-3, 8-19)
* l - register list for ldm/stm instruction
* m - m register (bits 0-3)
@@ -88,6 +93,7 @@ __KERNEL_RCSID(0, $NetBSD: disassem.c,v
* o - indirect register rn (bits 16-19) (used by swap)
* p - saved or current status register
* q - neon N register (7, 19-16)
+ * r - width minus 1 (bits 16-20)
* s - s register (bits 8-11)
* t - thumb branch address (bits 24, 0-23)
* u - neon M register (5, 3-0)
@@ -96,6 +102,7 @@ __KERNEL_RCSID(0, $NetBSD: disassem.c,v
* x - instruction in hex
* y - co-processor data processing registers
* z - co-processor register transfer registers
+ * C - cps effect
* D - destination-is-r15 (P) flag on TST, TEQ, CMP, CMN
* F - PSR transfer fields
* I - NEON operand size
@@ -121,60 +128,128 @@ struct arm32_insn {
};
static const struct arm32_insn arm32_i[] = {
-{ 0x0fff, 0x0ff0, imb, c }, /* Before swi */
-{ 0x0fff, 0x0ff1, imbrange, c }, /* Before swi */
-{ 0x0fff, 0x0320f003, yield, }, /* Before swi */
-{ 0x0fff, 0x0320f002, wfe, }, /* Before swi */
-{ 0x0fff, 0x0320f003, wfi, }, /* Before swi */
-{ 0x0f00, 0x0f00, swi, c },
+/* A5.7 Unconditional instructions */
+/*
+ * A5.7.1 Memory hints, Advanced SIMD instructions, and
+ * miscellaneous instructions
+ */
+{ 0xfff10020, 0xf100, cps, C!c },
+{ 0xfff100f0, 0xf101, setend\tle, },
+{ 0xfff102f0, 0xf1010200, setend\tbe, },
+/* pli */
+/* pld */
+{ 0x, 0xf57ff01f, clrex, },
+{ 0xfff0, 0xf57ff040, dsb,!l },
+{ 0xfff0, 0xf57ff050, dmb,!l },
+{ 0xfff0, 0xf57ff060, isb, },
+/* pli */
+/* pld */
+
+//{ 0x0e10, 0x0800, stm, XnWl },
+{ 0xfe5fffe0, 0xf84d0500, srs, XnW!m },
+{ 0xfe50, 0xf8100a00, rfe, XnW },
{ 0xfe00, 0xfa00, blx, t }, /* Before b and bl */
-{ 0x0f00, 0x0a00, b, b },
-{ 0x0f00, 0x0b00, bl, b },
-{ 0x0fe000f0, 0x0090, mul, Snms },
-{ 0x0fe000f0, 0x00200090, mla, Snmsd },
-{ 0x0fe000f0, 0x00800090, umull, Sdnms },
-{ 0x0fe000f0, 0x00c00090, smull, Sdnms },
-{ 0x0fe000f0, 0x00a00090, umlal, Sdnms },
-{ 0x0fe000f0, 0x00e00090, smlal, Sdnms },
+{ 0xfe100090, 0xfc00, stc2, L#v },
+{ 0x0e100090, 0x0c00, stc, L#v },
+{ 0xfe100090, 0xfc10, ldc2, L#v },
+{ 0x0e100090, 0x0c10, ldc, L#v },
+{ 0x0ff0, 0x0c40, mcrr, # },
+{ 0x0ff0, 0x0c50, mrrc, # },
+{ 0xff10, 0xfe00, cdp2, #y },
+{ 0x0f10, 0x0e00, cdp, #y },
+{ 0xff100010, 0xfe10, mcr2, #z },
+{ 0x0f100010, 0x0e10, mcr, #z },
+{ 0xff100010, 0xfe100010, mrc2, #z },
+{ 0x0f100010, 0x0e100010, mrc, #z },
+
+/* A5.4 Media instructions */
+{ 0x0fe00070, 0x07c00050, sbfx, dmir },
+{ 0x0fe0007f, 0x07c0001f, bfc,dij },
+{ 0x0fe00070, 0x07c00010, bfi,dmij },
+{ 0x0fe00070, 0x07e00050, ubfx, dmir },
+{ 0xfff000f0, 0xe7f0, und, x }, /* Special immediate? */
+
+{ 0x0610, 0x0610, und, x }, /* Remove
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: skrll Date: Tue Mar 31 16:15:07 UTC 2015 Modified Files: src/sys/arch/arm/arm: disassem.c Log Message: More instructions. Lots left to do. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/arch/arm/arm/disassem.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common
Module Name:src
Committed By: matt
Date: Tue Mar 31 17:18:35 UTC 2015
Modified Files:
src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common:
sanitizer_netbsd.cc
Log Message:
Deal with NetBSD using dwarf EH
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_netbsd.cc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_netbsd.cc
diff -u src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_netbsd.cc:1.3 src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_netbsd.cc:1.4
--- src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_netbsd.cc:1.3 Thu Oct 23 17:50:24 2014
+++ src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_netbsd.cc Tue Mar 31 17:18:35 2015
@@ -390,7 +390,7 @@ bool SanitizerGetThreadName(char *name,
#ifndef SANITIZER_GO
//- SlowUnwindStack ---
-#ifdef __arm__
+#if defined(__arm__) defined(__ARM_EABI__) !defined(__ARM_DWARF_EH__)
#include unwind-arm-common.h
#define UNWIND_STOP _URC_END_OF_STACK
#define UNWIND_CONTINUE _URC_NO_REASON
@@ -401,7 +401,7 @@ bool SanitizerGetThreadName(char *name,
#endif
uptr Unwind_GetIP(struct _Unwind_Context *ctx) {
-#ifdef __arm__
+#if defined(__arm__) defined(__ARM_EABI__) !defined(__ARM_DWARF_EH__)
uptr val;
_Unwind_VRS_Result res = _Unwind_VRS_Get(ctx, _UVRSC_CORE,
15 /* r15 = PC */, _UVRSD_UINT32, val);
CVS commit: src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common
Module Name:src Committed By: matt Date: Tue Mar 31 17:18:35 UTC 2015 Modified Files: src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common: sanitizer_netbsd.cc Log Message: Deal with NetBSD using dwarf EH To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_netbsd.cc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: christos Date: Tue Mar 31 18:01:09 UTC 2015 Modified Files: src/external/bsd/dhcpcd/dist: common.c Log Message: CID 1292550: Missing call to va_end(). To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/external/bsd/dhcpcd/dist/common.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gcc/dist/gcc
Module Name:src Committed By: matt Date: Tue Mar 31 17:57:40 UTC 2015 Modified Files: src/external/gpl3/gcc/dist/gcc: configure configure.ac Log Message: Update RISCV tls assembly tests To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/gcc/dist/gcc/configure cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gcc/dist/gcc/configure.ac Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/dist/gcc/configure diff -u src/external/gpl3/gcc/dist/gcc/configure:1.11 src/external/gpl3/gcc/dist/gcc/configure:1.12 --- src/external/gpl3/gcc/dist/gcc/configure:1.11 Sat Jan 10 01:06:41 2015 +++ src/external/gpl3/gcc/dist/gcc/configure Tue Mar 31 17:57:40 2015 @@ -23368,13 +23368,13 @@ x: .text la.tls.gd a0,x la.tls.ie a1,x - lui v0,%tls_ie_hi(x) - lw v0,%tls_ie_lo(x)(v0) - add v0,v0,tp,%tls_ie_add(x) - lw v0,%tls_ie_off(x)(v0) -lui v0,%tprel_hi(x) - add v0,v0,tp,%tprel_add(x) - lw v0,%tprel_lo(x)(v0)' + lui a0,%tls_ie_pcrel_hi(x) + lw a0,%pcrel_lo(x)(a0) + add a0,a0,tp + lw a0,(a0) +lui a0,%tprel_hi(x) + add a0,a0,tp,%tprel_add(x) + lw a0,%tprel_lo(x)(a0)' tls_first_major=2 tls_first_minor=21 tls_as_opt='-m32 --fatal-warnings' Index: src/external/gpl3/gcc/dist/gcc/configure.ac diff -u src/external/gpl3/gcc/dist/gcc/configure.ac:1.9 src/external/gpl3/gcc/dist/gcc/configure.ac:1.10 --- src/external/gpl3/gcc/dist/gcc/configure.ac:1.9 Sat Jan 10 01:06:41 2015 +++ src/external/gpl3/gcc/dist/gcc/configure.ac Tue Mar 31 17:57:40 2015 @@ -3116,13 +3116,13 @@ x: .text la.tls.gd a0,x la.tls.ie a1,x - lui v0,%tls_ie_hi(x) - lw v0,%tls_ie_lo(x)(v0) - add v0,v0,tp,%tls_ie_add(x) - lw v0,%tls_ie_off(x)(v0) - lui v0,%tprel_hi(x) - add v0,v0,tp,%tprel_add(x) - lw v0,%tprel_lo(x)(v0)' + lui a0,%tls_ie_pcrel_hi(x) + lw a0,%pcrel_lo(x)(a0) + add a0,a0,tp + lw a0,0(a0) + lui a0,%tprel_hi(x) + add a0,a0,tp,%tprel_add(x) + lw a0,%tprel_lo(x)(a0)' tls_first_major=2 tls_first_minor=21 tls_as_opt='-m32 --fatal-warnings'
CVS commit: src/external/gpl3/gcc/dist/gcc
Module Name:src Committed By: matt Date: Tue Mar 31 17:57:40 UTC 2015 Modified Files: src/external/gpl3/gcc/dist/gcc: configure configure.ac Log Message: Update RISCV tls assembly tests To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/gcc/dist/gcc/configure cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gcc/dist/gcc/configure.ac Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gcc/dist/libsanitizer/asan
Module Name:src
Committed By: matt
Date: Tue Mar 31 17:58:30 UTC 2015
Modified Files:
src/external/gpl3/gcc/dist/libsanitizer/asan: asan_linux.cc
Log Message:
Add RISCV bits
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/gcc/dist/libsanitizer/asan/asan_linux.cc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/libsanitizer/asan/asan_linux.cc
diff -u src/external/gpl3/gcc/dist/libsanitizer/asan/asan_linux.cc:1.5 src/external/gpl3/gcc/dist/libsanitizer/asan/asan_linux.cc:1.6
--- src/external/gpl3/gcc/dist/libsanitizer/asan/asan_linux.cc:1.5 Thu Oct 23 19:03:38 2014
+++ src/external/gpl3/gcc/dist/libsanitizer/asan/asan_linux.cc Tue Mar 31 17:58:30 2015
@@ -69,6 +69,8 @@ void GetPcSpBp(void *context, uptr *pc,
# define _UC_MACHINE_FP(ucontext) __UC_MACHINE_FP(ucontext, _REG_S8)
# elif defined(__powerpc__) || defined(__powerpc64__)
# define _UC_MACHINE_FP(ucontext) __UC_MACHINE_FP(ucontext, _REG_R1)
+# elif defined(__riscv__)
+# define _UC_MACHINE_FP(ucontext) __UC_MACHINE_FP(ucontext, _REG_S0)
# elif defined(__sparc__)
# define _UC_MACHINE_FP(ucontext) sp[15]
# elif defined(__sh3__)
@@ -106,6 +108,11 @@ void GetPcSpBp(void *context, uptr *pc,
// The powerpc{,64}-linux ABIs do not specify r31 as the frame
// pointer, but GCC always uses r31 when we need a frame pointer.
*bp = ucontext-uc_mcontext.regs-gpr[PT_R31];
+# elif defined(__riscv__)
+ ucontext_t *ucontext = (ucontext_t*)context;
+ *pc = ucontext-uc_mcontext.gregs[REG_PC];
+ *bp = ucontext-uc_mcontext.gregs[REG_S0];
+ *sp = ucontext-uc_mcontext.gregs[REG_SP];
# elif defined(__sparc__)
ucontext_t *ucontext = (ucontext_t*)context;
uptr *stk_ptr;
CVS commit: src/external/gpl3/gcc/dist/libsanitizer/asan
Module Name:src Committed By: matt Date: Tue Mar 31 17:58:30 UTC 2015 Modified Files: src/external/gpl3/gcc/dist/libsanitizer/asan: asan_linux.cc Log Message: Add RISCV bits To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/gcc/dist/libsanitizer/asan/asan_linux.cc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: riz Date: Tue Mar 31 17:37:47 UTC 2015 Modified Files: src/sys/arch/evbarm/conf: JETSONTK1 MINI2440 ODROID-C1 OMAP5EVM PANDABOARD ROCKCHIP Log Message: Spell Independent correctly in cargo-culted comments. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/JETSONTK1 cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/conf/MINI2440 cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/conf/ODROID-C1 cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/conf/OMAP5EVM cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbarm/conf/PANDABOARD cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/conf/ROCKCHIP 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/evbarm/conf/JETSONTK1 diff -u src/sys/arch/evbarm/conf/JETSONTK1:1.1 src/sys/arch/evbarm/conf/JETSONTK1:1.2 --- src/sys/arch/evbarm/conf/JETSONTK1:1.1 Sun Mar 29 10:41:59 2015 +++ src/sys/arch/evbarm/conf/JETSONTK1 Tue Mar 31 17:37:47 2015 @@ -1,5 +1,5 @@ # -# $NetBSD: JETSONTK1,v 1.1 2015/03/29 10:41:59 jmcneill Exp $ +# $NetBSD: JETSONTK1,v 1.2 2015/03/31 17:37:47 riz Exp $ # # NVIDIA Jetson TK1 - Tegra K1 development kit # https://developer.nvidia.com/jetson-tk1 @@ -47,7 +47,7 @@ file-system PTYFS # /dev/pts/N support # File system options #options QUOTA # legacy UFS quotas #options QUOTA2 # new, in-filesystem UFS quotas -#options FFS_EI # FFS Endian Independant support +#options FFS_EI # FFS Endian Independent support #options NFSSERVER #options WAPBL # File system journaling support - Experimental #options FFS_NO_SNAPSHOT # No FFS snapshot support Index: src/sys/arch/evbarm/conf/MINI2440 diff -u src/sys/arch/evbarm/conf/MINI2440:1.14 src/sys/arch/evbarm/conf/MINI2440:1.15 --- src/sys/arch/evbarm/conf/MINI2440:1.14 Sat Aug 23 20:26:57 2014 +++ src/sys/arch/evbarm/conf/MINI2440 Tue Mar 31 17:37:47 2015 @@ -1,4 +1,4 @@ -# $NetBSD: MINI2440,v 1.14 2014/08/23 20:26:57 dholland Exp $ +# $NetBSD: MINI2440,v 1.15 2015/03/31 17:37:47 riz Exp $ # # MINI2440 -- Friendly ARM evaluation board based on Samsung S3C2440 # @@ -72,7 +72,7 @@ file-system PTYFS # /dev/pts/N support # File system options #options QUOTA # UFS quotas -#options FFS_EI # FFS Endian Independant support +#options FFS_EI # FFS Endian Independent support #options NFSSERVER #options SOFTDEP options WAPBL # File system journaling support - Experimental Index: src/sys/arch/evbarm/conf/ODROID-C1 diff -u src/sys/arch/evbarm/conf/ODROID-C1:1.13 src/sys/arch/evbarm/conf/ODROID-C1:1.14 --- src/sys/arch/evbarm/conf/ODROID-C1:1.13 Sun Mar 22 17:28:22 2015 +++ src/sys/arch/evbarm/conf/ODROID-C1 Tue Mar 31 17:37:47 2015 @@ -1,5 +1,5 @@ # -# $NetBSD: ODROID-C1,v 1.13 2015/03/22 17:28:22 jmcneill Exp $ +# $NetBSD: ODROID-C1,v 1.14 2015/03/31 17:37:47 riz Exp $ # # Odroid-C1 (Amlogic S805) based SBC (Single Board Computer) # @@ -46,7 +46,7 @@ file-system PTYFS # /dev/pts/N support # File system options #options QUOTA # legacy UFS quotas #options QUOTA2 # new, in-filesystem UFS quotas -#options FFS_EI # FFS Endian Independant support +#options FFS_EI # FFS Endian Independent support #options NFSSERVER #options WAPBL # File system journaling support - Experimental #options FFS_NO_SNAPSHOT # No FFS snapshot support Index: src/sys/arch/evbarm/conf/OMAP5EVM diff -u src/sys/arch/evbarm/conf/OMAP5EVM:1.7 src/sys/arch/evbarm/conf/OMAP5EVM:1.8 --- src/sys/arch/evbarm/conf/OMAP5EVM:1.7 Sat Aug 23 20:26:57 2014 +++ src/sys/arch/evbarm/conf/OMAP5EVM Tue Mar 31 17:37:47 2015 @@ -1,5 +1,5 @@ # -# $NetBSD: OMAP5EVM,v 1.7 2014/08/23 20:26:57 dholland Exp $ +# $NetBSD: OMAP5EVM,v 1.8 2015/03/31 17:37:47 riz Exp $ # # PANDABOARD -- TI OMAP 4430 Eval Board Kernel # @@ -48,7 +48,7 @@ file-system PTYFS # /dev/pts/N support # File system options #options QUOTA # legacy UFS quotas #options QUOTA2 # new, in-filesystem UFS quotas -#options FFS_EI # FFS Endian Independant support +#options FFS_EI # FFS Endian Independent support #options NFSSERVER options WAPBL # File system journaling support - Experimental #options FFS_NO_SNAPSHOT # No FFS snapshot support Index: src/sys/arch/evbarm/conf/PANDABOARD diff -u src/sys/arch/evbarm/conf/PANDABOARD:1.17 src/sys/arch/evbarm/conf/PANDABOARD:1.18 --- src/sys/arch/evbarm/conf/PANDABOARD:1.17 Sat Aug 30 15:21:17 2014 +++ src/sys/arch/evbarm/conf/PANDABOARD Tue Mar 31 17:37:47 2015 @@ -1,5 +1,5 @@ # -# $NetBSD: PANDABOARD,v 1.17 2014/08/30 15:21:17 kiyohara Exp $ +# $NetBSD: PANDABOARD,v 1.18 2015/03/31 17:37:47 riz Exp $ # # PANDABOARD -- TI OMAP 4430 Eval Board Kernel # @@ -46,7 +46,7 @@ file-system PTYFS # /dev/pts/N support # File system options #options QUOTA # legacy UFS quotas #options QUOTA2 # new, in-filesystem UFS quotas -#options FFS_EI # FFS Endian Independant support +#options FFS_EI # FFS Endian Independent
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: riz Date: Tue Mar 31 17:37:47 UTC 2015 Modified Files: src/sys/arch/evbarm/conf: JETSONTK1 MINI2440 ODROID-C1 OMAP5EVM PANDABOARD ROCKCHIP Log Message: Spell Independent correctly in cargo-culted comments. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/JETSONTK1 cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/conf/MINI2440 cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/conf/ODROID-C1 cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/conf/OMAP5EVM cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbarm/conf/PANDABOARD cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/conf/ROCKCHIP Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: christos Date: Tue Mar 31 18:01:09 UTC 2015 Modified Files: src/external/bsd/dhcpcd/dist: common.c Log Message: CID 1292550: Missing call to va_end(). To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/external/bsd/dhcpcd/dist/common.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/dhcpcd/dist/common.c diff -u src/external/bsd/dhcpcd/dist/common.c:1.10 src/external/bsd/dhcpcd/dist/common.c:1.11 --- src/external/bsd/dhcpcd/dist/common.c:1.10 Fri Mar 27 07:33:46 2015 +++ src/external/bsd/dhcpcd/dist/common.c Tue Mar 31 14:01:09 2015 @@ -1,5 +1,5 @@ #include sys/cdefs.h - __RCSID($NetBSD: common.c,v 1.10 2015/03/27 11:33:46 roy Exp $); + __RCSID($NetBSD: common.c,v 1.11 2015/03/31 18:01:09 christos Exp $); /* * dhcpcd - DHCP client daemon @@ -192,12 +192,12 @@ logger(struct dhcpcd_ctx *ctx, int pri, char fmt_cpy[1024]; #endif - serrno = errno; - va_start(va, fmt); - if (pri = LOG_DEBUG ctx !(ctx-options DHCPCD_DEBUG)) return; + serrno = errno; + + va_start(va, fmt); #ifndef HAVE_PRINTF_M /* Print strerrno(errno) in place of %m */ if (ctx == NULL || !(ctx-options DHCPCD_QUIET) || ctx-log_fd != -1)
CVS commit: src/share/man/man9
Module Name:src Committed By: riastradh Date: Tue Mar 31 20:50:29 UTC 2015 Modified Files: src/share/man/man9: fstrans.9 Log Message: Nesting shared in lazy is OK. Note nesting never blocks. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/share/man/man9/fstrans.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/fstrans.9 diff -u src/share/man/man9/fstrans.9:1.18 src/share/man/man9/fstrans.9:1.19 --- src/share/man/man9/fstrans.9:1.18 Tue Mar 31 15:49:45 2015 +++ src/share/man/man9/fstrans.9 Tue Mar 31 20:50:29 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: fstrans.9,v 1.18 2015/03/31 15:49:45 riastradh Exp $ +.\ $NetBSD: fstrans.9,v 1.19 2015/03/31 20:50:29 riastradh Exp $ .\ .\ Copyright (c) 2007 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -108,13 +108,11 @@ to sync it to its backing store, but blo suspended. .Pp Transactions are per-thread and nestable: if a thread is already in a -transaction, it can enter another transaction. +transaction, it can enter another transaction without blocking. Each .Fn fstrans_start must be paired with .Fn fstrans_done . -Entering a shared transaction while in a lazy transaction is not -allowed and will lead to deadlock. Transactions for multiple distinct mount points may not be nested. .Pp The file system's
CVS commit: src/sys/dev/mii
Module Name:src
Committed By: jmcneill
Date: Tue Mar 31 21:01:02 UTC 2015
Modified Files:
src/sys/dev/mii: rgephy.c rgephyreg.h
Log Message:
when resetting RTL8211F, make sure to disable manual MDI mode
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/mii/rgephy.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/mii/rgephyreg.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/mii/rgephy.c
diff -u src/sys/dev/mii/rgephy.c:1.38 src/sys/dev/mii/rgephy.c:1.39
--- src/sys/dev/mii/rgephy.c:1.38 Wed Mar 4 18:21:00 2015
+++ src/sys/dev/mii/rgephy.c Tue Mar 31 21:01:02 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rgephy.c,v 1.38 2015/03/04 18:21:00 jmcneill Exp $ */
+/* $NetBSD: rgephy.c,v 1.39 2015/03/31 21:01:02 jmcneill Exp $ */
/*
* Copyright (c) 2003
@@ -33,7 +33,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rgephy.c,v 1.38 2015/03/04 18:21:00 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: rgephy.c,v 1.39 2015/03/31 21:01:02 jmcneill Exp $);
/*
@@ -619,7 +619,7 @@ rgephy_load_dspcode(struct mii_softc *sc
static void
rgephy_reset(struct mii_softc *sc)
{
- uint16_t ssr;
+ uint16_t ssr, phycr1;
mii_phy_reset(sc);
DELAY(1000);
@@ -634,6 +634,13 @@ rgephy_reset(struct mii_softc *sc)
ssr = ~RGEPHY_SSR_ALDPS;
PHY_WRITE(sc, RGEPHY_MII_SSR, ssr);
}
+ } else if (sc-mii_mpd_rev == 6) {
+ /* RTL8211F */
+ phycr1 = PHY_READ(sc, RGEPHY_MII_PHYCR1);
+ if ((phycr1 RGEPHY_PHYCR1_MDI_MMCE) != 0) {
+ phycr1 = ~RGEPHY_PHYCR1_MDI_MMCE;
+ PHY_WRITE(sc, RGEPHY_MII_PHYCR1, phycr1);
+ }
} else {
PHY_WRITE(sc, 0x1F, 0x);
PHY_WRITE(sc, 0x0e, 0x);
Index: src/sys/dev/mii/rgephyreg.h
diff -u src/sys/dev/mii/rgephyreg.h:1.7 src/sys/dev/mii/rgephyreg.h:1.8
--- src/sys/dev/mii/rgephyreg.h:1.7 Wed Mar 4 18:21:00 2015
+++ src/sys/dev/mii/rgephyreg.h Tue Mar 31 21:01:02 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rgephyreg.h,v 1.7 2015/03/04 18:21:00 jmcneill Exp $ */
+/* $NetBSD: rgephyreg.h,v 1.8 2015/03/31 21:01:02 jmcneill Exp $ */
/*
* Copyright (c) 2003
@@ -56,6 +56,9 @@
#define RGEPHY_SSR_JABBER 0x0001 /* Jabber */
/* RTL8211F */
+#define RGEPHY_MII_PHYCR1 0x18 /* PHY Specific control register 1 */
+#define RGEPHY_PHYCR1_MDI_MMCE __BIT(9)
+
#define RGEPHY_MII_PHYSR 0x1a /* PHY Specific status register */
#define RGEPHY_PHYSR_ALDPS __BIT(14)
#define RGEPHY_PHYSR_MDI_PLUG __BIT(13)
CVS commit: src/sys/dev/mii
Module Name:src Committed By: jmcneill Date: Tue Mar 31 21:01:02 UTC 2015 Modified Files: src/sys/dev/mii: rgephy.c rgephyreg.h Log Message: when resetting RTL8211F, make sure to disable manual MDI mode To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sys/dev/mii/rgephy.c cvs rdiff -u -r1.7 -r1.8 src/sys/dev/mii/rgephyreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/libpcap
Module Name:src Committed By: christos Date: Tue Mar 31 21:39:43 UTC 2015 Modified Files: src/external/bsd/libpcap/dist: fad-gifc.c fad-win32.c gencode.c gencode.h grammar.y inet.c optimize.c pcap-bpf.c pcap-bpf.h pcap-bt-linux.c pcap-bt-linux.h pcap-bt-monitor-linux.c pcap-can-linux.c pcap-canusb-linux.c pcap-common.c pcap-dag.c pcap-dbus.c pcap-dlpi.c pcap-dos.c pcap-dos.h pcap-int.h pcap-linux.c pcap-netfilter-linux.c pcap-netfilter-linux.h pcap-nit.c pcap-pf.c pcap-septel.c pcap-sita.c pcap-snf.c pcap-snit.c pcap-snoop.c pcap-usb-linux.c pcap-usb-linux.h pcap-win32.c pcap.3pcap.in pcap.c pcap_breakloop.3pcap pcap_datalink_name_to_val.3pcap pcap_dump.3pcap pcap_dump_open.3pcap.in pcap_get_selectable_fd.3pcap pcap_loop.3pcap pcap_setdirection.3pcap pcap_setnonblock.3pcap pcap_tstamp_type_name_to_val.3pcap savefile.c scanner.l sf-pcap-ng.c sf-pcap.c src/external/bsd/libpcap/dist/bpf/net: bpf_filter.c src/external/bsd/libpcap/dist/lbl: os-osf4.h os-osf5.h src/external/bsd/libpcap/dist/pcap: bluetooth.h bpf.h pcap.h usb.h src/external/bsd/libpcap/dist/tests: filtertest.c findalldevstest.c valgrindtest.c src/external/bsd/libpcap/lib: shlib_version Removed Files: src/external/bsd/libpcap/dist/packaging: pcap.spec.in Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libpcap/dist/fad-gifc.c \ src/external/bsd/libpcap/dist/fad-win32.c \ src/external/bsd/libpcap/dist/gencode.h \ src/external/bsd/libpcap/dist/inet.c \ src/external/bsd/libpcap/dist/pcap-bpf.h \ src/external/bsd/libpcap/dist/pcap-bt-linux.c \ src/external/bsd/libpcap/dist/pcap-bt-linux.h \ src/external/bsd/libpcap/dist/pcap-bt-monitor-linux.c \ src/external/bsd/libpcap/dist/pcap-can-linux.c \ src/external/bsd/libpcap/dist/pcap-canusb-linux.c \ src/external/bsd/libpcap/dist/pcap-common.c \ src/external/bsd/libpcap/dist/pcap-dag.c \ src/external/bsd/libpcap/dist/pcap-dbus.c \ src/external/bsd/libpcap/dist/pcap-dlpi.c \ src/external/bsd/libpcap/dist/pcap-dos.c \ src/external/bsd/libpcap/dist/pcap-dos.h \ src/external/bsd/libpcap/dist/pcap-int.h \ src/external/bsd/libpcap/dist/pcap-linux.c \ src/external/bsd/libpcap/dist/pcap-netfilter-linux.c \ src/external/bsd/libpcap/dist/pcap-netfilter-linux.h \ src/external/bsd/libpcap/dist/pcap-nit.c \ src/external/bsd/libpcap/dist/pcap-pf.c \ src/external/bsd/libpcap/dist/pcap-septel.c \ src/external/bsd/libpcap/dist/pcap-sita.c \ src/external/bsd/libpcap/dist/pcap-snf.c \ src/external/bsd/libpcap/dist/pcap-snit.c \ src/external/bsd/libpcap/dist/pcap-snoop.c \ src/external/bsd/libpcap/dist/pcap-usb-linux.c \ src/external/bsd/libpcap/dist/pcap-usb-linux.h \ src/external/bsd/libpcap/dist/pcap-win32.c \ src/external/bsd/libpcap/dist/pcap_breakloop.3pcap \ src/external/bsd/libpcap/dist/pcap_datalink_name_to_val.3pcap \ src/external/bsd/libpcap/dist/pcap_dump.3pcap \ src/external/bsd/libpcap/dist/pcap_get_selectable_fd.3pcap \ src/external/bsd/libpcap/dist/pcap_loop.3pcap \ src/external/bsd/libpcap/dist/pcap_setdirection.3pcap \ src/external/bsd/libpcap/dist/pcap_setnonblock.3pcap \ src/external/bsd/libpcap/dist/pcap_tstamp_type_name_to_val.3pcap \ src/external/bsd/libpcap/dist/savefile.c cvs rdiff -u -r1.7 -r1.8 src/external/bsd/libpcap/dist/gencode.c \ src/external/bsd/libpcap/dist/optimize.c cvs rdiff -u -r1.5 -r1.6 src/external/bsd/libpcap/dist/grammar.y \ src/external/bsd/libpcap/dist/pcap-bpf.c \ src/external/bsd/libpcap/dist/pcap.3pcap.in \ src/external/bsd/libpcap/dist/pcap.c \ src/external/bsd/libpcap/dist/sf-pcap-ng.c \ src/external/bsd/libpcap/dist/sf-pcap.c cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/libpcap/dist/pcap_dump_open.3pcap.in cvs rdiff -u -r1.6 -r1.7 src/external/bsd/libpcap/dist/scanner.l cvs rdiff -u -r1.5 -r1.6 src/external/bsd/libpcap/dist/bpf/net/bpf_filter.c cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libpcap/dist/lbl/os-osf4.h \ src/external/bsd/libpcap/dist/lbl/os-osf5.h cvs rdiff -u -r1.1.1.2 -r0 \ src/external/bsd/libpcap/dist/packaging/pcap.spec.in cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libpcap/dist/pcap/bluetooth.h \ src/external/bsd/libpcap/dist/pcap/usb.h cvs rdiff -u -r1.6 -r1.7 src/external/bsd/libpcap/dist/pcap/bpf.h cvs rdiff -u -r1.5 -r1.6 src/external/bsd/libpcap/dist/pcap/pcap.h cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libpcap/dist/tests/filtertest.c \ src/external/bsd/libpcap/dist/tests/findalldevstest.c \ src/external/bsd/libpcap/dist/tests/valgrindtest.c cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libpcap/lib/shlib_version Please note that diffs are not public domain; they are
CVS import: src/external/bsd/libpcap/dist
Module Name:src Committed By: christos Date: Tue Mar 31 21:25:22 UTC 2015 Update of /cvsroot/src/external/bsd/libpcap/dist In directory ivanova.netbsd.org:/tmp/cvs-serv12174 Log Message: Numbers seem to be off here: Thursday Feb. 12, 2015 g...@alum.mit.edu/m...@sandelman.ca Summary for 1.8.0 libpcap release Support for filtering Geneve encapsulated packets. Wednesday Nov. 12, 2014 g...@alum.mit.edu/m...@sandelman.ca Summary for 1.7.0 libpcap release Fix handling of zones for BPF on Solaris new DLT for ZWAVE clarifications for read timeouts. added bpf_filter1() with extensions some fixes to compilation without stdint.h EBUSY can now be returned by SNFv3 code. Status: Vendor Tag: TCPDUMP Release Tags: libpcap-1_7_2 C src/external/bsd/libpcap/dist/grammar.y U src/external/bsd/libpcap/dist/fad-glifc.c U src/external/bsd/libpcap/dist/llc.h C src/external/bsd/libpcap/dist/pcap_setnonblock.3pcap U src/external/bsd/libpcap/dist/sunatmpos.h C src/external/bsd/libpcap/dist/sf-pcap-ng.c C src/external/bsd/libpcap/dist/pcap-dbus.c U src/external/bsd/libpcap/dist/pcap_findalldevs.3pcap U src/external/bsd/libpcap/dist/Makefile-devel-adds U src/external/bsd/libpcap/dist/aclocal.m4 U src/external/bsd/libpcap/dist/pcap_list_tstamp_types.3pcap.in C src/external/bsd/libpcap/dist/pcap-bt-linux.h U src/external/bsd/libpcap/dist/README.sita C src/external/bsd/libpcap/dist/savefile.c U src/external/bsd/libpcap/dist/CHANGES U src/external/bsd/libpcap/dist/pcap_dump_ftell.3pcap C src/external/bsd/libpcap/dist/pcap-nit.c U src/external/bsd/libpcap/dist/pcap_can_set_rfmon.3pcap U src/external/bsd/libpcap/dist/README.tru64 U src/external/bsd/libpcap/dist/org.tcpdump.chmod_bpf.plist C src/external/bsd/libpcap/dist/pcap-netfilter-linux.c U src/external/bsd/libpcap/dist/pcap-tstamp.manmisc.in U src/external/bsd/libpcap/dist/README.hpux C src/external/bsd/libpcap/dist/pcap-linux.c C src/external/bsd/libpcap/dist/pcap-can-linux.c C src/external/bsd/libpcap/dist/pcap-bpf.c C src/external/bsd/libpcap/dist/pcap_datalink_name_to_val.3pcap U src/external/bsd/libpcap/dist/pcap_open_offline.3pcap.in U src/external/bsd/libpcap/dist/pcap_list_datalinks.3pcap.in C src/external/bsd/libpcap/dist/pcap-snoop.c U src/external/bsd/libpcap/dist/pcap_major_version.3pcap U src/external/bsd/libpcap/dist/pcap-filter.manmisc.in U src/external/bsd/libpcap/dist/pcap_activate.3pcap U src/external/bsd/libpcap/dist/pcap_fileno.3pcap U src/external/bsd/libpcap/dist/pcap-dbus.h U src/external/bsd/libpcap/dist/pcap_set_tstamp_type.3pcap.in U src/external/bsd/libpcap/dist/pcap-can-linux.h U src/external/bsd/libpcap/dist/pcap-snf.h U src/external/bsd/libpcap/dist/pcap_open_dead.3pcap.in U src/external/bsd/libpcap/dist/pcap_set_rfmon.3pcap U src/external/bsd/libpcap/dist/pcap-septel.h U src/external/bsd/libpcap/dist/README U src/external/bsd/libpcap/dist/pcap_set_immediate_mode.3pcap U src/external/bsd/libpcap/dist/pcap-config.in U src/external/bsd/libpcap/dist/pcap-libdlpi.c C src/external/bsd/libpcap/dist/pcap-win32.c U src/external/bsd/libpcap/dist/pcap_set_buffer_size.3pcap C src/external/bsd/libpcap/dist/pcap_dump_open.3pcap.in U src/external/bsd/libpcap/dist/pcap_lookupnet.3pcap C src/external/bsd/libpcap/dist/pcap-bpf.h U src/external/bsd/libpcap/dist/pcap_lookupdev.3pcap U src/external/bsd/libpcap/dist/pcap_dump_close.3pcap U src/external/bsd/libpcap/dist/pcap-sita.html U src/external/bsd/libpcap/dist/sf-pcap-ng.h U src/external/bsd/libpcap/dist/pcap_lib_version.3pcap U src/external/bsd/libpcap/dist/pcap-canusb-linux.h U src/external/bsd/libpcap/dist/Makefile.in U src/external/bsd/libpcap/dist/README.macosx C src/external/bsd/libpcap/dist/fad-win32.c U src/external/bsd/libpcap/dist/README.dag U src/external/bsd/libpcap/dist/runlex.sh U src/external/bsd/libpcap/dist/pcap_dump_file.3pcap U src/external/bsd/libpcap/dist/pcap_tstamp_type_val_to_name.3pcap C src/external/bsd/libpcap/dist/pcap_setdirection.3pcap C src/external/bsd/libpcap/dist/pcap_tstamp_type_name_to_val.3pcap U src/external/bsd/libpcap/dist/pcap_inject.3pcap N src/external/bsd/libpcap/dist/scanner.c.top U src/external/bsd/libpcap/dist/pcap-config.1 U src/external/bsd/libpcap/dist/pcap-enet.c U src/external/bsd/libpcap/dist/INSTALL.txt U src/external/bsd/libpcap/dist/nlpid.h U src/external/bsd/libpcap/dist/README.linux U src/external/bsd/libpcap/dist/pcap.h U src/external/bsd/libpcap/dist/pcap-bt-monitor-linux.h U src/external/bsd/libpcap/dist/pcap-dag.h U src/external/bsd/libpcap/dist/pcap_set_datalink.3pcap U src/external/bsd/libpcap/dist/config.h.in U src/external/bsd/libpcap/dist/pcap_stats.3pcap U src/external/bsd/libpcap/dist/bpf_dump.c C src/external/bsd/libpcap/dist/pcap.3pcap.in U src/external/bsd/libpcap/dist/pcap_snapshot.3pcap U src/external/bsd/libpcap/dist/pcap_geterr.3pcap U src/external/bsd/libpcap/dist/pcap-savefile.manfile.in C src/external/bsd/libpcap/dist/pcap_breakloop.3pcap C
CVS import: src/external/bsd/libpcap/dist
Module Name:src Committed By: christos Date: Tue Mar 31 21:25:22 UTC 2015 Update of /cvsroot/src/external/bsd/libpcap/dist In directory ivanova.netbsd.org:/tmp/cvs-serv12174 Log Message: Numbers seem to be off here: Thursday Feb. 12, 2015 g...@alum.mit.edu/m...@sandelman.ca Summary for 1.8.0 libpcap release Support for filtering Geneve encapsulated packets. Wednesday Nov. 12, 2014 g...@alum.mit.edu/m...@sandelman.ca Summary for 1.7.0 libpcap release Fix handling of zones for BPF on Solaris new DLT for ZWAVE clarifications for read timeouts. added bpf_filter1() with extensions some fixes to compilation without stdint.h EBUSY can now be returned by SNFv3 code. Status: Vendor Tag: TCPDUMP Release Tags: libpcap-1_7_2 C src/external/bsd/libpcap/dist/grammar.y U src/external/bsd/libpcap/dist/fad-glifc.c U src/external/bsd/libpcap/dist/llc.h C src/external/bsd/libpcap/dist/pcap_setnonblock.3pcap U src/external/bsd/libpcap/dist/sunatmpos.h C src/external/bsd/libpcap/dist/sf-pcap-ng.c C src/external/bsd/libpcap/dist/pcap-dbus.c U src/external/bsd/libpcap/dist/pcap_findalldevs.3pcap U src/external/bsd/libpcap/dist/Makefile-devel-adds U src/external/bsd/libpcap/dist/aclocal.m4 U src/external/bsd/libpcap/dist/pcap_list_tstamp_types.3pcap.in C src/external/bsd/libpcap/dist/pcap-bt-linux.h U src/external/bsd/libpcap/dist/README.sita C src/external/bsd/libpcap/dist/savefile.c U src/external/bsd/libpcap/dist/CHANGES U src/external/bsd/libpcap/dist/pcap_dump_ftell.3pcap C src/external/bsd/libpcap/dist/pcap-nit.c U src/external/bsd/libpcap/dist/pcap_can_set_rfmon.3pcap U src/external/bsd/libpcap/dist/README.tru64 U src/external/bsd/libpcap/dist/org.tcpdump.chmod_bpf.plist C src/external/bsd/libpcap/dist/pcap-netfilter-linux.c U src/external/bsd/libpcap/dist/pcap-tstamp.manmisc.in U src/external/bsd/libpcap/dist/README.hpux C src/external/bsd/libpcap/dist/pcap-linux.c C src/external/bsd/libpcap/dist/pcap-can-linux.c C src/external/bsd/libpcap/dist/pcap-bpf.c C src/external/bsd/libpcap/dist/pcap_datalink_name_to_val.3pcap U src/external/bsd/libpcap/dist/pcap_open_offline.3pcap.in U src/external/bsd/libpcap/dist/pcap_list_datalinks.3pcap.in C src/external/bsd/libpcap/dist/pcap-snoop.c U src/external/bsd/libpcap/dist/pcap_major_version.3pcap U src/external/bsd/libpcap/dist/pcap-filter.manmisc.in U src/external/bsd/libpcap/dist/pcap_activate.3pcap U src/external/bsd/libpcap/dist/pcap_fileno.3pcap U src/external/bsd/libpcap/dist/pcap-dbus.h U src/external/bsd/libpcap/dist/pcap_set_tstamp_type.3pcap.in U src/external/bsd/libpcap/dist/pcap-can-linux.h U src/external/bsd/libpcap/dist/pcap-snf.h U src/external/bsd/libpcap/dist/pcap_open_dead.3pcap.in U src/external/bsd/libpcap/dist/pcap_set_rfmon.3pcap U src/external/bsd/libpcap/dist/pcap-septel.h U src/external/bsd/libpcap/dist/README U src/external/bsd/libpcap/dist/pcap_set_immediate_mode.3pcap U src/external/bsd/libpcap/dist/pcap-config.in U src/external/bsd/libpcap/dist/pcap-libdlpi.c C src/external/bsd/libpcap/dist/pcap-win32.c U src/external/bsd/libpcap/dist/pcap_set_buffer_size.3pcap C src/external/bsd/libpcap/dist/pcap_dump_open.3pcap.in U src/external/bsd/libpcap/dist/pcap_lookupnet.3pcap C src/external/bsd/libpcap/dist/pcap-bpf.h U src/external/bsd/libpcap/dist/pcap_lookupdev.3pcap U src/external/bsd/libpcap/dist/pcap_dump_close.3pcap U src/external/bsd/libpcap/dist/pcap-sita.html U src/external/bsd/libpcap/dist/sf-pcap-ng.h U src/external/bsd/libpcap/dist/pcap_lib_version.3pcap U src/external/bsd/libpcap/dist/pcap-canusb-linux.h U src/external/bsd/libpcap/dist/Makefile.in U src/external/bsd/libpcap/dist/README.macosx C src/external/bsd/libpcap/dist/fad-win32.c U src/external/bsd/libpcap/dist/README.dag U src/external/bsd/libpcap/dist/runlex.sh U src/external/bsd/libpcap/dist/pcap_dump_file.3pcap U src/external/bsd/libpcap/dist/pcap_tstamp_type_val_to_name.3pcap C src/external/bsd/libpcap/dist/pcap_setdirection.3pcap C src/external/bsd/libpcap/dist/pcap_tstamp_type_name_to_val.3pcap U src/external/bsd/libpcap/dist/pcap_inject.3pcap N src/external/bsd/libpcap/dist/scanner.c.top U src/external/bsd/libpcap/dist/pcap-config.1 U src/external/bsd/libpcap/dist/pcap-enet.c U src/external/bsd/libpcap/dist/INSTALL.txt U src/external/bsd/libpcap/dist/nlpid.h U src/external/bsd/libpcap/dist/README.linux U src/external/bsd/libpcap/dist/pcap.h U src/external/bsd/libpcap/dist/pcap-bt-monitor-linux.h U src/external/bsd/libpcap/dist/pcap-dag.h U src/external/bsd/libpcap/dist/pcap_set_datalink.3pcap U src/external/bsd/libpcap/dist/config.h.in U src/external/bsd/libpcap/dist/pcap_stats.3pcap U src/external/bsd/libpcap/dist/bpf_dump.c C src/external/bsd/libpcap/dist/pcap.3pcap.in U src/external/bsd/libpcap/dist/pcap_snapshot.3pcap U src/external/bsd/libpcap/dist/pcap_geterr.3pcap U src/external/bsd/libpcap/dist/pcap-savefile.manfile.in C src/external/bsd/libpcap/dist/pcap_breakloop.3pcap C
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Tue Mar 31 21:40:57 UTC 2015 Modified Files: src/distrib/sets/lists/base: ad.aarch64 ad.arm ad.mips ad.powerpc ad.riscv md.amd64 md.sparc64 shl.mi src/distrib/sets/lists/debug: ad.aarch64 ad.arm ad.mips ad.powerpc ad.riscv md.amd64 md.sparc64 shl.mi Log Message: bump libpcap. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/distrib/sets/lists/base/ad.aarch64 cvs rdiff -u -r1.70 -r1.71 src/distrib/sets/lists/base/ad.arm cvs rdiff -u -r1.64 -r1.65 src/distrib/sets/lists/base/ad.mips cvs rdiff -u -r1.33 -r1.34 src/distrib/sets/lists/base/ad.powerpc cvs rdiff -u -r1.15 -r1.16 src/distrib/sets/lists/base/ad.riscv cvs rdiff -u -r1.260 -r1.261 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.248 -r1.249 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.733 -r1.734 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.18 -r1.19 src/distrib/sets/lists/debug/ad.aarch64 cvs rdiff -u -r1.59 -r1.60 src/distrib/sets/lists/debug/ad.arm cvs rdiff -u -r1.54 -r1.55 src/distrib/sets/lists/debug/ad.mips cvs rdiff -u -r1.34 -r1.35 src/distrib/sets/lists/debug/ad.powerpc cvs rdiff -u -r1.15 -r1.16 src/distrib/sets/lists/debug/ad.riscv cvs rdiff -u -r1.80 -r1.81 src/distrib/sets/lists/debug/md.amd64 cvs rdiff -u -r1.78 -r1.79 src/distrib/sets/lists/debug/md.sparc64 cvs rdiff -u -r1.94 -r1.95 src/distrib/sets/lists/debug/shl.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/base/ad.aarch64 diff -u src/distrib/sets/lists/base/ad.aarch64:1.19 src/distrib/sets/lists/base/ad.aarch64:1.20 --- src/distrib/sets/lists/base/ad.aarch64:1.19 Sun Jan 25 10:50:29 2015 +++ src/distrib/sets/lists/base/ad.aarch64 Tue Mar 31 17:40:57 2015 @@ -1,4 +1,4 @@ -# $NetBSD: ad.aarch64,v 1.19 2015/01/25 15:50:29 christos Exp $ +# $NetBSD: ad.aarch64,v 1.20 2015/03/31 21:40:57 christos Exp $ ./lib/eabi base-compat-shlib compat ./lib/eabi/npf base-npf-shlib compat ./lib/eabi/npf/ext_log.so base-npf-shlib compat,pic @@ -244,7 +244,7 @@ ./usr/lib/eabi/libpam.so.4 base-compat-shlib compat,pic,pam ./usr/lib/eabi/libpam.so.4.0 base-compat-shlib compat,pic,pam ./usr/lib/eabi/libpcap.so.5 base-compat-shlib compat,pic -./usr/lib/eabi/libpcap.so.5.0 base-compat-shlib compat,pic +./usr/lib/eabi/libpcap.so.5.1 base-compat-shlib compat,pic ./usr/lib/eabi/libpci.so.2 base-compat-shlib compat,pic ./usr/lib/eabi/libpci.so.2.1 base-compat-shlib compat,pic ./usr/lib/eabi/libperfuse.so.0 base-compat-shlib compat,pic @@ -562,7 +562,7 @@ ./usr/lib/eabihf/libpam.so.4 base-compat-shlib compat,pic,pam ./usr/lib/eabihf/libpam.so.4.0 base-compat-shlib compat,pic,pam ./usr/lib/eabihf/libpcap.so.5 base-compat-shlib compat,pic -./usr/lib/eabihf/libpcap.so.5.0 base-compat-shlib compat,pic +./usr/lib/eabihf/libpcap.so.5.1 base-compat-shlib compat,pic ./usr/lib/eabihf/libpci.so.2 base-compat-shlib compat,pic ./usr/lib/eabihf/libpci.so.2.1 base-compat-shlib compat,pic ./usr/lib/eabihf/libperfuse.so.0 base-compat-shlib compat,pic @@ -878,7 +878,7 @@ ./usr/lib/oabi/libpam.so.4 base-compat-shlib compat,pic,pam ./usr/lib/oabi/libpam.so.4.0 base-compat-shlib compat,pic,pam ./usr/lib/oabi/libpcap.so.5 base-compat-shlib compat,pic -./usr/lib/oabi/libpcap.so.5.0 base-compat-shlib compat,pic +./usr/lib/oabi/libpcap.so.5.1 base-compat-shlib compat,pic ./usr/lib/oabi/libpci.so.2 base-compat-shlib compat,pic ./usr/lib/oabi/libpci.so.2.1 base-compat-shlib compat,pic ./usr/lib/oabi/libperfuse.so.0 base-compat-shlib compat,pic Index: src/distrib/sets/lists/base/ad.arm diff -u src/distrib/sets/lists/base/ad.arm:1.70 src/distrib/sets/lists/base/ad.arm:1.71 --- src/distrib/sets/lists/base/ad.arm:1.70 Sun Jan 25 10:50:29 2015 +++ src/distrib/sets/lists/base/ad.arm Tue Mar 31 17:40:57 2015 @@ -1,4 +1,4 @@ -# $NetBSD: ad.arm,v 1.70 2015/01/25 15:50:29 christos Exp $ +# $NetBSD: ad.arm,v 1.71 2015/03/31 21:40:57 christos Exp $ ./lib/oabi base-compat-shlib compat ./lib/oabi/npf base-npf-shlib compat ./lib/oabi/npf/ext_log.so base-npf-shlib compat,pic @@ -242,7 +242,7 @@ ./usr/lib/oabi/libpam.so.4 base-compat-shlib compat,pic,pam ./usr/lib/oabi/libpam.so.4.0 base-compat-shlib compat,pic,pam ./usr/lib/oabi/libpcap.so.5 base-compat-shlib compat,pic -./usr/lib/oabi/libpcap.so.5.0 base-compat-shlib compat,pic +./usr/lib/oabi/libpcap.so.5.1 base-compat-shlib compat,pic ./usr/lib/oabi/libpci.so.2 base-compat-shlib compat,pic ./usr/lib/oabi/libpci.so.2.1 base-compat-shlib compat,pic ./usr/lib/oabi/libperfuse.so.0 base-compat-shlib compat,pic Index: src/distrib/sets/lists/base/ad.mips diff -u src/distrib/sets/lists/base/ad.mips:1.64 src/distrib/sets/lists/base/ad.mips:1.65 --- src/distrib/sets/lists/base/ad.mips:1.64 Sun Jan 25 10:50:29 2015 +++
CVS commit: src/sys/net
Module Name:src Committed By: christos Date: Tue Mar 31 21:42:16 UTC 2015 Modified Files: src/sys/net: dlt.h Log Message: update with new entries from libpcap-1.7.2 To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/net/dlt.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/net/dlt.h diff -u src/sys/net/dlt.h:1.15 src/sys/net/dlt.h:1.16 --- src/sys/net/dlt.h:1.15 Wed Nov 19 14:35:21 2014 +++ src/sys/net/dlt.h Tue Mar 31 17:42:16 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: dlt.h,v 1.15 2014/11/19 19:35:21 christos Exp $ */ +/* $NetBSD: dlt.h,v 1.16 2015/03/31 21:42:16 christos Exp $ */ /*- * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 @@ -1254,7 +1254,19 @@ */ #define DLT_IPMI_HPM_2 260 -#define DLT_MATCHING_MAX 260 /* highest value in the matching range */ +/* + * per Joshua Wright jwri...@hasborg.com, formats for Zwave captures. + */ +#define DLT_ZWAVE_R1_R2 261 +#define DLT_ZWAVE_R3 262 + +/* + * per Steve Karg sk...@users.sourceforge.net, formats for Wattstopper + * Digital Lighting Management room bus serial protocol captures. + */ +#define DLT_WATTSTOPPER_DLM 263 + +#define DLT_MATCHING_MAX 263 /* highest value in the matching range */ /* * DLT and savefile link type values are split into a class and
CVS commit: src/sys/net
Module Name:src Committed By: christos Date: Tue Mar 31 21:42:16 UTC 2015 Modified Files: src/sys/net: dlt.h Log Message: update with new entries from libpcap-1.7.2 To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/net/dlt.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: src/external/bsd/tcpdump/dist
Module Name:src Committed By: christos Date: Tue Mar 31 21:45:57 UTC 2015 Update of /cvsroot/src/external/bsd/tcpdump/dist In directory ivanova.netbsd.org:/tmp/cvs-serv25203 Log Message: Monday March. 11, 2015 g...@alum.mit.edu Summary for 4.7.3 tcpdump release Capsicum fixes for FreeBSD 10 Monday March. 10, 2015 g...@alum.mit.edu Summary for 4.7.2 tcpdump release DCCP: update Packet Types with RFC4340/IANA names fixes for CVE-2015-0261: IPv6 mobility header check issue fixes for CVE-2015-2153, 2154, 2155: kday packets Friday Nov. 12, 2014 g...@alum.mit.edu Summary for 4.7.0 tcpdump release changes to hex printing of CDP packets Fix PPI printing Radius: update Packet Type Codes and Attribute Types with RFC/IANA names Add a routine to print text protocols, and add FTP/HTTP/SMTP/RTSP support. improvements to telnet printer, even if not -v omit length for bcp, print-tcp uses it formatting fixes for a bunch of protocols new bounds checks for a number of protocols split netflow 1,6, and 6 dissector up. added geneve dissector CVE-2014-9140 PPP dissector fixed. Status: Vendor Tag: TCPDUMP Release Tags: tcpdump-4_7_3 U src/external/bsd/tcpdump/dist/print-lwres.c U src/external/bsd/tcpdump/dist/nfsfh.h U src/external/bsd/tcpdump/dist/llc.h U src/external/bsd/tcpdump/dist/print-m3ua.c U src/external/bsd/tcpdump/dist/l2vpn.h U src/external/bsd/tcpdump/dist/gmt2local.c U src/external/bsd/tcpdump/dist/af.h U src/external/bsd/tcpdump/dist/Makefile-devel-adds U src/external/bsd/tcpdump/dist/print-calm-fast.c C src/external/bsd/tcpdump/dist/print-icmp6.c U src/external/bsd/tcpdump/dist/print-pppoe.c U src/external/bsd/tcpdump/dist/print-sunrpc.c C src/external/bsd/tcpdump/dist/udp.h C src/external/bsd/tcpdump/dist/print-radius.c C src/external/bsd/tcpdump/dist/print-ip.c U src/external/bsd/tcpdump/dist/print-otv.c U src/external/bsd/tcpdump/dist/rpl.h U src/external/bsd/tcpdump/dist/pcap_dump_ftell.c U src/external/bsd/tcpdump/dist/addrtoname.h U src/external/bsd/tcpdump/dist/aclocal.m4 U src/external/bsd/tcpdump/dist/print-ipx.c C src/external/bsd/tcpdump/dist/print-ascii.c U src/external/bsd/tcpdump/dist/print-atalk.c C src/external/bsd/tcpdump/dist/print-sl.c C src/external/bsd/tcpdump/dist/print-tcp.c U src/external/bsd/tcpdump/dist/print-vtp.c C src/external/bsd/tcpdump/dist/print-lspping.c U src/external/bsd/tcpdump/dist/print-cip.c U src/external/bsd/tcpdump/dist/print-802_11.c U src/external/bsd/tcpdump/dist/print-udld.c U src/external/bsd/tcpdump/dist/gmpls.h C src/external/bsd/tcpdump/dist/print-pflog.c N src/external/bsd/tcpdump/dist/print-smtp.c U src/external/bsd/tcpdump/dist/nfs.h U src/external/bsd/tcpdump/dist/print-dhcp6.c C src/external/bsd/tcpdump/dist/print-slow.c C src/external/bsd/tcpdump/dist/util.c U src/external/bsd/tcpdump/dist/machdep.h U src/external/bsd/tcpdump/dist/CHANGES C src/external/bsd/tcpdump/dist/print-icmp.c C src/external/bsd/tcpdump/dist/print-arp.c U src/external/bsd/tcpdump/dist/print-sunatm.c U src/external/bsd/tcpdump/dist/openflow.h U src/external/bsd/tcpdump/dist/print-ripng.c U src/external/bsd/tcpdump/dist/print-hsrp.c U src/external/bsd/tcpdump/dist/print-vqp.c C src/external/bsd/tcpdump/dist/print-bgp.c C src/external/bsd/tcpdump/dist/print-fr.c U src/external/bsd/tcpdump/dist/print-mptcp.c C src/external/bsd/tcpdump/dist/print-ospf.c C src/external/bsd/tcpdump/dist/print-aodv.c U src/external/bsd/tcpdump/dist/strcasecmp.c U src/external/bsd/tcpdump/dist/README.md U src/external/bsd/tcpdump/dist/print-fddi.c U src/external/bsd/tcpdump/dist/print-openflow-1.0.c C src/external/bsd/tcpdump/dist/print-pim.c N src/external/bsd/tcpdump/dist/print-ftp.c U src/external/bsd/tcpdump/dist/smbutil.c U src/external/bsd/tcpdump/dist/print-dvmrp.c C src/external/bsd/tcpdump/dist/print-gre.c C src/external/bsd/tcpdump/dist/extract.h C src/external/bsd/tcpdump/dist/machdep.c U src/external/bsd/tcpdump/dist/appletalk.h U src/external/bsd/tcpdump/dist/checksum.c U src/external/bsd/tcpdump/dist/print-msdp.c U src/external/bsd/tcpdump/dist/print-nflog.c C src/external/bsd/tcpdump/dist/print-eigrp.c U src/external/bsd/tcpdump/dist/print-beep.c C src/external/bsd/tcpdump/dist/print-mpcp.c C src/external/bsd/tcpdump/dist/print-null.c C src/external/bsd/tcpdump/dist/print-mobility.c U src/external/bsd/tcpdump/dist/parsenfsfh.c U src/external/bsd/tcpdump/dist/Makefile.in U src/external/bsd/tcpdump/dist/print-dtp.c U src/external/bsd/tcpdump/dist/packetdat.awk U src/external/bsd/tcpdump/dist/print-l2tp.c U src/external/bsd/tcpdump/dist/pcap-missing.h U src/external/bsd/tcpdump/dist/print-ipfc.c U src/external/bsd/tcpdump/dist/slcompress.h U src/external/bsd/tcpdump/dist/print-ospf6.c U src/external/bsd/tcpdump/dist/smb.h C src/external/bsd/tcpdump/dist/print-isoclns.c U src/external/bsd/tcpdump/dist/print-ap1394.c U
CVS import: src/external/bsd/tcpdump/dist
Module Name:src Committed By: christos Date: Tue Mar 31 21:45:57 UTC 2015 Update of /cvsroot/src/external/bsd/tcpdump/dist In directory ivanova.netbsd.org:/tmp/cvs-serv25203 Log Message: Monday March. 11, 2015 g...@alum.mit.edu Summary for 4.7.3 tcpdump release Capsicum fixes for FreeBSD 10 Monday March. 10, 2015 g...@alum.mit.edu Summary for 4.7.2 tcpdump release DCCP: update Packet Types with RFC4340/IANA names fixes for CVE-2015-0261: IPv6 mobility header check issue fixes for CVE-2015-2153, 2154, 2155: kday packets Friday Nov. 12, 2014 g...@alum.mit.edu Summary for 4.7.0 tcpdump release changes to hex printing of CDP packets Fix PPI printing Radius: update Packet Type Codes and Attribute Types with RFC/IANA names Add a routine to print text protocols, and add FTP/HTTP/SMTP/RTSP support. improvements to telnet printer, even if not -v omit length for bcp, print-tcp uses it formatting fixes for a bunch of protocols new bounds checks for a number of protocols split netflow 1,6, and 6 dissector up. added geneve dissector CVE-2014-9140 PPP dissector fixed. Status: Vendor Tag: TCPDUMP Release Tags: tcpdump-4_7_3 U src/external/bsd/tcpdump/dist/print-lwres.c U src/external/bsd/tcpdump/dist/nfsfh.h U src/external/bsd/tcpdump/dist/llc.h U src/external/bsd/tcpdump/dist/print-m3ua.c U src/external/bsd/tcpdump/dist/l2vpn.h U src/external/bsd/tcpdump/dist/gmt2local.c U src/external/bsd/tcpdump/dist/af.h U src/external/bsd/tcpdump/dist/Makefile-devel-adds U src/external/bsd/tcpdump/dist/print-calm-fast.c C src/external/bsd/tcpdump/dist/print-icmp6.c U src/external/bsd/tcpdump/dist/print-pppoe.c U src/external/bsd/tcpdump/dist/print-sunrpc.c C src/external/bsd/tcpdump/dist/udp.h C src/external/bsd/tcpdump/dist/print-radius.c C src/external/bsd/tcpdump/dist/print-ip.c U src/external/bsd/tcpdump/dist/print-otv.c U src/external/bsd/tcpdump/dist/rpl.h U src/external/bsd/tcpdump/dist/pcap_dump_ftell.c U src/external/bsd/tcpdump/dist/addrtoname.h U src/external/bsd/tcpdump/dist/aclocal.m4 U src/external/bsd/tcpdump/dist/print-ipx.c C src/external/bsd/tcpdump/dist/print-ascii.c U src/external/bsd/tcpdump/dist/print-atalk.c C src/external/bsd/tcpdump/dist/print-sl.c C src/external/bsd/tcpdump/dist/print-tcp.c U src/external/bsd/tcpdump/dist/print-vtp.c C src/external/bsd/tcpdump/dist/print-lspping.c U src/external/bsd/tcpdump/dist/print-cip.c U src/external/bsd/tcpdump/dist/print-802_11.c U src/external/bsd/tcpdump/dist/print-udld.c U src/external/bsd/tcpdump/dist/gmpls.h C src/external/bsd/tcpdump/dist/print-pflog.c N src/external/bsd/tcpdump/dist/print-smtp.c U src/external/bsd/tcpdump/dist/nfs.h U src/external/bsd/tcpdump/dist/print-dhcp6.c C src/external/bsd/tcpdump/dist/print-slow.c C src/external/bsd/tcpdump/dist/util.c U src/external/bsd/tcpdump/dist/machdep.h U src/external/bsd/tcpdump/dist/CHANGES C src/external/bsd/tcpdump/dist/print-icmp.c C src/external/bsd/tcpdump/dist/print-arp.c U src/external/bsd/tcpdump/dist/print-sunatm.c U src/external/bsd/tcpdump/dist/openflow.h U src/external/bsd/tcpdump/dist/print-ripng.c U src/external/bsd/tcpdump/dist/print-hsrp.c U src/external/bsd/tcpdump/dist/print-vqp.c C src/external/bsd/tcpdump/dist/print-bgp.c C src/external/bsd/tcpdump/dist/print-fr.c U src/external/bsd/tcpdump/dist/print-mptcp.c C src/external/bsd/tcpdump/dist/print-ospf.c C src/external/bsd/tcpdump/dist/print-aodv.c U src/external/bsd/tcpdump/dist/strcasecmp.c U src/external/bsd/tcpdump/dist/README.md U src/external/bsd/tcpdump/dist/print-fddi.c U src/external/bsd/tcpdump/dist/print-openflow-1.0.c C src/external/bsd/tcpdump/dist/print-pim.c N src/external/bsd/tcpdump/dist/print-ftp.c U src/external/bsd/tcpdump/dist/smbutil.c U src/external/bsd/tcpdump/dist/print-dvmrp.c C src/external/bsd/tcpdump/dist/print-gre.c C src/external/bsd/tcpdump/dist/extract.h C src/external/bsd/tcpdump/dist/machdep.c U src/external/bsd/tcpdump/dist/appletalk.h U src/external/bsd/tcpdump/dist/checksum.c U src/external/bsd/tcpdump/dist/print-msdp.c U src/external/bsd/tcpdump/dist/print-nflog.c C src/external/bsd/tcpdump/dist/print-eigrp.c U src/external/bsd/tcpdump/dist/print-beep.c C src/external/bsd/tcpdump/dist/print-mpcp.c C src/external/bsd/tcpdump/dist/print-null.c C src/external/bsd/tcpdump/dist/print-mobility.c U src/external/bsd/tcpdump/dist/parsenfsfh.c U src/external/bsd/tcpdump/dist/Makefile.in U src/external/bsd/tcpdump/dist/print-dtp.c U src/external/bsd/tcpdump/dist/packetdat.awk U src/external/bsd/tcpdump/dist/print-l2tp.c U src/external/bsd/tcpdump/dist/pcap-missing.h U src/external/bsd/tcpdump/dist/print-ipfc.c U src/external/bsd/tcpdump/dist/slcompress.h U src/external/bsd/tcpdump/dist/print-ospf6.c U src/external/bsd/tcpdump/dist/smb.h C src/external/bsd/tcpdump/dist/print-isoclns.c U src/external/bsd/tcpdump/dist/print-ap1394.c U
CVS commit: src/external/bsd/tcpdump
Module Name:src Committed By: christos Date: Tue Mar 31 21:59:35 UTC 2015 Modified Files: src/external/bsd/tcpdump/bin: Makefile src/external/bsd/tcpdump/dist: addrtoname.c configure configure.in extract.h interface.h ip.h machdep.c netdissect.h oui.c print-ahcp.c print-aodv.c print-arcnet.c print-arp.c print-ascii.c print-atm.c print-bgp.c print-bootp.c print-cdp.c print-cfm.c print-chdlc.c print-cnfp.c print-dccp.c print-decnet.c print-eigrp.c print-enc.c print-ether.c print-forces.c print-fr.c print-gre.c print-icmp.c print-icmp6.c print-ip.c print-ip6.c print-isoclns.c print-juniper.c print-ldp.c print-llc.c print-lldp.c print-lmp.c print-lspping.c print-lwapp.c print-mobility.c print-mpcp.c print-mpls.c print-null.c print-ospf.c print-pflog.c print-pim.c print-ppp.c print-radius.c print-rsvp.c print-sflow.c print-sip.c print-sl.c print-sll.c print-slow.c print-smb.c print-tcp.c print-telnet.c print-udp.c print-wb.c tcp.h tcpdump.1.in tcpdump.c udp.h util.c src/external/bsd/tcpdump/include: config.h Removed Files: src/external/bsd/tcpdump/dist: bootp.h Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/external/bsd/tcpdump/bin/Makefile cvs rdiff -u -r1.6 -r1.7 src/external/bsd/tcpdump/dist/addrtoname.c \ src/external/bsd/tcpdump/dist/print-lmp.c \ src/external/bsd/tcpdump/dist/print-pim.c \ src/external/bsd/tcpdump/dist/print-rsvp.c cvs rdiff -u -r1.1.1.3 -r0 src/external/bsd/tcpdump/dist/bootp.h cvs rdiff -u -r1.5 -r1.6 src/external/bsd/tcpdump/dist/configure \ src/external/bsd/tcpdump/dist/configure.in \ src/external/bsd/tcpdump/dist/extract.h \ src/external/bsd/tcpdump/dist/interface.h \ src/external/bsd/tcpdump/dist/machdep.c \ src/external/bsd/tcpdump/dist/print-arcnet.c \ src/external/bsd/tcpdump/dist/print-arp.c \ src/external/bsd/tcpdump/dist/print-atm.c \ src/external/bsd/tcpdump/dist/print-bgp.c \ src/external/bsd/tcpdump/dist/print-bootp.c \ src/external/bsd/tcpdump/dist/print-cdp.c \ src/external/bsd/tcpdump/dist/print-cfm.c \ src/external/bsd/tcpdump/dist/print-chdlc.c \ src/external/bsd/tcpdump/dist/print-decnet.c \ src/external/bsd/tcpdump/dist/print-eigrp.c \ src/external/bsd/tcpdump/dist/print-ether.c \ src/external/bsd/tcpdump/dist/print-fr.c \ src/external/bsd/tcpdump/dist/print-gre.c \ src/external/bsd/tcpdump/dist/print-icmp.c \ src/external/bsd/tcpdump/dist/print-isoclns.c \ src/external/bsd/tcpdump/dist/print-juniper.c \ src/external/bsd/tcpdump/dist/print-ldp.c \ src/external/bsd/tcpdump/dist/print-llc.c \ src/external/bsd/tcpdump/dist/print-lldp.c \ src/external/bsd/tcpdump/dist/print-lspping.c \ src/external/bsd/tcpdump/dist/print-ospf.c \ src/external/bsd/tcpdump/dist/print-pflog.c \ src/external/bsd/tcpdump/dist/print-ppp.c \ src/external/bsd/tcpdump/dist/print-radius.c \ src/external/bsd/tcpdump/dist/print-sflow.c \ src/external/bsd/tcpdump/dist/print-sll.c \ src/external/bsd/tcpdump/dist/print-slow.c \ src/external/bsd/tcpdump/dist/print-tcp.c \ src/external/bsd/tcpdump/dist/print-udp.c \ src/external/bsd/tcpdump/dist/tcp.h src/external/bsd/tcpdump/dist/udp.h cvs rdiff -u -r1.4 -r1.5 src/external/bsd/tcpdump/dist/ip.h \ src/external/bsd/tcpdump/dist/oui.c \ src/external/bsd/tcpdump/dist/print-aodv.c \ src/external/bsd/tcpdump/dist/print-ascii.c \ src/external/bsd/tcpdump/dist/print-cnfp.c \ src/external/bsd/tcpdump/dist/print-dccp.c \ src/external/bsd/tcpdump/dist/print-enc.c \ src/external/bsd/tcpdump/dist/print-ip6.c \ src/external/bsd/tcpdump/dist/print-lwapp.c \ src/external/bsd/tcpdump/dist/print-mobility.c \ src/external/bsd/tcpdump/dist/print-mpcp.c \ src/external/bsd/tcpdump/dist/print-mpls.c \ src/external/bsd/tcpdump/dist/print-null.c \ src/external/bsd/tcpdump/dist/print-sip.c \ src/external/bsd/tcpdump/dist/print-sl.c \ src/external/bsd/tcpdump/dist/print-smb.c \ src/external/bsd/tcpdump/dist/print-telnet.c \ src/external/bsd/tcpdump/dist/print-wb.c \ src/external/bsd/tcpdump/dist/util.c cvs rdiff -u -r1.2 -r1.3 src/external/bsd/tcpdump/dist/netdissect.h \ src/external/bsd/tcpdump/dist/print-ahcp.c cvs rdiff -u -r1.3 -r1.4 src/external/bsd/tcpdump/dist/print-forces.c cvs rdiff -u -r1.7 -r1.8 src/external/bsd/tcpdump/dist/print-icmp6.c \ src/external/bsd/tcpdump/dist/print-ip.c cvs rdiff -u -r1.9 -r1.10 src/external/bsd/tcpdump/dist/tcpdump.1.in cvs rdiff -u -r1.10 -r1.11 src/external/bsd/tcpdump/dist/tcpdump.c cvs rdiff -u -r1.6 -r1.7 src/external/bsd/tcpdump/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Tue Mar 31 21:40:57 UTC 2015 Modified Files: src/distrib/sets/lists/base: ad.aarch64 ad.arm ad.mips ad.powerpc ad.riscv md.amd64 md.sparc64 shl.mi src/distrib/sets/lists/debug: ad.aarch64 ad.arm ad.mips ad.powerpc ad.riscv md.amd64 md.sparc64 shl.mi Log Message: bump libpcap. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/distrib/sets/lists/base/ad.aarch64 cvs rdiff -u -r1.70 -r1.71 src/distrib/sets/lists/base/ad.arm cvs rdiff -u -r1.64 -r1.65 src/distrib/sets/lists/base/ad.mips cvs rdiff -u -r1.33 -r1.34 src/distrib/sets/lists/base/ad.powerpc cvs rdiff -u -r1.15 -r1.16 src/distrib/sets/lists/base/ad.riscv cvs rdiff -u -r1.260 -r1.261 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.248 -r1.249 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.733 -r1.734 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.18 -r1.19 src/distrib/sets/lists/debug/ad.aarch64 cvs rdiff -u -r1.59 -r1.60 src/distrib/sets/lists/debug/ad.arm cvs rdiff -u -r1.54 -r1.55 src/distrib/sets/lists/debug/ad.mips cvs rdiff -u -r1.34 -r1.35 src/distrib/sets/lists/debug/ad.powerpc cvs rdiff -u -r1.15 -r1.16 src/distrib/sets/lists/debug/ad.riscv cvs rdiff -u -r1.80 -r1.81 src/distrib/sets/lists/debug/md.amd64 cvs rdiff -u -r1.78 -r1.79 src/distrib/sets/lists/debug/md.sparc64 cvs rdiff -u -r1.94 -r1.95 src/distrib/sets/lists/debug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: christos Date: Tue Mar 31 22:00:53 UTC 2015 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new libpcap/tcpdump To generate a diff of this commit: cvs rdiff -u -r1.1214 -r1.1215 src/doc/3RDPARTY cvs rdiff -u -r1.2061 -r1.2062 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: christos Date: Tue Mar 31 22:00:53 UTC 2015 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new libpcap/tcpdump To generate a diff of this commit: cvs rdiff -u -r1.1214 -r1.1215 src/doc/3RDPARTY cvs rdiff -u -r1.2061 -r1.2062 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/3RDPARTY diff -u src/doc/3RDPARTY:1.1214 src/doc/3RDPARTY:1.1215 --- src/doc/3RDPARTY:1.1214 Fri Mar 27 07:35:43 2015 +++ src/doc/3RDPARTY Tue Mar 31 18:00:53 2015 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1214 2015/03/27 11:35:43 roy Exp $ +# $NetBSD: 3RDPARTY,v 1.1215 2015/03/31 22:00:53 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -745,8 +745,8 @@ libdevmapper ioctl protocol code, theref import. Talk to haad before importing new version. Package: libpcap -Version: 1.6.2 -Current Vers: 1.6.2 +Version: 1.7.2 +Current Vers: 1.7.2 Maintainer: tcpdump-work...@tcpdump.org Archive Site: http://www.tcpdump.org/release/ Home Page: http://www.tcpdump.org/ @@ -1259,8 +1259,8 @@ Notes: Run cleantags before inporting because sqlite3.c has an RCSID Package: tcpdump -Version: 4.6.2 -Current Vers: 4.6.2 +Version: 4.7.3 +Current Vers: 4.7.3 Maintainer: tcpdump-work...@lists.tcpdump.org Archive Site: http://www.tcpdump.org/release/ Home Page: http://www.tcpdump.org/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2061 src/doc/CHANGES:1.2062 --- src/doc/CHANGES:1.2061 Fri Mar 27 08:45:00 2015 +++ src/doc/CHANGES Tue Mar 31 18:00:53 2015 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.2061 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.2062 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -145,3 +145,5 @@ Changes from NetBSD 7.0 to NetBSD 8.0: libc: Update to tzcode2015b. [christos 20150324] dhcpcd(8): Import dhcpcd-6.8.1. [roy 20150327] wm(4): Add X540 support [msaitoh 20150327] + libpcap: Import 1.7.2. [christos 20150331] + tcpdump(8): Import 4.7.3. [christos 20150331]
CVS commit: src/share/man/man9
Module Name:src Committed By: riastradh Date: Tue Mar 31 20:50:29 UTC 2015 Modified Files: src/share/man/man9: fstrans.9 Log Message: Nesting shared in lazy is OK. Note nesting never blocks. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/share/man/man9/fstrans.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/net/if_vlan.c
On Tue, Mar 31, 2015 at 11:09:02AM +0900, Ryota Ozaki wrote: On Tue, Mar 31, 2015 at 1:42 AM, Matt Thomas m...@3am-software.com wrote: It lacks compensating for the fact the CRC has been stripped by the time vlan gets the packet. # matt@ explained well than me... Note that the issue was found by some strict packet capture software (not by me, so I don't know what it is); typical OSes don't complain the extra padding, so we didn't notice the issue until recently. Yeah. I misunderstood your message in the PR. I read it as if if_vlan.c should be sending 72 byte minimum size packets and the code was doing something different. That's why I asked. Maybe we should update the PR. --chris
CVS commit: src/share/man/man9
Module Name:src Committed By: riastradh Date: Tue Mar 31 21:08:06 UTC 2015 Modified Files: src/share/man/man9: fstrans.9 Log Message: More details on what may sleep and what won't sleep when. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/share/man/man9/fstrans.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/fstrans.9 diff -u src/share/man/man9/fstrans.9:1.19 src/share/man/man9/fstrans.9:1.20 --- src/share/man/man9/fstrans.9:1.19 Tue Mar 31 20:50:29 2015 +++ src/share/man/man9/fstrans.9 Tue Mar 31 21:08:06 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: fstrans.9,v 1.19 2015/03/31 20:50:29 riastradh Exp $ +.\ $NetBSD: fstrans.9,v 1.20 2015/03/31 21:08:06 riastradh Exp $ .\ .\ Copyright (c) 2007 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -167,6 +167,8 @@ in Return zero on success, or error code if .Xr vfs_busy 9 fails. +.Pp +May sleep. .It Fn fstrans_unmount mp Finalize the .Nm @@ -176,8 +178,10 @@ Clears in .Fa mp Ns Li -mnt_iflag . Caller is responsible for ensuring that no transactions are active. +.Pp +May sleep. .It Fn fstrans_start mp lock_type -Begin a transaction of type +Enter a transaction of type .Fa lock_type on the file system .Fa mp @@ -194,6 +198,14 @@ If the file system is suspended, wait un Intended for operations needed to sync the file system to its backing store in order to suspend it. .El +.Pp +However, if the current thread is already in a transaction on +.Fa mp , +.Fn fstrans_start +will enter a nested transaction and return immediately without +waiting. +.Pp +May sleep. .It Fn fstrans_start_nowait mp lock_type Like .Fn fstrans_start , @@ -277,9 +289,13 @@ where is true if and only if the buffer .Fa bp has not yet been modified. +.Pp +May sleep. .It Fn fscow_disestablish mp func cookie Disestablish a copy-on-write callback established with .Fn fscow_establish . +.Pp +May sleep. .It Fn fscow_run bp data_valid Run all copy-on-write callbacks established for the file system this buffer belongs to, if they have not already been run for this buffer. @@ -288,6 +304,8 @@ If is .Dv true the buffer data has not yet been modified. +.Pp +May sleep. .El .Sh EXAMPLES The following is an example of a file system suspend operation.
CVS commit: src/share/man/man9
Module Name:src Committed By: riastradh Date: Tue Mar 31 21:08:06 UTC 2015 Modified Files: src/share/man/man9: fstrans.9 Log Message: More details on what may sleep and what won't sleep when. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/share/man/man9/fstrans.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/usr.sbin/service
Please could this be fixed to use shell quoting in a safe way. OK, if that'll unstall the pullup-7. Are you implying that the /etc/rc.d/ system supports space in filenames? Adrian
