CVS commit: src/share/man/man5
Module Name:src Committed By: simonb Date: Sun Apr 26 00:40:10 UTC 2020 Modified Files: src/share/man/man5: locate.conf.5 Log Message: More path markup. Ref wizd(8). To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/share/man/man5/locate.conf.5 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/man5/locate.conf.5 diff -u src/share/man/man5/locate.conf.5:1.11 src/share/man/man5/locate.conf.5:1.12 --- src/share/man/man5/locate.conf.5:1.11 Sat Apr 25 13:51:04 2020 +++ src/share/man/man5/locate.conf.5 Sun Apr 26 00:40:10 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: locate.conf.5,v 1.11 2020/04/25 13:51:04 wiz Exp $ +.\" $NetBSD: locate.conf.5,v 1.12 2020/04/26 00:40:10 simonb Exp $ .\" .\" Copyright (c) 2004 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -121,14 +121,16 @@ Default: !local cd9660 fdesc kernfs proc .It Sy searchpath Ar directory ... Specify base directories to be put in the database. .Pp -Default: / +Default: +.Pa / .It Sy workdir Ar directory Specify the working directory of locate.updatedb, in which a temporary file is placed. The temporary file is a list of all files, and you should specify a directory that has enough space to hold it. .Pp -Default: /tmp +Default: +.Pa /tmp .El .Pp Refer to
CVS commit: src/share/man/man5
Module Name:src Committed By: simonb Date: Sun Apr 26 00:40:10 UTC 2020 Modified Files: src/share/man/man5: locate.conf.5 Log Message: More path markup. Ref wizd(8). To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/share/man/man5/locate.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/miscfs/genfs
Module Name:src
Committed By: christos
Date: Sat Apr 25 22:28:47 UTC 2020
Modified Files:
src/sys/miscfs/genfs: genfs_vnops.c
Log Message:
Allow root to access and modify system space extended attributes.
XXX: this routine should not be using the string, but the attribute namespace.
I have fixed this in the ACL code.
To generate a diff of this commit:
cvs rdiff -u -r1.202 -r1.203 src/sys/miscfs/genfs/genfs_vnops.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/miscfs/genfs/genfs_vnops.c
diff -u src/sys/miscfs/genfs/genfs_vnops.c:1.202 src/sys/miscfs/genfs/genfs_vnops.c:1.203
--- src/sys/miscfs/genfs/genfs_vnops.c:1.202 Sun Feb 23 17:14:04 2020
+++ src/sys/miscfs/genfs/genfs_vnops.c Sat Apr 25 18:28:47 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: genfs_vnops.c,v 1.202 2020/02/23 22:14:04 ad Exp $ */
+/* $NetBSD: genfs_vnops.c,v 1.203 2020/04/25 22:28:47 christos Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: genfs_vnops.c,v 1.202 2020/02/23 22:14:04 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfs_vnops.c,v 1.203 2020/04/25 22:28:47 christos Exp $");
#include
#include
@@ -904,9 +904,13 @@ int
genfs_can_extattr(kauth_cred_t cred, int access_mode, vnode_t *vp,
const char *attr)
{
- /* We can't allow privileged namespaces. */
- if (strncasecmp(attr, "system", 6) == 0)
- return EPERM;
+ /*
+ * This string comparison is bogus: see xattr_native in vfs_xattr.c;
+ * it is going to go away soon.
+ */
+ if (strncasecmp(attr, "system.", 7) == 0)
+ return kauth_authorize_system(cred, KAUTH_SYSTEM_FS_EXTATTR,
+ 0, vp->v_mount, NULL, NULL);
return VOP_ACCESS(vp, access_mode, cred);
}
CVS commit: src/sys/miscfs/genfs
Module Name:src Committed By: christos Date: Sat Apr 25 22:28:47 UTC 2020 Modified Files: src/sys/miscfs/genfs: genfs_vnops.c Log Message: Allow root to access and modify system space extended attributes. XXX: this routine should not be using the string, but the attribute namespace. I have fixed this in the ACL code. To generate a diff of this commit: cvs rdiff -u -r1.202 -r1.203 src/sys/miscfs/genfs/genfs_vnops.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/evbarm/conf
Module Name:src Committed By: jmcneill Date: Sat Apr 25 22:08:49 UTC 2020 Modified Files: src/sys/arch/evbarm/conf: GENERIC64 Log Message: Add (commented out) nouveaufb To generate a diff of this commit: cvs rdiff -u -r1.155 -r1.156 src/sys/arch/evbarm/conf/GENERIC64 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/GENERIC64 diff -u src/sys/arch/evbarm/conf/GENERIC64:1.155 src/sys/arch/evbarm/conf/GENERIC64:1.156 --- src/sys/arch/evbarm/conf/GENERIC64:1.155 Sat Apr 25 22:08:04 2020 +++ src/sys/arch/evbarm/conf/GENERIC64 Sat Apr 25 22:08:49 2020 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC64,v 1.155 2020/04/25 22:08:04 jmcneill Exp $ +# $NetBSD: GENERIC64,v 1.156 2020/04/25 22:08:49 jmcneill Exp $ # # GENERIC ARM (aarch64) kernel # @@ -544,7 +544,8 @@ options FONT_BOLD16x32 # GPU #nouveau* at fdt? # NVIDIA GPU -#nouveau* at pci? +#nouveau* at pci? dev ? function ? +#nouveaufb* at nouveaufbbus? radeon* at pci? dev ? function ? # AMD Radeon radeondrmkmsfb* at radeonfbbus?
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Sat Apr 25 22:08:49 UTC 2020 Modified Files: src/sys/arch/evbarm/conf: GENERIC64 Log Message: Add (commented out) nouveaufb To generate a diff of this commit: cvs rdiff -u -r1.155 -r1.156 src/sys/arch/evbarm/conf/GENERIC64 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: jmcneill Date: Sat Apr 25 22:08:05 UTC 2020 Modified Files: src/sys/arch/evbarm/conf: GENERIC64 Log Message: Add acpiacad, acpibat, acpifan, acpitz To generate a diff of this commit: cvs rdiff -u -r1.154 -r1.155 src/sys/arch/evbarm/conf/GENERIC64 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: jmcneill Date: Sat Apr 25 22:08:05 UTC 2020 Modified Files: src/sys/arch/evbarm/conf: GENERIC64 Log Message: Add acpiacad, acpibat, acpifan, acpitz To generate a diff of this commit: cvs rdiff -u -r1.154 -r1.155 src/sys/arch/evbarm/conf/GENERIC64 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/GENERIC64 diff -u src/sys/arch/evbarm/conf/GENERIC64:1.154 src/sys/arch/evbarm/conf/GENERIC64:1.155 --- src/sys/arch/evbarm/conf/GENERIC64:1.154 Sat Apr 18 11:00:38 2020 +++ src/sys/arch/evbarm/conf/GENERIC64 Sat Apr 25 22:08:04 2020 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC64,v 1.154 2020/04/18 11:00:38 skrll Exp $ +# $NetBSD: GENERIC64,v 1.155 2020/04/25 22:08:04 jmcneill Exp $ # # GENERIC ARM (aarch64) kernel # @@ -202,9 +202,13 @@ simplebus* at fdt? pass 0 # ACPI support acpifdt* at fdt? pass 1 acpi* at acpifdt? +acpiacad* at acpi? +acpibat* at acpi? acpibut* at acpi? +acpifan* at acpi? acpiged* at acpi? acpilid* at acpi? +acpitz* at acpi? # CPUs cpus* at fdt? pass 0
CVS commit: src/sys/arch/arm/acpi
Module Name:src Committed By: jmcneill Date: Sat Apr 25 21:34:26 UTC 2020 Modified Files: src/sys/arch/arm/acpi: plcom_acpi.c Log Message: Enable HW FIFO To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/acpi/plcom_acpi.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/evbarm/dev
Module Name:src Committed By: jmcneill Date: Sat Apr 25 21:34:08 UTC 2020 Modified Files: src/sys/arch/evbarm/dev: plcom.c Log Message: plcom_common_putc: do not wait for FIFO to train after writing data To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/sys/arch/evbarm/dev/plcom.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/dev/plcom.c diff -u src/sys/arch/evbarm/dev/plcom.c:1.60 src/sys/arch/evbarm/dev/plcom.c:1.61 --- src/sys/arch/evbarm/dev/plcom.c:1.60 Sun Nov 10 21:16:25 2019 +++ src/sys/arch/evbarm/dev/plcom.c Sat Apr 25 21:34:08 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: plcom.c,v 1.60 2019/11/10 21:16:25 chs Exp $ */ +/* $NetBSD: plcom.c,v 1.61 2020/04/25 21:34:08 jmcneill Exp $ */ /*- * Copyright (c) 2001 ARM Ltd @@ -94,7 +94,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: plcom.c,v 1.60 2019/11/10 21:16:25 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: plcom.c,v 1.61 2020/04/25 21:34:08 jmcneill Exp $"); #include "opt_plcom.h" #include "opt_ddb.h" @@ -2327,11 +2327,6 @@ plcom_common_putc(dev_t dev, struct plco PWRITE1(pi, PL01XCOM_DR, c); PLCOM_BARRIER(pi, BR | BW); - /* wait for this transmission to complete */ - timo = 150; - while (!ISSET(PREAD1(pi, PL01XCOM_FR), PL01X_FR_TXFE) && --timo) - continue; - splx(s); }
CVS commit: src/sys/arch/arm/acpi
Module Name:src Committed By: jmcneill Date: Sat Apr 25 21:34:26 UTC 2020 Modified Files: src/sys/arch/arm/acpi: plcom_acpi.c Log Message: Enable HW FIFO To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/acpi/plcom_acpi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/acpi/plcom_acpi.c diff -u src/sys/arch/arm/acpi/plcom_acpi.c:1.2 src/sys/arch/arm/acpi/plcom_acpi.c:1.3 --- src/sys/arch/arm/acpi/plcom_acpi.c:1.2 Fri Nov 16 23:18:00 2018 +++ src/sys/arch/arm/acpi/plcom_acpi.c Sat Apr 25 21:34:26 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: plcom_acpi.c,v 1.2 2018/11/16 23:18:00 jmcneill Exp $ */ +/* $NetBSD: plcom_acpi.c,v 1.3 2020/04/25 21:34:26 jmcneill Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: plcom_acpi.c,v 1.2 2018/11/16 23:18:00 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: plcom_acpi.c,v 1.3 2020/04/25 21:34:26 jmcneill Exp $"); #include #include @@ -96,7 +96,7 @@ plcom_acpi_attach(device_t parent, devic goto done; } - sc->sc_hwflags = PLCOM_HW_TXFIFO_DISABLE; + sc->sc_hwflags = 0; sc->sc_swflags = 0; sc->sc_pi.pi_type = PLCOM_TYPE_PL011;
CVS commit: src/sys/arch/evbarm/dev
Module Name:src Committed By: jmcneill Date: Sat Apr 25 21:34:08 UTC 2020 Modified Files: src/sys/arch/evbarm/dev: plcom.c Log Message: plcom_common_putc: do not wait for FIFO to train after writing data To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/sys/arch/evbarm/dev/plcom.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/rump
On Sat, Apr 25, 2020 at 08:49:14AM -0700, Jason Thorpe wrote: > Why were any of these files touched by Xen changes? listsrcdirs is expected, we need to add xen here (because we now need xen/intrdefs.h For others I don't know. Actually a cvs diff shows that only the $NetBSD: $ did change. -- Manuel Bouyer NetBSD: 26 ans d'experience feront toujours la difference --
CVS commit: src/sys/arch/xen/xen
Module Name:src Committed By: jdolecek Date: Sat Apr 25 20:05:25 UTC 2020 Modified Files: src/sys/arch/xen/xen: xbdback_xenbus.c Log Message: parse indirect_op using appropriate 32/64-bit access types, this fixes the BLKIF_OP_INDIRECT handling for 32-bit DomU running against 64-bit Dom0, problem reported and fix tested by Manuel make sure to use the provided indirect_op when reporting back errors To generate a diff of this commit: cvs rdiff -u -r1.91 -r1.92 src/sys/arch/xen/xen/xbdback_xenbus.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/xen/xen
Module Name:src
Committed By: jdolecek
Date: Sat Apr 25 20:05:25 UTC 2020
Modified Files:
src/sys/arch/xen/xen: xbdback_xenbus.c
Log Message:
parse indirect_op using appropriate 32/64-bit access types, this fixes
the BLKIF_OP_INDIRECT handling for 32-bit DomU running against 64-bit Dom0,
problem reported and fix tested by Manuel
make sure to use the provided indirect_op when reporting back errors
To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 src/sys/arch/xen/xen/xbdback_xenbus.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/xen/xen/xbdback_xenbus.c
diff -u src/sys/arch/xen/xen/xbdback_xenbus.c:1.91 src/sys/arch/xen/xen/xbdback_xenbus.c:1.92
--- src/sys/arch/xen/xen/xbdback_xenbus.c:1.91 Sat Apr 25 15:26:18 2020
+++ src/sys/arch/xen/xen/xbdback_xenbus.c Sat Apr 25 20:05:25 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: xbdback_xenbus.c,v 1.91 2020/04/25 15:26:18 bouyer Exp $ */
+/* $NetBSD: xbdback_xenbus.c,v 1.92 2020/04/25 20:05:25 jdolecek Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xbdback_xenbus.c,v 1.91 2020/04/25 15:26:18 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xbdback_xenbus.c,v 1.92 2020/04/25 20:05:25 jdolecek Exp $");
#include
#include
@@ -966,9 +966,13 @@ xbdback_co_main_loop(struct xbdback_inst
blkif_request_t *req, *reqn;
blkif_x86_32_request_t *req32;
blkif_x86_64_request_t *req64;
- blkif_request_indirect_t *rin;
+ blkif_request_indirect_t *rinn;
+ blkif_x86_32_request_indirect_t *rin32;
+ blkif_x86_64_request_indirect_t *rin64;
if (xbdi->xbdi_ring.ring_n.req_cons != xbdi->xbdi_req_prod) {
+ uint8_t real_op = 0xff;
+
req = >xbdi_xen_req;
memset(req, 0, sizeof(*req));
@@ -976,19 +980,31 @@ xbdback_co_main_loop(struct xbdback_inst
case XBDIP_NATIVE:
reqn = RING_GET_REQUEST(>xbdi_ring.ring_n,
xbdi->xbdi_ring.ring_n.req_cons);
- req->operation = reqn->operation;
+ real_op = req->operation = reqn->operation;
+ if (real_op == BLKIF_OP_INDIRECT) {
+rinn = (blkif_request_indirect_t *)reqn;
+real_op = rinn->indirect_op;
+ }
req->id = reqn->id;
break;
case XBDIP_32:
req32 = RING_GET_REQUEST(>xbdi_ring.ring_32,
xbdi->xbdi_ring.ring_n.req_cons);
- req->operation = req32->operation;
+ real_op = req->operation = req32->operation;
+ if (real_op == BLKIF_OP_INDIRECT) {
+rin32 = (blkif_x86_32_request_indirect_t*)req32;
+real_op = rin32->indirect_op;
+ }
req->id = req32->id;
break;
case XBDIP_64:
req64 = RING_GET_REQUEST(>xbdi_ring.ring_64,
xbdi->xbdi_ring.ring_n.req_cons);
- req->operation = req64->operation;
+ real_op = req->operation = req64->operation;
+ if (real_op == BLKIF_OP_INDIRECT) {
+rin64 = (blkif_x86_64_request_indirect_t*)req64;
+real_op = rin64->indirect_op;
+ }
req->id = req64->id;
break;
}
@@ -1002,16 +1018,13 @@ xbdback_co_main_loop(struct xbdback_inst
switch (req->operation) {
case BLKIF_OP_INDIRECT:
/* just check indirect_op, rest is handled later */
- rin = (blkif_request_indirect_t *)
- RING_GET_REQUEST(>xbdi_ring.ring_n,
-xbdi->xbdi_ring.ring_n.req_cons);
- if (rin->indirect_op != BLKIF_OP_READ &&
- rin->indirect_op != BLKIF_OP_WRITE) {
+ if (real_op != BLKIF_OP_READ &&
+ real_op != BLKIF_OP_WRITE) {
if (ratecheck(>xbdi_lasterr_time,
_err_intvl)) {
printf("%s: unknown ind operation %d\n",
xbdi->xbdi_name,
- rin->indirect_op);
+ real_op);
}
goto fail;
}
@@ -1031,7 +1044,7 @@ xbdback_co_main_loop(struct xbdback_inst
xbdi->xbdi_name, req->operation);
}
fail:
- xbdback_send_reply(xbdi, req->id, req->operation,
+ xbdback_send_reply(xbdi, req->id, real_op,
BLKIF_RSP_ERROR);
xbdi->xbdi_cont = xbdback_co_main_incr;
break;
@@ -1136,12 +1149,6 @@ xbdback_co_io(struct xbdback_instance *x
KASSERT(req->operation == BLKIF_OP_READ ||
req->operation == BLKIF_OP_WRITE ||
req->operation == BLKIF_OP_INDIRECT);
- if (req->operation == BLKIF_OP_WRITE) {
- if (xbdi->xbdi_ro) {
- error = EROFS;
- goto end;
- }
- }
/* copy request segments */
switch (xbdi->xbdi_proto) {
@@ -1212,6 +1219,13 @@ xbdback_co_io(struct xbdback_instance *x
break;
}
+ if (req->operation == BLKIF_OP_WRITE) {
+ if (xbdi->xbdi_ro) {
+ error = EROFS;
+ goto end;
+ }
+ }
+
/* Max value checked already earlier */
if (req->nr_segments < 1)
goto bad_nr_segments;
@@ -1228,8 +1242,7 @@ xbdback_co_io(struct xbdback_instance *x
/* FALLTHROUGH */
end:
- xbdback_send_reply(xbdi, xbdi->xbdi_xen_req.id,
- xbdi->xbdi_xen_req.operation,
+ xbdback_send_reply(xbdi, req->id, req->operation,
(error == EROFS) ? BLKIF_RSP_EOPNOTSUPP : BLKIF_RSP_ERROR);
xbdi->xbdi_cont = xbdback_co_main_incr;
CVS commit: src/external/bsd/flex/dist/src
Module Name:src Committed By: joerg Date: Sat Apr 25 18:56:26 UTC 2020 Modified Files: src/external/bsd/flex/dist/src: flex.skl Log Message: Fix misindentations in the flex skeleton triggered by dtrace's dt_lex.l. Upstream committed as a631f5da8d4fd60fbde7b06bcf43bc9a155c27d5 To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/external/bsd/flex/dist/src/flex.skl 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/flex/dist/src/flex.skl diff -u src/external/bsd/flex/dist/src/flex.skl:1.13 src/external/bsd/flex/dist/src/flex.skl:1.14 --- src/external/bsd/flex/dist/src/flex.skl:1.13 Sun Dec 23 22:14:29 2018 +++ src/external/bsd/flex/dist/src/flex.skl Sat Apr 25 18:56:26 2020 @@ -1216,11 +1216,11 @@ m4_ifdef( [[]], m4_ifdef( [[M4_YY_USES_REJECT]], [[ -/* Create the reject buffer large enough to save one state per allowed character. */ -if ( ! YY_G(yy_state_buf) ) -YY_G(yy_state_buf) = (yy_state_type *)yyalloc(YY_STATE_BUF_SIZE M4_YY_CALL_LAST_ARG); -if ( ! YY_G(yy_state_buf) ) -YY_FATAL_ERROR( "out of dynamic memory in yylex()" ); + /* Create the reject buffer large enough to save one state per allowed character. */ + if ( ! YY_G(yy_state_buf) ) + YY_G(yy_state_buf) = (yy_state_type *)yyalloc(YY_STATE_BUF_SIZE M4_YY_CALL_LAST_ARG); + if ( ! YY_G(yy_state_buf) ) + YY_FATAL_ERROR( "out of dynamic memory in yylex()" ); ]]) if ( ! YY_G(yy_start) ) @@ -1749,7 +1749,7 @@ m4_ifdef( [[M4_YY_USES_REJECT]], %% [17.0] code to find the next state, and perhaps do backing up, goes here M4_YY_NOOP_GUTS_VAR(); - return yy_is_jam ? 0 : yy_current_state; +return yy_is_jam ? 0 : yy_current_state; }
CVS commit: src/external/bsd/flex/dist/src
Module Name:src Committed By: joerg Date: Sat Apr 25 18:56:26 UTC 2020 Modified Files: src/external/bsd/flex/dist/src: flex.skl Log Message: Fix misindentations in the flex skeleton triggered by dtrace's dt_lex.l. Upstream committed as a631f5da8d4fd60fbde7b06bcf43bc9a155c27d5 To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/external/bsd/flex/dist/src/flex.skl 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: christos Date: Sat Apr 25 18:20:57 UTC 2020 Modified Files: src/usr.bin/make: nonints.h str.c var.c src/usr.bin/make/unit-tests: sysv.exp sysv.mk Log Message: - Percent on the rhs is special only if the lhs has one too. - If the rhs does not have percent, but the lhs has, the result is the rhs This behavior matches gmake To generate a diff of this commit: cvs rdiff -u -r1.74 -r1.75 src/usr.bin/make/nonints.h cvs rdiff -u -r1.39 -r1.40 src/usr.bin/make/str.c cvs rdiff -u -r1.222 -r1.223 src/usr.bin/make/var.c cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/sysv.exp cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/sysv.mk 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: christos
Date: Sat Apr 25 18:20:57 UTC 2020
Modified Files:
src/usr.bin/make: nonints.h str.c var.c
src/usr.bin/make/unit-tests: sysv.exp sysv.mk
Log Message:
- Percent on the rhs is special only if the lhs has one too.
- If the rhs does not have percent, but the lhs has, the result is the rhs
This behavior matches gmake
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/usr.bin/make/nonints.h
cvs rdiff -u -r1.39 -r1.40 src/usr.bin/make/str.c
cvs rdiff -u -r1.222 -r1.223 src/usr.bin/make/var.c
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/sysv.exp
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/sysv.mk
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/nonints.h
diff -u src/usr.bin/make/nonints.h:1.74 src/usr.bin/make/nonints.h:1.75
--- src/usr.bin/make/nonints.h:1.74 Sun Sep 4 20:40:29 2016
+++ src/usr.bin/make/nonints.h Sat Apr 25 14:20:57 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nonints.h,v 1.74 2016/09/05 00:40:29 sevan Exp $ */
+/* $NetBSD: nonints.h,v 1.75 2020/04/25 18:20:57 christos Exp $ */
/*-
* Copyright (c) 1988, 1989, 1990, 1993
@@ -138,8 +138,8 @@ char *str_concat(const char *, const cha
char **brk_string(const char *, int *, Boolean, char **);
char *Str_FindSubstring(const char *, const char *);
int Str_Match(const char *, const char *);
-char *Str_SYSVMatch(const char *, const char *, int *len);
-void Str_SYSVSubst(Buffer *, char *, char *, int);
+char *Str_SYSVMatch(const char *, const char *, size_t *, Boolean *);
+void Str_SYSVSubst(Buffer *, char *, char *, size_t, Boolean);
/* suff.c */
void Suff_ClearSuffixes(void);
Index: src/usr.bin/make/str.c
diff -u src/usr.bin/make/str.c:1.39 src/usr.bin/make/str.c:1.40
--- src/usr.bin/make/str.c:1.39 Sun Dec 1 18:53:49 2019
+++ src/usr.bin/make/str.c Sat Apr 25 14:20:57 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: str.c,v 1.39 2019/12/01 23:53:49 rillig Exp $ */
+/* $NetBSD: str.c,v 1.40 2020/04/25 18:20:57 christos Exp $ */
/*-
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: str.c,v 1.39 2019/12/01 23:53:49 rillig Exp $";
+static char rcsid[] = "$NetBSD: str.c,v 1.40 2020/04/25 18:20:57 christos Exp $";
#else
#include
#ifndef lint
#if 0
static char sccsid[] = "@(#)str.c 5.8 (Berkeley) 6/1/90";
#else
-__RCSID("$NetBSD: str.c,v 1.39 2019/12/01 23:53:49 rillig Exp $");
+__RCSID("$NetBSD: str.c,v 1.40 2020/04/25 18:20:57 christos Exp $");
#endif
#endif/* not lint */
#endif
@@ -452,12 +452,14 @@ thisCharOK: ++pattern;
*---
*/
char *
-Str_SYSVMatch(const char *word, const char *pattern, int *len)
+Str_SYSVMatch(const char *word, const char *pattern, size_t *len,
+Boolean *hasPercent)
{
const char *p = pattern;
const char *w = word;
const char *m;
+*hasPercent = FALSE;
if (*p == '\0') {
/* Null pattern is the whole string */
*len = strlen(w);
@@ -465,6 +467,7 @@ Str_SYSVMatch(const char *word, const ch
}
if ((m = strchr(p, '%')) != NULL) {
+ *hasPercent = TRUE;
/* check that the prefix matches */
for (; p != m && *w && *w == *p; w++, p++)
continue;
@@ -509,19 +512,21 @@ Str_SYSVMatch(const char *word, const ch
*---
*/
void
-Str_SYSVSubst(Buffer *buf, char *pat, char *src, int len)
+Str_SYSVSubst(Buffer *buf, char *pat, char *src, size_t len,
+Boolean lhsHasPercent)
{
char *m;
-if ((m = strchr(pat, '%')) != NULL) {
+if ((m = strchr(pat, '%')) != NULL && lhsHasPercent) {
/* Copy the prefix */
Buf_AddBytes(buf, m - pat, pat);
/* skip the % */
pat = m + 1;
}
-
-/* Copy the pattern */
-Buf_AddBytes(buf, len, src);
+if (m != NULL || !lhsHasPercent) {
+ /* Copy the pattern */
+ Buf_AddBytes(buf, len, src);
+}
/* append the rest */
Buf_AddBytes(buf, strlen(pat), pat);
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.222 src/usr.bin/make/var.c:1.223
--- src/usr.bin/make/var.c:1.222 Sat Feb 2 22:19:29 2019
+++ src/usr.bin/make/var.c Sat Apr 25 14:20:57 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.222 2019/02/03 03:19:29 mrg Exp $ */
+/* $NetBSD: var.c,v 1.223 2020/04/25 18:20:57 christos Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.222 2019/02/03 03:19:29 mrg Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.223 2020/04/25 18:20:57 christos Exp $";
#else
#include
#ifndef lint
#if 0
static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: var.c,v 1.222 2019/02/03 03:19:29 mrg Exp $");
+__RCSID("$NetBSD: var.c,v 1.223 2020/04/25 18:20:57 christos Exp $");
#endif
#endif
CVS commit: src/sys/kern
Module Name:src
Committed By: thorpej
Date: Sat Apr 25 17:43:23 UTC 2020
Modified Files:
src/sys/kern: kern_threadpool.c
Log Message:
Take the ASSERT_SLEEPABLE() out of threadpool_cancel_job() and add a
comment explaining why we can't make that assertion there.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/kern/kern_threadpool.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_threadpool.c
diff -u src/sys/kern/kern_threadpool.c:1.17 src/sys/kern/kern_threadpool.c:1.18
--- src/sys/kern/kern_threadpool.c:1.17 Sun Feb 9 22:57:39 2020
+++ src/sys/kern/kern_threadpool.c Sat Apr 25 17:43:23 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_threadpool.c,v 1.17 2020/02/09 22:57:39 riastradh Exp $ */
+/* $NetBSD: kern_threadpool.c,v 1.18 2020/04/25 17:43:23 thorpej Exp $ */
/*-
* Copyright (c) 2014, 2018 The NetBSD Foundation, Inc.
@@ -81,7 +81,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_threadpool.c,v 1.17 2020/02/09 22:57:39 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_threadpool.c,v 1.18 2020/04/25 17:43:23 thorpej Exp $");
#include
#include
@@ -933,7 +933,12 @@ void
threadpool_cancel_job(struct threadpool *pool, struct threadpool_job *job)
{
- ASSERT_SLEEPABLE();
+ /*
+ * We may sleep here, but we can't ASSERT_SLEEPABLE() because
+ * the job lock (used to interlock the cv_wait()) may in fact
+ * legitimately be a spin lock, so the assertion would fire
+ * as a false-positive.
+ */
KASSERT(mutex_owned(job->job_lock));
CVS commit: src/sys/kern
Module Name:src Committed By: thorpej Date: Sat Apr 25 17:43:23 UTC 2020 Modified Files: src/sys/kern: kern_threadpool.c Log Message: Take the ASSERT_SLEEPABLE() out of threadpool_cancel_job() and add a comment explaining why we can't make that assertion there. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/kern/kern_threadpool.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src Committed By: bouyer Date: Sat Apr 25 16:10:06 UTC 2020 Modified Files: src/sys/arch/amd64/conf: XEN3_DOM0 XEN3_DOMU src/sys/arch/i386/conf: GENERIC XEN3PAE_DOM0 XEN3PAE_DOMU Log Message: Disable -g, which got enabled by mistake in the bouyer-xenpvh merge To generate a diff of this commit: cvs rdiff -u -r1.176 -r1.177 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.92 -r1.93 src/sys/arch/amd64/conf/XEN3_DOMU cvs rdiff -u -r1.1228 -r1.1229 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.24 -r1.25 src/sys/arch/i386/conf/XEN3PAE_DOM0 cvs rdiff -u -r1.12 -r1.13 src/sys/arch/i386/conf/XEN3PAE_DOMU Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src Committed By: bouyer Date: Sat Apr 25 16:10:06 UTC 2020 Modified Files: src/sys/arch/amd64/conf: XEN3_DOM0 XEN3_DOMU src/sys/arch/i386/conf: GENERIC XEN3PAE_DOM0 XEN3PAE_DOMU Log Message: Disable -g, which got enabled by mistake in the bouyer-xenpvh merge To generate a diff of this commit: cvs rdiff -u -r1.176 -r1.177 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.92 -r1.93 src/sys/arch/amd64/conf/XEN3_DOMU cvs rdiff -u -r1.1228 -r1.1229 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.24 -r1.25 src/sys/arch/i386/conf/XEN3PAE_DOM0 cvs rdiff -u -r1.12 -r1.13 src/sys/arch/i386/conf/XEN3PAE_DOMU Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/XEN3_DOM0 diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.176 src/sys/arch/amd64/conf/XEN3_DOM0:1.177 --- src/sys/arch/amd64/conf/XEN3_DOM0:1.176 Sat Apr 25 15:26:16 2020 +++ src/sys/arch/amd64/conf/XEN3_DOM0 Sat Apr 25 16:10:06 2020 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.176 2020/04/25 15:26:16 bouyer Exp $ +# $NetBSD: XEN3_DOM0,v 1.177 2020/04/25 16:10:06 bouyer Exp $ include "arch/amd64/conf/std.xen" @@ -12,7 +12,7 @@ options INCLUDE_CONFIG_FILE # embed con #options UVMHIST_PRINT #options SYSCALL_DEBUG -#ident "XEN3_DOM0-$Revision: 1.176 $" +#ident "XEN3_DOM0-$Revision: 1.177 $" maxusers 32 # estimated number of users @@ -61,7 +61,7 @@ options DDB_ONPANIC=1 # see also sysctl options DDB_HISTORY_SIZE=512 # enable history editing in DDB #options KGDB # remote debugger #options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x2f8,KGDB_DEVRATE=57600 -makeoptions DEBUG="-g" # compile full symbol table +#makeoptions DEBUG="-g" # compile full symbol table makeoptions COPTS="-O2 -fno-omit-frame-pointer" options DDB_COMMANDONENTER="show registers" Index: src/sys/arch/amd64/conf/XEN3_DOMU diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.92 src/sys/arch/amd64/conf/XEN3_DOMU:1.93 --- src/sys/arch/amd64/conf/XEN3_DOMU:1.92 Sat Apr 25 15:26:16 2020 +++ src/sys/arch/amd64/conf/XEN3_DOMU Sat Apr 25 16:10:06 2020 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOMU,v 1.92 2020/04/25 15:26:16 bouyer Exp $ +# $NetBSD: XEN3_DOMU,v 1.93 2020/04/25 16:10:06 bouyer Exp $ include "arch/amd64/conf/std.xen" @@ -11,7 +11,7 @@ options INCLUDE_CONFIG_FILE # embed con #options UVMHIST_PRINT #options SYSCALL_DEBUG -#ident "XEN3_DOMU-$Revision: 1.92 $" +#ident "XEN3_DOMU-$Revision: 1.93 $" maxusers 32 # estimated number of users @@ -51,7 +51,7 @@ options DDB_ONPANIC=1 # see also sysctl options DDB_HISTORY_SIZE=512 # enable history editing in DDB #options KGDB # remote debugger #options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x2f8,KGDB_DEVRATE=57600 -makeoptions DEBUG="-g" # compile full symbol table +#makeoptions DEBUG="-g" # compile full symbol table makeoptions COPTS="-O2 -fno-omit-frame-pointer" options DDB_COMMANDONENTER="trace;show registers" Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1228 src/sys/arch/i386/conf/GENERIC:1.1229 --- src/sys/arch/i386/conf/GENERIC:1.1228 Sat Apr 25 15:26:16 2020 +++ src/sys/arch/i386/conf/GENERIC Sat Apr 25 16:10:06 2020 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1228 2020/04/25 15:26:16 bouyer Exp $ +# $NetBSD: GENERIC,v 1.1229 2020/04/25 16:10:06 bouyer Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1228 $" +#ident "GENERIC-$Revision: 1.1229 $" maxusers 64 # estimated number of users @@ -128,7 +128,7 @@ options DDB_HISTORY_SIZE=512 # enable h #options DDB_VERBOSE_HELP #options KGDB # remote debugger #options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600 -makeoptions DEBUG="-g" # compile full symbol table +#makeoptions DEBUG="-g" # compile full symbol table #options KUBSAN # Kernel Undefined Behavior Sanitizer (kUBSan) #options UBSAN_ALWAYS_FATAL # (optional) Panic on all kUBSan reports #options SYSCALL_STATS # per syscall counts Index: src/sys/arch/i386/conf/XEN3PAE_DOM0 diff -u src/sys/arch/i386/conf/XEN3PAE_DOM0:1.24 src/sys/arch/i386/conf/XEN3PAE_DOM0:1.25 --- src/sys/arch/i386/conf/XEN3PAE_DOM0:1.24 Sat Apr 25 15:26:16 2020 +++ src/sys/arch/i386/conf/XEN3PAE_DOM0 Sat Apr 25 16:10:06 2020 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3PAE_DOM0,v 1.24 2020/04/25 15:26:16 bouyer Exp $ +# $NetBSD: XEN3PAE_DOM0,v 1.25 2020/04/25 16:10:06 bouyer Exp $ # # XEN3_0: Xen 3.0 domain0 kernel @@ -74,7 +74,7 @@ options DDB_ONPANIC=1 # see also sysctl options DDB_HISTORY_SIZE=512 # enable history editing in DDB #options KGDB # remote debugger #options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x2f8,KGDB_DEVRATE=57600 -makeoptions DEBUG="-g" # compile full symbol table +#makeoptions DEBUG="-g" # compile full symbol table options DDB_COMMANDONENTER="show
Re: CVS commit: src/sys/rump
Why were any of these files touched by Xen changes? > On Apr 25, 2020, at 8:42 AM, Manuel Bouyer wrote: > > Module Name: src > Committed By: bouyer > Date: Sat Apr 25 15:42:15 UTC 2020 > > Modified Files: > src/sys/rump: listsrcdirs > src/sys/rump/dev/lib/libumass: Makefile > src/sys/rump/fs/lib/libffs: Makefile > src/sys/rump/include/rump: rump_syscalls.h > src/sys/rump/librump/rumpkern: lwproc.c rump.c rump_syscalls.c sleepq.c > src/sys/rump/librump/rumpvfs: rump_vfs.c rumpfs.c > > Log Message: > Merge the bouyer-xenpvh branch, bringing in Xen PV drivers support under HVM > guests in GENERIC. > Xen support can be disabled at runtime with > boot -c > disable hypervisor > > > To generate a diff of this commit: > cvs rdiff -u -r1.49 -r1.50 src/sys/rump/listsrcdirs > cvs rdiff -u -r1.11 -r1.12 src/sys/rump/dev/lib/libumass/Makefile > cvs rdiff -u -r1.18 -r1.19 src/sys/rump/fs/lib/libffs/Makefile > cvs rdiff -u -r1.115 -r1.116 src/sys/rump/include/rump/rump_syscalls.h > cvs rdiff -u -r1.47 -r1.48 src/sys/rump/librump/rumpkern/lwproc.c > cvs rdiff -u -r1.345 -r1.346 src/sys/rump/librump/rumpkern/rump.c > cvs rdiff -u -r1.146 -r1.147 src/sys/rump/librump/rumpkern/rump_syscalls.c > cvs rdiff -u -r1.19 -r1.20 src/sys/rump/librump/rumpkern/sleepq.c > cvs rdiff -u -r1.92 -r1.93 src/sys/rump/librump/rumpvfs/rump_vfs.c > cvs rdiff -u -r1.157 -r1.158 src/sys/rump/librump/rumpvfs/rumpfs.c > > Please note that diffs are not public domain; they are subject to the > copyright notices on the relevant files. > -- thorpej
CVS commit: src
Module Name:src Committed By: bouyer Date: Sat Apr 25 15:46:59 UTC 2020 Modified Files: src/distrib/sets/lists/comp: md.amd64 md.i386 src/share/mk: bsd.klinks.mk Log Message: Add /usr/include/xen/intrdefs.h to sets Add xen to KLINKFILES for amd64/i386 To generate a diff of this commit: cvs rdiff -u -r1.276 -r1.277 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.194 -r1.195 src/distrib/sets/lists/comp/md.i386 cvs rdiff -u -r1.14 -r1.15 src/share/mk/bsd.klinks.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: bouyer
Date: Sat Apr 25 15:46:59 UTC 2020
Modified Files:
src/distrib/sets/lists/comp: md.amd64 md.i386
src/share/mk: bsd.klinks.mk
Log Message:
Add /usr/include/xen/intrdefs.h to sets
Add xen to KLINKFILES for amd64/i386
To generate a diff of this commit:
cvs rdiff -u -r1.276 -r1.277 src/distrib/sets/lists/comp/md.amd64
cvs rdiff -u -r1.194 -r1.195 src/distrib/sets/lists/comp/md.i386
cvs rdiff -u -r1.14 -r1.15 src/share/mk/bsd.klinks.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/md.amd64
diff -u src/distrib/sets/lists/comp/md.amd64:1.276 src/distrib/sets/lists/comp/md.amd64:1.277
--- src/distrib/sets/lists/comp/md.amd64:1.276 Fri Feb 7 18:48:58 2020
+++ src/distrib/sets/lists/comp/md.amd64 Sat Apr 25 15:46:59 2020
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.276 2020/02/07 18:48:58 kamil Exp $
+# $NetBSD: md.amd64,v 1.277 2020/04/25 15:46:59 bouyer Exp $
./usr/include/amd64comp-c-include
./usr/include/amd64/ansi.h comp-c-include
./usr/include/amd64/aout_machdep.h comp-c-include
@@ -1002,6 +1002,7 @@
./usr/include/x86/trap.h comp-c-include
./usr/include/x86/via_padlock.h comp-c-include
./usr/include/xencomp-c-include
+./usr/include/xen/intrdefs.h comp-c-include
./usr/include/xen/xenio.h comp-c-include
./usr/include/xen/xenio3.h comp-c-include
./usr/include/xmmintrin.h comp-obsolete obsolete
Index: src/distrib/sets/lists/comp/md.i386
diff -u src/distrib/sets/lists/comp/md.i386:1.194 src/distrib/sets/lists/comp/md.i386:1.195
--- src/distrib/sets/lists/comp/md.i386:1.194 Fri Feb 7 18:48:58 2020
+++ src/distrib/sets/lists/comp/md.i386 Sat Apr 25 15:46:59 2020
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.194 2020/02/07 18:48:58 kamil Exp $
+# $NetBSD: md.i386,v 1.195 2020/04/25 15:46:59 bouyer Exp $
./usr/include/clang-3.4/__wmmintrin_aes.h comp-obsolete obsolete
./usr/include/clang-3.4/__wmmintrin_pclmul.h comp-obsolete obsolete
./usr/include/clang-3.4/ammintrin.h comp-obsolete obsolete
@@ -871,6 +871,7 @@
./usr/include/x86/trap.h comp-c-include
./usr/include/x86/via_padlock.h comp-c-include
./usr/include/xencomp-c-include
+./usr/include/xen/intrdefs.h comp-c-include
./usr/include/xen/xenio.h comp-c-include
./usr/include/xen/xenio3.h comp-c-include
./usr/include/xmmintrin.h comp-obsolete obsolete
Index: src/share/mk/bsd.klinks.mk
diff -u src/share/mk/bsd.klinks.mk:1.14 src/share/mk/bsd.klinks.mk:1.15
--- src/share/mk/bsd.klinks.mk:1.14 Wed Dec 6 02:06:45 2017
+++ src/share/mk/bsd.klinks.mk Sat Apr 25 15:46:59 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.klinks.mk,v 1.14 2017/12/06 02:06:45 christos Exp $
+# $NetBSD: bsd.klinks.mk,v 1.15 2020/04/25 15:46:59 bouyer Exp $
#
.include
@@ -23,9 +23,9 @@ KLINKFILES+= sun68k
.elif ${KLINK_MACHINE} == "sparc64"
KLINKFILES+= sparc
.elif ${KLINK_MACHINE} == "i386"
-KLINKFILES+= x86
+KLINKFILES+= x86 xen
.elif ${KLINK_MACHINE} == "amd64"
-KLINKFILES+= x86 i386
+KLINKFILES+= x86 i386 xen
.elif ${KLINK_MACHINE} == "evbmips"
KLINKFILES+= algor sbmips
.elif ${MACHINE_CPU} == "aarch64"
CVS commit: src/sys/rump
Module Name:src
Committed By: bouyer
Date: Sat Apr 25 15:42:15 UTC 2020
Modified Files:
src/sys/rump: listsrcdirs
src/sys/rump/dev/lib/libumass: Makefile
src/sys/rump/fs/lib/libffs: Makefile
src/sys/rump/include/rump: rump_syscalls.h
src/sys/rump/librump/rumpkern: lwproc.c rump.c rump_syscalls.c sleepq.c
src/sys/rump/librump/rumpvfs: rump_vfs.c rumpfs.c
Log Message:
Merge the bouyer-xenpvh branch, bringing in Xen PV drivers support under HVM
guests in GENERIC.
Xen support can be disabled at runtime with
boot -c
disable hypervisor
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/rump/listsrcdirs
cvs rdiff -u -r1.11 -r1.12 src/sys/rump/dev/lib/libumass/Makefile
cvs rdiff -u -r1.18 -r1.19 src/sys/rump/fs/lib/libffs/Makefile
cvs rdiff -u -r1.115 -r1.116 src/sys/rump/include/rump/rump_syscalls.h
cvs rdiff -u -r1.47 -r1.48 src/sys/rump/librump/rumpkern/lwproc.c
cvs rdiff -u -r1.345 -r1.346 src/sys/rump/librump/rumpkern/rump.c
cvs rdiff -u -r1.146 -r1.147 src/sys/rump/librump/rumpkern/rump_syscalls.c
cvs rdiff -u -r1.19 -r1.20 src/sys/rump/librump/rumpkern/sleepq.c
cvs rdiff -u -r1.92 -r1.93 src/sys/rump/librump/rumpvfs/rump_vfs.c
cvs rdiff -u -r1.157 -r1.158 src/sys/rump/librump/rumpvfs/rumpfs.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/rump/listsrcdirs
diff -u src/sys/rump/listsrcdirs:1.49 src/sys/rump/listsrcdirs:1.50
--- src/sys/rump/listsrcdirs:1.49 Fri Sep 27 11:57:42 2019
+++ src/sys/rump/listsrcdirs Sat Apr 25 15:42:14 2020
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: listsrcdirs,v 1.49 2019/09/27 11:57:42 bad Exp $
+# $NetBSD: listsrcdirs,v 1.50 2020/04/25 15:42:14 bouyer Exp $
#
#
@@ -78,7 +78,7 @@ include_headerlist ()
fi
}
-ARCHS="amd64 i386 x86 arm evbarm sparc sparc64 powerpc evbppc mips evbmips aarch64 riscv"
+ARCHS="amd64 i386 x86 xen arm evbarm sparc sparc64 powerpc evbppc mips evbmips aarch64 riscv"
ARCHS_EXTRA="arm/arm32 Makefile"
# files listed in src/tools/Makefile.nbincludes
ARCHS_EXTRA="$ARCHS_EXTRA ews4800mips/include/pdinfo.h
Index: src/sys/rump/dev/lib/libumass/Makefile
diff -u src/sys/rump/dev/lib/libumass/Makefile:1.11 src/sys/rump/dev/lib/libumass/Makefile:1.12
--- src/sys/rump/dev/lib/libumass/Makefile:1.11 Mon Apr 13 11:27:22 2020
+++ src/sys/rump/dev/lib/libumass/Makefile Sat Apr 25 15:42:14 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2020/04/13 11:27:22 jdolecek Exp $
+# $NetBSD: Makefile,v 1.12 2020/04/25 15:42:14 bouyer Exp $
#
.PATH: ${.CURDIR}/../../../../dev/usb
Index: src/sys/rump/fs/lib/libffs/Makefile
diff -u src/sys/rump/fs/lib/libffs/Makefile:1.18 src/sys/rump/fs/lib/libffs/Makefile:1.19
--- src/sys/rump/fs/lib/libffs/Makefile:1.18 Sat Apr 18 19:18:33 2020
+++ src/sys/rump/fs/lib/libffs/Makefile Sat Apr 25 15:42:15 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2020/04/18 19:18:33 christos Exp $
+# $NetBSD: Makefile,v 1.19 2020/04/25 15:42:15 bouyer Exp $
#
.PATH: ${.CURDIR}/../../../../ufs/ffs ${.CURDIR}/../../../../ufs/ufs
Index: src/sys/rump/include/rump/rump_syscalls.h
diff -u src/sys/rump/include/rump/rump_syscalls.h:1.115 src/sys/rump/include/rump/rump_syscalls.h:1.116
--- src/sys/rump/include/rump/rump_syscalls.h:1.115 Wed Apr 22 21:25:17 2020
+++ src/sys/rump/include/rump/rump_syscalls.h Sat Apr 25 15:42:15 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_syscalls.h,v 1.115 2020/04/22 21:25:17 thorpej Exp $ */
+/* $NetBSD: rump_syscalls.h,v 1.116 2020/04/25 15:42:15 bouyer Exp $ */
/*
* System call protos in rump namespace.
Index: src/sys/rump/librump/rumpkern/lwproc.c
diff -u src/sys/rump/librump/rumpkern/lwproc.c:1.47 src/sys/rump/librump/rumpkern/lwproc.c:1.48
--- src/sys/rump/librump/rumpkern/lwproc.c:1.47 Fri Apr 24 13:34:47 2020
+++ src/sys/rump/librump/rumpkern/lwproc.c Sat Apr 25 15:42:15 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lwproc.c,v 1.47 2020/04/24 13:34:47 thorpej Exp $ */
+/* $NetBSD: lwproc.c,v 1.48 2020/04/25 15:42:15 bouyer Exp $ */
/*
* Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
#define RUMP__CURLWP_PRIVATE
#include
-__KERNEL_RCSID(0, "$NetBSD: lwproc.c,v 1.47 2020/04/24 13:34:47 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lwproc.c,v 1.48 2020/04/25 15:42:15 bouyer Exp $");
#include
#include
Index: src/sys/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.345 src/sys/rump/librump/rumpkern/rump.c:1.346
--- src/sys/rump/librump/rumpkern/rump.c:1.345 Thu Apr 23 00:34:29 2020
+++ src/sys/rump/librump/rumpkern/rump.c Sat Apr 25 15:42:15 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.345 2020/04/23 00:34:29 joerg Exp $ */
+/* $NetBSD: rump.c,v 1.346 2020/04/25 15:42:15 bouyer Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.345 2020/04/23 00:34:29
CVS commit: src/sys/rump
Module Name:src Committed By: bouyer Date: Sat Apr 25 15:42:15 UTC 2020 Modified Files: src/sys/rump: listsrcdirs src/sys/rump/dev/lib/libumass: Makefile src/sys/rump/fs/lib/libffs: Makefile src/sys/rump/include/rump: rump_syscalls.h src/sys/rump/librump/rumpkern: lwproc.c rump.c rump_syscalls.c sleepq.c src/sys/rump/librump/rumpvfs: rump_vfs.c rumpfs.c Log Message: Merge the bouyer-xenpvh branch, bringing in Xen PV drivers support under HVM guests in GENERIC. Xen support can be disabled at runtime with boot -c disable hypervisor To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/sys/rump/listsrcdirs cvs rdiff -u -r1.11 -r1.12 src/sys/rump/dev/lib/libumass/Makefile cvs rdiff -u -r1.18 -r1.19 src/sys/rump/fs/lib/libffs/Makefile cvs rdiff -u -r1.115 -r1.116 src/sys/rump/include/rump/rump_syscalls.h cvs rdiff -u -r1.47 -r1.48 src/sys/rump/librump/rumpkern/lwproc.c cvs rdiff -u -r1.345 -r1.346 src/sys/rump/librump/rumpkern/rump.c cvs rdiff -u -r1.146 -r1.147 src/sys/rump/librump/rumpkern/rump_syscalls.c cvs rdiff -u -r1.19 -r1.20 src/sys/rump/librump/rumpkern/sleepq.c cvs rdiff -u -r1.92 -r1.93 src/sys/rump/librump/rumpvfs/rump_vfs.c cvs rdiff -u -r1.157 -r1.158 src/sys/rump/librump/rumpvfs/rumpfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: bouyer Date: Sat Apr 25 15:26:19 UTC 2020 Modified Files: src/common/lib/libc/arch/i386/atomic: atomic.S src/sys/arch/amd64/amd64: genassym.cf lock_stubs.S locore.S machdep.c netbsd32_machdep.c spl.S vector.S src/sys/arch/amd64/conf: GENERIC Makefile.amd64 XEN3_DOM0 XEN3_DOMU files.amd64 std.amd64 std.xen src/sys/arch/amd64/include: asan.h asm.h frameasm.h gdt.h intrdefs.h msan.h pte.h types.h src/sys/arch/i386/conf: GENERIC Makefile.i386 XEN3PAE_DOM0 XEN3PAE_DOMU files.i386 std.i386 std.xen src/sys/arch/i386/i386: genassym.cf i386_trap.S lock_stubs.S locore.S machdep.c spl.S vector.S src/sys/arch/i386/include: asm.h frameasm.h gdt.h intrdefs.h kcore.h pte.h src/sys/arch/x86/conf: files.x86 src/sys/arch/x86/include: apicvar.h cpu.h cpufunc.h cpuvar.h intr.h intrdefs.h machdep.h pci_machdep_common.h pic.h pmap.h specialreg.h src/sys/arch/x86/isa: clock.c isa_machdep.c src/sys/arch/x86/pci: amdsmn.c amdzentemp.c msipic.c src/sys/arch/x86/x86: bus_space.c consinit.c cpu.c cpu_ucode.c cpu_ucode_amd.c cpu_ucode_intel.c hyperv.c i8259.c identcpu.c identcpu_subr.c intr.c ioapic.c lapic.c mainbus.c patch.c pmap.c procfs_machdep.c svs.c sys_machdep.c tsc.c x86_autoconf.c x86_machdep.c src/sys/arch/xen/conf: Makefile.xen files.compat files.xen std.xenversion src/sys/arch/xen/include: Makefile evtchn.h hypervisor.h i82093var.h intr.h intrdefs.h xen.h xen_shm.h xenbus.h xenpmap.h xenring.h src/sys/arch/xen/x86: autoconf.c cpu.c hypervisor_machdep.c pintr.c xen_bus_dma.c xen_intr.c xen_ipi.c xen_mainbus.c xen_shm_machdep.c xenfunc.c src/sys/arch/xen/xen: balloon.c evtchn.c hypervisor.c if_xennet_xenbus.c privcmd.c xbd_xenbus.c xbdback_xenbus.c xen_machdep.c xencons.c xenevt.c xengnt.c src/sys/arch/xen/xenbus: xenbus_comms.c xenbus_dev.c xenbus_probe.c Added Files: src/sys/arch/amd64/include/xen: hypercalls.h src/sys/arch/i386/include/xen: hypercalls.h src/sys/arch/x86/x86: x86_softintr.c src/sys/arch/xen/conf: files.xen.pv src/sys/arch/xen/xen: xen_clock.c Removed Files: src/sys/arch/amd64/conf: XEN3_PVHVM src/sys/arch/i386/conf: XEN3PAE_PVHVM src/sys/arch/xen/include/amd64: hypercalls.h src/sys/arch/xen/include/i386: hypercalls.h src/sys/arch/xen/xen: clock.c Log Message: Merge the bouyer-xenpvh branch, bringing in Xen PV drivers support under HVM guests in GENERIC. Xen support can be disabled at runtime with boot -c disable hypervisor To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/common/lib/libc/arch/i386/atomic/atomic.S cvs rdiff -u -r1.82 -r1.83 src/sys/arch/amd64/amd64/genassym.cf cvs rdiff -u -r1.35 -r1.36 src/sys/arch/amd64/amd64/lock_stubs.S cvs rdiff -u -r1.200 -r1.201 src/sys/arch/amd64/amd64/locore.S cvs rdiff -u -r1.347 -r1.348 src/sys/arch/amd64/amd64/machdep.c cvs rdiff -u -r1.135 -r1.136 src/sys/arch/amd64/amd64/netbsd32_machdep.c cvs rdiff -u -r1.43 -r1.44 src/sys/arch/amd64/amd64/spl.S cvs rdiff -u -r1.73 -r1.74 src/sys/arch/amd64/amd64/vector.S cvs rdiff -u -r1.565 -r1.566 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.83 -r1.84 src/sys/arch/amd64/conf/Makefile.amd64 cvs rdiff -u -r1.175 -r1.176 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.91 -r1.92 src/sys/arch/amd64/conf/XEN3_DOMU cvs rdiff -u -r1.4 -r0 src/sys/arch/amd64/conf/XEN3_PVHVM cvs rdiff -u -r1.115 -r1.116 src/sys/arch/amd64/conf/files.amd64 cvs rdiff -u -r1.11 -r1.12 src/sys/arch/amd64/conf/std.amd64 cvs rdiff -u -r1.12 -r1.13 src/sys/arch/amd64/conf/std.xen cvs rdiff -u -r1.4 -r1.5 src/sys/arch/amd64/include/asan.h cvs rdiff -u -r1.20 -r1.21 src/sys/arch/amd64/include/asm.h cvs rdiff -u -r1.47 -r1.48 src/sys/arch/amd64/include/frameasm.h cvs rdiff -u -r1.11 -r1.12 src/sys/arch/amd64/include/gdt.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/amd64/include/intrdefs.h \ src/sys/arch/amd64/include/msan.h cvs rdiff -u -r1.13 -r1.14 src/sys/arch/amd64/include/pte.h cvs rdiff -u -r1.66 -r1.67 src/sys/arch/amd64/include/types.h cvs rdiff -u -r0 -r1.2 src/sys/arch/amd64/include/xen/hypercalls.h cvs rdiff -u -r1.1227 -r1.1228 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.194 -r1.195 src/sys/arch/i386/conf/Makefile.i386 cvs rdiff -u -r1.23 -r1.24 src/sys/arch/i386/conf/XEN3PAE_DOM0 cvs rdiff -u -r1.11 -r1.12 src/sys/arch/i386/conf/XEN3PAE_DOMU cvs rdiff -u -r1.5 -r0 src/sys/arch/i386/conf/XEN3PAE_PVHVM cvs rdiff -u -r1.402 -r1.403 src/sys/arch/i386/conf/files.i386 cvs rdiff -u -r1.35 -r1.36 src/sys/arch/i386/conf/std.i386 cvs rdiff -u -r1.1 -r1.2 src/sys/arch/i386/conf/std.xen cvs rdiff -u -r1.120 -r1.121 src/sys/arch/i386/i386/genassym.cf cvs rdiff -u -r1.20
CVS commit: [bouyer-xenpvh] src/sys/arch
Module Name:src Committed By: bouyer Date: Sat Apr 25 15:03:18 UTC 2020 Modified Files: src/sys/arch/amd64/conf [bouyer-xenpvh]: GENERIC src/sys/arch/i386/conf [bouyer-xenpvh]: GENERIC Removed Files: src/sys/arch/amd64/conf [bouyer-xenpvh]: GENERIC_XENHVM XEN3_PVHVM src/sys/arch/i386/conf [bouyer-xenpvh]: GENERIC_XENHVM XEN3PAE_PVHVM Log Message: Merge GENERIC_XENHVM in GENERIC. Remove XEN3_PVHVM/XEN3PAE_PVHVM files which have been obsolete for some time on the branch To generate a diff of this commit: cvs rdiff -u -r1.564.2.1 -r1.564.2.2 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.1.2.5 -r0 src/sys/arch/amd64/conf/GENERIC_XENHVM cvs rdiff -u -r1.3.2.3 -r0 src/sys/arch/amd64/conf/XEN3_PVHVM cvs rdiff -u -r1.1227.2.1 -r1.1227.2.2 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.1.2.2 -r0 src/sys/arch/i386/conf/GENERIC_XENHVM cvs rdiff -u -r1.3.2.3 -r0 src/sys/arch/i386/conf/XEN3PAE_PVHVM Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.564.2.1 src/sys/arch/amd64/conf/GENERIC:1.564.2.2 --- src/sys/arch/amd64/conf/GENERIC:1.564.2.1 Mon Apr 20 11:28:51 2020 +++ src/sys/arch/amd64/conf/GENERIC Sat Apr 25 15:03:17 2020 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.564.2.1 2020/04/20 11:28:51 bouyer Exp $ +# $NetBSD: GENERIC,v 1.564.2.2 2020/04/25 15:03:17 bouyer Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.564.2.1 $" +#ident "GENERIC-$Revision: 1.564.2.2 $" maxusers 64 # estimated number of users @@ -89,6 +89,15 @@ hyperv0 at cpu0 # Microsoft Hyper-V powernow0 at cpu0 # AMD PowerNow! and Cool'n'Quiet (non-ACPI) vmt0 at cpu0 # VMware Tools +#Xen PV support for HVM guests +options XENPVHVM +options XEN +hypervisor* at mainbus? # Xen hypervisor +xenbus* at hypervisor? # Xen virtual bus +xencons* at hypervisor? # Xen virtual console +xennet* at xenbus? # Xen virtual network interface +xbd* at xenbus? # Xen virtual block device + # Alternate buffer queue strategies for better responsiveness under high # disk I/O load. #options BUFQ_READPRIO Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1227.2.1 src/sys/arch/i386/conf/GENERIC:1.1227.2.2 --- src/sys/arch/i386/conf/GENERIC:1.1227.2.1 Mon Apr 20 19:38:11 2020 +++ src/sys/arch/i386/conf/GENERIC Sat Apr 25 15:03:18 2020 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1227.2.1 2020/04/20 19:38:11 bouyer Exp $ +# $NetBSD: GENERIC,v 1.1227.2.2 2020/04/25 15:03:18 bouyer Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1227.2.1 $" +#ident "GENERIC-$Revision: 1.1227.2.2 $" maxusers 64 # estimated number of users @@ -44,6 +44,15 @@ powernow0 at cpu0 # AMD PowerNow! and C viac7temp* at cpu? # VIA C7 temperature sensor vmt0 at cpu0 # VMware Tools +#Xen PV support for HVM guests +options XENPVHVM +options XEN +hypervisor* at mainbus? # Xen hypervisor +xenbus* at hypervisor? # Xen virtual bus +xencons* at hypervisor? # Xen virtual console +xennet* at xenbus? # Xen virtual network interface +xbd* at xenbus? # Xen virtual block device + options MTRR # memory-type range register syscall support options MULTIBOOT # Multiboot support (see multiboot(8))
CVS commit: [bouyer-xenpvh] src/sys/arch
Module Name:src Committed By: bouyer Date: Sat Apr 25 15:03:18 UTC 2020 Modified Files: src/sys/arch/amd64/conf [bouyer-xenpvh]: GENERIC src/sys/arch/i386/conf [bouyer-xenpvh]: GENERIC Removed Files: src/sys/arch/amd64/conf [bouyer-xenpvh]: GENERIC_XENHVM XEN3_PVHVM src/sys/arch/i386/conf [bouyer-xenpvh]: GENERIC_XENHVM XEN3PAE_PVHVM Log Message: Merge GENERIC_XENHVM in GENERIC. Remove XEN3_PVHVM/XEN3PAE_PVHVM files which have been obsolete for some time on the branch To generate a diff of this commit: cvs rdiff -u -r1.564.2.1 -r1.564.2.2 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.1.2.5 -r0 src/sys/arch/amd64/conf/GENERIC_XENHVM cvs rdiff -u -r1.3.2.3 -r0 src/sys/arch/amd64/conf/XEN3_PVHVM cvs rdiff -u -r1.1227.2.1 -r1.1227.2.2 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.1.2.2 -r0 src/sys/arch/i386/conf/GENERIC_XENHVM cvs rdiff -u -r1.3.2.3 -r0 src/sys/arch/i386/conf/XEN3PAE_PVHVM Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [bouyer-xenpvh] src/sys/arch/xen/conf
Module Name:src
Committed By: bouyer
Date: Sat Apr 25 15:01:41 UTC 2020
Modified Files:
src/sys/arch/xen/conf [bouyer-xenpvh]: files.xen
Log Message:
restore part accidentaly deleted
To generate a diff of this commit:
cvs rdiff -u -r1.180.2.8 -r1.180.2.9 src/sys/arch/xen/conf/files.xen
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/xen/conf/files.xen
diff -u src/sys/arch/xen/conf/files.xen:1.180.2.8 src/sys/arch/xen/conf/files.xen:1.180.2.9
--- src/sys/arch/xen/conf/files.xen:1.180.2.8 Sat Apr 25 13:16:48 2020
+++ src/sys/arch/xen/conf/files.xen Sat Apr 25 15:01:41 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files.xen,v 1.180.2.8 2020/04/25 13:16:48 bouyer Exp $
+# $NetBSD: files.xen,v 1.180.2.9 2020/04/25 15:01:41 bouyer Exp $
defflag opt_xen.h XEN XENPVH XENPVHVM PAE
@@ -10,3 +10,37 @@ file arch/xen/xen/xengnt.c xen
file arch/xen/x86/xen_mainbus.c xen
file arch/xen/xen/xen_clock.c xen
file arch/xen/x86/xen_bus_dma.c xen
+
+define hypervisorbus {}
+define xendevbus {}
+
+# Xen hypervisor
+device hypervisor { [apid = -1]}: isabus, pcibus, sysmon_power, xendevbus, acpibus
+attach hypervisor at hypervisorbus
+file arch/xen/xen/hypervisor.c hypervisor needs-flag
+file arch/xen/xen/shutdown_xenbus.c hypervisor
+
+# Xenbus
+device xenbus {[id = -1]}
+attach xenbus at xendevbus
+file arch/xen/xenbus/xenbus_client.c xenbus needs-flag
+file arch/xen/xenbus/xenbus_comms.c xenbus needs-flag
+file arch/xen/xenbus/xenbus_dev.c xenbus needs-flag
+file arch/xen/xenbus/xenbus_probe.c xenbus needs-flag
+file arch/xen/xenbus/xenbus_xs.c xenbus needs-flag
+
+# Xen console support
+device xencons: tty
+attach xencons at xendevbus
+file arch/xen/xen/xencons.c xencons needs-flag
+
+# Xen Network driver
+device xennet: arp, ether, ifnet
+attach xennet at xenbus
+file arch/xen/xen/if_xennet_xenbus.c xennet needs-flag
+file arch/xen/xen/xennet_checksum.c xvif | xennet
+
+# Xen Block device driver and wd/sd/cd identities
+device xbd: disk
+attach xbd at xenbus
+file arch/xen/xen/xbd_xenbus.c xbd
CVS commit: [bouyer-xenpvh] src/sys/arch/xen/conf
Module Name:src Committed By: bouyer Date: Sat Apr 25 15:01:41 UTC 2020 Modified Files: src/sys/arch/xen/conf [bouyer-xenpvh]: files.xen Log Message: restore part accidentaly deleted To generate a diff of this commit: cvs rdiff -u -r1.180.2.8 -r1.180.2.9 src/sys/arch/xen/conf/files.xen Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [bouyer-xenpvh] src/sys/arch
Module Name:src
Committed By: bouyer
Date: Sat Apr 25 15:01:01 UTC 2020
Modified Files:
src/sys/arch/amd64/include/xen [bouyer-xenpvh]: hypercalls.h
src/sys/arch/i386/include/xen [bouyer-xenpvh]: hypercalls.h
Log Message:
Include changes in sys/arch/xen/include/ between bouyer-xenpvh-base1 and
bouyer-xenpvh-base2.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/amd64/include/xen/hypercalls.h
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/i386/include/xen/hypercalls.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/amd64/include/xen/hypercalls.h
diff -u src/sys/arch/amd64/include/xen/hypercalls.h:1.1.2.1 src/sys/arch/amd64/include/xen/hypercalls.h:1.1.2.2
--- src/sys/arch/amd64/include/xen/hypercalls.h:1.1.2.1 Thu Apr 16 08:46:34 2020
+++ src/sys/arch/amd64/include/xen/hypercalls.h Sat Apr 25 15:01:01 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: hypercalls.h,v 1.1.2.1 2020/04/16 08:46:34 bouyer Exp $ */
+/* $NetBSD: hypercalls.h,v 1.1.2.2 2020/04/25 15:01:01 bouyer Exp $ */
/**
* hypercall.h
*
@@ -274,9 +274,9 @@ HYPERVISOR_console_io(
}
static inline int
-HYPERVISOR_physdev_op(void *op)
+HYPERVISOR_physdev_op(int cmd, void *op)
{
- return _hypercall1(int, physdev_op_compat, op);
+ return _hypercall2(int, physdev_op, cmd, op);
}
static inline int
Index: src/sys/arch/i386/include/xen/hypercalls.h
diff -u src/sys/arch/i386/include/xen/hypercalls.h:1.1.2.1 src/sys/arch/i386/include/xen/hypercalls.h:1.1.2.2
--- src/sys/arch/i386/include/xen/hypercalls.h:1.1.2.1 Thu Apr 16 08:46:34 2020
+++ src/sys/arch/i386/include/xen/hypercalls.h Sat Apr 25 15:01:01 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: hypercalls.h,v 1.1.2.1 2020/04/16 08:46:34 bouyer Exp $ */
+/* $NetBSD: hypercalls.h,v 1.1.2.2 2020/04/25 15:01:01 bouyer Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -536,13 +536,13 @@ HYPERVISOR_console_io(int cmd, int count
}
static __inline int
-HYPERVISOR_physdev_op(void *physdev_op)
+HYPERVISOR_physdev_op(int cmd, void *physdev_op)
{
int ret;
-unsigned long ign1;
+unsigned long ign1, ign2;
-_hypercall(__HYPERVISOR_physdev_op, _harg("1" (physdev_op)),
- _harg("=a" (ret), "=b" (ign1)));
+_hypercall(__HYPERVISOR_physdev_op, _harg("1" (cmd), "2" (physdev_op)),
+ _harg("=a" (ret), "=b" (ign1), "=c" (ign2)));
return ret;
}
CVS commit: [bouyer-xenpvh] src/sys/arch
Module Name:src Committed By: bouyer Date: Sat Apr 25 15:01:01 UTC 2020 Modified Files: src/sys/arch/amd64/include/xen [bouyer-xenpvh]: hypercalls.h src/sys/arch/i386/include/xen [bouyer-xenpvh]: hypercalls.h Log Message: Include changes in sys/arch/xen/include/ between bouyer-xenpvh-base1 and bouyer-xenpvh-base2. To generate a diff of this commit: cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/amd64/include/xen/hypercalls.h cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/i386/include/xen/hypercalls.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [phil-wifi] src/sys/dev/usb
Module Name:src
Committed By: nat
Date: Sat Apr 25 14:40:12 UTC 2020
Modified Files:
src/sys/dev/usb [phil-wifi]: if_urtwn.c
Log Message:
Remove configuring 40Mhz channels for now.
Avoid duplicate state transitions in urtwn_newstate.
Avoid changing channel parameters in urtwn_newstate.
Rework of tx desc parameters for all types of packets.
Don't create a percpuq as the stack is not expecting it //XXX not sure
Tested connections to an open 11n network with 8188CUS, 8192CU and 8192EU
usb adaptors.
To generate a diff of this commit:
cvs rdiff -u -r1.59.2.15 -r1.59.2.16 src/sys/dev/usb/if_urtwn.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_urtwn.c
diff -u src/sys/dev/usb/if_urtwn.c:1.59.2.15 src/sys/dev/usb/if_urtwn.c:1.59.2.16
--- src/sys/dev/usb/if_urtwn.c:1.59.2.15 Sat Apr 25 09:32:16 2020
+++ src/sys/dev/usb/if_urtwn.c Sat Apr 25 14:40:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urtwn.c,v 1.59.2.15 2020/04/25 09:32:16 nat Exp $ */
+/* $NetBSD: if_urtwn.c,v 1.59.2.16 2020/04/25 14:40:11 nat Exp $ */
/* $OpenBSD: if_urtwn.c,v 1.42 2015/02/10 23:25:46 mpi Exp $ */
/*-
@@ -42,7 +42,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.59.2.15 2020/04/25 09:32:16 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.59.2.16 2020/04/25 14:40:11 nat Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -2173,7 +2173,7 @@ urtwn_newstate_cb(struct urtwn_softc *sc
/* 802.11b/g */
urtwn_write_1(sc, R92C_INIRTS_RATE_SEL, 3);
} else /* IEEE_MODE_11NG */
- urtwn_write_1(sc, R92C_INIRTS_RATE_SEL, 12); /* MCS 0 */
+ urtwn_write_1(sc, R92C_INIRTS_RATE_SEL, 11);
/* Enable Rx of data frames. */
urtwn_write_2(sc, R92C_RXFLTMAP2, 0x);
@@ -2227,7 +2227,7 @@ urtwn_newstate_cb(struct urtwn_softc *sc
urtwn_write_1(sc, R92C_T2T_SIFS + 1, sifs_time);
/* Initialize rate adaptation. */
- if (ISSET(sc->chip, URTWN_CHIP_88E) ||
+ if (1 || ISSET(sc->chip, URTWN_CHIP_88E) ||
ISSET(sc->chip, URTWN_CHIP_92EU))
ni->ni_txrate = ni->ni_rates.rs_nrates - 1;
else
@@ -2311,6 +2311,8 @@ urtwn_newstate(struct ieee80211vap *vap,
break;
case IEEE80211_S_RUN:
+ if (nstate == IEEE80211_S_RUN)
+ break;
/* Turn link LED off. */
urtwn_set_led(sc, URTWN_LED_LINK, 0);
@@ -2328,9 +2330,11 @@ urtwn_newstate(struct ieee80211vap *vap,
urtwn_read_1(sc, R92C_BCN_CTRL) |
R92C_BCN_CTRL_DIS_TSF_UDT0);
+#if 0
/* Back to 20MHz mode */
urtwn_set_chan(sc, ic->ic_curchan,
IEEE80211_HTINFO_2NDCHAN_NONE);
+#endif
if (ic->ic_opmode == IEEE80211_M_IBSS ||
ic->ic_opmode == IEEE80211_M_HOSTAP) {
@@ -2364,6 +2368,8 @@ urtwn_newstate(struct ieee80211vap *vap,
break;
case IEEE80211_S_SCAN:
+ if (ostate == IEEE80211_S_SCAN)
+ break;
if (ostate != IEEE80211_S_SCAN) {
/*
* Begin of scanning
@@ -2404,8 +2410,10 @@ urtwn_newstate(struct ieee80211vap *vap,
urtwn_write_1(sc, R92C_TXPAUSE,
urtwn_read_1(sc, R92C_TXPAUSE) | 0x0f);
+#if 0
urtwn_set_chan(sc, ic->ic_curchan,
IEEE80211_HTINFO_2NDCHAN_NONE);
+#endif
/* Start periodic scan. */
if (!sc->sc_dying)
@@ -2413,6 +2421,8 @@ urtwn_newstate(struct ieee80211vap *vap,
break;
case IEEE80211_S_AUTH:
+ if (ostate == IEEE80211_S_AUTH)
+ break;
/* Set initial gain under link. */
reg = urtwn_bb_read(sc, R92C_OFDM0_AGCCORE1(0));
reg = RW(reg, R92C_OFDM0_AGCCORE1_GAIN, 0x32);
@@ -2432,24 +2442,32 @@ urtwn_newstate(struct ieee80211vap *vap,
urtwn_read_4(sc, R92C_RCR) &
~(R92C_RCR_CBSSID_DATA | R92C_RCR_CBSSID_BCN));
+#if 0
urtwn_set_chan(sc, ic->ic_curchan,
IEEE80211_HTINFO_2NDCHAN_NONE);
+#endif
break;
case IEEE80211_S_ASSOC:
break;
case IEEE80211_S_RUN:
+ if (ostate == IEEE80211_S_RUN)
+ break;
ni = vap->iv_bss;
+#if 0
/* XXX: Set 20MHz mode */
urtwn_set_chan(sc, ic->ic_curchan,
IEEE80211_HTINFO_2NDCHAN_NONE);
+#endif
if (ic->ic_opmode == IEEE80211_M_MONITOR) {
+#if 0
/* Back to 20MHz mode */
urtwn_set_chan(sc, ic->ic_curchan,
IEEE80211_HTINFO_2NDCHAN_NONE);
+#endif
/* Set media status to 'No Link'. */
urtwn_set_nettype0_msr(sc, R92C_CR_NETTYPE_NOLINK);
@@ -3108,9 +3126,6 @@ urtwn_tx(struct urtwn_softc *sc, struct
R92C_TXDW0_OWN | R92C_TXDW0_FSG | R92C_TXDW0_LSG);
}
- if (ic->ic_curmode == IEEE80211_MODE_11NG)
- txd->txdw5 |= htole32(R92C_TXDW5_SGI);
-
if (IEEE80211_IS_MULTICAST(wh->i_addr1))
txd->txdw0 |= htole32(R92C_TXDW0_BMCAST);
@@ -3120,15 +3135,21 @@ urtwn_tx(struct urtwn_softc *sc, struct
device_xname(sc->sc_dev), __func__, padsize));
txd->txdw1 |= htole32(SM(R92C_TXDW1_PKTOFF, (padsize / 8)));
}
+ if (ic->ic_curmode == IEEE80211_MODE_11B) {
+ raid = R92C_RAID_11B;
+ txd->txdw5 |= htole32(SM(R92C_TXDW5_DATARATE, 0));
+ } else if (ic->ic_curmode == IEEE80211_MODE_11G) {
+
CVS commit: [phil-wifi] src/sys/dev/usb
Module Name:src Committed By: nat Date: Sat Apr 25 14:40:12 UTC 2020 Modified Files: src/sys/dev/usb [phil-wifi]: if_urtwn.c Log Message: Remove configuring 40Mhz channels for now. Avoid duplicate state transitions in urtwn_newstate. Avoid changing channel parameters in urtwn_newstate. Rework of tx desc parameters for all types of packets. Don't create a percpuq as the stack is not expecting it //XXX not sure Tested connections to an open 11n network with 8188CUS, 8192CU and 8192EU usb adaptors. To generate a diff of this commit: cvs rdiff -u -r1.59.2.15 -r1.59.2.16 src/sys/dev/usb/if_urtwn.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/man5
Module Name:src Committed By: wiz Date: Sat Apr 25 13:51:04 UTC 2020 Modified Files: src/share/man/man5: locate.conf.5 Log Message: Use more markup. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/share/man/man5/locate.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man5
Module Name:src Committed By: wiz Date: Sat Apr 25 13:51:04 UTC 2020 Modified Files: src/share/man/man5: locate.conf.5 Log Message: Use more markup. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/share/man/man5/locate.conf.5 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/man5/locate.conf.5 diff -u src/share/man/man5/locate.conf.5:1.10 src/share/man/man5/locate.conf.5:1.11 --- src/share/man/man5/locate.conf.5:1.10 Sat Apr 25 10:56:53 2020 +++ src/share/man/man5/locate.conf.5 Sat Apr 25 13:51:04 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: locate.conf.5,v 1.10 2020/04/25 10:56:53 simonb Exp $ +.\" $NetBSD: locate.conf.5,v 1.11 2020/04/25 13:51:04 wiz Exp $ .\" .\" Copyright (c) 2004 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -64,7 +64,8 @@ Specify the location of the .Xr locate 1 database to be created. .Pp -Default: /var/db/locate.database +Default: +.Pa /var/db/locate.database .It Sy ignore Ar pattern ... Ignore files or directories. When building the database,
CVS commit: [bouyer-xenpvh] src/sys/arch
Module Name:src
Committed By: bouyer
Date: Sat Apr 25 13:16:48 UTC 2020
Modified Files:
src/sys/arch/x86/conf [bouyer-xenpvh]: files.x86
src/sys/arch/x86/x86 [bouyer-xenpvh]: cpu.c i8259.c
src/sys/arch/xen/conf [bouyer-xenpvh]: files.xen
src/sys/arch/xen/x86 [bouyer-xenpvh]: hypervisor_machdep.c xen_intr.c
xen_ipi.c
src/sys/arch/xen/xen [bouyer-xenpvh]: xbdback_xenbus.c
Log Message:
sync with bouyer-xenpvh-base2 (HEAD)
To generate a diff of this commit:
cvs rdiff -u -r1.107.10.2 -r1.107.10.3 src/sys/arch/x86/conf/files.x86
cvs rdiff -u -r1.181.4.4 -r1.181.4.5 src/sys/arch/x86/x86/cpu.c
cvs rdiff -u -r1.23.10.2 -r1.23.10.3 src/sys/arch/x86/x86/i8259.c
cvs rdiff -u -r1.180.2.7 -r1.180.2.8 src/sys/arch/xen/conf/files.xen
cvs rdiff -u -r1.36.8.6 -r1.36.8.7 src/sys/arch/xen/x86/hypervisor_machdep.c
cvs rdiff -u -r1.21.2.9 -r1.21.2.10 src/sys/arch/xen/x86/xen_intr.c
cvs rdiff -u -r1.35.6.6 -r1.35.6.7 src/sys/arch/xen/x86/xen_ipi.c
cvs rdiff -u -r1.77.2.3 -r1.77.2.4 src/sys/arch/xen/xen/xbdback_xenbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/conf/files.x86
diff -u src/sys/arch/x86/conf/files.x86:1.107.10.2 src/sys/arch/x86/conf/files.x86:1.107.10.3
--- src/sys/arch/x86/conf/files.x86:1.107.10.2 Thu Apr 16 08:46:34 2020
+++ src/sys/arch/x86/conf/files.x86 Sat Apr 25 13:16:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files.x86,v 1.107.10.2 2020/04/16 08:46:34 bouyer Exp $
+# $NetBSD: files.x86,v 1.107.10.3 2020/04/25 13:16:48 bouyer Exp $
# options for MP configuration through the MP spec
defflag opt_mpbios.h MPBIOS MPDEBUG MPBIOS_SCANPCI
@@ -59,7 +59,7 @@ device odcm
attach odcm at cpufeaturebus
file arch/x86/x86/odcm.c odcm
-device padlock: opencrypto
+device padlock: opencrypto, rijndael
attach padlock at cpufeaturebus
file arch/x86/x86/via_padlock.c padlock
@@ -91,6 +91,7 @@ file arch/x86/x86/efi.c machdep
file arch/x86/x86/errata.c machdep
file arch/x86/x86/genfb_machdep.c machdep
file arch/x86/x86/identcpu.c machdep
+file arch/x86/x86/identcpu_subr.c machdep
file arch/x86/x86/i8259.c machdep & (!xenpv | dom0ops)
file arch/x86/x86/intr.c machdep & !xenpv
file arch/x86/x86/x86_softintr.c machdep
Index: src/sys/arch/x86/x86/cpu.c
diff -u src/sys/arch/x86/x86/cpu.c:1.181.4.4 src/sys/arch/x86/x86/cpu.c:1.181.4.5
--- src/sys/arch/x86/x86/cpu.c:1.181.4.4 Mon Apr 20 11:29:00 2020
+++ src/sys/arch/x86/x86/cpu.c Sat Apr 25 13:16:48 2020
@@ -1,7 +1,7 @@
-/* $NetBSD: cpu.c,v 1.181.4.4 2020/04/20 11:29:00 bouyer Exp $ */
+/* $NetBSD: cpu.c,v 1.181.4.5 2020/04/25 13:16:48 bouyer Exp $ */
/*
- * Copyright (c) 2000-2012 NetBSD Foundation, Inc.
+ * Copyright (c) 2000-2020 NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
@@ -62,7 +62,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.181.4.4 2020/04/20 11:29:00 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.181.4.5 2020/04/25 13:16:48 bouyer Exp $");
#include "opt_ddb.h"
#include "opt_mpbios.h" /* for MPDEBUG */
@@ -73,6 +73,7 @@ __KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.18
#include "lapic.h"
#include "ioapic.h"
#include "acpica.h"
+#include "hpet.h"
#include
#include
@@ -119,6 +120,7 @@ __KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.18
#endif
#include
+#include
#include
#include
@@ -202,6 +204,8 @@ static vaddr_t cmos_data_mapping;
#endif
struct cpu_info *cpu_starting;
+int (*cpu_nullop_ptr)(void *) = nullop;
+
#ifdef MULTIPROCESSOR
void cpu_hatch(void *);
static void cpu_boot_secondary(struct cpu_info *ci);
@@ -433,8 +437,11 @@ cpu_attach(device_t parent, device_t sel
* must be done to allow booting other processors.
*/
if (!again) {
- atomic_or_32(>ci_flags, CPUF_PRESENT | CPUF_PRIMARY);
+ /* Make sure DELAY() (likely i8254_delay()) is initialized. */
+ DELAY(1);
+
/* Basic init. */
+ atomic_or_32(>ci_flags, CPUF_PRESENT | CPUF_PRIMARY);
cpu_intr_init(ci);
cpu_get_tsc_freq(ci);
cpu_init(ci);
@@ -451,8 +458,6 @@ cpu_attach(device_t parent, device_t sel
lapic_calibrate_timer(ci);
}
#endif
- /* Make sure DELAY() is initialized. */
- DELAY(1);
kcsan_cpu_init(ci);
again = true;
}
@@ -718,7 +723,6 @@ cpu_init(struct cpu_info *ci)
if (ci != _info_primary) {
/* Synchronize TSC */
- wbinvd();
atomic_or_32(>ci_flags, CPUF_RUNNING);
tsc_sync_ap(ci);
} else {
@@ -734,6 +738,14 @@ cpu_boot_secondary_processors(void)
kcpuset_t *cpus;
u_long i;
+#if NHPET > 0
+ /* Use HPET delay, and re-calibrate TSC on boot CPU using HPET. */
+ if (hpet_delay_p() && x86_delay == i8254_delay) {
+ delay_func = x86_delay = hpet_delay;
+ cpu_get_tsc_freq(curcpu());
+ }
+#endif
+
/* Now that we know the number of CPUs, patch the text segment. */
x86_patch(false);
@@ -842,7 +854,6 @@ cpu_start_secondary(struct
CVS commit: [bouyer-xenpvh] src/sys/arch
Module Name:src Committed By: bouyer Date: Sat Apr 25 13:16:48 UTC 2020 Modified Files: src/sys/arch/x86/conf [bouyer-xenpvh]: files.x86 src/sys/arch/x86/x86 [bouyer-xenpvh]: cpu.c i8259.c src/sys/arch/xen/conf [bouyer-xenpvh]: files.xen src/sys/arch/xen/x86 [bouyer-xenpvh]: hypervisor_machdep.c xen_intr.c xen_ipi.c src/sys/arch/xen/xen [bouyer-xenpvh]: xbdback_xenbus.c Log Message: sync with bouyer-xenpvh-base2 (HEAD) To generate a diff of this commit: cvs rdiff -u -r1.107.10.2 -r1.107.10.3 src/sys/arch/x86/conf/files.x86 cvs rdiff -u -r1.181.4.4 -r1.181.4.5 src/sys/arch/x86/x86/cpu.c cvs rdiff -u -r1.23.10.2 -r1.23.10.3 src/sys/arch/x86/x86/i8259.c cvs rdiff -u -r1.180.2.7 -r1.180.2.8 src/sys/arch/xen/conf/files.xen cvs rdiff -u -r1.36.8.6 -r1.36.8.7 src/sys/arch/xen/x86/hypervisor_machdep.c cvs rdiff -u -r1.21.2.9 -r1.21.2.10 src/sys/arch/xen/x86/xen_intr.c cvs rdiff -u -r1.35.6.6 -r1.35.6.7 src/sys/arch/xen/x86/xen_ipi.c cvs rdiff -u -r1.77.2.3 -r1.77.2.4 src/sys/arch/xen/xen/xbdback_xenbus.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/amd64/conf
Module Name:src Committed By: simonb Date: Sat Apr 25 12:41:58 UTC 2020 Modified Files: src/sys/arch/amd64/conf: ALL Log Message: Add uxrcom. To generate a diff of this commit: cvs rdiff -u -r1.148 -r1.149 src/sys/arch/amd64/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/ALL diff -u src/sys/arch/amd64/conf/ALL:1.148 src/sys/arch/amd64/conf/ALL:1.149 --- src/sys/arch/amd64/conf/ALL:1.148 Mon Apr 13 09:30:42 2020 +++ src/sys/arch/amd64/conf/ALL Sat Apr 25 12:41:57 2020 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.148 2020/04/13 09:30:42 jdolecek Exp $ +# $NetBSD: ALL,v 1.149 2020/04/25 12:41:57 simonb Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.148 $" +#ident "ALL-$Revision: 1.149 $" maxusers 64 # estimated number of users @@ -1289,6 +1289,9 @@ ucom* at uark? portno ? umcs* at uhub? port ? # Moschip MCS7xxx serial adapter ucom* at umcs? portno ? +uxrcom* at uhub? port ? # Exar XR21V141x serial adapter +ucom* at uxrcom? portno ? + uhmodem* at uhub? ucom* at uhmodem? portno ?
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: simonb Date: Sat Apr 25 12:41:58 UTC 2020 Modified Files: src/sys/arch/amd64/conf: ALL Log Message: Add uxrcom. To generate a diff of this commit: cvs rdiff -u -r1.148 -r1.149 src/sys/arch/amd64/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu
Module Name:src Committed By: simonb Date: Sat Apr 25 12:39:15 UTC 2020 Modified Files: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu: amdgpu_display.c Log Message: Fix gcc uninitialised variable warning. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_display.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/amd/amdgpu/amdgpu_display.c diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_display.c:1.6 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_display.c:1.7 --- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_display.c:1.6 Fri Feb 14 04:38:13 2020 +++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_display.c Sat Apr 25 12:39:15 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: amdgpu_display.c,v 1.6 2020/02/14 04:38:13 riastradh Exp $ */ +/* $NetBSD: amdgpu_display.c,v 1.7 2020/04/25 12:39:15 simonb Exp $ */ /* * Copyright 2007-8 Advanced Micro Devices, Inc. @@ -26,7 +26,7 @@ * Alex Deucher */ #include -__KERNEL_RCSID(0, "$NetBSD: amdgpu_display.c,v 1.6 2020/02/14 04:38:13 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: amdgpu_display.c,v 1.7 2020/04/25 12:39:15 simonb Exp $"); #include #include @@ -78,7 +78,7 @@ static void amdgpu_flip_work_func(struct struct drm_crtc *crtc = >base; unsigned long flags; unsigned i, repcnt = 4; - int vpos, hpos, stat, min_udelay = 0; + int vpos, hpos, stat = 0, min_udelay = 0; struct drm_vblank_crtc *vblank = >dev->vblank[work->crtc_id]; amdgpu_flip_wait_fence(adev, >excl);
CVS commit: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu
Module Name:src Committed By: simonb Date: Sat Apr 25 12:39:15 UTC 2020 Modified Files: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu: amdgpu_display.c Log Message: Fix gcc uninitialised variable warning. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_display.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: kre Date: Sat Apr 25 12:18:48 UTC 2020 Modified Files: src/distrib/sets/lists/base: mi src/doc: 3RDPARTY CHANGES Log Message: Update to tzdata2020a (new zone file America/Nuuk) XXX pullup -8 -9 To generate a diff of this commit: cvs rdiff -u -r1.1240 -r1.1241 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.1714 -r1.1715 src/doc/3RDPARTY cvs rdiff -u -r1.2680 -r1.2681 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
Module Name:src Committed By: kre Date: Sat Apr 25 12:18:48 UTC 2020 Modified Files: src/distrib/sets/lists/base: mi src/doc: 3RDPARTY CHANGES Log Message: Update to tzdata2020a (new zone file America/Nuuk) XXX pullup -8 -9 To generate a diff of this commit: cvs rdiff -u -r1.1240 -r1.1241 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.1714 -r1.1715 src/doc/3RDPARTY cvs rdiff -u -r1.2680 -r1.2681 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/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.1240 src/distrib/sets/lists/base/mi:1.1241 --- src/distrib/sets/lists/base/mi:1.1240 Tue Apr 14 03:16:26 2020 +++ src/distrib/sets/lists/base/mi Sat Apr 25 12:18:47 2020 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1240 2020/04/14 03:16:26 kre Exp $ +# $NetBSD: mi,v 1.1241 2020/04/25 12:18:47 kre Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -5530,6 +5530,7 @@ ./usr/share/zoneinfo/America/North_Dakota/Beulah base-sys-share share ./usr/share/zoneinfo/America/North_Dakota/Center base-sys-share share ./usr/share/zoneinfo/America/North_Dakota/New_Salem base-sys-share share +./usr/share/zoneinfo/America/Nuuk base-sys-share share ./usr/share/zoneinfo/America/Ojinaga base-sys-share share ./usr/share/zoneinfo/America/Panama base-sys-share share ./usr/share/zoneinfo/America/Pangnirtung base-sys-share share @@ -5669,6 +5670,7 @@ ./usr/share/zoneinfo/Asia/Riyadh87 base-obsolete obsolete ./usr/share/zoneinfo/Asia/Riyadh88 base-obsolete obsolete ./usr/share/zoneinfo/Asia/Riyadh89 base-obsolete obsolete +./usr/share/zoneinfo/Asia/Qostanay base-sys-share share ./usr/share/zoneinfo/Asia/Saigon base-sys-share share ./usr/share/zoneinfo/Asia/Sakhalin base-sys-share share ./usr/share/zoneinfo/Asia/Samarkand base-sys-share share Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1714 src/doc/3RDPARTY:1.1715 --- src/doc/3RDPARTY:1.1714 Fri Apr 24 19:38:10 2020 +++ src/doc/3RDPARTY Sat Apr 25 12:18:48 2020 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1714 2020/04/24 19:38:10 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1715 2020/04/25 12:18:48 kre Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1382,8 +1382,8 @@ Notes: Added changes from a5 -> a12 manually. Package: tz -Version: tzcode2019b / tzdata2019c -Current Vers: tzcode2019c / tzdata2019c +Version: tzcode2019b / tzdata2020a +Current Vers: tzcode2020a / tzdata2020a Maintainer: Paul Eggert Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2680 src/doc/CHANGES:1.2681 --- src/doc/CHANGES:1.2680 Fri Apr 24 19:38:10 2020 +++ src/doc/CHANGES Sat Apr 25 12:18:48 2020 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2680 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2681 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -183,3 +183,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0: xbdback(4): Support indirect segments [jdolecek 20200421] xbdback(4): Make the driver MP-safe [jdolecek 20200423] OpenSSL: Imported 1.1.1g. [christos 20200424] + tzdata updated to 2020a [kre 20200425]
CVS commit: src/external/public-domain/tz/dist
Module Name:src Committed By: kre Date: Sat Apr 25 12:17:17 UTC 2020 Modified Files: src/external/public-domain/tz/dist: TZDATA_VERSION Log Message: Merge tzdata2020a To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/external/public-domain/tz/dist/TZDATA_VERSION Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/public-domain/tz/dist
Module Name:src Committed By: kre Date: Sat Apr 25 12:17:17 UTC 2020 Modified Files: src/external/public-domain/tz/dist: TZDATA_VERSION Log Message: Merge tzdata2020a To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/external/public-domain/tz/dist/TZDATA_VERSION Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/tz/dist/TZDATA_VERSION diff -u src/external/public-domain/tz/dist/TZDATA_VERSION:1.18 src/external/public-domain/tz/dist/TZDATA_VERSION:1.19 --- src/external/public-domain/tz/dist/TZDATA_VERSION:1.18 Tue Oct 8 02:44:35 2019 +++ src/external/public-domain/tz/dist/TZDATA_VERSION Sat Apr 25 12:17:17 2020 @@ -1 +1 @@ -tzdata-2019c +tzdata-2020a
CVS import: src/external/public-domain/tz/dist
Module Name:src Committed By: kre Date: Sat Apr 25 12:17:00 UTC 2020 Update of /cvsroot/src/external/public-domain/tz/dist In directory ivanova.netbsd.org:/tmp/cvs-serv24977 Log Message: Import tzdata2020a from ftp://ftp.iana.org/tz/releases/tzdata2020a.tar.gz Summary of changes in tzdata2020a (2020-04-23 16:03:47 -0700): Morocco resumes summer time on 2020-05-31, not 2020-05-24. Canada's Yukon advanced to -07 year-round on 2020-03-08 (summer time will not end this year).. America/Nuuk renamed from America/Godthab (both names now exist). Status: Vendor Tag: TZDATA Release Tags: TZDATA2020A U src/external/public-domain/tz/dist/leap-seconds.list U src/external/public-domain/tz/dist/calendars U src/external/public-domain/tz/dist/CONTRIBUTING U src/external/public-domain/tz/dist/LICENSE U src/external/public-domain/tz/dist/Makefile U src/external/public-domain/tz/dist/NEWS U src/external/public-domain/tz/dist/README U src/external/public-domain/tz/dist/theory.html U src/external/public-domain/tz/dist/version U src/external/public-domain/tz/dist/africa U src/external/public-domain/tz/dist/antarctica U src/external/public-domain/tz/dist/asia U src/external/public-domain/tz/dist/australasia U src/external/public-domain/tz/dist/europe U src/external/public-domain/tz/dist/northamerica U src/external/public-domain/tz/dist/southamerica U src/external/public-domain/tz/dist/etcetera U src/external/public-domain/tz/dist/systemv U src/external/public-domain/tz/dist/factory U src/external/public-domain/tz/dist/backward U src/external/public-domain/tz/dist/pacificnew U src/external/public-domain/tz/dist/backzone U src/external/public-domain/tz/dist/iso3166.tab U src/external/public-domain/tz/dist/checklinks.awk U src/external/public-domain/tz/dist/zone.tab U src/external/public-domain/tz/dist/leapseconds U src/external/public-domain/tz/dist/yearistype.sh U src/external/public-domain/tz/dist/zone1970.tab U src/external/public-domain/tz/dist/leapseconds.awk U src/external/public-domain/tz/dist/checktab.awk U src/external/public-domain/tz/dist/zoneinfo2tdf.pl U src/external/public-domain/tz/dist/ziguard.awk U src/external/public-domain/tz/dist/zishrink.awk No conflicts created by this import
CVS import: src/external/public-domain/tz/dist
Module Name:src Committed By: kre Date: Sat Apr 25 12:17:00 UTC 2020 Update of /cvsroot/src/external/public-domain/tz/dist In directory ivanova.netbsd.org:/tmp/cvs-serv24977 Log Message: Import tzdata2020a from ftp://ftp.iana.org/tz/releases/tzdata2020a.tar.gz Summary of changes in tzdata2020a (2020-04-23 16:03:47 -0700): Morocco resumes summer time on 2020-05-31, not 2020-05-24. Canada's Yukon advanced to -07 year-round on 2020-03-08 (summer time will not end this year).. America/Nuuk renamed from America/Godthab (both names now exist). Status: Vendor Tag: TZDATA Release Tags: TZDATA2020A U src/external/public-domain/tz/dist/leap-seconds.list U src/external/public-domain/tz/dist/calendars U src/external/public-domain/tz/dist/CONTRIBUTING U src/external/public-domain/tz/dist/LICENSE U src/external/public-domain/tz/dist/Makefile U src/external/public-domain/tz/dist/NEWS U src/external/public-domain/tz/dist/README U src/external/public-domain/tz/dist/theory.html U src/external/public-domain/tz/dist/version U src/external/public-domain/tz/dist/africa U src/external/public-domain/tz/dist/antarctica U src/external/public-domain/tz/dist/asia U src/external/public-domain/tz/dist/australasia U src/external/public-domain/tz/dist/europe U src/external/public-domain/tz/dist/northamerica U src/external/public-domain/tz/dist/southamerica U src/external/public-domain/tz/dist/etcetera U src/external/public-domain/tz/dist/systemv U src/external/public-domain/tz/dist/factory U src/external/public-domain/tz/dist/backward U src/external/public-domain/tz/dist/pacificnew U src/external/public-domain/tz/dist/backzone U src/external/public-domain/tz/dist/iso3166.tab U src/external/public-domain/tz/dist/checklinks.awk U src/external/public-domain/tz/dist/zone.tab U src/external/public-domain/tz/dist/leapseconds U src/external/public-domain/tz/dist/yearistype.sh U src/external/public-domain/tz/dist/zone1970.tab U src/external/public-domain/tz/dist/leapseconds.awk U src/external/public-domain/tz/dist/checktab.awk U src/external/public-domain/tz/dist/zoneinfo2tdf.pl U src/external/public-domain/tz/dist/ziguard.awk U src/external/public-domain/tz/dist/zishrink.awk No conflicts created by this import
CVS commit: [bouyer-xenpvh] src/sys/rump
Module Name:src Committed By: bouyer Date: Sat Apr 25 11:44:29 UTC 2020 Modified Files: src/sys/rump [bouyer-xenpvh]: listsrcdirs Log Message: Add xen as include dir for x86 To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.49.6.1 src/sys/rump/listsrcdirs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [bouyer-xenpvh] src/sys/rump
Module Name:src Committed By: bouyer Date: Sat Apr 25 11:44:29 UTC 2020 Modified Files: src/sys/rump [bouyer-xenpvh]: listsrcdirs Log Message: Add xen as include dir for x86 To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.49.6.1 src/sys/rump/listsrcdirs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/rump/listsrcdirs diff -u src/sys/rump/listsrcdirs:1.49 src/sys/rump/listsrcdirs:1.49.6.1 --- src/sys/rump/listsrcdirs:1.49 Fri Sep 27 11:57:42 2019 +++ src/sys/rump/listsrcdirs Sat Apr 25 11:44:29 2020 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: listsrcdirs,v 1.49 2019/09/27 11:57:42 bad Exp $ +# $NetBSD: listsrcdirs,v 1.49.6.1 2020/04/25 11:44:29 bouyer Exp $ # # @@ -78,7 +78,7 @@ include_headerlist () fi } -ARCHS="amd64 i386 x86 arm evbarm sparc sparc64 powerpc evbppc mips evbmips aarch64 riscv" +ARCHS="amd64 i386 x86 xen arm evbarm sparc sparc64 powerpc evbppc mips evbmips aarch64 riscv" ARCHS_EXTRA="arm/arm32 Makefile" # files listed in src/tools/Makefile.nbincludes ARCHS_EXTRA="$ARCHS_EXTRA ews4800mips/include/pdinfo.h
CVS commit: src/sys/arch/xen/xen
Module Name:src
Committed By: jdolecek
Date: Sat Apr 25 11:33:28 UTC 2020
Modified Files:
src/sys/arch/xen/xen: if_xennet_xenbus.c xennetback_xenbus.c
Log Message:
use m_defrag() instead of local code now that it returns single mbuf
To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.117 src/sys/arch/xen/xen/if_xennet_xenbus.c
cvs rdiff -u -r1.96 -r1.97 src/sys/arch/xen/xen/xennetback_xenbus.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/xen/xen/if_xennet_xenbus.c
diff -u src/sys/arch/xen/xen/if_xennet_xenbus.c:1.116 src/sys/arch/xen/xen/if_xennet_xenbus.c:1.117
--- src/sys/arch/xen/xen/if_xennet_xenbus.c:1.116 Thu Apr 23 15:06:49 2020
+++ src/sys/arch/xen/xen/if_xennet_xenbus.c Sat Apr 25 11:33:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xennet_xenbus.c,v 1.116 2020/04/23 15:06:49 jdolecek Exp $ */
+/* $NetBSD: if_xennet_xenbus.c,v 1.117 2020/04/25 11:33:28 jdolecek Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -81,7 +81,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.116 2020/04/23 15:06:49 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.117 2020/04/25 11:33:28 jdolecek Exp $");
#include "opt_xen.h"
#include "opt_nfs_boot.h"
@@ -1002,41 +1002,23 @@ xennet_start(struct ifnet *ifp)
txflags = NETTXF_data_validated;
}
- /* Try to load the mbuf as-is, if that fails allocate new */
+ /* Try to load the mbuf as-is, if that fails defrag */
if (__predict_false(bus_dmamap_load_mbuf(
sc->sc_xbusd->xbusd_dmat,
req->txreq_dmamap, m, BUS_DMA_NOWAIT) != 0)) {
- struct mbuf *new_m;
-
- MGETHDR(new_m, M_DONTWAIT, MT_DATA);
- if (__predict_false(new_m == NULL)) {
-printf("%s: cannot allocate new mbuf\n",
- device_xname(sc->sc_dev));
+ if (__predict_false(m_defrag(m, M_DONTWAIT) == NULL)) {
+DPRINTF(("%s: defrag failed\n",
+device_xname(sc->sc_dev)));
m_freem(m);
break;
}
- if (m->m_pkthdr.len > MHLEN) {
-MCLGET(new_m, M_DONTWAIT);
-if (__predict_false(
-(new_m->m_flags & M_EXT) == 0)) {
- DPRINTF(("%s: no mbuf cluster\n",
- device_xname(sc->sc_dev)));
- m_freem(new_m);
- m_freem(m);
- break;
-}
- }
-
- m_copydata(m, 0, m->m_pkthdr.len, mtod(new_m, void *));
- new_m->m_len = new_m->m_pkthdr.len = m->m_pkthdr.len;
- m_freem(m);
- m = new_m;
if (__predict_false(bus_dmamap_load_mbuf(
sc->sc_xbusd->xbusd_dmat,
req->txreq_dmamap, m, BUS_DMA_NOWAIT) != 0)) {
-printf("%s: cannot load new mbuf\n",
- device_xname(sc->sc_dev));
+printf("%s: cannot load new mbuf len %d\n",
+device_xname(sc->sc_dev),
+m->m_pkthdr.len);
m_freem(m);
break;
}
Index: src/sys/arch/xen/xen/xennetback_xenbus.c
diff -u src/sys/arch/xen/xen/xennetback_xenbus.c:1.96 src/sys/arch/xen/xen/xennetback_xenbus.c:1.97
--- src/sys/arch/xen/xen/xennetback_xenbus.c:1.96 Sat Apr 11 11:48:20 2020
+++ src/sys/arch/xen/xen/xennetback_xenbus.c Sat Apr 25 11:33:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: xennetback_xenbus.c,v 1.96 2020/04/11 11:48:20 jdolecek Exp $ */
+/* $NetBSD: xennetback_xenbus.c,v 1.97 2020/04/25 11:33:28 jdolecek Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -25,7 +25,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xennetback_xenbus.c,v 1.96 2020/04/11 11:48:20 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xennetback_xenbus.c,v 1.97 2020/04/25 11:33:28 jdolecek Exp $");
#include "opt_xen.h"
@@ -860,44 +860,6 @@ xennetback_ifstart(struct ifnet *ifp)
xennetback_ifsoftstart_copy(xneti);
}
-/*
- * sighly different from m_dup(); for some reason m_dup() can return
- * a chain where the data area can cross a page boundary.
- * This doesn't happens with the function below.
- */
-static struct mbuf *
-xennetback_copymbuf(struct mbuf *m)
-{
- struct mbuf *new_m;
-
- MGETHDR(new_m, M_DONTWAIT, MT_DATA);
- if (__predict_false(new_m == NULL)) {
- m_freem(m);
- return NULL;
- }
- if (m->m_pkthdr.len > MHLEN) {
- MCLGET(new_m, M_DONTWAIT);
- if (__predict_false((new_m->m_flags & M_EXT) == 0)) {
- m_freem(new_m);
- m_freem(m);
- return NULL;
- }
- }
- m_copydata(m, 0, m->m_pkthdr.len,
- mtod(new_m, void *));
- new_m->m_len = new_m->m_pkthdr.len =
- m->m_pkthdr.len;
-
- /*
- * Need to retain csum flags to know if csum was actually computed.
- * This is used to set NETRXF_csum_blank/NETRXF_data_validated.
- */
- new_m->m_pkthdr.csum_flags = m->m_pkthdr.csum_flags;
-
- m_freem(m);
- return new_m;
-}
-
static void
xennetback_ifsoftstart_copy(struct xnetback_instance *xneti)
{
@@ -953,12 +915,11 @@ xennetback_ifsoftstart_copy(struct xnetb
if (bus_dmamap_load_mbuf(
xneti->xni_xbusd->xbusd_dmat,
xst->xs_dmamap, m, BUS_DMA_NOWAIT) != 0) {
-/* Not possible to load, must copy */
CVS commit: src/sys/arch/xen/xen
Module Name:src Committed By: jdolecek Date: Sat Apr 25 11:33:28 UTC 2020 Modified Files: src/sys/arch/xen/xen: if_xennet_xenbus.c xennetback_xenbus.c Log Message: use m_defrag() instead of local code now that it returns single mbuf To generate a diff of this commit: cvs rdiff -u -r1.116 -r1.117 src/sys/arch/xen/xen/if_xennet_xenbus.c cvs rdiff -u -r1.96 -r1.97 src/sys/arch/xen/xen/xennetback_xenbus.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [bouyer-xenpvh] src/sys
Module Name:src Committed By: bouyer Date: Sat Apr 25 11:24:08 UTC 2020 Modified Files: src/sys/arch/aarch64/aarch64 [bouyer-xenpvh]: netbsd32_machdep.c sig_machdep.c src/sys/arch/aarch64/include [bouyer-xenpvh]: profile.h src/sys/arch/amd64/amd64 [bouyer-xenpvh]: machdep.c netbsd32_machdep.c src/sys/arch/amd64/include [bouyer-xenpvh]: gdt.h pte.h src/sys/arch/arm/arm32 [bouyer-xenpvh]: pmap.c src/sys/arch/arm/include [bouyer-xenpvh]: asm.h src/sys/arch/hp300/hp300 [bouyer-xenpvh]: machdep.c src/sys/arch/hppa/hppa [bouyer-xenpvh]: trap.c src/sys/arch/i386/conf [bouyer-xenpvh]: files.i386 src/sys/arch/i386/i386 [bouyer-xenpvh]: genassym.cf machdep.c src/sys/arch/i386/include [bouyer-xenpvh]: gdt.h kcore.h pte.h src/sys/arch/macppc/conf [bouyer-xenpvh]: GENERIC src/sys/arch/macppc/dev [bouyer-xenpvh]: lmu.c src/sys/arch/macppc/stand [bouyer-xenpvh]: Makefile.inc src/sys/arch/macppc/stand/ofwboot [bouyer-xenpvh]: boot.c net.c src/sys/arch/mips/cavium/dev [bouyer-xenpvh]: if_cnmac.c octeon_gmx.c octeon_gmxvar.h src/sys/arch/sparc/stand/bootxx [bouyer-xenpvh]: Makefile src/sys/arch/sparc/stand/common [bouyer-xenpvh]: net.c src/sys/arch/sparc/stand/ofwboot [bouyer-xenpvh]: net.c src/sys/arch/sun68k/stand/libsa [bouyer-xenpvh]: Makefile.inc src/sys/arch/x86/include [bouyer-xenpvh]: apicvar.h cpu.h pmap.h specialreg.h src/sys/arch/x86/pci [bouyer-xenpvh]: amdsmn.c amdzentemp.c src/sys/arch/x86/x86 [bouyer-xenpvh]: bus_space.c hyperv.c pmap.c procfs_machdep.c svs.c sys_machdep.c tsc.c src/sys/arch/xen/include [bouyer-xenpvh]: hypervisor.h i82093var.h intr.h intrdefs.h xenring.h src/sys/arch/xen/x86 [bouyer-xenpvh]: hypervisor_machdep.c pintr.c src/sys/arch/xen/xen [bouyer-xenpvh]: evtchn.c if_xennet_xenbus.c xbd_xenbus.c src/sys/arch/zaurus/stand [bouyer-xenpvh]: Makefile.inc src/sys/compat/linux/common [bouyer-xenpvh]: linux_exec.c linux_sched.c src/sys/compat/netbsd32 [bouyer-xenpvh]: netbsd32_fs.c netbsd32_syscall.h netbsd32_syscallargs.h netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c netbsd32_systrace_args.c syscalls.master src/sys/conf [bouyer-xenpvh]: files src/sys/crypto/rijndael [bouyer-xenpvh]: files.rijndael src/sys/dev [bouyer-xenpvh]: vnd.c src/sys/dev/ata [bouyer-xenpvh]: ata.c ata_subr.c atavar.h src/sys/dev/hid [bouyer-xenpvh]: hidkbdmap.c src/sys/dev/i2c [bouyer-xenpvh]: files.i2c src/sys/dev/ic [bouyer-xenpvh]: bcmgenetreg.h hpet.c hpetvar.h vga.c vga_raster.c src/sys/dev/isa [bouyer-xenpvh]: pcdisplay.c src/sys/dev/marvell [bouyer-xenpvh]: files.armada src/sys/dev/pci [bouyer-xenpvh]: ichsmb.c if_aq.c if_mcx.c if_msk.c pcidevs pcidevs.h pcidevs_data.h src/sys/external/bsd/drm2/dist/drm/i915 [bouyer-xenpvh]: i915_gem_gtt.c src/sys/fs/adosfs [bouyer-xenpvh]: advnops.c src/sys/fs/cd9660 [bouyer-xenpvh]: cd9660_vnops.c src/sys/fs/efs [bouyer-xenpvh]: efs_vnops.c src/sys/fs/filecorefs [bouyer-xenpvh]: filecore_vnops.c src/sys/fs/hfs [bouyer-xenpvh]: hfs_vnops.c src/sys/fs/msdosfs [bouyer-xenpvh]: msdosfs_denode.c msdosfs_vnops.c src/sys/fs/nilfs [bouyer-xenpvh]: nilfs_vnops.c src/sys/fs/puffs [bouyer-xenpvh]: puffs_vnops.c src/sys/fs/sysvbfs [bouyer-xenpvh]: sysvbfs_vnops.c src/sys/fs/tmpfs [bouyer-xenpvh]: tmpfs_subr.c tmpfs_vnops.c src/sys/fs/udf [bouyer-xenpvh]: udf_allocation.c udf_vnops.c src/sys/fs/v7fs [bouyer-xenpvh]: v7fs_vnops.c src/sys/kern [bouyer-xenpvh]: files.kern init_sysent.c kern_crashme.c kern_exec.c kern_exit.c kern_fork.c kern_lwp.c kern_pmf.c kern_proc.c subr_vmem.c sys_lwp.c syscalls.c syscalls.master syscalls_autoload.c systrace_args.c uipc_mbuf.c uipc_usrreq.c vfs_bio.c vfs_cache.c vfs_cwd.c vfs_getcwd.c vfs_lookup.c vfs_mount.c vfs_subr.c vfs_syscalls.c src/sys/lib/libkern [bouyer-xenpvh]: Makefile.compiler-rt src/sys/miscfs/procfs [bouyer-xenpvh]: procfs_linux.c procfs_vnops.c src/sys/netinet6 [bouyer-xenpvh]: in6_proto.c nd6_nbr.c src/sys/netipsec [bouyer-xenpvh]: files.netipsec src/sys/nfs [bouyer-xenpvh]: nfs_bio.c src/sys/opencrypto [bouyer-xenpvh]: files.opencrypto src/sys/rump/include/rump [bouyer-xenpvh]: rump_syscalls.h src/sys/rump/librump/rumpkern [bouyer-xenpvh]: lwproc.c rump.c rump_syscalls.c src/sys/rump/librump/rumpvfs [bouyer-xenpvh]: rump_vfs.c rumpfs.c src/sys/sys [bouyer-xenpvh]: buf.h cdefs.h filedesc.h lwp.h param.h
CVS commit: [bouyer-xenpvh] src/sys
Module Name:src Committed By: bouyer Date: Sat Apr 25 11:24:08 UTC 2020 Modified Files: src/sys/arch/aarch64/aarch64 [bouyer-xenpvh]: netbsd32_machdep.c sig_machdep.c src/sys/arch/aarch64/include [bouyer-xenpvh]: profile.h src/sys/arch/amd64/amd64 [bouyer-xenpvh]: machdep.c netbsd32_machdep.c src/sys/arch/amd64/include [bouyer-xenpvh]: gdt.h pte.h src/sys/arch/arm/arm32 [bouyer-xenpvh]: pmap.c src/sys/arch/arm/include [bouyer-xenpvh]: asm.h src/sys/arch/hp300/hp300 [bouyer-xenpvh]: machdep.c src/sys/arch/hppa/hppa [bouyer-xenpvh]: trap.c src/sys/arch/i386/conf [bouyer-xenpvh]: files.i386 src/sys/arch/i386/i386 [bouyer-xenpvh]: genassym.cf machdep.c src/sys/arch/i386/include [bouyer-xenpvh]: gdt.h kcore.h pte.h src/sys/arch/macppc/conf [bouyer-xenpvh]: GENERIC src/sys/arch/macppc/dev [bouyer-xenpvh]: lmu.c src/sys/arch/macppc/stand [bouyer-xenpvh]: Makefile.inc src/sys/arch/macppc/stand/ofwboot [bouyer-xenpvh]: boot.c net.c src/sys/arch/mips/cavium/dev [bouyer-xenpvh]: if_cnmac.c octeon_gmx.c octeon_gmxvar.h src/sys/arch/sparc/stand/bootxx [bouyer-xenpvh]: Makefile src/sys/arch/sparc/stand/common [bouyer-xenpvh]: net.c src/sys/arch/sparc/stand/ofwboot [bouyer-xenpvh]: net.c src/sys/arch/sun68k/stand/libsa [bouyer-xenpvh]: Makefile.inc src/sys/arch/x86/include [bouyer-xenpvh]: apicvar.h cpu.h pmap.h specialreg.h src/sys/arch/x86/pci [bouyer-xenpvh]: amdsmn.c amdzentemp.c src/sys/arch/x86/x86 [bouyer-xenpvh]: bus_space.c hyperv.c pmap.c procfs_machdep.c svs.c sys_machdep.c tsc.c src/sys/arch/xen/include [bouyer-xenpvh]: hypervisor.h i82093var.h intr.h intrdefs.h xenring.h src/sys/arch/xen/x86 [bouyer-xenpvh]: hypervisor_machdep.c pintr.c src/sys/arch/xen/xen [bouyer-xenpvh]: evtchn.c if_xennet_xenbus.c xbd_xenbus.c src/sys/arch/zaurus/stand [bouyer-xenpvh]: Makefile.inc src/sys/compat/linux/common [bouyer-xenpvh]: linux_exec.c linux_sched.c src/sys/compat/netbsd32 [bouyer-xenpvh]: netbsd32_fs.c netbsd32_syscall.h netbsd32_syscallargs.h netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c netbsd32_systrace_args.c syscalls.master src/sys/conf [bouyer-xenpvh]: files src/sys/crypto/rijndael [bouyer-xenpvh]: files.rijndael src/sys/dev [bouyer-xenpvh]: vnd.c src/sys/dev/ata [bouyer-xenpvh]: ata.c ata_subr.c atavar.h src/sys/dev/hid [bouyer-xenpvh]: hidkbdmap.c src/sys/dev/i2c [bouyer-xenpvh]: files.i2c src/sys/dev/ic [bouyer-xenpvh]: bcmgenetreg.h hpet.c hpetvar.h vga.c vga_raster.c src/sys/dev/isa [bouyer-xenpvh]: pcdisplay.c src/sys/dev/marvell [bouyer-xenpvh]: files.armada src/sys/dev/pci [bouyer-xenpvh]: ichsmb.c if_aq.c if_mcx.c if_msk.c pcidevs pcidevs.h pcidevs_data.h src/sys/external/bsd/drm2/dist/drm/i915 [bouyer-xenpvh]: i915_gem_gtt.c src/sys/fs/adosfs [bouyer-xenpvh]: advnops.c src/sys/fs/cd9660 [bouyer-xenpvh]: cd9660_vnops.c src/sys/fs/efs [bouyer-xenpvh]: efs_vnops.c src/sys/fs/filecorefs [bouyer-xenpvh]: filecore_vnops.c src/sys/fs/hfs [bouyer-xenpvh]: hfs_vnops.c src/sys/fs/msdosfs [bouyer-xenpvh]: msdosfs_denode.c msdosfs_vnops.c src/sys/fs/nilfs [bouyer-xenpvh]: nilfs_vnops.c src/sys/fs/puffs [bouyer-xenpvh]: puffs_vnops.c src/sys/fs/sysvbfs [bouyer-xenpvh]: sysvbfs_vnops.c src/sys/fs/tmpfs [bouyer-xenpvh]: tmpfs_subr.c tmpfs_vnops.c src/sys/fs/udf [bouyer-xenpvh]: udf_allocation.c udf_vnops.c src/sys/fs/v7fs [bouyer-xenpvh]: v7fs_vnops.c src/sys/kern [bouyer-xenpvh]: files.kern init_sysent.c kern_crashme.c kern_exec.c kern_exit.c kern_fork.c kern_lwp.c kern_pmf.c kern_proc.c subr_vmem.c sys_lwp.c syscalls.c syscalls.master syscalls_autoload.c systrace_args.c uipc_mbuf.c uipc_usrreq.c vfs_bio.c vfs_cache.c vfs_cwd.c vfs_getcwd.c vfs_lookup.c vfs_mount.c vfs_subr.c vfs_syscalls.c src/sys/lib/libkern [bouyer-xenpvh]: Makefile.compiler-rt src/sys/miscfs/procfs [bouyer-xenpvh]: procfs_linux.c procfs_vnops.c src/sys/netinet6 [bouyer-xenpvh]: in6_proto.c nd6_nbr.c src/sys/netipsec [bouyer-xenpvh]: files.netipsec src/sys/nfs [bouyer-xenpvh]: nfs_bio.c src/sys/opencrypto [bouyer-xenpvh]: files.opencrypto src/sys/rump/include/rump [bouyer-xenpvh]: rump_syscalls.h src/sys/rump/librump/rumpkern [bouyer-xenpvh]: lwproc.c rump.c rump_syscalls.c src/sys/rump/librump/rumpvfs [bouyer-xenpvh]: rump_vfs.c rumpfs.c src/sys/sys [bouyer-xenpvh]: buf.h cdefs.h filedesc.h lwp.h param.h
CVS commit: src/usr.bin/progress
Module Name:src
Committed By: simonb
Date: Sat Apr 25 11:12:39 UTC 2020
Modified Files:
src/usr.bin/progress: progress.c
Log Message:
Whitespace nit.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/usr.bin/progress/progress.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/progress/progress.c
diff -u src/usr.bin/progress/progress.c:1.21 src/usr.bin/progress/progress.c:1.22
--- src/usr.bin/progress/progress.c:1.21 Sat Jan 17 10:57:51 2015
+++ src/usr.bin/progress/progress.c Sat Apr 25 11:12:39 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: progress.c,v 1.21 2015/01/17 10:57:51 gson Exp $ */
+/* $NetBSD: progress.c,v 1.22 2020/04/25 11:12:39 simonb Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: progress.c,v 1.21 2015/01/17 10:57:51 gson Exp $");
+__RCSID("$NetBSD: progress.c,v 1.22 2020/04/25 11:12:39 simonb Exp $");
#endif/* not lint */
#include
@@ -75,7 +75,6 @@ usage(void)
exit(EXIT_FAILURE);
}
-
int
main(int argc, char *argv[])
{
CVS commit: src/usr.bin/progress
Module Name:src Committed By: simonb Date: Sat Apr 25 11:12:39 UTC 2020 Modified Files: src/usr.bin/progress: progress.c Log Message: Whitespace nit. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/usr.bin/progress/progress.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/jot
Module Name:src Committed By: simonb Date: Sat Apr 25 11:11:33 UTC 2020 Modified Files: src/usr.bin/jot: jot.1 Log Message: Document the default values for options in a way that hopefully makes much more sense. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/usr.bin/jot/jot.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/jot/jot.1 diff -u src/usr.bin/jot/jot.1:1.16 src/usr.bin/jot/jot.1:1.17 --- src/usr.bin/jot/jot.1:1.16 Mon Jun 25 14:29:17 2018 +++ src/usr.bin/jot/jot.1 Sat Apr 25 11:11:33 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: jot.1,v 1.16 2018/06/25 14:29:17 christos Exp $ +.\" $NetBSD: jot.1,v 1.17 2020/04/25 11:11:33 simonb Exp $ .\" .\" Copyright (c) 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)jot.1 8.1 (Berkeley) 6/6/93 .\" -.Dd June 25, 2018 +.Dd April 25, 2020 .Dt JOT 1 .Os .Sh NAME @@ -54,6 +54,7 @@ The .Nm jot utility is used to print out increasing, decreasing, random, or redundant data (usually numbers) one per line. +The default is to produce sequential data. .Pp The following options are available: .Bl -tag -width indent @@ -83,7 +84,7 @@ option is overridden by whatever appears conversion following .Fl w . .It Fl r -Generate random data instead of sequential data, the default. +Generate random data. .It Fl s Ar string Print data separated by .Ar string . @@ -120,8 +121,10 @@ and .Ar end are given. .Pp -Defaults for the four arguments are, respectively, -100, 1, 100, and 1, except that when random data are requested, +When sequential data are requested the defaults for the four arguments +are 100 data, a lower bound of 1, an upper bound of 100 and a step size +of 1. +When random data are requested .Ar s defaults to a seed depending upon the time of day. .Ar reps
CVS commit: src/usr.bin/jot
Module Name:src Committed By: simonb Date: Sat Apr 25 11:11:33 UTC 2020 Modified Files: src/usr.bin/jot: jot.1 Log Message: Document the default values for options in a way that hopefully makes much more sense. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/usr.bin/jot/jot.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src
Committed By: jdolecek
Date: Sat Apr 25 11:03:04 UTC 2020
Modified Files:
src/sys/kern: uipc_mbuf.c
Log Message:
in m_defrag() must copy data elsewhere before adding cluster, the
data part of mbuf gets reused and hence overwritten by extbuf
To generate a diff of this commit:
cvs rdiff -u -r1.239 -r1.240 src/sys/kern/uipc_mbuf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/uipc_mbuf.c
diff -u src/sys/kern/uipc_mbuf.c:1.239 src/sys/kern/uipc_mbuf.c:1.240
--- src/sys/kern/uipc_mbuf.c:1.239 Fri Apr 24 22:50:55 2020
+++ src/sys/kern/uipc_mbuf.c Sat Apr 25 11:03:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_mbuf.c,v 1.239 2020/04/24 22:50:55 jdolecek Exp $ */
+/* $NetBSD: uipc_mbuf.c,v 1.240 2020/04/25 11:03:04 jdolecek Exp $ */
/*
* Copyright (c) 1999, 2001, 2018 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.239 2020/04/24 22:50:55 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.240 2020/04/25 11:03:04 jdolecek Exp $");
#ifdef _KERNEL_OPT
#include "opt_mbuftrace.h"
@@ -1677,7 +1677,7 @@ m_defrag(struct mbuf *m, int how)
return m;
/* Defrag to single mbuf if at all possible */
- if ((m->m_flags & M_EXT) == 0) {
+ if ((m->m_flags & M_EXT) == 0 && m->m_pkthdr.len <= MCLBYTES) {
if (m->m_pkthdr.len <= MHLEN) {
if (M_TRAILINGSPACE(m) < (m->m_pkthdr.len - m->m_len)) {
KASSERT(M_LEADINGSPACE(m) >=
@@ -1685,29 +1685,29 @@ m_defrag(struct mbuf *m, int how)
memmove(m->m_pktdat, m->m_data, m->m_len);
m->m_data = m->m_pktdat;
}
-
- KASSERT(M_TRAILINGSPACE(m) >=
- (m->m_pkthdr.len - m->m_len));
- if (__predict_false(!m_ensure_contig(,
- m->m_pkthdr.len))) {
-panic("m_ensure_contig(%d) failed\n",
-m->m_pkthdr.len);
- }
- return m;
- } else if (m->m_pkthdr.len <= MCLBYTES) {
- void *odata = m->m_data;
+ } else {
+ /* Must copy data before adding cluster */
+ m0 = m_get(how, MT_DATA);
+ if (m0 == NULL)
+return NULL;
+ KASSERT(m->m_len <= MHLEN);
+ m_copydata(m, 0, m->m_len, mtod(m0, void *));
MCLGET(m, how);
- if ((m->m_flags & M_EXT) == 0)
+ if ((m->m_flags & M_EXT) == 0) {
+m_free(m0);
return NULL;
- memcpy(m->m_data, odata, m->m_len);
- if (m_pulldown(m, m->m_len, m->m_pkthdr.len - m->m_len,
- NULL) == NULL) {
-panic("m_pulldown(%d, %d) failed\n",
-m->m_len, m->m_pkthdr.len - m->m_len);
}
- return m;
+ memcpy(m->m_data, mtod(m0, void *), m->m_len);
+ m_free(m0);
}
+ KASSERT(M_TRAILINGSPACE(m) >= (m->m_pkthdr.len - m->m_len));
+ m_copydata(m->m_next, 0, m->m_pkthdr.len - m->m_len,
+ mtod(m, char *) + m->m_len);
+ m->m_len = m->m_pkthdr.len;
+ m_freem(m->m_next);
+ m->m_next = NULL;
+ return m;
}
m0 = m_get(how, MT_DATA);
CVS commit: src/sys/kern
Module Name:src Committed By: jdolecek Date: Sat Apr 25 11:03:04 UTC 2020 Modified Files: src/sys/kern: uipc_mbuf.c Log Message: in m_defrag() must copy data elsewhere before adding cluster, the data part of mbuf gets reused and hence overwritten by extbuf To generate a diff of this commit: cvs rdiff -u -r1.239 -r1.240 src/sys/kern/uipc_mbuf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [bouyer-xenpvh] src/common/lib/libc/arch/m68k/gen
Module Name:src Committed By: bouyer Date: Sat Apr 25 11:02:23 UTC 2020 Removed Files: src/common/lib/libc/arch/m68k/gen [bouyer-xenpvh]: divsi3.S modsi3.S udivsi3.S umodsi3.S Log Message: Sync with HEAD To generate a diff of this commit: cvs rdiff -u -r1.5 -r0 src/common/lib/libc/arch/m68k/gen/divsi3.S \ src/common/lib/libc/arch/m68k/gen/umodsi3.S cvs rdiff -u -r1.7 -r0 src/common/lib/libc/arch/m68k/gen/modsi3.S cvs rdiff -u -r1.4 -r0 src/common/lib/libc/arch/m68k/gen/udivsi3.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [bouyer-xenpvh] src/common/lib/libc/arch/m68k/gen
Module Name:src Committed By: bouyer Date: Sat Apr 25 11:02:23 UTC 2020 Removed Files: src/common/lib/libc/arch/m68k/gen [bouyer-xenpvh]: divsi3.S modsi3.S udivsi3.S umodsi3.S Log Message: Sync with HEAD To generate a diff of this commit: cvs rdiff -u -r1.5 -r0 src/common/lib/libc/arch/m68k/gen/divsi3.S \ src/common/lib/libc/arch/m68k/gen/umodsi3.S cvs rdiff -u -r1.7 -r0 src/common/lib/libc/arch/m68k/gen/modsi3.S cvs rdiff -u -r1.4 -r0 src/common/lib/libc/arch/m68k/gen/udivsi3.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man5
Module Name:src Committed By: simonb Date: Sat Apr 25 10:56:53 UTC 2020 Modified Files: src/share/man/man5: locate.conf.5 Log Message: Document the "database" configuration option. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/share/man/man5/locate.conf.5 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/man5/locate.conf.5 diff -u src/share/man/man5/locate.conf.5:1.9 src/share/man/man5/locate.conf.5:1.10 --- src/share/man/man5/locate.conf.5:1.9 Sun Jul 10 13:42:49 2011 +++ src/share/man/man5/locate.conf.5 Sat Apr 25 10:56:53 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: locate.conf.5,v 1.9 2011/07/10 13:42:49 apb Exp $ +.\" $NetBSD: locate.conf.5,v 1.10 2020/04/25 10:56:53 simonb Exp $ .\" .\" Copyright (c) 2004 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 July 10, 2011 +.Dd April 25, 2020 .Dt LOCATE.CONF 5 .Os .Sh NAME @@ -59,6 +59,12 @@ in the middle of a line does not start a .Pp The configuration options are as follows: .Bl -tag -width XX +.It Sy database Ar filename +Specify the location of the +.Xr locate 1 +database to be created. +.Pp +Default: /var/db/locate.database .It Sy ignore Ar pattern ... Ignore files or directories. When building the database,
CVS commit: src/share/man/man5
Module Name:src Committed By: simonb Date: Sat Apr 25 10:56:53 UTC 2020 Modified Files: src/share/man/man5: locate.conf.5 Log Message: Document the "database" configuration option. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/share/man/man5/locate.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Sat Apr 25 10:55:11 UTC 2020 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1542 To generate a diff of this commit: cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Sat Apr 25 10:55:11 UTC 2020 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1542 To generate a diff of this commit: cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.3 diff -u src/doc/CHANGES-8.3:1.1.2.5 src/doc/CHANGES-8.3:1.1.2.6 --- src/doc/CHANGES-8.3:1.1.2.5 Fri Apr 24 16:18:06 2020 +++ src/doc/CHANGES-8.3 Sat Apr 25 10:55:11 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.5 2020/04/24 16:18:06 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.6 2020/04/25 10:55:11 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -111,3 +111,8 @@ sys/dev/dkwedge/dk.c1.98 on last close of a wedge. [maya, ticket #1541] +sys/arch/hppa/hppa/trap.c 1.115 + + Fix incorrect KASSERT. + [skrll, ticket #1542] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Sat Apr 25 10:53:48 UTC 2020 Modified Files: src/doc [netbsd-9]: CHANGES-9.1 Log Message: Tickets #852 - #854 To generate a diff of this commit: cvs rdiff -u -r1.1.2.41 -r1.1.2.42 src/doc/CHANGES-9.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.1 diff -u src/doc/CHANGES-9.1:1.1.2.41 src/doc/CHANGES-9.1:1.1.2.42 --- src/doc/CHANGES-9.1:1.1.2.41 Fri Apr 24 17:48:01 2020 +++ src/doc/CHANGES-9.1 Sat Apr 25 10:53:48 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.1,v 1.1.2.41 2020/04/24 17:48:01 martin Exp $ +# $NetBSD: CHANGES-9.1,v 1.1.2.42 2020/04/25 10:53:48 martin Exp $ A complete list of changes from the NetBSD 9.0 release to the NetBSD 9.1 release: @@ -1057,3 +1057,23 @@ sys/arch/x86/pci/amdzentemp.c 1.10 Add support for newer AMD Family 15 temperature sensors. [simonb, ticket #851] +sys/dev/hdaudio/hdafg.c1.22 + + PR kern/54474: make round_blocksize satisfy old, new and 6 channel + hardware requirements. + [isaki, ticket #852] + +bin/csh/extern.h1.32 +bin/csh/time.c 1.22 +usr.bin/time/ext.h1.4 +usr.bin/time/time.11.29 +usr.bin/time/time.c1.24 + + time(1): add '-t' option for tcsh-style time output. + [simonb, ticket #853] + +sys/arch/hppa/hppa/trap.c 1.115 + + Fix incorrect KASSERT. + [skrll, ticket #854] +
CVS commit: [netbsd-8] src/sys/arch/hppa/hppa
Module Name:src Committed By: martin Date: Sat Apr 25 10:54:23 UTC 2020 Modified Files: src/sys/arch/hppa/hppa [netbsd-8]: trap.c Log Message: Pull up following revision(s) (requested by skrll in ticket #1542): sys/arch/hppa/hppa/trap.c: revision 1.115 Fix KASSERT that has been incorrect since revision 1.85 from 10 years ago. To generate a diff of this commit: cvs rdiff -u -r1.107 -r1.107.10.1 src/sys/arch/hppa/hppa/trap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Sat Apr 25 10:53:48 UTC 2020 Modified Files: src/doc [netbsd-9]: CHANGES-9.1 Log Message: Tickets #852 - #854 To generate a diff of this commit: cvs rdiff -u -r1.1.2.41 -r1.1.2.42 src/doc/CHANGES-9.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/arch/hppa/hppa
Module Name:src Committed By: martin Date: Sat Apr 25 10:54:23 UTC 2020 Modified Files: src/sys/arch/hppa/hppa [netbsd-8]: trap.c Log Message: Pull up following revision(s) (requested by skrll in ticket #1542): sys/arch/hppa/hppa/trap.c: revision 1.115 Fix KASSERT that has been incorrect since revision 1.85 from 10 years ago. To generate a diff of this commit: cvs rdiff -u -r1.107 -r1.107.10.1 src/sys/arch/hppa/hppa/trap.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/hppa/hppa/trap.c diff -u src/sys/arch/hppa/hppa/trap.c:1.107 src/sys/arch/hppa/hppa/trap.c:1.107.10.1 --- src/sys/arch/hppa/hppa/trap.c:1.107 Mon Mar 2 11:05:12 2015 +++ src/sys/arch/hppa/hppa/trap.c Sat Apr 25 10:54:23 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: trap.c,v 1.107 2015/03/02 11:05:12 martin Exp $ */ +/* $NetBSD: trap.c,v 1.107.10.1 2020/04/25 10:54:23 martin Exp $ */ /*- * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc. @@ -58,7 +58,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.107 2015/03/02 11:05:12 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.107.10.1 2020/04/25 10:54:23 martin Exp $"); /* #define INTRDEBUG */ /* #define TRAPDEBUG */ @@ -850,7 +850,7 @@ do_onfault: } /* Never call uvm_fault in interrupt context. */ - KASSERT(curcpu()->ci_cpl == 0); + KASSERT(curcpu()->ci_intr_depth == 0); onfault = pcb->pcb_onfault; pcb->pcb_onfault = 0;
CVS commit: [netbsd-9] src/sys/arch/hppa/hppa
Module Name:src Committed By: martin Date: Sat Apr 25 10:52:56 UTC 2020 Modified Files: src/sys/arch/hppa/hppa [netbsd-9]: trap.c Log Message: Pull up following revision(s) (requested by skrll in ticket #854): sys/arch/hppa/hppa/trap.c: revision 1.115 Fix KASSERT that has been incorrect since revision 1.85 from 10 years ago. To generate a diff of this commit: cvs rdiff -u -r1.111 -r1.111.4.1 src/sys/arch/hppa/hppa/trap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/arch/hppa/hppa
Module Name:src Committed By: martin Date: Sat Apr 25 10:52:56 UTC 2020 Modified Files: src/sys/arch/hppa/hppa [netbsd-9]: trap.c Log Message: Pull up following revision(s) (requested by skrll in ticket #854): sys/arch/hppa/hppa/trap.c: revision 1.115 Fix KASSERT that has been incorrect since revision 1.85 from 10 years ago. To generate a diff of this commit: cvs rdiff -u -r1.111 -r1.111.4.1 src/sys/arch/hppa/hppa/trap.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/hppa/hppa/trap.c diff -u src/sys/arch/hppa/hppa/trap.c:1.111 src/sys/arch/hppa/hppa/trap.c:1.111.4.1 --- src/sys/arch/hppa/hppa/trap.c:1.111 Mon Apr 15 20:45:08 2019 +++ src/sys/arch/hppa/hppa/trap.c Sat Apr 25 10:52:56 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: trap.c,v 1.111 2019/04/15 20:45:08 skrll Exp $ */ +/* $NetBSD: trap.c,v 1.111.4.1 2020/04/25 10:52:56 martin Exp $ */ /*- * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc. @@ -58,7 +58,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.111 2019/04/15 20:45:08 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.111.4.1 2020/04/25 10:52:56 martin Exp $"); /* #define INTRDEBUG */ /* #define TRAPDEBUG */ @@ -853,7 +853,7 @@ do_onfault: } /* Never call uvm_fault in interrupt context. */ - KASSERT(curcpu()->ci_cpl == 0); + KASSERT(curcpu()->ci_intr_depth == 0); onfault = pcb->pcb_onfault; pcb->pcb_onfault = 0;
CVS commit: [bouyer-xenpvh] src/sys/arch/xen/conf
Module Name:src Committed By: bouyer Date: Sat Apr 25 10:52:26 UTC 2020 Modified Files: src/sys/arch/xen/conf [bouyer-xenpvh]: files.compat files.xen files.xen.pv Log Message: Include again xen/conf/files.compat for PV kernels, and make it build. My build.sh -u used stale opt_*.h files ... To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.32.10.1 src/sys/arch/xen/conf/files.compat cvs rdiff -u -r1.180.2.6 -r1.180.2.7 src/sys/arch/xen/conf/files.xen cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/arch/xen/conf/files.xen.pv Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/xen/conf/files.compat diff -u src/sys/arch/xen/conf/files.compat:1.32 src/sys/arch/xen/conf/files.compat:1.32.10.1 --- src/sys/arch/xen/conf/files.compat:1.32 Sun Dec 9 00:45:18 2018 +++ src/sys/arch/xen/conf/files.compat Sat Apr 25 10:52:26 2020 @@ -1,16 +1,10 @@ -# $NetBSD: files.compat,v 1.32 2018/12/09 00:45:18 mrg Exp $ +# $NetBSD: files.compat,v 1.32.10.1 2020/04/25 10:52:26 bouyer Exp $ # NetBSD: files.x86,v 1.10 2003/10/08 17:30:00 bouyer Exp # options for MP configuration through the MP spec #defflag opt_mpbios.h MPBIOS MPVERBOSE MPDEBUG MPBIOS_SCANPCI #defflag opt_mpacpi.h MPACPI MPACPI_SCANPCI -# MTRR support -defflagMTRR - -defflag opt_xen.h XEN PAE - - # XXX define fake options to make config create the .h files defflag lapic.h XXXLAPIC defflag apm.h XXXAPM Index: src/sys/arch/xen/conf/files.xen diff -u src/sys/arch/xen/conf/files.xen:1.180.2.6 src/sys/arch/xen/conf/files.xen:1.180.2.7 --- src/sys/arch/xen/conf/files.xen:1.180.2.6 Mon Apr 20 19:40:24 2020 +++ src/sys/arch/xen/conf/files.xen Sat Apr 25 10:52:26 2020 @@ -1,6 +1,6 @@ -# $NetBSD: files.xen,v 1.180.2.6 2020/04/20 19:40:24 bouyer Exp $ +# $NetBSD: files.xen,v 1.180.2.7 2020/04/25 10:52:26 bouyer Exp $ -defflag opt_xen.h XEN XENPVH XENPVHVM +defflag opt_xen.h XEN XENPVH XENPVHVM PAE file arch/xen/x86/hypervisor_machdep.c xen file arch/xen/x86/xen_intr.c xen Index: src/sys/arch/xen/conf/files.xen.pv diff -u src/sys/arch/xen/conf/files.xen.pv:1.1.2.4 src/sys/arch/xen/conf/files.xen.pv:1.1.2.5 --- src/sys/arch/xen/conf/files.xen.pv:1.1.2.4 Mon Apr 20 19:40:24 2020 +++ src/sys/arch/xen/conf/files.xen.pv Sat Apr 25 10:52:26 2020 @@ -1,4 +1,4 @@ -# $NetBSD: files.xen.pv,v 1.1.2.4 2020/04/20 19:40:24 bouyer Exp $ +# $NetBSD: files.xen.pv,v 1.1.2.5 2020/04/25 10:52:26 bouyer Exp $ file arch/xen/x86/autoconf.c xenpv file arch/xen/x86/x86_xpmap.c xenpv @@ -11,6 +11,8 @@ file arch/xen/x86/pintr.c machdep & dom file arch/xen/x86/xen_ipi.c multiprocessor & xenpv +include "arch/xen/conf/files.compat" + # # System bus types #
CVS commit: [bouyer-xenpvh] src/sys/arch/xen/conf
Module Name:src Committed By: bouyer Date: Sat Apr 25 10:52:26 UTC 2020 Modified Files: src/sys/arch/xen/conf [bouyer-xenpvh]: files.compat files.xen files.xen.pv Log Message: Include again xen/conf/files.compat for PV kernels, and make it build. My build.sh -u used stale opt_*.h files ... To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.32.10.1 src/sys/arch/xen/conf/files.compat cvs rdiff -u -r1.180.2.6 -r1.180.2.7 src/sys/arch/xen/conf/files.xen cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/arch/xen/conf/files.xen.pv Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src
Module Name:src
Committed By: martin
Date: Sat Apr 25 10:50:47 UTC 2020
Modified Files:
src/bin/csh [netbsd-9]: extern.h time.c
src/usr.bin/time [netbsd-9]: ext.h time.1 time.c
Log Message:
Pull up following revision(s) (requested by simonb in ticket #853):
bin/csh/time.c: revision 1.22
usr.bin/time/time.c: revision 1.24
bin/csh/extern.h: revision 1.32
usr.bin/time/time.1: revision 1.29
usr.bin/time/ext.h: revision 1.4
Add '-t' option for tcsh-style time output.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.31.2.1 src/bin/csh/extern.h
cvs rdiff -u -r1.21 -r1.21.8.1 src/bin/csh/time.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/usr.bin/time/ext.h
cvs rdiff -u -r1.28 -r1.28.8.1 src/usr.bin/time/time.1
cvs rdiff -u -r1.23 -r1.23.8.1 src/usr.bin/time/time.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/csh/extern.h
diff -u src/bin/csh/extern.h:1.31 src/bin/csh/extern.h:1.31.2.1
--- src/bin/csh/extern.h:1.31 Sat Jan 5 16:54:00 2019
+++ src/bin/csh/extern.h Sat Apr 25 10:50:47 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.31 2019/01/05 16:54:00 christos Exp $ */
+/* $NetBSD: extern.h,v 1.31.2.1 2020/04/25 10:50:47 martin Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -297,7 +297,7 @@ void plist(struct varent *);
*/
void donice(Char **, struct command *);
void dotime(Char **, struct command *);
-void prusage1(FILE *, const char *, struct rusage *, struct rusage *,
+void prusage1(FILE *, const char *, int, struct rusage *, struct rusage *,
struct timespec *, struct timespec *);
void prusage(FILE *, struct rusage *, struct rusage *, struct timespec *,
struct timespec *);
Index: src/bin/csh/time.c
diff -u src/bin/csh/time.c:1.21 src/bin/csh/time.c:1.21.8.1
--- src/bin/csh/time.c:1.21 Sat Jul 15 14:35:55 2017
+++ src/bin/csh/time.c Sat Apr 25 10:50:47 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: time.c,v 1.21 2017/07/15 14:35:55 christos Exp $ */
+/* $NetBSD: time.c,v 1.21.8.1 2020/04/25 10:50:47 martin Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)time.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: time.c,v 1.21 2017/07/15 14:35:55 christos Exp $");
+__RCSID("$NetBSD: time.c,v 1.21.8.1 2020/04/25 10:50:47 martin Exp $");
#endif
#endif /* not lint */
@@ -49,7 +49,7 @@ __RCSID("$NetBSD: time.c,v 1.21 2017/07/
/*
* C Shell - routines handling process timing and niceing
*/
-static void pdeltat(FILE *, struct timeval *, struct timeval *);
+static void pdeltat(FILE *, int, struct timeval *, struct timeval *);
static void pcsecs(FILE *, long);
#ifndef NOT_CSH
@@ -138,12 +138,13 @@ prusage(FILE *fp, struct rusage *r0, str
cp = short2str(vp->vec[1]);
else
cp = "%Uu %Ss %E %P %X+%Dk %I+%Oio %Fpf+%Ww";
-prusage1(fp, cp, r0, r1, e, b);
+prusage1(fp, cp, 1, r0, r1, e, b);
}
#endif
void
-prusage1(FILE *fp, const char *cp, struct rusage *r0, struct rusage *r1,
+prusage1(FILE *fp, const char *cp, int prec,
+struct rusage *r0, struct rusage *r1,
struct timespec *e, struct timespec *b)
{
long i;
@@ -201,10 +202,10 @@ prusage1(FILE *fp, const char *cp, struc
(void)fprintf(fp, "%ld", r1->ru_minflt - r0->ru_minflt);
break;
case 'S': /* system CPU time used */
- pdeltat(fp, >ru_stime, >ru_stime);
+ pdeltat(fp, prec, >ru_stime, >ru_stime);
break;
case 'U': /* user CPU time used */
- pdeltat(fp, >ru_utime, >ru_utime);
+ pdeltat(fp, prec, >ru_utime, >ru_utime);
break;
case 'W': /* number of swaps */
i = r1->ru_nswap - r0->ru_nswap;
@@ -234,13 +235,13 @@ prusage1(FILE *fp, const char *cp, struc
}
static void
-pdeltat(FILE *fp, struct timeval *t1, struct timeval *t0)
+pdeltat(FILE *fp, int prec, struct timeval *t1, struct timeval *t0)
{
struct timeval td;
timersub(t1, t0, );
-(void)fprintf(fp, "%ld.%01ld", (long)td.tv_sec,
- (long)(td.tv_usec / 10));
+(void)fprintf(fp, "%ld.%0*ld", (long)td.tv_sec,
+ prec, (long)(td.tv_usec / 10));
}
#define P2DIG(fp, i) (void)fprintf(fp, "%ld%ld", (i) / 10, (i) % 10)
Index: src/usr.bin/time/ext.h
diff -u src/usr.bin/time/ext.h:1.3 src/usr.bin/time/ext.h:1.3.8.1
--- src/usr.bin/time/ext.h:1.3 Sat Jul 15 14:34:08 2017
+++ src/usr.bin/time/ext.h Sat Apr 25 10:50:47 2020
@@ -1,5 +1,5 @@
-/* $NetBSD: ext.h,v 1.3 2017/07/15 14:34:08 christos Exp $ */
+/* $NetBSD: ext.h,v 1.3.8.1 2020/04/25 10:50:47 martin Exp $ */
/* borrowed from ../../bin/csh/extern.h */
-void prusage1(FILE *, const char *fmt, struct rusage *, struct rusage *,
+void prusage1(FILE *, const char *fmt, int, struct rusage *, struct rusage *,
struct timespec *, struct timespec *);
Index: src/usr.bin/time/time.1
diff -u src/usr.bin/time/time.1:1.28 src/usr.bin/time/time.1:1.28.8.1
--- src/usr.bin/time/time.1:1.28 Sat Jul 15 14:40:36 2017
+++
CVS commit: [bouyer-xenpvh] src/sys/arch/xen/include
Module Name:src Committed By: bouyer Date: Sat Apr 25 10:51:25 UTC 2020 Modified Files: src/sys/arch/xen/include [bouyer-xenpvh]: Makefile Log Message: Also install xen/intrdefs.h To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.108.1 src/sys/arch/xen/include/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Sat Apr 25 10:50:47 UTC 2020 Modified Files: src/bin/csh [netbsd-9]: extern.h time.c src/usr.bin/time [netbsd-9]: ext.h time.1 time.c Log Message: Pull up following revision(s) (requested by simonb in ticket #853): bin/csh/time.c: revision 1.22 usr.bin/time/time.c: revision 1.24 bin/csh/extern.h: revision 1.32 usr.bin/time/time.1: revision 1.29 usr.bin/time/ext.h: revision 1.4 Add '-t' option for tcsh-style time output. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.31.2.1 src/bin/csh/extern.h cvs rdiff -u -r1.21 -r1.21.8.1 src/bin/csh/time.c cvs rdiff -u -r1.3 -r1.3.8.1 src/usr.bin/time/ext.h cvs rdiff -u -r1.28 -r1.28.8.1 src/usr.bin/time/time.1 cvs rdiff -u -r1.23 -r1.23.8.1 src/usr.bin/time/time.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [bouyer-xenpvh] src/sys/arch/xen/include
Module Name:src Committed By: bouyer Date: Sat Apr 25 10:51:25 UTC 2020 Modified Files: src/sys/arch/xen/include [bouyer-xenpvh]: Makefile Log Message: Also install xen/intrdefs.h To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.108.1 src/sys/arch/xen/include/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/xen/include/Makefile diff -u src/sys/arch/xen/include/Makefile:1.3 src/sys/arch/xen/include/Makefile:1.3.108.1 --- src/sys/arch/xen/include/Makefile:1.3 Sun Feb 17 16:23:12 2008 +++ src/sys/arch/xen/include/Makefile Sat Apr 25 10:51:25 2020 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2008/02/17 16:23:12 bouyer Exp $ +# $NetBSD: Makefile,v 1.3.108.1 2020/04/25 10:51:25 bouyer Exp $ INCSDIR= /usr/include/xen -INCS= xenio.h xenio3.h +INCS= intrdefs.h xenio.h xenio3.h .include
CVS commit: [netbsd-9] src/sys/dev/hdaudio
Module Name:src Committed By: martin Date: Sat Apr 25 10:40:45 UTC 2020 Modified Files: src/sys/dev/hdaudio [netbsd-9]: hdafg.c Log Message: Pull up following revision(s) (requested by isaki in ticket #852): sys/dev/hdaudio/hdafg.c: revision 1.22 Make round_blocksize satisfy all of - restrictions that existed before merging isaki-audio2 branch. - better support for 6 channels hardware. - audio layer's requirement. This may help PR kern/54474. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.18.2.1 src/sys/dev/hdaudio/hdafg.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/hdaudio
Module Name:src
Committed By: martin
Date: Sat Apr 25 10:40:45 UTC 2020
Modified Files:
src/sys/dev/hdaudio [netbsd-9]: hdafg.c
Log Message:
Pull up following revision(s) (requested by isaki in ticket #852):
sys/dev/hdaudio/hdafg.c: revision 1.22
Make round_blocksize satisfy all of
- restrictions that existed before merging isaki-audio2 branch.
- better support for 6 channels hardware.
- audio layer's requirement.
This may help PR kern/54474.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.18.2.1 src/sys/dev/hdaudio/hdafg.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/hdaudio/hdafg.c
diff -u src/sys/dev/hdaudio/hdafg.c:1.18 src/sys/dev/hdaudio/hdafg.c:1.18.2.1
--- src/sys/dev/hdaudio/hdafg.c:1.18 Sat Jun 8 08:02:38 2019
+++ src/sys/dev/hdaudio/hdafg.c Sat Apr 25 10:40:45 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: hdafg.c,v 1.18 2019/06/08 08:02:38 isaki Exp $ */
+/* $NetBSD: hdafg.c,v 1.18.2.1 2020/04/25 10:40:45 martin Exp $ */
/*
* Copyright (c) 2009 Precedence Technologies Ltd
@@ -60,7 +60,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: hdafg.c,v 1.18 2019/06/08 08:02:38 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdafg.c,v 1.18.2.1 2020/04/25 10:40:45 martin Exp $");
#include
#include
@@ -3934,12 +3934,28 @@ hdafg_set_format(void *opaque, int setmo
return 0;
}
+/* LCM for round_blocksize */
+static u_int gcd(u_int, u_int);
+static u_int lcm(u_int, u_int);
+
+static u_int gcd(u_int a, u_int b)
+{
+
+ return (b == 0) ? a : gcd(b, a % b);
+}
+static u_int lcm(u_int a, u_int b)
+{
+
+ return a * b / gcd(a, b);
+}
+
static int
hdafg_round_blocksize(void *opaque, int blksize, int mode,
const audio_params_t *param)
{
struct hdaudio_audiodev *ad = opaque;
struct hdaudio_stream *st;
+ u_int minblksize;
int bufsize;
st = (mode == AUMODE_PLAY) ? ad->ad_playback : ad->ad_capture;
@@ -3949,6 +3965,15 @@ hdafg_round_blocksize(void *opaque, int
return 128;
}
+ if (blksize > 8192)
+ blksize = 8192;
+
+ /* Make sure there are enough BDL descriptors */
+ bufsize = st->st_data.dma_size;
+ if (bufsize > HDAUDIO_BDL_MAX * blksize) {
+ blksize = bufsize / HDAUDIO_BDL_MAX;
+ }
+
/*
* HD audio's buffer constraint looks like following:
* - The buffer MUST start on a 128bytes boundary.
@@ -3956,13 +3981,15 @@ hdafg_round_blocksize(void *opaque, int
* - The buffer size is preferred multiple of 128bytes for efficiency.
*
* https://www.intel.co.jp/content/www/jp/ja/standards/high-definition-audio-specification.html , p70.
+ *
+ * Also, the audio layer requires that the blocksize must be a
+ * multiple of the number of channels.
*/
+ minblksize = lcm(128, param->channels);
+ blksize = rounddown(blksize, minblksize);
+ if (blksize < minblksize)
+ blksize = minblksize;
- /* Make sure there are enough BDL descriptors */
- bufsize = st->st_data.dma_size;
- if (bufsize > HDAUDIO_BDL_MAX * blksize) {
- blksize = bufsize / HDAUDIO_BDL_MAX;
- }
return blksize;
}
CVS commit: src/sys/dev/ic
Module Name:src Committed By: jmcneill Date: Sat Apr 25 10:21:41 UTC 2020 Modified Files: src/sys/dev/ic: bcmgenetreg.h Log Message: Add missing receive error status bit definitions, from Robert Sprowson in PR# kern/55199 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/dev/ic/bcmgenetreg.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/ic/bcmgenetreg.h diff -u src/sys/dev/ic/bcmgenetreg.h:1.2 src/sys/dev/ic/bcmgenetreg.h:1.3 --- src/sys/dev/ic/bcmgenetreg.h:1.2 Sat Feb 22 13:41:41 2020 +++ src/sys/dev/ic/bcmgenetreg.h Sat Apr 25 10:21:41 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: bcmgenetreg.h,v 1.2 2020/02/22 13:41:41 jmcneill Exp $ */ +/* $NetBSD: bcmgenetreg.h,v 1.3 2020/04/25 10:21:41 jmcneill Exp $ */ /*- * Copyright (c) 2020 Jared McNeill @@ -138,7 +138,12 @@ #define GENET_RX_DESC_STATUS_OWN __BIT(15) #define GENET_RX_DESC_STATUS_EOP __BIT(14) #define GENET_RX_DESC_STATUS_SOP __BIT(13) -#define GENET_RX_DESC_STATUS_RX_ERROR __BIT(2) +#define GENET_RX_DESC_STATUS_ALL_ERRS __BITS(4,0) +#define GENET_RX_DESC_STATUS_LEN_ERR __BIT(4) +#define GENET_RX_DESC_STATUS_FRAME_ERR __BIT(3) +#define GENET_RX_DESC_STATUS_RX_ERR __BIT(2) +#define GENET_RX_DESC_STATUS_CRC_ERR __BIT(1) +#define GENET_RX_DESC_STATUS_OVRUN_ERR __BIT(0) #define GENET_RX_DESC_ADDRESS_LO(idx) (GENET_RX_BASE + GENET_DMA_DESC_SIZE * (idx) + 0x04) #define GENET_RX_DESC_ADDRESS_HI(idx) (GENET_RX_BASE + GENET_DMA_DESC_SIZE * (idx) + 0x08)
CVS commit: src/sys/dev/ic
Module Name:src Committed By: jmcneill Date: Sat Apr 25 10:21:41 UTC 2020 Modified Files: src/sys/dev/ic: bcmgenetreg.h Log Message: Add missing receive error status bit definitions, from Robert Sprowson in PR# kern/55199 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/dev/ic/bcmgenetreg.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/locate/locate
Module Name:src Committed By: simonb Date: Sat Apr 25 10:06:42 UTC 2020 Modified Files: src/usr.bin/locate/locate: updatedb.sh Log Message: Little clean up: use getopts and don't use ``. Suggested by kre@. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/usr.bin/locate/locate/updatedb.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/locate/locate
Module Name:src
Committed By: simonb
Date: Sat Apr 25 10:06:42 UTC 2020
Modified Files:
src/usr.bin/locate/locate: updatedb.sh
Log Message:
Little clean up: use getopts and don't use ``. Suggested by kre@.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/locate/locate/updatedb.sh
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/locate/locate/updatedb.sh
diff -u src/usr.bin/locate/locate/updatedb.sh:1.16 src/usr.bin/locate/locate/updatedb.sh:1.17
--- src/usr.bin/locate/locate/updatedb.sh:1.16 Thu Feb 6 08:45:44 2020
+++ src/usr.bin/locate/locate/updatedb.sh Sat Apr 25 10:06:42 2020
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: updatedb.sh,v 1.16 2020/02/06 08:45:44 simonb Exp $
+# $NetBSD: updatedb.sh,v 1.17 2020/04/25 10:06:42 simonb Exp $
#
# Copyright (c) 1989, 1993
# The Regents of the University of California. All rights reserved.
@@ -39,6 +39,7 @@
# @(#)updatedb.csh 8.4 (Berkeley) 10/27/94
#
+PROG="$(basename "${0}")"
LIBDIR="/usr/libexec" # for subprograms
TMPDIR="/tmp"# for temp files
FCODES="/var/db/locate.database" # the database
@@ -96,25 +97,22 @@ shell_quote()
printf "%s\n" "$result"
)}
-args=`getopt c: $*`
-if [ $? -ne 0 ]; then
- progname=`basename $0`
- echo 'Usage: ...'
- echo "usage: ${progname} [-c config]"
- exit 2
-fi
-set -- $args
-while [ $# -gt 0 ]; do
- case "$1" in
- -c)
- CONF=$2; shift
- ;;
- --)
- shift; break
- ;;
+usage()
+{
+ echo "usage: $PROG [-c config]" >&2
+ exit 1
+}
+
+while getopts c: f; do
+ case "$f" in
+ c)
+ CONF="$OPTARG" ;;
+ *)
+ usage ;;
esac
- shift
done
+shift $((OPTIND - 1))
+[ $# -ne 0 ] && usage
# read configuration file
if [ -f "$CONF" ]; then
CVS commit: [phil-wifi] src/sys/dev/usb
Module Name:src Committed By: nat Date: Sat Apr 25 09:32:16 UTC 2020 Modified Files: src/sys/dev/usb [phil-wifi]: if_urtwn.c Log Message: Compete some more of 11n support. htcaps and streams values from FreeBSD. To generate a diff of this commit: cvs rdiff -u -r1.59.2.14 -r1.59.2.15 src/sys/dev/usb/if_urtwn.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [phil-wifi] src/sys/dev/usb
Module Name:src Committed By: nat Date: Sat Apr 25 09:32:16 UTC 2020 Modified Files: src/sys/dev/usb [phil-wifi]: if_urtwn.c Log Message: Compete some more of 11n support. htcaps and streams values from FreeBSD. To generate a diff of this commit: cvs rdiff -u -r1.59.2.14 -r1.59.2.15 src/sys/dev/usb/if_urtwn.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_urtwn.c diff -u src/sys/dev/usb/if_urtwn.c:1.59.2.14 src/sys/dev/usb/if_urtwn.c:1.59.2.15 --- src/sys/dev/usb/if_urtwn.c:1.59.2.14 Tue Apr 21 18:42:38 2020 +++ src/sys/dev/usb/if_urtwn.c Sat Apr 25 09:32:16 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: if_urtwn.c,v 1.59.2.14 2020/04/21 18:42:38 martin Exp $ */ +/* $NetBSD: if_urtwn.c,v 1.59.2.15 2020/04/25 09:32:16 nat Exp $ */ /* $OpenBSD: if_urtwn.c,v 1.42 2015/02/10 23:25:46 mpi Exp $ */ /*- @@ -42,7 +42,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.59.2.14 2020/04/21 18:42:38 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.59.2.15 2020/04/25 09:32:16 nat Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -515,6 +515,21 @@ urtwn_attach(device_t parent, device_t s IEEE80211_C_WME | /* 802.11e */ IEEE80211_C_WPA; /* 802.11i */ + ic->ic_htcaps = + IEEE80211_HTC_HT | + IEEE80211_HTCAP_SHORTGI20 | /* short GI in 20MHz */ +#if 0 + IEEE80211_HTCAP_MAXAMSDU_3839 | /* max A-MSDU length */ +#endif + IEEE80211_HTCAP_SMPS_OFF; /* SM PS mode disabled */ +#if 0 + IEEE80211_HTCAP_CHWIDTH40 | /* 40 MHz channel width */ + IEEE80211_HTCAP_SHORTGI40; /* short GI in 40MHz */ +#endif + + ic->ic_txstream = sc->ntxchains; + ic->ic_rxstream = sc->nrxchains; + ic->ic_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; #ifdef should_delete_NNN @@ -3667,7 +3682,8 @@ urtwn_getradiocaps(struct ieee80211com * setbit(bands, IEEE80211_MODE_11G); setbit(bands, IEEE80211_MODE_11NG); ieee80211_add_channel_list_2ghz(chans, maxchans, nchans, - urtwn_chan_2ghz, nitems(urtwn_chan_2ghz), bands, 0); + urtwn_chan_2ghz, nitems(urtwn_chan_2ghz), bands, IEEE80211_CHAN_HT20 | + IEEE80211_CHAN_HT40U | IEEE80211_CHAN_HT40D); }
CVS commit: src/sys/arch/hppa/hppa
Module Name:src Committed By: skrll Date: Sat Apr 25 08:02:40 UTC 2020 Modified Files: src/sys/arch/hppa/hppa: trap.c Log Message: Fix KASSERT that has been incorrect since revision 1.85 from 10 years ago. To generate a diff of this commit: cvs rdiff -u -r1.114 -r1.115 src/sys/arch/hppa/hppa/trap.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/hppa/hppa
Module Name:src Committed By: skrll Date: Sat Apr 25 08:02:40 UTC 2020 Modified Files: src/sys/arch/hppa/hppa: trap.c Log Message: Fix KASSERT that has been incorrect since revision 1.85 from 10 years ago. To generate a diff of this commit: cvs rdiff -u -r1.114 -r1.115 src/sys/arch/hppa/hppa/trap.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/hppa/hppa/trap.c diff -u src/sys/arch/hppa/hppa/trap.c:1.114 src/sys/arch/hppa/hppa/trap.c:1.115 --- src/sys/arch/hppa/hppa/trap.c:1.114 Fri Dec 6 08:40:33 2019 +++ src/sys/arch/hppa/hppa/trap.c Sat Apr 25 08:02:39 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: trap.c,v 1.114 2019/12/06 08:40:33 skrll Exp $ */ +/* $NetBSD: trap.c,v 1.115 2020/04/25 08:02:39 skrll Exp $ */ /*- * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc. @@ -58,7 +58,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.114 2019/12/06 08:40:33 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.115 2020/04/25 08:02:39 skrll Exp $"); /* #define INTRDEBUG */ /* #define TRAPDEBUG */ @@ -851,7 +851,7 @@ do_onfault: } /* Never call uvm_fault in interrupt context. */ - KASSERT(curcpu()->ci_cpl == 0); + KASSERT(curcpu()->ci_intr_depth == 0); onfault = pcb->pcb_onfault; pcb->pcb_onfault = 0;
CVS commit: src/sys/sys
Module Name:src Committed By: mlelstv Date: Sat Apr 25 07:23:21 UTC 2020 Modified Files: src/sys/sys: threadpool.h Log Message: we use kcondvars, we need to include the header To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/sys/threadpool.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/sys
Module Name:src Committed By: mlelstv Date: Sat Apr 25 07:23:21 UTC 2020 Modified Files: src/sys/sys: threadpool.h Log Message: we use kcondvars, we need to include the header To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/sys/threadpool.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/sys/threadpool.h diff -u src/sys/sys/threadpool.h:1.6 src/sys/sys/threadpool.h:1.7 --- src/sys/sys/threadpool.h:1.6 Wed Dec 26 22:16:27 2018 +++ src/sys/sys/threadpool.h Sat Apr 25 07:23:21 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: threadpool.h,v 1.6 2018/12/26 22:16:27 thorpej Exp $ */ +/* $NetBSD: threadpool.h,v 1.7 2020/04/25 07:23:21 mlelstv Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -39,6 +39,7 @@ #include #include #include +#include #include struct threadpool;
