CVS commit: src/sys/dev/iscsi
Module Name:src
Committed By: mlelstv
Date: Sun Dec 25 06:55:28 UTC 2016
Modified Files:
src/sys/dev/iscsi: iscsi_ioctl.c iscsi_main.c iscsi_rcv.c iscsi_send.c
iscsi_utils.c
Log Message:
Lock correctly around CV calls.
Fix handling of session termination.
Enable MPSAFE processing for scsipi.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/iscsi/iscsi_ioctl.c \
src/sys/dev/iscsi/iscsi_rcv.c
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/iscsi/iscsi_main.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/iscsi/iscsi_send.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/iscsi/iscsi_utils.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/iscsi/iscsi_ioctl.c
diff -u src/sys/dev/iscsi/iscsi_ioctl.c:1.22 src/sys/dev/iscsi/iscsi_ioctl.c:1.23
--- src/sys/dev/iscsi/iscsi_ioctl.c:1.22 Wed Jun 15 04:30:30 2016
+++ src/sys/dev/iscsi/iscsi_ioctl.c Sun Dec 25 06:55:28 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsi_ioctl.c,v 1.22 2016/06/15 04:30:30 mlelstv Exp $ */
+/* $NetBSD: iscsi_ioctl.c,v 1.23 2016/12/25 06:55:28 mlelstv Exp $ */
/*-
* Copyright (c) 2004,2005,2006,2011 The NetBSD Foundation, Inc.
@@ -128,10 +128,9 @@ register_event(iscsi_register_event_para
was_empty = TAILQ_FIRST(_handlers) == NULL;
TAILQ_INSERT_TAIL(_handlers, handler, link);
- mutex_exit(_cleanup_mtx);
-
if (was_empty)
iscsi_notify_cleanup();
+ mutex_exit(_cleanup_mtx);
par->status = ISCSI_STATUS_SUCCESS;
DEB(5, ("Register Event OK, ID %d\n", par->event_id));
@@ -162,8 +161,6 @@ deregister_event(iscsi_register_event_pa
}
TAILQ_REMOVE(_handlers, handler, link);
- mutex_exit(_cleanup_mtx);
-
if (handler->waiter != NULL) {
handler->waiter->status = ISCSI_STATUS_EVENT_DEREGISTERED;
cv_broadcast(_event_cv);
@@ -173,6 +170,7 @@ deregister_event(iscsi_register_event_pa
TAILQ_REMOVE(>events, evt, link);
free(evt, M_TEMP);
}
+ mutex_exit(_cleanup_mtx);
free(handler, M_DEVBUF);
par->status = ISCSI_STATUS_SUCCESS;
@@ -490,6 +488,7 @@ void
kill_connection(connection_t *conn, uint32_t status, int logout, bool recover)
{
session_t *sess = conn->session;
+ int terminating;
DEBC(conn, 1, ("Kill_connection: terminating=%d, status=%d, logout=%d, "
"state=%d\n",
@@ -516,19 +515,18 @@ kill_connection(connection_t *conn, uint
DEBC(conn, 1, ("Kill_connection setting destroy flag\n"));
conn->destroy = TRUE;
}
- /* in case it was already terminated earlier and rcv/send-threads */
- /* are waiting */
- cv_broadcast(>idle_cv);
}
+ terminating = conn->terminating;
+ if (!terminating)
+ conn->terminating = status;
+ mutex_exit(_cleanup_mtx);
+
/* Don't recurse */
- if (conn->terminating) {
- mutex_exit(_cleanup_mtx);
+ if (terminating) {
DEBC(conn, 1, ("Kill_connection exiting (already terminating)\n"));
- return;
+ goto done;
}
- conn->terminating = status;
- mutex_exit(_cleanup_mtx);
if (conn->state == ST_FULL_FEATURE) {
sess->active_connections--;
@@ -566,8 +564,11 @@ kill_connection(connection_t *conn, uint
conn->state = ST_SETTLING;
+done:
/* let send thread take over next step of cleanup */
+ mutex_enter(>lock);
cv_broadcast(>conn_cv);
+ mutex_exit(>lock);
DEBC(conn, 5, ("kill_connection returns\n"));
}
@@ -899,10 +900,9 @@ recreate_connection(iscsi_login_paramete
suspend_ccb(ccb, FALSE);
TAILQ_INSERT_TAIL(_waiting, ccb, chain);
}
- mutex_exit(>lock);
-
init_sernum(>StatSN_buf);
cv_broadcast(>idle_cv);
+ mutex_exit(>lock);
if ((rc = send_login(connection)) != 0) {
DEBOUT(("Login failed (rc %d)\n", rc));
@@ -954,7 +954,9 @@ recreate_connection(iscsi_login_paramete
}
}
+ mutex_enter(>lock);
cv_broadcast(>sess_cv);
+ mutex_exit(>lock);
DEBC(connection, 0, ("Connection ReCreated successfully - status %d\n",
par->status));
@@ -1631,8 +1633,8 @@ add_connection_cleanup(connection_t *con
{
mutex_enter(_cleanup_mtx);
TAILQ_INSERT_TAIL(_cleanupc_list, conn, connections);
- mutex_exit(_cleanup_mtx);
iscsi_notify_cleanup();
+ mutex_exit(_cleanup_mtx);
}
/*
@@ -1646,8 +1648,8 @@ connection_timeout_co(void *par)
mutex_enter(_cleanup_mtx);
conn->timedout = TOUT_QUEUED;
TAILQ_INSERT_TAIL(_timeout_conn_list, conn, tchain);
- mutex_exit(_cleanup_mtx);
iscsi_notify_cleanup();
+ mutex_exit(_cleanup_mtx);
}
void
@@ -1685,8 +1687,8 @@ ccb_timeout_co(void *par)
mutex_enter(_cleanup_mtx);
ccb->timedout = TOUT_QUEUED;
TAILQ_INSERT_TAIL(_timeout_ccb_list, ccb, tchain);
- mutex_exit(_cleanup_mtx);
iscsi_notify_cleanup();
+ mutex_exit(_cleanup_mtx);
}
void
@@ -1773,6 +1775,13 @@ iscsi_cleanup_thread(void *par)
if (--sess->total_connections == 0) {
DEB(1, ("Cleanup: session %d\n", sess->id));
+if (!sess->terminating) {
+ sess->terminating = ISCSI_CONNECTION_TERMINATED;
+ KASSERT(sess->sessions.tqe_prev != NULL);
+
CVS commit: src/lib/libc/time
Module Name:src Committed By: abhinav Date: Sun Dec 25 06:37:50 UTC 2016 Modified Files: src/lib/libc/time: strptime.3 Log Message: As per the IEEE 1003.1-2008 standard, the range of values for the %S format specifier is [0,60]. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/lib/libc/time/strptime.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/libc/time/strptime.3 diff -u src/lib/libc/time/strptime.3:1.34 src/lib/libc/time/strptime.3:1.35 --- src/lib/libc/time/strptime.3:1.34 Sat Oct 31 02:09:06 2015 +++ src/lib/libc/time/strptime.3 Sun Dec 25 06:37:50 2016 @@ -1,4 +1,4 @@ -.\" $NetBSD: strptime.3,v 1.34 2015/10/31 02:09:06 ginsbach Exp $ +.\" $NetBSD: strptime.3,v 1.35 2016/12/25 06:37:50 abhinav Exp $ .\" .\" Copyright (c) 1997, 1998, 2008 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -162,7 +162,7 @@ the time (12-hour clock) with %p, using .It Cm \&%R the time as %H:%M. .It Cm \&%S -the seconds [0,61]; +the seconds [0,60]; leading zeros are permitted but not required. .It Cm \&%s the number of seconds since the Epoch, UTC (see
CVS commit: src/sys/uvm
Module Name:src
Committed By: cherry
Date: Sun Dec 25 06:30:58 UTC 2016
Modified Files:
src/sys/uvm: uvm_physseg.c
Log Message:
Make uvm_physseg_set_avail_start(9) available unconditional to UVM_HOTPLUG
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/uvm/uvm_physseg.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/uvm/uvm_physseg.c
diff -u src/sys/uvm/uvm_physseg.c:1.4 src/sys/uvm/uvm_physseg.c:1.5
--- src/sys/uvm/uvm_physseg.c:1.4 Sun Dec 25 03:39:26 2016
+++ src/sys/uvm/uvm_physseg.c Sun Dec 25 06:30:58 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_physseg.c,v 1.4 2016/12/25 03:39:26 christos Exp $ */
+/* $NetBSD: uvm_physseg.c,v 1.5 2016/12/25 06:30:58 cherry Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -543,34 +543,6 @@ uvm_physseg_find(paddr_t pframe, psize_t
return ps;
}
-#if defined(PMAP_STEAL_MEMORY)
-void
-uvm_physseg_set_avail_start(uvm_physseg_t upm, paddr_t avail_start)
-{
- struct uvm_physseg *ps = HANDLE_TO_PHYSSEG_NODE(upm);
-
-#if defined(DIAGNOSTIC)
- paddr_t avail_end;
- avail_end = uvm_physseg_get_avail_end(upm);
-#endif
- KASSERT(avail_start < avail_end && avail_start >= ps->start);
- ps->avail_start = avail_start;
-}
-void uvm_physseg_set_avail_end(uvm_physseg_t upm, paddr_t avail_end)
-{
- struct uvm_physseg *ps = HANDLE_TO_PHYSSEG_NODE(upm);
-
-#if defined(DIAGNOSTIC)
- paddr_t avail_start;
- avail_start = uvm_physseg_get_avail_start(upm);
-#endif
-
- KASSERT(avail_end > avail_start && avail_end <= ps->end);
-
- ps->avail_end = avail_end;
-}
-
-#endif /* PMAP_STEAL_MEMORY */
#else /* UVM_HOTPLUG */
/*
@@ -1036,11 +1008,33 @@ uvm_physseg_get_avail_start(uvm_physseg_
void
uvm_physseg_set_avail_start(uvm_physseg_t upm, paddr_t avail_start)
{
+ struct uvm_physseg *ps = HANDLE_TO_PHYSSEG_NODE(upm);
+
+#if defined(DIAGNOSTIC)
+ paddr_t avail_end;
+ avail_end = uvm_physseg_get_avail_end(upm);
KASSERT(uvm_physseg_valid_p(upm));
- HANDLE_TO_PHYSSEG_NODE(upm)->avail_start = avail_start;
+ KASSERT(avail_start < avail_end && avail_start >= ps->start);
+#endif
+
+ ps->avail_start = avail_start;
}
+void uvm_physseg_set_avail_end(uvm_physseg_t upm, paddr_t avail_end)
+{
+ struct uvm_physseg *ps = HANDLE_TO_PHYSSEG_NODE(upm);
+
+#if defined(DIAGNOSTIC)
+ paddr_t avail_start;
+ avail_start = uvm_physseg_get_avail_start(upm);
+ KASSERT(uvm_physseg_valid_p(upm));
+ KASSERT(avail_end > avail_start && avail_end <= ps->end);
#endif
+ ps->avail_end = avail_end;
+}
+
+#endif /* PMAP_STEAL_MEMORY */
+
paddr_t
uvm_physseg_get_avail_end(uvm_physseg_t upm)
{
CVS commit: src/sys/arch/evbarm/iq80321
Module Name:src
Committed By: christos
Date: Sun Dec 25 04:35:30 UTC 2016
Modified Files:
src/sys/arch/evbarm/iq80321: iq80321_machdep.c
Log Message:
fix printf format
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/evbarm/iq80321/iq80321_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/iq80321/iq80321_machdep.c
diff -u src/sys/arch/evbarm/iq80321/iq80321_machdep.c:1.56 src/sys/arch/evbarm/iq80321/iq80321_machdep.c:1.57
--- src/sys/arch/evbarm/iq80321/iq80321_machdep.c:1.56 Thu Dec 22 09:47:55 2016
+++ src/sys/arch/evbarm/iq80321/iq80321_machdep.c Sat Dec 24 23:35:30 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: iq80321_machdep.c,v 1.56 2016/12/22 14:47:55 cherry Exp $ */
+/* $NetBSD: iq80321_machdep.c,v 1.57 2016/12/25 04:35:30 christos Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: iq80321_machdep.c,v 1.56 2016/12/22 14:47:55 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80321_machdep.c,v 1.57 2016/12/25 04:35:30 christos Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -453,8 +453,8 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
/* Tell the user about the memory */
- printf("physmemory: %d pages at 0x%08lx -> 0x%08lx\n", physmem,
- physical_start, physical_end - 1);
+ printf("physmemory: %"PRIuPSIZE" pages at 0x%08lx -> 0x%08lx\n",
+ physmem, physical_start, physical_end - 1);
#endif
/*
CVS commit: src/sys/uvm
Module Name:src
Committed By: christos
Date: Sun Dec 25 03:39:26 UTC 2016
Modified Files:
src/sys/uvm: uvm_physseg.c
Log Message:
Provide a set_available_start method for the non UVM_HOTPLUG case.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/uvm/uvm_physseg.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/uvm/uvm_physseg.c
diff -u src/sys/uvm/uvm_physseg.c:1.3 src/sys/uvm/uvm_physseg.c:1.4
--- src/sys/uvm/uvm_physseg.c:1.3 Fri Dec 23 02:42:32 2016
+++ src/sys/uvm/uvm_physseg.c Sat Dec 24 22:39:26 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_physseg.c,v 1.3 2016/12/23 07:42:32 cherry Exp $ */
+/* $NetBSD: uvm_physseg.c,v 1.4 2016/12/25 03:39:26 christos Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -1032,6 +1032,15 @@ uvm_physseg_get_avail_start(uvm_physseg_
return HANDLE_TO_PHYSSEG_NODE(upm)->avail_start;
}
+#if defined(PMAP_STEAL_MEMORY)
+void
+uvm_physseg_set_avail_start(uvm_physseg_t upm, paddr_t avail_start)
+{
+ KASSERT(uvm_physseg_valid_p(upm));
+ HANDLE_TO_PHYSSEG_NODE(upm)->avail_start = avail_start;
+}
+#endif
+
paddr_t
uvm_physseg_get_avail_end(uvm_physseg_t upm)
{
CVS commit: src/doc
Module Name:src Committed By: christos Date: Sun Dec 25 00:10:34 UTC 2016 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new OpenSSH To generate a diff of this commit: cvs rdiff -u -r1.1384 -r1.1385 src/doc/3RDPARTY cvs rdiff -u -r1.2227 -r1.2228 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.1384 src/doc/3RDPARTY:1.1385 --- src/doc/3RDPARTY:1.1384 Fri Dec 23 18:17:57 2016 +++ src/doc/3RDPARTY Sat Dec 24 19:10:33 2016 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1384 2016/12/23 23:17:57 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.1385 2016/12/25 00:10:33 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1017,7 +1017,7 @@ Notes: Patch applied after OpenSSH import. Package: OpenSSH -Version: 7.3 +Version: 7.4 Current Vers: 7.4 / portable 7.4p1 Maintainer: OpenSSH Archive Site: http://www.openssh.com/ftp.html Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2227 src/doc/CHANGES:1.2228 --- src/doc/CHANGES:1.2227 Fri Dec 23 15:49:02 2016 +++ src/doc/CHANGES Sat Dec 24 19:10:33 2016 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2227 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2228 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -437,3 +437,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0: xen: Add support for kernel modules. [maxv 20161216] mips64: Use N64 binaries where kvm is required, fixing fstat, netstat, systat, crash, pstat and kgmon. [mrg 20161222] + OpenSSH: Imported 7.4. [christos 20161224]
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Sun Dec 25 00:09:20 UTC 2016 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/debug: shl.mi Log Message: bump libssh To generate a diff of this commit: cvs rdiff -u -r1.794 -r1.795 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.152 -r1.153 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/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.794 src/distrib/sets/lists/base/shl.mi:1.795 --- src/distrib/sets/lists/base/shl.mi:1.794 Wed Dec 14 07:59:51 2016 +++ src/distrib/sets/lists/base/shl.mi Sat Dec 24 19:09:20 2016 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.794 2016/12/14 12:59:51 kre Exp $ +# $NetBSD: shl.mi,v 1.795 2016/12/25 00:09:20 christos Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -775,8 +775,8 @@ ./usr/lib/libsqlite3.so.1.2 base-sys-shlib compatfile ./usr/lib/libss.sobase-obsolete obsolete ./usr/lib/libssh.sobase-secsh-shlib compatfile,crypto -./usr/lib/libssh.so.28base-secsh-shlib compatfile,crypto -./usr/lib/libssh.so.28.0 base-secsh-shlib compatfile,crypto +./usr/lib/libssh.so.29base-secsh-shlib compatfile,crypto +./usr/lib/libssh.so.29.0 base-secsh-shlib compatfile,crypto ./usr/lib/libssl.sobase-crypto-shlib compatfile,crypto ./usr/lib/libssl.so.12base-crypto-shlib compatfile,crypto ./usr/lib/libssl.so.12.0 base-crypto-shlib compatfile,crypto Index: src/distrib/sets/lists/debug/shl.mi diff -u src/distrib/sets/lists/debug/shl.mi:1.152 src/distrib/sets/lists/debug/shl.mi:1.153 --- src/distrib/sets/lists/debug/shl.mi:1.152 Sat Dec 10 00:39:13 2016 +++ src/distrib/sets/lists/debug/shl.mi Sat Dec 24 19:09:20 2016 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.152 2016/12/10 05:39:13 christos Exp $ +# $NetBSD: shl.mi,v 1.153 2016/12/25 00:09:20 christos Exp $ ./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir ./usr/libdata/debug/lib/libblacklist.so.0.0.debug comp-sys-debug debug,dynamicroot ./usr/libdata/debug/lib/libc.so.12.205.debug comp-sys-debug debug,dynamicroot @@ -262,7 +262,7 @@ ./usr/libdata/debug/usr/lib/libskey.so.2.0.debug comp-sys-debug debug,compatfile,skey ./usr/libdata/debug/usr/lib/libsl.so.5.0.debug comp-krb5-debug debug,compatfile,kerberos ./usr/libdata/debug/usr/lib/libsqlite3.so.1.2.debug comp-sys-debug debug,compatfile -./usr/libdata/debug/usr/lib/libssh.so.28.0.debug comp-secsh-debug debug,compatfile,crypto +./usr/libdata/debug/usr/lib/libssh.so.29.0.debug comp-secsh-debug debug,compatfile,crypto ./usr/libdata/debug/usr/lib/libssl.so.12.0.debug comp-crypto-debug debug,compatfile,crypto ./usr/libdata/debug/usr/lib/libstdc++.so.7.3.debug comp-sys-debug debug,compatfile,gcc=48,cxx,libstdcxx ./usr/libdata/debug/usr/lib/libstdc++.so.7.4.debug comp-sys-debug debug,compatfile,gcc=53,cxx,libstdcxx
CVS import: src/crypto/external/bsd/openssh/dist
Module Name:src Committed By: christos Date: Sun Dec 25 00:00:17 UTC 2016 Update of /cvsroot/src/crypto/external/bsd/openssh/dist In directory ivanova.netbsd.org:/tmp/cvs-serv20944 Log Message: Import OpenSSH-7.4 OpenSSH 7.4 has just been released. It will be available from the mirrors listed at http://www.openssh.com/ shortly. OpenSSH is a 100% complete SSH protocol 2.0 implementation and includes sftp client and server support. OpenSSH also includes transitional support for the legacy SSH 1.3 and 1.5 protocols that may be enabled at compile-time. Once again, we would like to thank the OpenSSH community for their continued support of the project, especially those who contributed code or patches, reported bugs, tested snapshots or donated to the project. More information on donations may be found at: http://www.openssh.com/donations.html Future deprecation notice = We plan on retiring more legacy cryptography in future releases, specifically: * In approximately August 2017, removing remaining support for the SSH v.1 protocol (client-only and currently compile-time disabled). * In the same release, removing support for Blowfish and RC4 ciphers and the RIPE-MD160 HMAC. (These are currently run-time disabled). * Refusing all RSA keys smaller than 1024 bits (the current minimum is 768 bits) * The next release of OpenSSH will remove support for running sshd(8) with privilege separation disabled. * The next release of portable OpenSSH will remove support for OpenSSL version prior to 1.0.1. This list reflects our current intentions, but please check the final release notes for future releases. Potentially-incompatible changes This release includes a number of changes that may affect existing configurations: * This release removes server support for the SSH v.1 protocol. * ssh(1): Remove 3des-cbc from the client's default proposal. 64-bit block ciphers are not safe in 2016 and we don't want to wait until attacks like SWEET32 are extended to SSH. As 3des-cbc was the only mandatory cipher in the SSH RFCs, this may cause problems connecting to older devices using the default configuration, but it's highly likely that such devices already need explicit configuration for key exchange and hostkey algorithms already anyway. * sshd(8): Remove support for pre-authentication compression. Doing compression early in the protocol probably seemed reasonable in the 1990s, but today it's clearly a bad idea in terms of both cryptography (cf. multiple compression oracle attacks in TLS) and attack surface. Pre-auth compression support has been disabled by default for >10 years. Support remains in the client. * ssh-agent will refuse to load PKCS#11 modules outside a whitelist of trusted paths by default. The path whitelist may be specified at run-time. * sshd(8): When a forced-command appears in both a certificate and an authorized keys/principals command= restriction, sshd will now refuse to accept the certificate unless they are identical. The previous (documented) behaviour of having the certificate forced-command override the other could be a bit confusing and error-prone. * sshd(8): Remove the UseLogin configuration directive and support for having /bin/login manage login sessions. Status: Vendor Tag: OPENSSH Release Tags: v74-20161219 U src/crypto/external/bsd/openssh/dist/PROTOCOL.agent U src/crypto/external/bsd/openssh/dist/kexc25519.c U src/crypto/external/bsd/openssh/dist/LICENCE U src/crypto/external/bsd/openssh/dist/OVERVIEW U src/crypto/external/bsd/openssh/dist/PROTOCOL U src/crypto/external/bsd/openssh/dist/PROTOCOL.chacha20poly1305 U src/crypto/external/bsd/openssh/dist/PROTOCOL.certkeys U src/crypto/external/bsd/openssh/dist/auth-bsdauth.c U src/crypto/external/bsd/openssh/dist/PROTOCOL.key U src/crypto/external/bsd/openssh/dist/PROTOCOL.krl U src/crypto/external/bsd/openssh/dist/PROTOCOL.mux U src/crypto/external/bsd/openssh/dist/README C src/crypto/external/bsd/openssh/dist/addrmatch.c C src/crypto/external/bsd/openssh/dist/atomicio.c U src/crypto/external/bsd/openssh/dist/atomicio.h C src/crypto/external/bsd/openssh/dist/auth-options.c U src/crypto/external/bsd/openssh/dist/auth-krb5.c U src/crypto/external/bsd/openssh/dist/auth2-hostbased.c C src/crypto/external/bsd/openssh/dist/auth-options.h U src/crypto/external/bsd/openssh/dist/auth-passwd.c C src/crypto/external/bsd/openssh/dist/kex.h C src/crypto/external/bsd/openssh/dist/auth-rhosts.c C src/crypto/external/bsd/openssh/dist/auth.c C src/crypto/external/bsd/openssh/dist/auth.h U src/crypto/external/bsd/openssh/dist/auth2-chall.c U src/crypto/external/bsd/openssh/dist/auth2-gss.c U src/crypto/external/bsd/openssh/dist/auth2-kbdint.c U src/crypto/external/bsd/openssh/dist/auth2-none.c U src/crypto/external/bsd/openssh/dist/auth2-passwd.c C
CVS commit: src/external/mit/xorg/lib/xkeyboard-config
Module Name:src
Committed By: christos
Date: Sat Dec 24 21:17:17 UTC 2016
Modified Files:
src/external/mit/xorg/lib/xkeyboard-config: Makefile.xkbdata
Log Message:
sort codes for reproducibile builds.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata
diff -u src/external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata:1.1 src/external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata:1.2
--- src/external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata:1.1 Wed Jun 10 21:49:20 2009
+++ src/external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata Sat Dec 24 16:17:16 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xkbdata,v 1.1 2009/06/11 01:49:20 mrg Exp $
+# $NetBSD: Makefile.xkbdata,v 1.2 2016/12/24 21:17:16 christos Exp $
XKBDISTDIR= ${X11SRCDIR.xkeyboard-config}/${XKBNAME}
@@ -17,7 +17,10 @@ CLEANFILES+= ${XKBNAME}.dir
${XKBNAME}.dir:
${_MKTARGET_CREATE}
rm -f ${.TARGET}
- (cd ${XKBDISTDIR} && ${XKBCOMP} -lfhlpR -o ${.OBJDIR}/${.TARGET} '*')
+ (cd ${XKBDISTDIR} && rm -f ${.OBJDIR}/${.TARGET}.tmp && \
+ ${XKBCOMP} -lfhlpR -o ${.OBJDIR}/${.TARGET}.tmp '*' && \
+ sort ${.OBJDIR}/${.TARGET}.tmp > ${.OBJDIR}/${.TARGET} && \
+ rm -f ${.OBJDIR}/${.TARGET}.tmp)
realall: ${FILES}
CVS commit: src/etc
Module Name:src
Committed By: christos
Date: Sat Dec 24 20:36:28 UTC 2016
Modified Files:
src/etc: Makefile.params
Log Message:
For MKREPRO, don't print varying params.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/etc/Makefile.params
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/Makefile.params
diff -u src/etc/Makefile.params:1.13 src/etc/Makefile.params:1.14
--- src/etc/Makefile.params:1.13 Thu Jul 23 04:03:25 2015
+++ src/etc/Makefile.params Sat Dec 24 15:36:28 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.params,v 1.13 2015/07/23 08:03:25 mrg Exp $
+# $NetBSD: Makefile.params,v 1.14 2016/12/24 20:36:28 christos Exp $
#
# Makefile fragment for printing build parameters.
#
@@ -37,10 +37,8 @@
.include # for some variables
-RELEASEVARS= BSDOBJDIR BSDSRCDIR BUILDID BUILDINFO BUILDSEED \
- DESTDIR DISTRIBVER EXTERNAL_TOOLCHAIN HAVE_GCC HAVE_GDB \
+RELEASEVARS= DISTRIBVER EXTERNAL_TOOLCHAIN HAVE_GCC HAVE_GDB \
HAVE_LLVM HAVE_PCC INSTALLWORLDDIR \
- KERNARCHDIR KERNCONFDIR KERNOBJDIR KERNSRCDIR \
MACHINE MACHINE_ARCH MAKE MAKECONF MAKEFLAGS \
MAKEOBJDIR MAKEOBJDIRPREFIX MAKEVERBOSE \
MKARZERO MKATF MKBFD MKBINUTILS MKCATPAGES \
@@ -54,14 +52,18 @@ RELEASEVARS= BSDOBJDIR BSDSRCDIR BUILDID
MKPROFILE MKREPRO \
MKSHARE MKSKEY MKSOFTFLOAT MKSTATICLIB \
MKUNPRIVED MKUPDATE MKX11 MKYP \
- NBUILDJOBS NETBSDSRCDIR \
NOCLEANDIR NODISTRIBDIRS NOINCLUDES \
- OBJMACHINE \
- RELEASEDIR RELEASEMACHINEDIR TOOLCHAIN_MISSING TOOLDIR \
+ TOOLCHAIN_MISSING \
USE_HESIOD USE_INET6 USE_JEMALLOC USE_KERBEROS USE_LDAP \
USE_PAM USE_SKEY USE_YP \
- USETOOLS USR_OBJMACHINE \
- X11SRCDIR
+ USETOOLS
+
+.if ${MKREPRO:Uno} != "yes"
+RELEASEVARS+= BSDOBJDIR BSDSRCDIR BUILDID BUILDINFO BUILDSEED \
+ DESTDIR KERNARCHDIR KERNCONFDIR KERNOBJDIR KERNSRCDIR \
+ NBUILDJOBS NETBSDSRCDIR OBJMACHINE OBJMACHINE_ARCH \
+ RELEASEDIR RELEASEMACHINEDIR TOOLDIR USR_OBJMACHINE X11SRCDIR
+.endif
#
@@ -77,7 +79,7 @@ DISTRIBVER!= ${HOST_SH} ${NETBSDSRCDIR}/
_params_redirect?= # empty
_params: .PHONY
-.for var in ${RELEASEVARS}
+.for var in ${RELEASEVARS:O}
.if defined(${var})
@printf "%20s = '%-s'\n" ${var} ${${var}:C/'/'''/gW:Q} \
${_params_redirect}
CVS commit: src/sys/uvm
Module Name:src Committed By: cherry Date: Sat Dec 24 19:21:29 UTC 2016 Modified Files: src/sys/uvm: uvm_extern.h Log Message: uvm_extern.h is has both a _KERNEL only, and a non _KERNEL only API. Since we unconditionally expose the uvm_physseg.h API via uvm_extern.h right now, and since uvm_physseg.h uses a kernel only datatype, viz psize_t, we restrict exposure of uvm_physseg.h API exposure to kernel only. This is in conformance of its documentation via uvm_hotplug(9) as a kernel internal API. To generate a diff of this commit: cvs rdiff -u -r1.200 -r1.201 src/sys/uvm/uvm_extern.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/uvm/uvm_extern.h diff -u src/sys/uvm/uvm_extern.h:1.200 src/sys/uvm/uvm_extern.h:1.201 --- src/sys/uvm/uvm_extern.h:1.200 Thu Dec 22 13:26:24 2016 +++ src/sys/uvm/uvm_extern.h Sat Dec 24 19:21:29 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_extern.h,v 1.200 2016/12/22 13:26:24 cherry Exp $ */ +/* $NetBSD: uvm_extern.h,v 1.201 2016/12/24 19:21:29 cherry Exp $ */ /* * Copyright (c) 1997 Charles D. Cranor and Washington University. @@ -472,7 +472,6 @@ extern bool vm_page_zero_enable; #if defined(_KERNEL) || defined(_KMEMUSER) #include #include -#endif /* * Include the uvm_hotplug(9) API unconditionally until @@ -481,6 +480,7 @@ extern bool vm_page_zero_enable; * After this, MD code will have to explicitly include it if needed. */ #include +#endif /* * helpers for calling ubc_release()
CVS commit: src/sys/arch/powerpc/ibm4xx
Module Name:src Committed By: cherry Date: Sat Dec 24 19:02:16 UTC 2016 Modified Files: src/sys/arch/powerpc/ibm4xx: pmap.c Log Message: Conform API use of uvm_hotplug(9) to documented behaviour: When testing for an invalid uvm_physseg_t, compare with UVM_PHYSSEG_TYPE_INVALID which is implementation agnostic. To generate a diff of this commit: cvs rdiff -u -r1.75 -r1.76 src/sys/arch/powerpc/ibm4xx/pmap.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/powerpc/ibm4xx/pmap.c diff -u src/sys/arch/powerpc/ibm4xx/pmap.c:1.75 src/sys/arch/powerpc/ibm4xx/pmap.c:1.76 --- src/sys/arch/powerpc/ibm4xx/pmap.c:1.75 Sat Dec 24 18:07:31 2016 +++ src/sys/arch/powerpc/ibm4xx/pmap.c Sat Dec 24 19:02:16 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.75 2016/12/24 18:07:31 cherry Exp $ */ +/* $NetBSD: pmap.c,v 1.76 2016/12/24 19:02:16 cherry Exp $ */ /* * Copyright 2001 Wasabi Systems, Inc. @@ -67,7 +67,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.75 2016/12/24 18:07:31 cherry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.76 2016/12/24 19:02:16 cherry Exp $"); #include #include @@ -201,7 +201,7 @@ pa_to_pv(paddr_t pa) psize_t pg; bank = uvm_physseg_find(atop(pa), ); - if (bank == -1) + if (bank == UVM_PHYSSEG_TYPE_INVALID) return NULL; return _physseg_get_pmseg(bank)->pvent[pg]; } @@ -213,7 +213,7 @@ pa_to_attr(paddr_t pa) psize_t pg; bank = uvm_physseg_find(atop(pa), ); - if (bank == -1) + if (bank == UVM_PHYSSEG_TYPE_INVALID) return NULL; return _physseg_get_pmseg(bank)->attrs[pg]; }
CVS commit: src/sys/arch/powerpc
Module Name:src
Committed By: cherry
Date: Sat Dec 24 18:34:31 UTC 2016
Modified Files:
src/sys/arch/powerpc/booke: booke_pmap.c
src/sys/arch/powerpc/include/booke: pmap.h
Log Message:
Tell mpc85xx about uvm_hotplug(9)
Should fix the evbppc build breakage.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/powerpc/booke/booke_pmap.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/powerpc/include/booke/pmap.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/booke/booke_pmap.c
diff -u src/sys/arch/powerpc/booke/booke_pmap.c:1.24 src/sys/arch/powerpc/booke/booke_pmap.c:1.25
--- src/sys/arch/powerpc/booke/booke_pmap.c:1.24 Mon Jul 11 16:06:52 2016
+++ src/sys/arch/powerpc/booke/booke_pmap.c Sat Dec 24 18:34:31 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: booke_pmap.c,v 1.24 2016/07/11 16:06:52 matt Exp $ */
+/* $NetBSD: booke_pmap.c,v 1.25 2016/12/24 18:34:31 cherry Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -38,7 +38,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: booke_pmap.c,v 1.24 2016/07/11 16:06:52 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: booke_pmap.c,v 1.25 2016/12/24 18:34:31 cherry Exp $");
#include
#include
@@ -190,8 +190,8 @@ pmap_bootstrap(vaddr_t startkernel, vadd
* for us. Must do this before uvm_pageboot_alloc()
* can be called.
*/
- pmap_limits.avail_start = vm_physmem[0].start << PGSHIFT;
- pmap_limits.avail_end = vm_physmem[vm_nphysseg - 1].end << PGSHIFT;
+ pmap_limits.avail_start = uvm_physseg_get_start(uvm_physseg_get_first()) << PGSHIFT;
+ pmap_limits.avail_end = uvm_physseg_get_end(uvm_physseg_get_last()) << PGSHIFT;
const size_t max_nsegtabs =
(pmap_round_seg(VM_MAX_KERNEL_ADDRESS)
- pmap_trunc_seg(VM_MIN_KERNEL_ADDRESS)) / NBSEG;
Index: src/sys/arch/powerpc/include/booke/pmap.h
diff -u src/sys/arch/powerpc/include/booke/pmap.h:1.16 src/sys/arch/powerpc/include/booke/pmap.h:1.17
--- src/sys/arch/powerpc/include/booke/pmap.h:1.16 Mon Jul 11 16:06:52 2016
+++ src/sys/arch/powerpc/include/booke/pmap.h Sat Dec 24 18:34:31 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.16 2016/07/11 16:06:52 matt Exp $ */
+/* $NetBSD: pmap.h,v 1.17 2016/12/24 18:34:31 cherry Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -51,6 +51,7 @@
#include
#include
#include
+#include
#ifdef __PMAP_PRIVATE
#include
#endif
@@ -151,7 +152,7 @@ pmap_md_tlb_asid_max(void)
struct vm_physseg;
static inline bool
-pmap_md_ok_to_steal_p(const struct vm_physseg *seg, size_t npgs)
+pmap_md_ok_to_steal_p(const uvm_physseg_t bank, size_t npgs)
{
return true;
}
CVS commit: src/sys/arch/powerpc/ibm4xx
Module Name:src
Committed By: cherry
Date: Sat Dec 24 18:07:31 UTC 2016
Modified Files:
src/sys/arch/powerpc/ibm4xx: pmap.c
Log Message:
introduce evbppc pmap to the uvm_hotplug(9) API
Should fix build.
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/sys/arch/powerpc/ibm4xx/pmap.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/powerpc/ibm4xx/pmap.c
diff -u src/sys/arch/powerpc/ibm4xx/pmap.c:1.74 src/sys/arch/powerpc/ibm4xx/pmap.c:1.75
--- src/sys/arch/powerpc/ibm4xx/pmap.c:1.74 Fri Dec 23 07:15:27 2016
+++ src/sys/arch/powerpc/ibm4xx/pmap.c Sat Dec 24 18:07:31 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.74 2016/12/23 07:15:27 cherry Exp $ */
+/* $NetBSD: pmap.c,v 1.75 2016/12/24 18:07:31 cherry Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.74 2016/12/23 07:15:27 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.75 2016/12/24 18:07:31 cherry Exp $");
#include
#include
@@ -197,23 +197,25 @@ static int ppc4xx_tlb_size_mask(size_t,
struct pv_entry *
pa_to_pv(paddr_t pa)
{
- int bank, pg;
+ uvm_physseg_t bank;
+ psize_t pg;
bank = uvm_physseg_find(atop(pa), );
if (bank == -1)
return NULL;
- return _PHYSMEM_PTR(bank)->pmseg.pvent[pg];
+ return _physseg_get_pmseg(bank)->pvent[pg];
}
static inline char *
pa_to_attr(paddr_t pa)
{
- int bank, pg;
+ uvm_physseg_t bank;
+ psize_t pg;
bank = uvm_physseg_find(atop(pa), );
if (bank == -1)
return NULL;
- return _PHYSMEM_PTR(bank)->pmseg.attrs[pg];
+ return _physseg_get_pmseg(bank)->attrs[pg];
}
/*
@@ -473,10 +475,12 @@ pmap_init(void)
pv = pv_table;
attr = pmap_attrib;
- for (bank = 0; bank < vm_nphysseg; bank++) {
- sz = VM_PHYSMEM_PTR(bank)->end - VM_PHYSMEM_PTR(bank)->start;
- VM_PHYSMEM_PTR(bank)->pmseg.pvent = pv;
- VM_PHYSMEM_PTR(bank)->pmseg.attrs = attr;
+ for (bank = uvm_physseg_get_first();
+ uvm_physseg_valid_p(bank);
+ bank = uvm_physseg_get_next(bank)) {
+ sz = uvm_physseg_get_end(bank) - uvm_physseg_get_start(bank);
+ uvm_physseg_get_pmseg(bank)->pvent = pv;
+ uvm_physseg_get_pmseg(bank)->attrs = attr;
pv += sz;
attr += sz;
}
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Sat Dec 24 17:44:22 UTC 2016
Modified Files:
src/share/mk: bsd.sys.mk
Log Message:
Add to lint flags for MKREPRO
To generate a diff of this commit:
cvs rdiff -u -r1.262 -r1.263 src/share/mk/bsd.sys.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.262 src/share/mk/bsd.sys.mk:1.263
--- src/share/mk/bsd.sys.mk:1.262 Fri Dec 23 16:11:45 2016
+++ src/share/mk/bsd.sys.mk Sat Dec 24 12:44:22 2016
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sys.mk,v 1.262 2016/12/23 21:11:45 christos Exp $
+# $NetBSD: bsd.sys.mk,v 1.263 2016/12/24 17:44:22 christos Exp $
#
# Build definitions used for NetBSD source tree builds.
@@ -28,6 +28,7 @@ CPPFLAGS+= -Wp,-iremap,${NETBSDSRCDIR}:/
CPPFLAGS+= -Wp,-iremap,${X11SRCDIR}:/usr/xsrc
REPROFLAGS+= -fdebug-prefix-map=\$$NETBSDSRCDIR=/usr/src
REPROFLAGS+= -fdebug-prefix-map=\$$X11SRCDIR=/usr/xsrc
+LINTFLAGS+= -R${NETBSDSRCDIR}=/usr/src -R${X11SRCDIR}=/usr/xsrc
REPROFLAGS+= -fdebug-regex-map='/usr/src/(.*)/obj.*=/usr/obj/\1'
CVS commit: src/usr.bin/xlint
Module Name:src
Committed By: christos
Date: Sat Dec 24 17:43:45 UTC 2016
Modified Files:
src/usr.bin/xlint/lint1: externs1.h main1.c mem1.c scan.l
src/usr.bin/xlint/xlint: lint.1 xlint.c
Log Message:
Add -R (source filename remapping) for MKREPRO
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/usr.bin/xlint/lint1/externs1.h
cvs rdiff -u -r1.25 -r1.26 src/usr.bin/xlint/lint1/main1.c
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/xlint/lint1/mem1.c
cvs rdiff -u -r1.67 -r1.68 src/usr.bin/xlint/lint1/scan.l
cvs rdiff -u -r1.37 -r1.38 src/usr.bin/xlint/xlint/lint.1
cvs rdiff -u -r1.45 -r1.46 src/usr.bin/xlint/xlint/xlint.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/xlint/lint1/externs1.h
diff -u src/usr.bin/xlint/lint1/externs1.h:1.32 src/usr.bin/xlint/lint1/externs1.h:1.33
--- src/usr.bin/xlint/lint1/externs1.h:1.32 Thu Apr 17 20:23:46 2014
+++ src/usr.bin/xlint/lint1/externs1.h Sat Dec 24 12:43:45 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: externs1.h,v 1.32 2014/04/18 00:23:46 christos Exp $ */
+/* $NetBSD: externs1.h,v 1.33 2016/12/24 17:43:45 christos Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -96,6 +96,8 @@ extern int yylex(void);
extern const char *fnalloc(const char *);
extern const char *fnnalloc(const char *, size_t);
extern int getfnid(const char *);
+extern void fnaddreplsrcdir(char *);
+extern const char *fnxform(const char *, size_t);
extern void initmem(void);
Index: src/usr.bin/xlint/lint1/main1.c
diff -u src/usr.bin/xlint/lint1/main1.c:1.25 src/usr.bin/xlint/lint1/main1.c:1.26
--- src/usr.bin/xlint/lint1/main1.c:1.25 Fri Apr 18 17:53:44 2014
+++ src/usr.bin/xlint/lint1/main1.c Sat Dec 24 12:43:45 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: main1.c,v 1.25 2014/04/18 21:53:44 christos Exp $ */
+/* $NetBSD: main1.c,v 1.26 2016/12/24 17:43:45 christos Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: main1.c,v 1.25 2014/04/18 21:53:44 christos Exp $");
+__RCSID("$NetBSD: main1.c,v 1.26 2016/12/24 17:43:45 christos Exp $");
#endif
#include
@@ -176,7 +176,7 @@ main(int argc, char *argv[])
setprogname(argv[0]);
ERR_ZERO();
- while ((c = getopt(argc, argv, "abcdeghmprstuvwyzFPSX:")) != -1) {
+ while ((c = getopt(argc, argv, "abcdeghmprstuvwyzFPR:SX:")) != -1) {
switch (c) {
case 'a': aflag++; break;
case 'b': bflag = 1; break;
@@ -202,6 +202,10 @@ main(int argc, char *argv[])
msglist();
return(0);
+ case 'R':
+ fnaddreplsrcdir(optarg);
+ break;
+
case 'X':
for (ptr = strtok(optarg, ","); ptr;
ptr = strtok(NULL, ",")) {
Index: src/usr.bin/xlint/lint1/mem1.c
diff -u src/usr.bin/xlint/lint1/mem1.c:1.17 src/usr.bin/xlint/lint1/mem1.c:1.18
--- src/usr.bin/xlint/lint1/mem1.c:1.17 Thu Apr 17 20:21:14 2014
+++ src/usr.bin/xlint/lint1/mem1.c Sat Dec 24 12:43:45 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: mem1.c,v 1.17 2014/04/18 00:21:14 christos Exp $ */
+/* $NetBSD: mem1.c,v 1.18 2016/12/24 17:43:45 christos Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: mem1.c,v 1.17 2014/04/18 00:21:14 christos Exp $");
+__RCSID("$NetBSD: mem1.c,v 1.18 2016/12/24 17:43:45 christos Exp $");
#endif
#include
@@ -87,6 +87,47 @@ fnalloc(const char *s)
return (s != NULL ? fnnalloc(s, strlen(s)) : NULL);
}
+struct repl {
+ char *orig;
+ char *repl;
+ size_t len;
+ struct repl *next;
+};
+
+struct repl *replist;
+
+void
+fnaddreplsrcdir(char *arg)
+{
+ struct repl *r = xmalloc(sizeof(*r));
+
+ r->orig = arg;
+ if ((r->repl = strchr(arg, '=')) == NULL)
+ err(1, "Bad replacement directory spec `%s'", arg);
+ r->len = r->repl - r->orig;
+ *(r->repl)++ = '\0';
+ if (replist == NULL) {
+ r->next = NULL;
+ } else
+ r->next = replist;
+ replist = r;
+}
+
+const char *
+fnxform(const char *name, size_t len)
+{
+ static char buf[MAXPATHLEN];
+ struct repl *r;
+
+ for (r = replist; r; r = r->next)
+ if (r->len < len && memcmp(name, r->orig, r->len) == 0)
+ break;
+ if (r == NULL)
+ return name;
+ snprintf(buf, sizeof(buf), "%s%s", r->repl, name + r->len);
+ return buf;
+}
+
const char *
fnnalloc(const char *s, size_t len)
{
@@ -111,7 +152,7 @@ fnnalloc(const char *s, size_t len)
outclr();
outint(fn->fn_id);
outchar('s');
- outstrg(fn->fn_name);
+ outstrg(fnxform(fn->fn_name, fn->fn_len));
}
return (fn->fn_name);
}
Index: src/usr.bin/xlint/lint1/scan.l
diff -u src/usr.bin/xlint/lint1/scan.l:1.67 src/usr.bin/xlint/lint1/scan.l:1.68
--- src/usr.bin/xlint/lint1/scan.l:1.67 Fri Nov 4 21:09:30 2016
+++ src/usr.bin/xlint/lint1/scan.l Sat Dec 24 12:43:45 2016
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: scan.l,v 1.67 2016/11/05 01:09:30 christos Exp $ */
+/* $NetBSD: scan.l,v 1.68 2016/12/24 17:43:45 christos Exp $ */
/*
*
CVS commit: src/sys/arch/evbarm/tisdp24xx
Module Name:src
Committed By: mlelstv
Date: Sat Dec 24 17:36:59 UTC 2016
Modified Files:
src/sys/arch/evbarm/tisdp24xx: sdp24xx_machdep.c
Log Message:
another physmem type change
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c
diff -u src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c:1.17 src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c:1.18
--- src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c:1.17 Thu Dec 22 14:47:56 2016
+++ src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c Sat Dec 24 17:36:59 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: sdp24xx_machdep.c,v 1.17 2016/12/22 14:47:56 cherry Exp $ */
+/* $NetBSD: sdp24xx_machdep.c,v 1.18 2016/12/24 17:36:59 mlelstv Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sdp24xx_machdep.c,v 1.17 2016/12/22 14:47:56 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdp24xx_machdep.c,v 1.18 2016/12/24 17:36:59 mlelstv Exp $");
#include "opt_machdep.h"
#include "opt_ddb.h"
@@ -870,7 +870,7 @@ printf("\t%#lx:%#lx\n", kernel_pt_table[
printf(mem_fmt, "SDRAM", physical_start, physical_end-1,
KERN_PHYSTOV(physical_start), KERN_PHYSTOV(physical_end-1),
- physmem);
+ (int)physmem);
printf(mem_fmt, "text section",
KERN_VTOPHYS(physical_start), KERN_VTOPHYS(etext-1),
(vaddr_t)KERNEL_BASE_phys, (vaddr_t)etext-1,
CVS commit: src/sys/arch/sh3/sh3
Module Name:src Committed By: cherry Date: Sat Dec 24 17:18:00 UTC 2016 Modified Files: src/sys/arch/sh3/sh3: pmap.c Log Message: Use the correct page frame number to steal pages during boot. Fixes the related sh3 kernel build breakage. To generate a diff of this commit: cvs rdiff -u -r1.79 -r1.80 src/sys/arch/sh3/sh3/pmap.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/sh3/sh3/pmap.c diff -u src/sys/arch/sh3/sh3/pmap.c:1.79 src/sys/arch/sh3/sh3/pmap.c:1.80 --- src/sys/arch/sh3/sh3/pmap.c:1.79 Fri Dec 23 07:15:28 2016 +++ src/sys/arch/sh3/sh3/pmap.c Sat Dec 24 17:18:00 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.79 2016/12/23 07:15:28 cherry Exp $ */ +/* $NetBSD: pmap.c,v 1.80 2016/12/24 17:18:00 cherry Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.79 2016/12/23 07:15:28 cherry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.80 2016/12/24 17:18:00 cherry Exp $"); #include #include @@ -148,7 +148,7 @@ pmap_steal_memory(vsize_t size, vaddr_t /* Steal pages */ pa = ptoa(uvm_physseg_get_start(bank)); - uvm_physseg_unplug(start, npage); + uvm_physseg_unplug(atop(pa), npage); va = SH3_PHYS_TO_P1SEG(pa); memset((void *)va, 0, size);
CVS commit: src/sys/arch/acorn26/acorn26
Module Name:src Committed By: cherry Date: Sat Dec 24 17:11:31 UTC 2016 Modified Files: src/sys/arch/acorn26/acorn26: pmap.c Log Message: pass the bank handle to uvm_physseg_get_avail_start(); Should fix the acorn26 kernel build. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sys/arch/acorn26/acorn26/pmap.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/acorn26/acorn26/pmap.c diff -u src/sys/arch/acorn26/acorn26/pmap.c:1.37 src/sys/arch/acorn26/acorn26/pmap.c:1.38 --- src/sys/arch/acorn26/acorn26/pmap.c:1.37 Fri Dec 23 07:15:27 2016 +++ src/sys/arch/acorn26/acorn26/pmap.c Sat Dec 24 17:11:31 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.37 2016/12/23 07:15:27 cherry Exp $ */ +/* $NetBSD: pmap.c,v 1.38 2016/12/24 17:11:31 cherry Exp $ */ /*- * Copyright (c) 1997, 1998, 2000 Ben Harris * All rights reserved. @@ -102,7 +102,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.37 2016/12/23 07:15:27 cherry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.38 2016/12/24 17:11:31 cherry Exp $"); #include /* for cold */ #include @@ -311,7 +311,7 @@ pmap_steal_memory(vsize_t size, vaddr_t ((char*)MEMC_PHYS_BASE + ptoa(avail_start)); avail_start++; - uvm_physseg_set_avail_start(avail_start); + uvm_physseg_set_avail_start(bank, avail_start); break; }
CVS commit: src/sys/dev/dkwedge
Module Name:src
Committed By: mlelstv
Date: Sat Dec 24 16:39:55 UTC 2016
Modified Files:
src/sys/dev/dkwedge: dk.c
Log Message:
add missing mutex/cv cleanup to error paths.
To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/sys/dev/dkwedge/dk.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/dkwedge/dk.c
diff -u src/sys/dev/dkwedge/dk.c:1.92 src/sys/dev/dkwedge/dk.c:1.93
--- src/sys/dev/dkwedge/dk.c:1.92 Fri Dec 16 15:06:39 2016
+++ src/sys/dev/dkwedge/dk.c Sat Dec 24 16:39:55 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: dk.c,v 1.92 2016/12/16 15:06:39 mlelstv Exp $ */
+/* $NetBSD: dk.c,v 1.93 2016/12/24 16:39:55 mlelstv Exp $ */
/*-
* Copyright (c) 2004, 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.92 2016/12/16 15:06:39 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.93 2016/12/24 16:39:55 mlelstv Exp $");
#ifdef _KERNEL_OPT
#include "opt_dkwedge.h"
@@ -369,6 +369,8 @@ dkwedge_add(struct dkwedge_info *dkw)
}
mutex_exit(>dk_openlock);
if (error) {
+ cv_destroy(>sc_dkdrn);
+ mutex_destroy(>sc_iolock);
bufq_free(sc->sc_bufq);
free(sc, M_DKWEDGE);
return (error);
@@ -422,6 +424,8 @@ dkwedge_add(struct dkwedge_info *dkw)
LIST_REMOVE(sc, sc_plink);
mutex_exit(>dk_openlock);
+ cv_destroy(>sc_dkdrn);
+ mutex_destroy(>sc_iolock);
bufq_free(sc->sc_bufq);
free(sc, M_DKWEDGE);
return (error);
@@ -448,6 +452,8 @@ dkwedge_add(struct dkwedge_info *dkw)
LIST_REMOVE(sc, sc_plink);
mutex_exit(>dk_openlock);
+ cv_destroy(>sc_dkdrn);
+ mutex_destroy(>sc_iolock);
bufq_free(sc->sc_bufq);
free(sc, M_DKWEDGE);
return (ENOMEM);
CVS commit: src/usr.bin/touch
Module Name:src Committed By: abhinav Date: Sat Dec 24 15:49:18 UTC 2016 Modified Files: src/usr.bin/touch: touch.1 Log Message: Update the description of the -t option to bring it in sync with IEEE 1003.1 -2008. The .SS field of the datetime argument of -t option can have range from 0 to 60 as per the 1003.1 2008 standard. POSIX has removed all mentions of double leap seconds, therefore the allowed range of seconds is now [0,60]. Also, add an ENVIRONMENT section, as the interpretation of the datetime argument in -t option depends on the TZ environment variable. Add an xref for parsedate(3) in SEE ALSO. ok wiz@ To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/usr.bin/touch/touch.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/touch/touch.1 diff -u src/usr.bin/touch/touch.1:1.25 src/usr.bin/touch/touch.1:1.26 --- src/usr.bin/touch/touch.1:1.25 Wed Oct 24 02:46:25 2012 +++ src/usr.bin/touch/touch.1 Sat Dec 24 15:49:18 2016 @@ -1,4 +1,4 @@ -.\" $NetBSD: touch.1,v 1.25 2012/10/24 02:46:25 pgoyette Exp $ +.\" $NetBSD: touch.1,v 1.26 2016/12/24 15:49:18 abhinav Exp $ .\" .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -32,7 +32,7 @@ .\" .\" @(#)touch.1 8.3 (Berkeley) 4/28/95 .\" -.Dd October 22, 2012 +.Dd December 24, 2016 .Dt TOUCH 1 .Os .Sh NAME @@ -125,7 +125,20 @@ The hour of the day, from 0 to 23. .It Ar mm The minute of the hour, from 0 to 59. .It Ar SS -The second of the minute, from 0 to 61. +The second of the minute, from 0 to 60 (permitting leap seconds). +If +.Ar SS +is 60 and the resulting time, +as affected by the +.Ev TZ +environment variable, +does not refer to a leap second, +the resulting time is one second after a time where +.Ar SS +is 59. +If +.Ar SS +is not given a value, it is assumed to be zero. .El .Pp If the @@ -146,6 +159,15 @@ and .Fl t options are mutually exclusive. If more than one of these options is present, the last one is used. +.Sh ENVIRONMENT +.Bl -tag -width -iTZ +.It Ev TZ +The timezone to be used for interpreting the +.Ar datetime +argument of the +.Fl t +option. +.El .Sh EXIT STATUS .Ex -std .Sh COMPATIBILITY @@ -176,7 +198,8 @@ If the letter pair is in the range 69 to 99, the year is set to 1969 to 1999, otherwise, the year is set in the 21st century. .Sh SEE ALSO -.Xr utimes 2 +.Xr utimes 2 , +.Xr parsedate 3 .Sh STANDARDS The .Nm
CVS commit: src/external/gpl3/gcc/dist/libstdc++-v3
Module Name:src
Committed By: kamil
Date: Sat Dec 24 15:48:26 UTC 2016
Modified Files:
src/external/gpl3/gcc/dist/libstdc++-v3/include/std: mutex
src/external/gpl3/gcc/dist/libstdc++-v3/src/c++11: mutex.cc
Log Message:
Revert introduction of FIXME_PR_51139
This change introduced ABI incompatible change with older versions shipped
on NetBSD. This back out code that is currently not working correctly due
to TLS-based std::call_once implementation in GNU libstdc++.
Error when starting gnuchash:
/usr/pkg/lib/libwebkitgtk-1.0.so.0: Undefined symbol "_ZSt15__once_callable"
(symnum = 1705)
PR 51139
Reported by
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/dist/libstdc++-v3/include/std/mutex
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/dist/libstdc++-v3/src/c++11/mutex.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/libstdc++-v3/include/std/mutex
diff -u src/external/gpl3/gcc/dist/libstdc++-v3/include/std/mutex:1.2 src/external/gpl3/gcc/dist/libstdc++-v3/include/std/mutex:1.3
--- src/external/gpl3/gcc/dist/libstdc++-v3/include/std/mutex:1.2 Wed Dec 21 21:55:46 2016
+++ src/external/gpl3/gcc/dist/libstdc++-v3/include/std/mutex Sat Dec 24 15:48:26 2016
@@ -695,7 +695,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
call_once(once_flag& __once, _Callable&& __f, _Args&&... __args);
};
-#if defined(_GLIBCXX_HAVE_TLS) && defined(FIXME_PR_51139)
+#ifdef _GLIBCXX_HAVE_TLS
extern __thread void* __once_callable;
extern __thread void (*__once_call)();
@@ -722,7 +722,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
void
call_once(once_flag& __once, _Callable&& __f, _Args&&... __args)
{
-#if defined(_GLIBCXX_HAVE_TLS) && defined(FIXME_PR_51139)
+#ifdef _GLIBCXX_HAVE_TLS
auto __bound_functor = std::__bind_simple(std::forward<_Callable>(__f),
std::forward<_Args>(__args)...);
__once_callable = std::__addressof(__bound_functor);
@@ -737,7 +737,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
int __e = __gthread_once(&__once._M_once, &__once_proxy);
-#if !defined(_GLIBCXX_HAVE_TLS) || !defined(FIXME_PR_51139)
+#ifndef _GLIBCXX_HAVE_TLS
if (__functor_lock)
__set_once_functor_lock_ptr(0);
#endif
Index: src/external/gpl3/gcc/dist/libstdc++-v3/src/c++11/mutex.cc
diff -u src/external/gpl3/gcc/dist/libstdc++-v3/src/c++11/mutex.cc:1.2 src/external/gpl3/gcc/dist/libstdc++-v3/src/c++11/mutex.cc:1.3
--- src/external/gpl3/gcc/dist/libstdc++-v3/src/c++11/mutex.cc:1.2 Wed Dec 21 21:55:46 2016
+++ src/external/gpl3/gcc/dist/libstdc++-v3/src/c++11/mutex.cc Sat Dec 24 15:48:26 2016
@@ -25,7 +25,7 @@
#include
#if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1)
-#if !defined(_GLIBCXX_HAVE_TLS) || !defined(FIXME_PR_51139)
+#ifndef _GLIBCXX_HAVE_TLS
namespace
{
inline std::unique_lock*&
@@ -41,7 +41,7 @@ namespace std _GLIBCXX_VISIBILITY(defaul
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION
-#if defined(_GLIBCXX_HAVE_TLS) && defined(FIXME_PR_51139)
+#ifdef _GLIBCXX_HAVE_TLS
__thread void* __once_callable;
__thread void (*__once_call)();
#else
@@ -76,7 +76,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{
void __once_proxy()
{
-#if !defined(_GLIBCXX_HAVE_TLS) || !defined(FIXME_PR_51139)
+#ifndef _GLIBCXX_HAVE_TLS
function __once_call = std::move(__once_functor);
if (unique_lock* __lock = __get_once_functor_lock_ptr())
{
CVS commit: src/sys/external/bsd/drm2/dist/drm/ttm
Module Name:src Committed By: riastradh Date: Sat Dec 24 15:46:50 UTC 2016 Modified Files: src/sys/external/bsd/drm2/dist/drm/ttm: ttm_tt.c Log Message: Guarantee no zero-size uao/kmem allocations via ttm. It may be that all callers guarantee no zero-size ttm objects, but I can't prove that in five minutes of browsing callers. Rather than add a KASSERT, lacking proof, we'll add a warning message so that if it does happen then it happens noisily, but we'll also prevent the bad consequences of passing zero into uao_create by rounding up to a harmless nonzero allocation. XXX pullup-7 To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/drm2/dist/drm/ttm/ttm_tt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/drm2/dist/drm/ttm/ttm_tt.c diff -u src/sys/external/bsd/drm2/dist/drm/ttm/ttm_tt.c:1.7 src/sys/external/bsd/drm2/dist/drm/ttm/ttm_tt.c:1.8 --- src/sys/external/bsd/drm2/dist/drm/ttm/ttm_tt.c:1.7 Sun Apr 24 04:26:12 2016 +++ src/sys/external/bsd/drm2/dist/drm/ttm/ttm_tt.c Sat Dec 24 15:46:50 2016 @@ -203,6 +203,9 @@ int ttm_tt_init(struct ttm_tt *ttm, stru ttm->dummy_read_page = dummy_read_page; ttm->state = tt_unpopulated; #ifdef __NetBSD__ + WARN(size == 0, "zero-size allocation in %s, please file a NetBSD PR", + __func__); /* paranoia -- can't prove in five minutes */ + size = MAX(size, 1); ttm->swap_storage = uao_create(roundup2(size, PAGE_SIZE), 0); uao_set_pgfl(ttm->swap_storage, bus_dmamem_pgfl(bdev->dmat)); #else @@ -245,6 +248,9 @@ int ttm_dma_tt_init(struct ttm_dma_tt *t ttm->dummy_read_page = dummy_read_page; ttm->state = tt_unpopulated; #ifdef __NetBSD__ + WARN(size == 0, "zero-size allocation in %s, please file a NetBSD PR", + __func__); /* paranoia -- can't prove in five minutes */ + size = MAX(size, 1); ttm->swap_storage = uao_create(roundup2(size, PAGE_SIZE), 0); uao_set_pgfl(ttm->swap_storage, bus_dmamem_pgfl(bdev->dmat)); #else
CVS commit: src/sys/uvm
Module Name:src Committed By: maya Date: Sat Dec 24 15:42:05 UTC 2016 Modified Files: src/sys/uvm: uvm_physseg.h Log Message: as a stopgap fix make all of uvm_physseg.h kernel-only. this file uses paddr_t which isn't available to userland, breaking builds that use uvm headers, like devel/libuv on pkgsrc. pointed out by Carsten Kunze on pkgsrc-users. ok riastradh To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/uvm/uvm_physseg.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/uvm/uvm_physseg.h diff -u src/sys/uvm/uvm_physseg.h:1.4 src/sys/uvm/uvm_physseg.h:1.5 --- src/sys/uvm/uvm_physseg.h:1.4 Fri Dec 23 07:15:28 2016 +++ src/sys/uvm/uvm_physseg.h Sat Dec 24 15:42:05 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_physseg.h,v 1.4 2016/12/23 07:15:28 cherry Exp $ */ +/* $NetBSD: uvm_physseg.h,v 1.5 2016/12/24 15:42:05 maya Exp $ */ /* * Consolidated API from uvm_page.c and others. @@ -16,6 +16,7 @@ #include #include +#ifdef _KERNEL /* * No APIs are explicitly #included in uvm_physseg.c */ @@ -114,5 +115,6 @@ void uvm_physseg_set_avail_start(uvm_phy void uvm_physseg_set_avail_end(uvm_physseg_t, paddr_t); #endif /* PMAP_STEAL_MEMORY */ -#endif /* _UVM_UVM_PHYSSEG_H_ */ +#endif /* _KERNEL */ +#endif /* _UVM_UVM_PHYSSEG_H_ */
CVS commit: src/share/man/man9
Module Name:src Committed By: abhinav Date: Sat Dec 24 14:04:10 UTC 2016 Modified Files: src/share/man/man9: pool.9 Log Message: Add a missing .El, which is causing the rest of the text being rendered indented. Patch provided by fox on IRC. While there, remove a .Pp before .Bl. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/share/man/man9/pool.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/pool.9 diff -u src/share/man/man9/pool.9:1.45 src/share/man/man9/pool.9:1.46 --- src/share/man/man9/pool.9:1.45 Sat Aug 15 10:18:07 2015 +++ src/share/man/man9/pool.9 Sat Dec 24 14:04:10 2016 @@ -1,4 +1,4 @@ -.\" $NetBSD: pool.9,v 1.45 2015/08/15 10:18:07 maxv Exp $ +.\" $NetBSD: pool.9,v 1.46 2016/12/24 14:04:10 abhinav Exp $ .\" .\" Copyright (c) 1997, 1998, 2007 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -82,7 +82,6 @@ The function .Fn pool_init initializes a resource pool. The arguments are: -.Pp .Bl -tag -offset indent -width "align_offset" .It Fa pp The handle identifying the pool resource instance. @@ -125,6 +124,7 @@ when the pool will never be accessed fro .It Fa ipl Specifies an interrupt priority level that will block all interrupt handlers that could potentially access the pool. +.El .Ss DESTROYING A POOL The function .Fn pool_destroy
CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Sat Dec 24 11:51:33 UTC 2016 Modified Files: src/sys/dev/usb: if_athn_usb.c Log Message: Call cv_broadcast with interlock held as per condvar(9) To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/dev/usb/if_athn_usb.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/if_athn_usb.c diff -u src/sys/dev/usb/if_athn_usb.c:1.19 src/sys/dev/usb/if_athn_usb.c:1.20 --- src/sys/dev/usb/if_athn_usb.c:1.19 Sat Dec 17 15:27:26 2016 +++ src/sys/dev/usb/if_athn_usb.c Sat Dec 24 11:51:33 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: if_athn_usb.c,v 1.19 2016/12/17 15:27:26 skrll Exp $ */ +/* $NetBSD: if_athn_usb.c,v 1.20 2016/12/24 11:51:33 skrll Exp $ */ /* $OpenBSD: if_athn_usb.c,v 1.12 2013/01/14 09:50:31 jsing Exp $ */ /*- @@ -22,7 +22,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_athn_usb.c,v 1.19 2016/12/17 15:27:26 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_athn_usb.c,v 1.20 2016/12/24 11:51:33 skrll Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -826,8 +826,8 @@ athn_usb_task(void *arg) ring->queued--; ring->next = (ring->next + 1) % ATHN_USB_HOST_CMD_RING_COUNT; } - mutex_spin_exit(>usc_task_mtx); cv_broadcast(>usc_task_cv); + mutex_spin_exit(>usc_task_mtx); } Static void
CVS commit: src/sys/arch/arm/arm32
Module Name:src Committed By: skrll Date: Sat Dec 24 09:19:23 UTC 2016 Modified Files: src/sys/arch/arm/arm32: arm32_kvminit.c Log Message: Fix VERBOSE_INIT_ARM build To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sys/arch/arm/arm32/arm32_kvminit.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/arm32/arm32_kvminit.c diff -u src/sys/arch/arm/arm32/arm32_kvminit.c:1.37 src/sys/arch/arm/arm32/arm32_kvminit.c:1.38 --- src/sys/arch/arm/arm32/arm32_kvminit.c:1.37 Wed Nov 25 08:36:50 2015 +++ src/sys/arch/arm/arm32/arm32_kvminit.c Sat Dec 24 09:19:23 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: arm32_kvminit.c,v 1.37 2015/11/25 08:36:50 skrll Exp $ */ +/* $NetBSD: arm32_kvminit.c,v 1.38 2016/12/24 09:19:23 skrll Exp $ */ /* * Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved. @@ -124,7 +124,7 @@ #include "opt_multiprocessor.h" #include -__KERNEL_RCSID(0, "$NetBSD: arm32_kvminit.c,v 1.37 2015/11/25 08:36:50 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: arm32_kvminit.c,v 1.38 2016/12/24 09:19:23 skrll Exp $"); #include #include @@ -870,7 +870,7 @@ arm32_kernel_vm_init(vaddr_t kernel_vm_b printf(mem_fmt, "SDRAM", bmi->bmi_start, bmi->bmi_end - 1, KERN_PHYSTOV(bmi, bmi->bmi_start), KERN_PHYSTOV(bmi, bmi->bmi_end - 1), - physmem); + (int)physmem); printf(mem_fmt, "text section", text.pv_pa, text.pv_pa + text.pv_size - 1, text.pv_va, text.pv_va + text.pv_size - 1,
CVS commit: src/usr.sbin/mountd
Module Name:src Committed By: abhinav Date: Sat Dec 24 08:26:57 UTC 2016 Modified Files: src/usr.sbin/mountd: mountd.8 Log Message: Remove xref to signal(7). As noted by wiz, it is probably not a good idea to mention signal(7) in SEE ALSO every time a signal name is used in a man page. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/usr.sbin/mountd/mountd.8 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/mountd/mountd.8 diff -u src/usr.sbin/mountd/mountd.8:1.37 src/usr.sbin/mountd/mountd.8:1.38 --- src/usr.sbin/mountd/mountd.8:1.37 Thu Dec 22 09:44:56 2016 +++ src/usr.sbin/mountd/mountd.8 Sat Dec 24 08:26:57 2016 @@ -1,4 +1,4 @@ -.\" $NetBSD: mountd.8,v 1.37 2016/12/22 09:44:56 abhinav Exp $ +.\" $NetBSD: mountd.8,v 1.38 2016/12/24 08:26:57 abhinav Exp $ .\" .\" Copyright (c) 1989, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -140,7 +140,6 @@ the list of remotely mounted filesystems .Xr nfssvc 2 , .Xr ipsec_set_policy 3 , .Xr exports 5 , -.Xr signal 7 , .Xr nfsd 8 , .Xr rpcbind 8 , .Xr showmount 8
CVS commit: othersrc/usr.bin/guest2core
Module Name:othersrc
Committed By: wiz
Date: Sat Dec 24 08:18:44 UTC 2016
Modified Files:
othersrc/usr.bin/guest2core: Makefile
Added Files:
othersrc/usr.bin/guest2core: guest2core.8
Log Message:
Add man page for guest2core.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 othersrc/usr.bin/guest2core/Makefile
cvs rdiff -u -r0 -r1.1 othersrc/usr.bin/guest2core/guest2core.8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/usr.bin/guest2core/Makefile
diff -u othersrc/usr.bin/guest2core/Makefile:1.1 othersrc/usr.bin/guest2core/Makefile:1.2
--- othersrc/usr.bin/guest2core/Makefile:1.1 Thu Dec 22 10:31:17 2016
+++ othersrc/usr.bin/guest2core/Makefile Sat Dec 24 08:18:44 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/12/22 10:31:17 mlelstv Exp $
+# $NetBSD: Makefile,v 1.2 2016/12/24 08:18:44 wiz Exp $
# @(#)Makefile8.1 (Berkeley) 6/6/93
.include
@@ -6,7 +6,7 @@
WARNS= 3
PROG= guest2core
SRCS= main.c
-MAN=
+MAN= guest2core.8
LDADD+= -lelf
DPADD+= ${LIBELF}
Added files:
Index: othersrc/usr.bin/guest2core/guest2core.8
diff -u /dev/null othersrc/usr.bin/guest2core/guest2core.8:1.1
--- /dev/null Sat Dec 24 08:18:44 2016
+++ othersrc/usr.bin/guest2core/guest2core.8 Sat Dec 24 08:18:44 2016
@@ -0,0 +1,85 @@
+.\" $NetBSD: guest2core.8,v 1.1 2016/12/24 08:18:44 wiz Exp $
+.\"
+.\" Copyright (c) 2016 The NetBSD Foundation, Inc.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to The NetBSD Foundation
+.\" by Thomas Klausner.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"notice, this list of conditions and the following disclaimer in the
+.\"documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+.\" POSSIBILITY OF SUCH DAMAGE.
+.\"
+.Dd December 24, 2016
+.Dt GUEST2CORE 8
+.Os
+.Sh NAME
+.Nm guest2core
+.Nd translate qemu guest memory dump to NetBSD kernel core file
+.Sh SYNOPSIS
+.Nm
+.Ar infile
+.Ar outfile
+.Ar ptd
+.Sh DESCRIPTION
+The
+.Nm
+program converts the output of
+.Xr qemu 1 Ap s
+.Xr dump-guest-memory 1
+command into a
+.Nx
+kernel core file for analysis by
+.Xr crash 8
+or
+.Xr gdb 1 .
+.Pp
+The x86_64 core dump needs a single parameter, the physical address
+of the PDP to find the MMU tables to translate the physical address
+core dump to virtual (KVA) addresses used by
+.Xr kvm 3 .
+This value needs to be passed to the program as argument
+.Ar ptd .
+.Pp
+The value is stored on the running guest in the kernel variable
+PDPpaddr.
+The value doesn't change between runs but between different kernels.
+.Pp
+You can get the value either from
+.Xr qemu 1
+onsole by looking at the virtual memory of the guest or by attaching a
+remote
+.Xr gdb 1
+to
+.Xr qemu 1 .
+In either case you need an unstripped version of the guest kernel to
+find the virtual address of PDPpaddr.
+.Sh SEE ALSO
+.Xr gdb 1 ,
+.Xr qemu 1 ,
+.Xr crash 8
+.Sh HISTORY
+.Nm
+was written by
+.An Michael van Elst Aq Mt mlel...@netbsd.org .
+.Sh BUGS
+So far,
+.Nm
+is for x86_64 only.
CVS commit: src/share/man/man9
Module Name:src Committed By: wiz Date: Sat Dec 24 08:05:47 UTC 2016 Modified Files: src/share/man/man9: uvm_hotplug.9 Log Message: Fix SYNOPSIS. Fix xref. Avoid Xr for itself. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man9/uvm_hotplug.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/uvm_hotplug.9 diff -u src/share/man/man9/uvm_hotplug.9:1.3 src/share/man/man9/uvm_hotplug.9:1.4 --- src/share/man/man9/uvm_hotplug.9:1.3 Sat Dec 24 07:22:41 2016 +++ src/share/man/man9/uvm_hotplug.9 Sat Dec 24 08:05:47 2016 @@ -1,4 +1,4 @@ -.\" $NetBSD: uvm_hotplug.9,v 1.3 2016/12/24 07:22:41 abhinav Exp $ +.\" $NetBSD: uvm_hotplug.9,v 1.4 2016/12/24 08:05:47 wiz Exp $ .\" .\" Copyright (c) 2016 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -95,7 +95,7 @@ They must never be used after .Xr uvm_init 9 . .Pp -.Em WARNING: +.Em WARNING : This is an experimental feature and should not be used in production environments. Furthermore, attempting to "hotplug" without @@ -114,7 +114,7 @@ once, at boot time, and from MD code. registers .Xr uvm 9 with a memory segment span, and on a specified -.Fa free_list. +.Fa free_list . It must be called at system boot time as part of setting up memory management. The arguments describe the start and end of the physical addresses of the @@ -280,41 +280,41 @@ depending on success or failure respecti .Sh UTILITY FUNCTIONS .Bl -ohang .It Ft bool -.Fn uvm_physseg_valid "uvm_physseg_t upm"; +.Fn uvm_physseg_valid "uvm_physseg_t upm" .It Ft paddr_t -.Fn uvm_physseg_get_start "uvm_physseg_t upm"; +.Fn uvm_physseg_get_start "uvm_physseg_t upm" .It Ft paddr_t -.Fn uvm_physseg_get_end "uvm_physseg_t upm"; +.Fn uvm_physseg_get_end "uvm_physseg_t upm" .It Ft paddr_t -.Fn uvm_physseg_get_avail_start "uvm_physseg_t upm"; +.Fn uvm_physseg_get_avail_start "uvm_physseg_t upm" .It Ft paddr_t -.Fn uvm_physseg_get_avail_end "uvm_physseg_t upm"; +.Fn uvm_physseg_get_avail_end "uvm_physseg_t upm" .It Ft struct vm_page * -.Fn uvm_physseg_get_pg "uvm_physseg_t upm" "paddr_t index"; +.Fn uvm_physseg_get_pg "uvm_physseg_t upm" "paddr_t index" .It Ft struct pmap_physseg * -.Fn uvm_physseg_get_pmesg "uvm_physseg_t upm"; +.Fn uvm_physseg_get_pmesg "uvm_physseg_t upm" .It Ft int -.Fn uvm_physseg_get_free_list "uvm_physseg_t upm"; +.Fn uvm_physseg_get_free_list "uvm_physseg_t upm" .It Ft u_int -.Fn uvm_physseg_get_start_hint "uvm_physseg_t upm"; +.Fn uvm_physseg_get_start_hint "uvm_physseg_t upm" .It Ft bool -.Fn uvm_physseg_set_start_hint "uvm_physseg_t upm" "u_int start_hint"; +.Fn uvm_physseg_set_start_hint "uvm_physseg_t upm" "u_int start_hint" .It Ft uvm_physseg_t -.Fn uvm_physseg_get_next "uvm_physseg_t upm"; +.Fn uvm_physseg_get_next "uvm_physseg_t upm" .It Ft uvm_physseg_t -.Fn uvm_physseg_get_prev "uvm_physseg_t upm"; +.Fn uvm_physseg_get_prev "uvm_physseg_t upm" .It Ft uvm_physseg_t -.Fn uvm_physseg_get_first "void"; +.Fn uvm_physseg_get_first "void" .It Ft uvm_physseg_t -.Fn uvm_physseg_get_last "void"; +.Fn uvm_physseg_get_last "void" .It Ft paddr_t -.Fn uvm_physseg_get_highest_frame "void"; +.Fn uvm_physseg_get_highest_frame "void" .It Ft paddr_t -.Fn uvm_physseg_find "paddr pframe" "psize_t *offsetp"; +.Fn uvm_physseg_find "paddr pframe" "psize_t *offsetp" .It Ft void -.Fn uvm_physseg_set_avail_start "uvm_physseg_t upm" "paddr_t avail_start"; +.Fn uvm_physseg_set_avail_start "uvm_physseg_t upm" "paddr_t avail_start" .It Ft void -.Fn uvm_physseg_set_avail_end "uvm_physseg_t upm" "paddr_t avail_end"; +.Fn uvm_physseg_set_avail_end "uvm_physseg_t upm" "paddr_t avail_end" .El .Pp .Fn uvm_physseg_valid @@ -499,20 +499,20 @@ in a kernel build where is not enabled. .Sh DIAGNOSTICS Tests for -.Xr uvm_hotplug 9 +.Nm are in .Pa tests/sys/uvm . .Pp Unit / functional tests are in .Pa tests/sys/uvm/t_uvm_physseg.c . These tests focus on the expected working of the -.Xr uvm_hotplug 9 +.Nm API and its utility functions. .Pp Load tests can be found in .Pa tests/sys/uvm/t_uvm_physseg_load.c . These tests focus on stressing the -.Xr uvm_hotplug 9 +.Nm implementation in order to make performance comparisons between kernel builds with and without .Cd 'options UVM_HOTPLUG' @@ -533,7 +533,7 @@ The uvm hotplug API is exported via .Sh HISTORY This API emerged out of the need to insert new pages at runtime in the Xen -.Xr balloon 9 +.Xr x86/balloon 4 driver. .Sh AUTHORS .An -nosplit
