CVS commit: src/sys/arch/xen/xen
Module Name:src
Committed By: kre
Date: Tue Mar 17 05:04:11 UTC 2020
Modified Files:
src/sys/arch/xen/xen: xennetback_xenbus.c
Log Message:
#if 0 the declaration and definition of xennetback_tx_free()
Since it is never otherwise referenced, this cannot make any
current operational difference, but should fix the build.
(-Werror=unused-function)
The added #if/#endif lines are /* XXX */ commented, so they will be
easy to remove when needed.
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 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/xennetback_xenbus.c
diff -u src/sys/arch/xen/xen/xennetback_xenbus.c:1.78 src/sys/arch/xen/xen/xennetback_xenbus.c:1.79
--- src/sys/arch/xen/xen/xennetback_xenbus.c:1.78 Mon Mar 16 20:51:36 2020
+++ src/sys/arch/xen/xen/xennetback_xenbus.c Tue Mar 17 05:04:10 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: xennetback_xenbus.c,v 1.78 2020/03/16 20:51:36 jdolecek Exp $ */
+/* $NetBSD: xennetback_xenbus.c,v 1.79 2020/03/17 05:04:10 kre Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -25,7 +25,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xennetback_xenbus.c,v 1.78 2020/03/16 20:51:36 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xennetback_xenbus.c,v 1.79 2020/03/17 05:04:10 kre Exp $");
#include "opt_xen.h"
@@ -141,7 +141,9 @@ static void xennetback_frontend_changed(
static inline void xennetback_tx_response(struct xnetback_instance *,
int, int);
+#if 0 /* XXX */
static void xennetback_tx_free(struct mbuf * , void *, size_t, void *);
+#endif /* XXX */
static SLIST_HEAD(, xnetback_instance) xnetback_instances;
static kmutex_t xnetback_lock;
@@ -895,6 +897,7 @@ xennetback_evthandler(void *arg)
return 1;
}
+#if 0 /* XXX */
static void
xennetback_tx_free(struct mbuf *m, void *va, size_t size, void *arg)
{
@@ -912,6 +915,7 @@ xennetback_tx_free(struct mbuf *m, void
pool_cache_put(mb_cache, m);
splx(s);
}
+#endif /* XXX */
static int
xennetback_ifioctl(struct ifnet *ifp, u_long cmd, void *data)
CVS commit: src/external/cddl/osnet/lib/libdtrace
Module Name:src
Committed By: fox
Date: Tue Mar 17 01:36:29 UTC 2020
Modified Files:
src/external/cddl/osnet/lib/libdtrace: Makefile
Log Message:
external/cddl/osnet: Do not suppress the warning output for libdtrace.
Changed -Wno-maybe-uninitialized to -Wno-error=maybe-uninitialized to allow
warnings to be printed out during build.
Suggested by: christos@
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/external/cddl/osnet/lib/libdtrace/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/lib/libdtrace/Makefile
diff -u src/external/cddl/osnet/lib/libdtrace/Makefile:1.27 src/external/cddl/osnet/lib/libdtrace/Makefile:1.28
--- src/external/cddl/osnet/lib/libdtrace/Makefile:1.27 Tue Mar 17 00:50:12 2020
+++ src/external/cddl/osnet/lib/libdtrace/Makefile Tue Mar 17 01:36:29 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2020/03/17 00:50:12 fox Exp $
+# $NetBSD: Makefile,v 1.28 2020/03/17 01:36:29 fox Exp $
# $FreeBSD: head/cddl/lib/libdtrace/Makefile 314654 2017-03-04 11:30:04Z ngie $
@@ -96,7 +96,7 @@ COPTS.dt_isadep.c += -Wno-unused-variabl
.if (${MKLIBCSANITIZER:Uno} == "yes")
.if (${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} == 8)
-COPTS.dt_proc.c+= -Wno-maybe-uninitialized
+COPTS.dt_proc.c+= -Wno-error=maybe-uninitialized
.endif
.endif
CVS commit: src/external/bsd/iscsi/dist/src/lib
Module Name:src
Committed By: fox
Date: Tue Mar 17 00:57:55 UTC 2020
Modified Files:
src/external/bsd/iscsi/dist/src/lib: initiator.c
Log Message:
external/bsd/iscsi: Fix -Werror=maybe-uninitialized error in initiator.c.
Error was reported when build.sh was run with MKLIBCSANITIZER=yes flag.
Submitted by: mlelstv@
Reviewed by: kamil@
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/iscsi/dist/src/lib/initiator.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/iscsi/dist/src/lib/initiator.c
diff -u src/external/bsd/iscsi/dist/src/lib/initiator.c:1.9 src/external/bsd/iscsi/dist/src/lib/initiator.c:1.10
--- src/external/bsd/iscsi/dist/src/lib/initiator.c:1.9 Fri Nov 1 07:53:34 2013
+++ src/external/bsd/iscsi/dist/src/lib/initiator.c Tue Mar 17 00:57:54 2020
@@ -794,6 +794,7 @@ discovery_phase(int target, strv_t *svp)
}
} else {
/* the user has asked for a specific target - find it */
+ ptr = NULL;
for (i = 0 ; i < svp->c ; i += 2) {
if (strcmp(g_target[target].iqnwanted,
svp->v[i]) == 0) {
@@ -803,7 +804,7 @@ discovery_phase(int target, strv_t *svp)
break;
}
}
- if (i >= svp->c) {
+ if (ptr == NULL) {
iscsi_err(__FILE__, __LINE__,
"SendTargets failed - target `%s' not found\n",
g_target[target].iqnwanted);
CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src Committed By: fox Date: Tue Mar 17 00:54:03 UTC 2020 Modified Files: src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_acl.c Log Message: external/cddl/osnet: Fix -Werror=maybe-uninitialized error in zfs_acl.c. Detected by build.sh with MKLIBCSANITIZER=yes and fixed upstream, pick only the fix from the commit. Upstream commits https://github.com/zfsonfreebsd/ZoF/commit/100a91aa3e9773f2a2a373c5cb066b52c780716c https://github.com/openzfs/zfs/commit/100a91aa3e9773f2a2a373c5cb066b52c780716c Cherry-pick: >From 100a91aa3e9773f2a2a373c5cb066b52c780716c Mon Sep 17 00:00:00 2001 From: Chunwei Chen Date: Fri, 17 Jun 2016 17:36:01 -0700 Subject: [PATCH] Fix NFS credential Signed-off-by: Chunwei Chen Signed-off-by: Brian Behlendorf Closes #4772 Closes #4758 Reviewed by: kamil@ To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_acl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_acl.c diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_acl.c:1.5 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_acl.c:1.6 --- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_acl.c:1.5 Fri Sep 7 02:25:40 2018 +++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_acl.c Tue Mar 17 00:54:03 2020 @@ -1598,7 +1598,7 @@ zfs_acl_ids_create(znode_t *dzp, int fla int error; zfsvfs_t *zfsvfs = dzp->z_zfsvfs; zfs_acl_t *paclp; - gid_t gid; + gid_t gid = vap->va_gid; boolean_t trim = B_FALSE; boolean_t inherited = B_FALSE;
CVS commit: src/external/cddl/osnet/lib/libdtrace
Module Name:src
Committed By: fox
Date: Tue Mar 17 00:50:12 UTC 2020
Modified Files:
src/external/cddl/osnet/lib/libdtrace: Makefile
Log Message:
external/cddl/osnet: Supress -Werror=maybe-uninitialized error in libdtrace.
It looks like this is a false positive, since the section of code triggering
the error
external/cddl/osnet/dist/lib/libdtrace/common/dt_proc.c:400:42:
is only accessed after "err" is initialized.
Error was reported when build.sh was run with MKLIBCSANITIZER=yes flag.
Reviewed by: kamil@
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/external/cddl/osnet/lib/libdtrace/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/lib/libdtrace/Makefile
diff -u src/external/cddl/osnet/lib/libdtrace/Makefile:1.26 src/external/cddl/osnet/lib/libdtrace/Makefile:1.27
--- src/external/cddl/osnet/lib/libdtrace/Makefile:1.26 Tue Dec 3 22:10:56 2019
+++ src/external/cddl/osnet/lib/libdtrace/Makefile Tue Mar 17 00:50:12 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2019/12/03 22:10:56 jmcneill Exp $
+# $NetBSD: Makefile,v 1.27 2020/03/17 00:50:12 fox Exp $
# $FreeBSD: head/cddl/lib/libdtrace/Makefile 314654 2017-03-04 11:30:04Z ngie $
@@ -94,6 +94,12 @@ COPTS.dt_options.c += -Wno-parentheses
COPTS.dt_pid.c += ${${ACTIVE_CC} == "gcc" :? -Wno-unused-but-set-variable :}
COPTS.dt_isadep.c += -Wno-unused-variable
+.if (${MKLIBCSANITIZER:Uno} == "yes")
+.if (${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} == 8)
+COPTS.dt_proc.c+= -Wno-maybe-uninitialized
+.endif
+.endif
+
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
CPPFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/intel
CPPFLAGS+= -I${.CURDIR}/../../dev/dtrace/x86
CVS commit: src/sys/uvm
Module Name:src
Committed By: ad
Date: Tue Mar 17 00:30:18 UTC 2020
Modified Files:
src/sys/uvm: uvm_page_array.c
Log Message:
Fix a comment.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/uvm/uvm_page_array.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/uvm/uvm_page_array.c
diff -u src/sys/uvm/uvm_page_array.c:1.4 src/sys/uvm/uvm_page_array.c:1.5
--- src/sys/uvm/uvm_page_array.c:1.4 Sun Feb 23 15:46:43 2020
+++ src/sys/uvm/uvm_page_array.c Tue Mar 17 00:30:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_page_array.c,v 1.4 2020/02/23 15:46:43 ad Exp $ */
+/* $NetBSD: uvm_page_array.c,v 1.5 2020/03/17 00:30:17 ad Exp $ */
/*-
* Copyright (c)2011 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvm_page_array.c,v 1.4 2020/02/23 15:46:43 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_page_array.c,v 1.5 2020/03/17 00:30:17 ad Exp $");
#include
#include
@@ -139,7 +139,7 @@ uvm_page_array_fill(struct uvm_page_arra
maxpages = nwant;
}
#if 0 /* called from DDB for "show obj/f" without lock */
- KASSERT(rw_write_held(uobj->vmobjlock));
+ KASSERT(rw_lock_held(uobj->vmobjlock));
#endif
KASSERT(uvm_page_array_peek(ar) == NULL);
if ((flags & UVM_PAGE_ARRAY_FILL_DIRTY) != 0) {
CVS commit: src/sys/arch/powerpc/oea
Module Name:src
Committed By: macallan
Date: Mon Mar 16 22:02:38 UTC 2020
Modified Files:
src/sys/arch/powerpc/oea: ofw_rascons.c ofw_rasconsvar.h
Log Message:
make the ROM font usable on G5s:
- copy the font data into a buffer instead of just pointing at the ROM
- don't blindly assume the font's width
- don't try to center output ourselves - rasops_init() will do it for us
- provide a hook to add the ROM font to wsfont when we're ready
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/powerpc/oea/ofw_rascons.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/powerpc/oea/ofw_rasconsvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/oea/ofw_rascons.c
diff -u src/sys/arch/powerpc/oea/ofw_rascons.c:1.13 src/sys/arch/powerpc/oea/ofw_rascons.c:1.14
--- src/sys/arch/powerpc/oea/ofw_rascons.c:1.13 Mon Sep 3 16:29:26 2018
+++ src/sys/arch/powerpc/oea/ofw_rascons.c Mon Mar 16 22:02:37 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw_rascons.c,v 1.13 2018/09/03 16:29:26 riastradh Exp $ */
+/* $NetBSD: ofw_rascons.c,v 1.14 2020/03/16 22:02:37 macallan Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ofw_rascons.c,v 1.13 2018/09/03 16:29:26 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_rascons.c,v 1.14 2020/03/16 22:02:37 macallan Exp $");
#include "wsdisplay.h"
@@ -65,6 +65,9 @@ static vaddr_t fbaddr;
static int romfont_loaded = 0;
static int needs_finalize = 0;
+#define FONTBUFSIZE (2048) /* enough for 96 6x11 bitmap characters */
+static uint8_t fontbuf[FONTBUFSIZE];
+
struct vcons_screen rascons_console_screen;
struct wsscreen_descr rascons_stdscreen = {
@@ -86,8 +89,10 @@ rascons_cnattach(void)
OF_interpret("line#", 0, 1, );
/* move (rom monitor) cursor to the lowest line - 1 */
+ /* - Why? */
+#if 0
OF_interpret("#lines 2 - to line#", 0, 0);
-
+#endif
wsfont_init();
if (copy_rom_font() == 0) {
#if !defined(OFWOEA_WSCONS_NO_ROM_FONT)
@@ -142,23 +147,37 @@ rascons_cnattach(void)
}
void
+rascons_add_rom_font(void)
+{
+ wsfont_init();
+ if (romfont_loaded) {
+ wsfont_add(, 0);
+ }
+}
+
+void
rascons_finalize(void)
{
struct rasops_info *ri = _console_screen.scr_ri;
long defattr;
+ int crow = 0;
if (needs_finalize == 0) return;
-
+
+ /* get current cursor position */
+ if (romfont_loaded) OF_interpret("line#", 0, 1, );
+
ri->ri_ops.allocattr(ri, 0, 0, 0, );
- wsdisplay_preattach(_stdscreen, ri, 0, 0, defattr);
+ wsdisplay_preattach(_stdscreen, ri, 0, uimax(0,
+ uimin(crow, ri->ri_rows - 1)), defattr);
}
static int
copy_rom_font(void)
{
u_char *romfont;
- int char_width, char_height;
- int chosen, mmu, m, e;
+ int char_width, char_height, stride;
+ int chosen, mmu, m, e, size;
/* Get ROM FONT address. */
OF_interpret("font-adr", 0, 1, );
@@ -178,16 +197,22 @@ copy_rom_font(void)
OF_interpret("char-width", 0, 1, _width);
OF_interpret("char-height", 0, 1, _height);
+ stride = (char_width + 7) >> 3;
+ size = stride * char_height * 96;
+ if (size > FONTBUFSIZE) return -1;
+
+ memcpy(fontbuf, romfont, size);
+
openfirm6x11.name = "Open Firmware";
openfirm6x11.firstchar = 32;
openfirm6x11.numchars = 96;
openfirm6x11.encoding = WSDISPLAY_FONTENC_ISO;
openfirm6x11.fontwidth = char_width;
openfirm6x11.fontheight = char_height;
- openfirm6x11.stride = 1;
+ openfirm6x11.stride = stride;
openfirm6x11.bitorder = WSDISPLAY_FONTORDER_L2R;
openfirm6x11.byteorder = WSDISPLAY_FONTORDER_L2R;
- openfirm6x11.data = romfont;
+ openfirm6x11.data = fontbuf;
return 0;
}
@@ -223,7 +248,7 @@ rascons_init_rasops(int node, struct ras
/* mimic firmware output if we can find the ROM font */
if (romfont_loaded) {
- int cols, rows;
+ int cols = 0, rows = 0;
/*
* XXX this assumes we're the console which may or may not
@@ -234,12 +259,12 @@ rascons_init_rasops(int node, struct ras
ri->ri_font =
ri->ri_wsfcookie = -1; /* not using wsfont */
rasops_init(ri, rows, cols);
-
- ri->ri_xorigin = (width - cols * ri->ri_font->fontwidth) >> 1;
- ri->ri_yorigin = (height - rows * ri->ri_font->fontheight)
- >> 1;
- ri->ri_bits = (char *)fbaddr + ri->ri_xorigin +
- ri->ri_stride * ri->ri_yorigin;
+#ifdef RASCONS_DEBUG
+ char buffer[128];
+ snprintf(buffer, 128, "bits %08x c %d w %d -> %d %d\n",
+ (uint32_t)ri->ri_bits, cols, width, ri->ri_xorigin, ri->ri_yorigin);
+ OF_write(console_instance, buffer, strlen(buffer));
+#endif
} else {
/* use as much of the screen as the font permits */
rasops_init(ri, height/8, width/8);
Index: src/sys/arch/powerpc/oea/ofw_rasconsvar.h
diff -u src/sys/arch/powerpc/oea/ofw_rasconsvar.h:1.2 src/sys/arch/powerpc/oea/ofw_rasconsvar.h:1.3
--- src/sys/arch/powerpc/oea/ofw_rasconsvar.h:1.2 Fri Mar 2 14:37:18 2018
+++
CVS commit: src/sys
Module Name:src Committed By: pgoyette Date: Mon Mar 16 21:20:13 UTC 2020 Modified Files: src/sys/compat/linux/common: linux_mod.c linux_sysctl.c linux_sysctl.h src/sys/compat/linux32/common: linux32_mod.c linux32_sysctl.c linux32_sysctl.h src/sys/dev/acpi: acpi_cpu.c src/sys/dev/pci: ubsec.c src/sys/dev/sysmon: swsensor.c swwdog.c src/sys/fs/adosfs: advfsops.c src/sys/fs/autofs: autofs_vfsops.c src/sys/fs/cd9660: cd9660_vfsops.c src/sys/fs/filecorefs: filecore_vfsops.c src/sys/fs/msdosfs: msdosfs_vfsops.c src/sys/fs/nilfs: nilfs_vfsops.c src/sys/fs/ptyfs: ptyfs_vfsops.c src/sys/fs/smbfs: smbfs_vfsops.c src/sys/fs/udf: udf_vfsops.c src/sys/fs/union: union_vfsops.c src/sys/kern: sys_aio.c sys_mqueue.c vfs_wapbl.c src/sys/miscfs/fdesc: fdesc_vfsops.c src/sys/miscfs/kernfs: kernfs_vfsops.c src/sys/miscfs/nullfs: null_vfsops.c src/sys/miscfs/overlay: overlay_vfsops.c src/sys/miscfs/procfs: procfs_vfsops.c src/sys/miscfs/umapfs: umap_vfsops.c src/sys/net: bpf.c src/sys/netinet: accf_http.c src/sys/nfs: nfs_vfsops.c src/sys/opencrypto: crypto.c src/sys/secmodel/bsd44: bsd44.h secmodel_bsd44.c src/sys/secmodel/extensions: secmodel_extensions.c src/sys/secmodel/overlay: secmodel_overlay.c src/sys/secmodel/securelevel: secmodel_securelevel.c securelevel.h src/sys/secmodel/suser: secmodel_suser.c suser.h src/sys/ufs/ext2fs: ext2fs_vfsops.c src/sys/ufs/ffs: ffs_vfsops.c src/sys/ufs/lfs: lfs_vfsops.c src/sys/ufs/mfs: mfs_vfsops.c src/sys/ufs/ufs: ufs_dirhash.c Log Message: Use the module subsystem's ability to process SYSCTL_SETUP() entries to automate installation of sysctl nodes. Note that there are still a number of device and pseudo-device modules that create entries tied to individual device units, rather than to the module itself. These are not changed. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/compat/linux/common/linux_mod.c cvs rdiff -u -r1.44 -r1.45 src/sys/compat/linux/common/linux_sysctl.c cvs rdiff -u -r1.6 -r1.7 src/sys/compat/linux/common/linux_sysctl.h cvs rdiff -u -r1.12 -r1.13 src/sys/compat/linux32/common/linux32_mod.c cvs rdiff -u -r1.17 -r1.18 src/sys/compat/linux32/common/linux32_sysctl.c cvs rdiff -u -r1.4 -r1.5 src/sys/compat/linux32/common/linux32_sysctl.h cvs rdiff -u -r1.51 -r1.52 src/sys/dev/acpi/acpi_cpu.c cvs rdiff -u -r1.47 -r1.48 src/sys/dev/pci/ubsec.c cvs rdiff -u -r1.15 -r1.16 src/sys/dev/sysmon/swsensor.c cvs rdiff -u -r1.21 -r1.22 src/sys/dev/sysmon/swwdog.c cvs rdiff -u -r1.78 -r1.79 src/sys/fs/adosfs/advfsops.c cvs rdiff -u -r1.9 -r1.10 src/sys/fs/autofs/autofs_vfsops.c cvs rdiff -u -r1.94 -r1.95 src/sys/fs/cd9660/cd9660_vfsops.c cvs rdiff -u -r1.82 -r1.83 src/sys/fs/filecorefs/filecore_vfsops.c cvs rdiff -u -r1.132 -r1.133 src/sys/fs/msdosfs/msdosfs_vfsops.c cvs rdiff -u -r1.25 -r1.26 src/sys/fs/nilfs/nilfs_vfsops.c cvs rdiff -u -r1.57 -r1.58 src/sys/fs/ptyfs/ptyfs_vfsops.c cvs rdiff -u -r1.108 -r1.109 src/sys/fs/smbfs/smbfs_vfsops.c cvs rdiff -u -r1.77 -r1.78 src/sys/fs/udf/udf_vfsops.c cvs rdiff -u -r1.80 -r1.81 src/sys/fs/union/union_vfsops.c cvs rdiff -u -r1.46 -r1.47 src/sys/kern/sys_aio.c cvs rdiff -u -r1.45 -r1.46 src/sys/kern/sys_mqueue.c cvs rdiff -u -r1.105 -r1.106 src/sys/kern/vfs_wapbl.c cvs rdiff -u -r1.93 -r1.94 src/sys/miscfs/fdesc/fdesc_vfsops.c cvs rdiff -u -r1.98 -r1.99 src/sys/miscfs/kernfs/kernfs_vfsops.c cvs rdiff -u -r1.96 -r1.97 src/sys/miscfs/nullfs/null_vfsops.c cvs rdiff -u -r1.68 -r1.69 src/sys/miscfs/overlay/overlay_vfsops.c cvs rdiff -u -r1.102 -r1.103 src/sys/miscfs/procfs/procfs_vfsops.c cvs rdiff -u -r1.101 -r1.102 src/sys/miscfs/umapfs/umap_vfsops.c cvs rdiff -u -r1.235 -r1.236 src/sys/net/bpf.c cvs rdiff -u -r1.9 -r1.10 src/sys/netinet/accf_http.c cvs rdiff -u -r1.239 -r1.240 src/sys/nfs/nfs_vfsops.c cvs rdiff -u -r1.112 -r1.113 src/sys/opencrypto/crypto.c cvs rdiff -u -r1.6 -r1.7 src/sys/secmodel/bsd44/bsd44.h cvs rdiff -u -r1.16 -r1.17 src/sys/secmodel/bsd44/secmodel_bsd44.c cvs rdiff -u -r1.11 -r1.12 src/sys/secmodel/extensions/secmodel_extensions.c cvs rdiff -u -r1.13 -r1.14 src/sys/secmodel/overlay/secmodel_overlay.c cvs rdiff -u -r1.33 -r1.34 \ src/sys/secmodel/securelevel/secmodel_securelevel.c cvs rdiff -u -r1.4 -r1.5 src/sys/secmodel/securelevel/securelevel.h cvs rdiff -u -r1.51 -r1.52 src/sys/secmodel/suser/secmodel_suser.c cvs rdiff -u -r1.2 -r1.3 src/sys/secmodel/suser/suser.h cvs rdiff -u -r1.216 -r1.217 src/sys/ufs/ext2fs/ext2fs_vfsops.c cvs rdiff -u -r1.365 -r1.366 src/sys/ufs/ffs/ffs_vfsops.c cvs rdiff -u -r1.376 -r1.377 src/sys/ufs/lfs/lfs_vfsops.c cvs rdiff -u -r1.113 -r1.114 src/sys/ufs/mfs/mfs_vfsops.c cvs rdiff -u -r1.39 -r1.40 src/sys/ufs/ufs/ufs_dirhash.c Please note that
CVS commit: src/sys/arch/xen
Module Name:src Committed By: jdolecek Date: Mon Mar 16 20:51:36 UTC 2020 Modified Files: src/sys/arch/xen/include: xennet_checksum.h src/sys/arch/xen/xen: if_xennet_xenbus.c xennet_checksum.c xennetback_xenbus.c Log Message: drop the disabled M_EXT_ROMAP mbuf code, convert xennet_checksum_fill() to use in_undefer_cksum() instead of custom code to compute the checksum for Rx packets, and set csum_data appropriately for eventual hw offloading make it possible to skip the sw checksum computation by appropriate Rx flag similarily as we do for Tx XXX for now, the Rx flag is mostly for testing as it only works for dom0<->domu, need some further network stack changes to arrange for the checksum to be eventually computed when packets goes outside xen To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/xen/include/xennet_checksum.h cvs rdiff -u -r1.89 -r1.90 src/sys/arch/xen/xen/if_xennet_xenbus.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/xen/xen/xennet_checksum.c cvs rdiff -u -r1.77 -r1.78 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/include/xennet_checksum.h diff -u src/sys/arch/xen/include/xennet_checksum.h:1.1 src/sys/arch/xen/include/xennet_checksum.h:1.2 --- src/sys/arch/xen/include/xennet_checksum.h:1.1 Wed Jul 12 15:02:15 2006 +++ src/sys/arch/xen/include/xennet_checksum.h Mon Mar 16 20:51:36 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: xennet_checksum.h,v 1.1 2006/07/12 15:02:15 yamt Exp $ */ +/* $NetBSD: xennet_checksum.h,v 1.2 2020/03/16 20:51:36 jdolecek Exp $ */ /*- * Copyright (c)2006 YAMAMOTO Takashi, @@ -29,8 +29,9 @@ #ifndef _XEN_XENNET_CHECKSUM_H_ #define _XEN_XENNET_CHECKSUM_H_ +struct ifnet; struct mbuf; -int xennet_checksum_fill(struct mbuf **); +int xennet_checksum_fill(struct ifnet *, struct mbuf *); #endif /* !_XEN_XENNET_CHECKSUM_H_ */ Index: src/sys/arch/xen/xen/if_xennet_xenbus.c diff -u src/sys/arch/xen/xen/if_xennet_xenbus.c:1.89 src/sys/arch/xen/xen/if_xennet_xenbus.c:1.90 --- src/sys/arch/xen/xen/if_xennet_xenbus.c:1.89 Mon Mar 16 20:49:22 2020 +++ src/sys/arch/xen/xen/if_xennet_xenbus.c Mon Mar 16 20:51:36 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: if_xennet_xenbus.c,v 1.89 2020/03/16 20:49:22 jdolecek Exp $ */ +/* $NetBSD: if_xennet_xenbus.c,v 1.90 2020/03/16 20:51:36 jdolecek Exp $ */ /* * Copyright (c) 2006 Manuel Bouyer. @@ -84,7 +84,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.89 2020/03/16 20:49:22 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.90 2020/03/16 20:51:36 jdolecek Exp $"); #include "opt_xen.h" #include "opt_nfs_boot.h" Index: src/sys/arch/xen/xen/xennet_checksum.c diff -u src/sys/arch/xen/xen/xennet_checksum.c:1.5 src/sys/arch/xen/xen/xennet_checksum.c:1.6 --- src/sys/arch/xen/xen/xennet_checksum.c:1.5 Mon Mar 16 20:49:22 2020 +++ src/sys/arch/xen/xen/xennet_checksum.c Mon Mar 16 20:51:36 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: xennet_checksum.c,v 1.5 2020/03/16 20:49:22 jdolecek Exp $ */ +/* $NetBSD: xennet_checksum.c,v 1.6 2020/03/16 20:51:36 jdolecek Exp $ */ /*- * Copyright (c)2006 YAMAMOTO Takashi, @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: xennet_checksum.c,v 1.5 2020/03/16 20:49:22 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: xennet_checksum.c,v 1.6 2020/03/16 20:51:36 jdolecek Exp $"); #include #include Index: src/sys/arch/xen/xen/xennetback_xenbus.c diff -u src/sys/arch/xen/xen/xennetback_xenbus.c:1.77 src/sys/arch/xen/xen/xennetback_xenbus.c:1.78 --- src/sys/arch/xen/xen/xennetback_xenbus.c:1.77 Mon Mar 16 20:49:22 2020 +++ src/sys/arch/xen/xen/xennetback_xenbus.c Mon Mar 16 20:51:36 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: xennetback_xenbus.c,v 1.77 2020/03/16 20:49:22 jdolecek Exp $ */ +/* $NetBSD: xennetback_xenbus.c,v 1.78 2020/03/16 20:51:36 jdolecek Exp $ */ /* * Copyright (c) 2006 Manuel Bouyer. @@ -25,7 +25,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: xennetback_xenbus.c,v 1.77 2020/03/16 20:49:22 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: xennetback_xenbus.c,v 1.78 2020/03/16 20:51:36 jdolecek Exp $"); #include "opt_xen.h"
CVS commit: src/sys/arch/xen/xen
Module Name:src
Committed By: jdolecek
Date: Mon Mar 16 20:49:22 UTC 2020
Modified Files:
src/sys/arch/xen/xen: if_xennet_xenbus.c xennet_checksum.c
xennetback_xenbus.c
Log Message:
drop the disabled M_EXT_ROMAP mbuf code, and convert xennet_checksum_fill()
to use in_undefer_cksum() instead of custom code to compute the checksum
for incoming packets
make it possible to defer/skip the checksum computation by appropriate Rx
flag similarily as we do for Tx; with
To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/sys/arch/xen/xen/if_xennet_xenbus.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/xen/xen/xennet_checksum.c
cvs rdiff -u -r1.76 -r1.77 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.88 src/sys/arch/xen/xen/if_xennet_xenbus.c:1.89
--- src/sys/arch/xen/xen/if_xennet_xenbus.c:1.88 Wed Jan 29 05:41:48 2020
+++ src/sys/arch/xen/xen/if_xennet_xenbus.c Mon Mar 16 20:49:22 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xennet_xenbus.c,v 1.88 2020/01/29 05:41:48 thorpej Exp $ */
+/* $NetBSD: if_xennet_xenbus.c,v 1.89 2020/03/16 20:49:22 jdolecek Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -84,7 +84,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.88 2020/01/29 05:41:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.89 2020/03/16 20:49:22 jdolecek Exp $");
#include "opt_xen.h"
#include "opt_nfs_boot.h"
@@ -386,7 +386,9 @@ xennet_xenbus_attach(device_t parent, de
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
ifp->if_timer = 0;
ifp->if_snd.ifq_maxlen = uimax(ifqmaxlen, NET_TX_RING_SIZE * 2);
- ifp->if_capabilities = IFCAP_CSUM_TCPv4_Tx | IFCAP_CSUM_UDPv4_Tx;
+ ifp->if_capabilities =
+ IFCAP_CSUM_UDPv4_Rx | IFCAP_CSUM_UDPv4_Tx
+ | IFCAP_CSUM_TCPv4_Rx | IFCAP_CSUM_TCPv4_Tx;
IFQ_SET_READY(>if_snd);
if_attach(ifp);
ether_ifattach(ifp, sc->sc_enaddr);
@@ -1119,12 +1121,7 @@ again:
m->m_flags |= M_EXT_RW; /* we own the buffer */
}
if ((rx->flags & NETRXF_csum_blank) != 0) {
- xennet_checksum_fill();
- if (m == NULL) {
-if_statinc(ifp, if_ierrors);
-xennet_rx_free_req(req);
-continue;
- }
+ xennet_checksum_fill(ifp, m);
}
/* free req may overwrite *rx, better doing it late */
xennet_rx_free_req(req);
Index: src/sys/arch/xen/xen/xennet_checksum.c
diff -u src/sys/arch/xen/xen/xennet_checksum.c:1.4 src/sys/arch/xen/xen/xennet_checksum.c:1.5
--- src/sys/arch/xen/xen/xennet_checksum.c:1.4 Sat Mar 14 11:52:12 2020
+++ src/sys/arch/xen/xen/xennet_checksum.c Mon Mar 16 20:49:22 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: xennet_checksum.c,v 1.4 2020/03/14 11:52:12 jdolecek Exp $ */
+/* $NetBSD: xennet_checksum.c,v 1.5 2020/03/16 20:49:22 jdolecek Exp $ */
/*-
* Copyright (c)2006 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xennet_checksum.c,v 1.4 2020/03/14 11:52:12 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xennet_checksum.c,v 1.5 2020/03/16 20:49:22 jdolecek Exp $");
#include
#include
@@ -39,73 +39,51 @@ __KERNEL_RCSID(0, "$NetBSD: xennet_check
#include
#include
+#include
#include
#include
#include
#include
-static const void *m_extract(struct mbuf *, int, int, void *);
-static void *m_extract_write(struct mbuf *, int, int, void *);
-
-static void *m_extract1(struct mbuf *, int, int, void *, int);
-#define MBUF_EXTRACT_WRITE 1
+/* ratecheck(9) for checksum validation failures */
+static const struct timeval xn_cksum_errintvl = { 600, 0 }; /* 10 min, each */
static void *
-m_extract1(struct mbuf *m, int off, int len, void *buf, int flags)
-{
- void *result;
-
- KASSERT((m->m_flags & M_PKTHDR) != 0);
-
- if (m->m_pkthdr.len < off + len) {
- result = NULL;
- } else if (m->m_len >= off + len &&
- ((flags & MBUF_EXTRACT_WRITE) != 0 || !M_READONLY(m))) {
- result = mtod(m, char *) + off;
- } else {
- m_copydata(m, off, len, buf);
- result = buf;
- }
-
- return result;
-}
-
-static const void *
-m_extract(struct mbuf *m, int off, int len, void *buf)
+m_extract(struct mbuf *m, int off, int len)
{
+ KASSERT(m->m_pkthdr.len >= off + len);
+ KASSERT(m->m_len >= off + len);
- return m_extract1(m, off, len, buf, 0);
-}
-
-static void *
-m_extract_write(struct mbuf *m, int off, int len, void *buf)
-{
-
- return m_extract1(m, off, len, buf, MBUF_EXTRACT_WRITE);
+ if (m->m_pkthdr.len >= off + len)
+ return mtod(m, char *) + off;
+ else
+ return NULL;
}
/*
- * xennet_checksum_fill: fill TCP/UDP checksum
+ * xennet_checksum_fill: fill TCP/UDP checksum, or arrange
+ * for hw offload to do it
*/
-
int
-xennet_checksum_fill(struct mbuf **mp)
+xennet_checksum_fill(struct ifnet *ifp, struct mbuf *m)
{
- struct mbuf *m = *mp;
- struct ether_header eh_store;
CVS commit: src/sys/uvm/pmap
Module Name:src
Committed By: ad
Date: Mon Mar 16 20:07:44 UTC 2020
Modified Files:
src/sys/uvm/pmap: pmap_pvt.c
Log Message:
Use C99-ism to reduce ifdefs. Pointed out by christos@.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/uvm/pmap/pmap_pvt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/uvm/pmap/pmap_pvt.c
diff -u src/sys/uvm/pmap/pmap_pvt.c:1.9 src/sys/uvm/pmap/pmap_pvt.c:1.10
--- src/sys/uvm/pmap/pmap_pvt.c:1.9 Mon Mar 16 19:56:39 2020
+++ src/sys/uvm/pmap/pmap_pvt.c Mon Mar 16 20:07:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_pvt.c,v 1.9 2020/03/16 19:56:39 ad Exp $ */
+/* $NetBSD: pmap_pvt.c,v 1.10 2020/03/16 20:07:44 ad Exp $ */
/*-
* Copyright (c) 2014, 2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__RCSID("$NetBSD: pmap_pvt.c,v 1.9 2020/03/16 19:56:39 ad Exp $");
+__RCSID("$NetBSD: pmap_pvt.c,v 1.10 2020/03/16 20:07:44 ad Exp $");
#include
#include
@@ -77,9 +77,6 @@ pmap_pv_track(paddr_t start, psize_t siz
{
struct pv_track *pvt;
size_t npages;
-#ifdef PMAP_PAGE_INIT
- size_t i;
-#endif
KASSERT(start == trunc_page(start));
KASSERT(size == trunc_page(size));
@@ -94,7 +91,7 @@ pmap_pv_track(paddr_t start, psize_t siz
pvt->pvt_size = size;
#ifdef PMAP_PAGE_INIT
- for (i = 0; i < npages; i++)
+ for (size_t i = 0; i < npages; i++)
PMAP_PAGE_INIT(>pvt_pages[i]);
#endif
CVS commit: src/sys/uvm/pmap
Module Name:src
Committed By: ad
Date: Mon Mar 16 19:56:39 UTC 2020
Modified Files:
src/sys/uvm/pmap: pmap_pvt.c
Log Message:
pmap_pv_track(): use PMAP_PAGE_INIT() otherwise the x86 pmap pukes.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/uvm/pmap/pmap_pvt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/uvm/pmap/pmap_pvt.c
diff -u src/sys/uvm/pmap/pmap_pvt.c:1.8 src/sys/uvm/pmap/pmap_pvt.c:1.9
--- src/sys/uvm/pmap/pmap_pvt.c:1.8 Wed Jan 1 16:50:41 2020
+++ src/sys/uvm/pmap/pmap_pvt.c Mon Mar 16 19:56:39 2020
@@ -1,7 +1,7 @@
-/* $NetBSD: pmap_pvt.c,v 1.8 2020/01/01 16:50:41 martin Exp $ */
+/* $NetBSD: pmap_pvt.c,v 1.9 2020/03/16 19:56:39 ad Exp $ */
/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * Copyright (c) 2014, 2020 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
@@ -30,7 +30,7 @@
*/
#include
-__RCSID("$NetBSD: pmap_pvt.c,v 1.8 2020/01/01 16:50:41 martin Exp $");
+__RCSID("$NetBSD: pmap_pvt.c,v 1.9 2020/03/16 19:56:39 ad Exp $");
#include
#include
@@ -77,6 +77,9 @@ pmap_pv_track(paddr_t start, psize_t siz
{
struct pv_track *pvt;
size_t npages;
+#ifdef PMAP_PAGE_INIT
+ size_t i;
+#endif
KASSERT(start == trunc_page(start));
KASSERT(size == trunc_page(size));
@@ -90,6 +93,11 @@ pmap_pv_track(paddr_t start, psize_t siz
pvt->pvt_start = start;
pvt->pvt_size = size;
+#ifdef PMAP_PAGE_INIT
+ for (i = 0; i < npages; i++)
+ PMAP_PAGE_INIT(>pvt_pages[i]);
+#endif
+
mutex_enter(_unmanaged.lock);
pvt->pvt_next = pv_unmanaged.list;
atomic_store_release(_unmanaged.list, pvt);
CVS commit: src/share/man/man4
Module Name:src Committed By: nia Date: Mon Mar 16 19:20:36 UTC 2020 Modified Files: src/share/man/man4: audio.4 Log Message: audio.4: Mention the blk_ms sysctl To generate a diff of this commit: cvs rdiff -u -r1.98 -r1.99 src/share/man/man4/audio.4 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/man4/audio.4 diff -u src/share/man/man4/audio.4:1.98 src/share/man/man4/audio.4:1.99 --- src/share/man/man4/audio.4:1.98 Mon Mar 16 13:02:05 2020 +++ src/share/man/man4/audio.4 Mon Mar 16 19:20:36 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: audio.4,v 1.98 2020/03/16 13:02:05 wiz Exp $ +.\" $NetBSD: audio.4,v 1.99 2020/03/16 19:20:36 nia Exp $ .\" .\" Copyright (c) 1996 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -326,11 +326,9 @@ opportunity to adjust this block size to implementation-required limits. Normally the .Va blocksize -is calculated to correspond to 40ms -(for some hardware, this value may be different due to -the hardware restrictions) -of sound and it is recalculated -when the encoding parameters change. +is calculated to correspond to the value of the +.Em hw.audioX.blk_ms +sysctl and is recalculated when the encoding parameters change. If the descriptor is opened for read only, .Va blocksize indicates the blocksize for the recording track.
CVS commit: src/sys/arch
Module Name:src Committed By: nia Date: Mon Mar 16 19:09:34 UTC 2020 Modified Files: src/sys/arch/i386/conf: GENERIC src/sys/arch/macppc/conf: GENERIC src/sys/arch/sparc64/conf: GENERIC Log Message: Lower blk_ms on more ports that are even slightly likely to play video To generate a diff of this commit: cvs rdiff -u -r1.1225 -r1.1226 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.364 -r1.365 src/sys/arch/macppc/conf/GENERIC cvs rdiff -u -r1.224 -r1.225 src/sys/arch/sparc64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1225 src/sys/arch/i386/conf/GENERIC:1.1226 --- src/sys/arch/i386/conf/GENERIC:1.1225 Mon Feb 17 06:32:46 2020 +++ src/sys/arch/i386/conf/GENERIC Mon Mar 16 19:09:34 2020 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1225 2020/02/17 06:32:46 nisimura Exp $ +# $NetBSD: GENERIC,v 1.1226 2020/03/16 19:09:34 nia 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.1225 $" +#ident "GENERIC-$Revision: 1.1226 $" maxusers 64 # estimated number of users @@ -77,6 +77,9 @@ options MULTIBOOT # Multiboot support ( options INSECURE # disable kernel security levels - X needs this +options AUDIO_BLK_MS=4 # make software with low latency needs performant +# no substantial CPU overhead on this platform + options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT options NTP # NTP phase/frequency locked loop Index: src/sys/arch/macppc/conf/GENERIC diff -u src/sys/arch/macppc/conf/GENERIC:1.364 src/sys/arch/macppc/conf/GENERIC:1.365 --- src/sys/arch/macppc/conf/GENERIC:1.364 Mon Jan 27 20:54:59 2020 +++ src/sys/arch/macppc/conf/GENERIC Mon Mar 16 19:09:34 2020 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.364 2020/01/27 20:54:59 macallan Exp $ +# $NetBSD: GENERIC,v 1.365 2020/03/16 19:09:34 nia Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/macppc/conf/std.macppc" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.364 $" +#ident "GENERIC-$Revision: 1.365 $" maxusers 32 @@ -31,6 +31,9 @@ options ALTIVEC # Include AltiVec supp # Standard system options options INSECURE # disable kernel security levels +options AUDIO_BLK_MS=4 # make software with low latency needs performant +# no substantial CPU overhead on this platform + options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT options NTP # NTP phase/frequency locked loop options KTRACE # system call tracing via ktrace(1) Index: src/sys/arch/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.224 src/sys/arch/sparc64/conf/GENERIC:1.225 --- src/sys/arch/sparc64/conf/GENERIC:1.224 Wed Jan 29 18:39:03 2020 +++ src/sys/arch/sparc64/conf/GENERIC Mon Mar 16 19:09:34 2020 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.224 2020/01/29 18:39:03 maya Exp $ +# $NetBSD: GENERIC,v 1.225 2020/03/16 19:09:34 nia Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/sparc64/conf/std.sparc64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.224 $" +#ident "GENERIC-$Revision: 1.225 $" maxusers 64 @@ -48,6 +48,9 @@ config netbsd root on ? type ? #options UVMHIST #options UVMHIST_PRINT # Loud! +options AUDIO_BLK_MS=4 # make software with low latency needs performant +# no substantial CPU overhead on this platform + ## System call tracing (see ktrace(1)). options KTRACE
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Mon Mar 16 13:02:05 UTC 2020 Modified Files: src/share/man/man4: audio.4 Log Message: Sort sections. To generate a diff of this commit: cvs rdiff -u -r1.97 -r1.98 src/share/man/man4/audio.4 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/man4/audio.4 diff -u src/share/man/man4/audio.4:1.97 src/share/man/man4/audio.4:1.98 --- src/share/man/man4/audio.4:1.97 Mon Mar 16 09:20:01 2020 +++ src/share/man/man4/audio.4 Mon Mar 16 13:02:05 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: audio.4,v 1.97 2020/03/16 09:20:01 nia Exp $ +.\" $NetBSD: audio.4,v 1.98 2020/03/16 13:02:05 wiz Exp $ .\" .\" Copyright (c) 1996 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -813,13 +813,13 @@ string values. .Sh HISTORY Support for virtual channels and mixing first appeared in .Nx 8.0 . -.Sh BUGS -If the device is used in -.Xr mmap 2 -it is currently always mapped for writing (playing) due to VM system weirdness. .Sh CAVEATS The audio device cannot be reliably used with event notification mechanisms such as .Xr poll 2 . Most users are expected to only read and write a limited number of samples at -a time, limiting the time spent in the system call. +a time, limiting the time spent in the system call. +.Sh BUGS +If the device is used in +.Xr mmap 2 +it is currently always mapped for writing (playing) due to VM system weirdness.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: sborrill Date: Mon Mar 16 12:23:05 UTC 2020 Modified Files: src/doc [netbsd-8]: CHANGES-8.2 Log Message: Ticket #1521 To generate a diff of this commit: cvs rdiff -u -r1.1.2.107 -r1.1.2.108 src/doc/CHANGES-8.2 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.2 diff -u src/doc/CHANGES-8.2:1.1.2.107 src/doc/CHANGES-8.2:1.1.2.108 --- src/doc/CHANGES-8.2:1.1.2.107 Fri Mar 13 08:36:23 2020 +++ src/doc/CHANGES-8.2 Mon Mar 16 12:23:05 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.2,v 1.1.2.107 2020/03/13 08:36:23 martin Exp $ +# $NetBSD: CHANGES-8.2,v 1.1.2.108 2020/03/16 12:23:05 sborrill Exp $ A complete list of changes from the NetBSD 8.1 release to the NetBSD 8.2 release: @@ -2140,3 +2140,11 @@ sys/netipsec/key.c1.271 Fix kern/55066. [knakahara, ticket #1520] +sys/arch/xen/xen/xennet_checksum.c 1.4 + + Make the packet length check less strict, allow the physical + packet longer than IP payload. This fixes problem where checksum + was not recomputed for short packets coming from Windows domU + on same physical host as it seems Windows does some padding. + [jdolecek, ticket #1521] +
CVS commit: [netbsd-8] src/sys/arch/xen/xen
Module Name:src
Committed By: sborrill
Date: Mon Mar 16 12:22:03 UTC 2020
Modified Files:
src/sys/arch/xen/xen [netbsd-8]: xennet_checksum.c
Log Message:
Pull up the following revisions(s) (requested by jdolecek in ticket #1521):
sys/arch/xen/xen/xennet_checksum.c: revision 1.4
Make the packet length check less strict, allow the physical packet longer
than IP payload. This fixes problem where checksum was not recomputed for
short packets coming from Windows domU on same physical host as it seems
Windows does some padding.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.98.1 src/sys/arch/xen/xen/xennet_checksum.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/xennet_checksum.c
diff -u src/sys/arch/xen/xen/xennet_checksum.c:1.3 src/sys/arch/xen/xen/xennet_checksum.c:1.3.98.1
--- src/sys/arch/xen/xen/xennet_checksum.c:1.3 Thu Nov 22 16:17:10 2007
+++ src/sys/arch/xen/xen/xennet_checksum.c Mon Mar 16 12:22:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: xennet_checksum.c,v 1.3 2007/11/22 16:17:10 bouyer Exp $ */
+/* $NetBSD: xennet_checksum.c,v 1.3.98.1 2020/03/16 12:22:03 sborrill Exp $ */
/*-
* Copyright (c)2006 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xennet_checksum.c,v 1.3 2007/11/22 16:17:10 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xennet_checksum.c,v 1.3.98.1 2020/03/16 12:22:03 sborrill Exp $");
#include
#include
@@ -124,7 +124,7 @@ xennet_checksum_fill(struct mbuf **mp)
nxt = iph->ip_p;
iphlen = iph->ip_hl * 4;
iplen = ntohs(iph->ip_len);
- if (ehlen + iplen != m->m_pkthdr.len) {
+ if (ehlen + iplen > m->m_pkthdr.len) {
return EINVAL;
}
if (nxt == IPPROTO_UDP) {
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: sborrill Date: Mon Mar 16 12:09:46 UTC 2020 Modified Files: src/doc [netbsd-7]: CHANGES-7.3 Log Message: Ticket #1726 To generate a diff of this commit: cvs rdiff -u -r1.1.2.77 -r1.1.2.78 src/doc/CHANGES-7.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-7.3 diff -u src/doc/CHANGES-7.3:1.1.2.77 src/doc/CHANGES-7.3:1.1.2.78 --- src/doc/CHANGES-7.3:1.1.2.77 Sun Mar 8 09:20:52 2020 +++ src/doc/CHANGES-7.3 Mon Mar 16 12:09:46 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.3,v 1.1.2.77 2020/03/08 09:20:52 martin Exp $ +# $NetBSD: CHANGES-7.3,v 1.1.2.78 2020/03/16 12:09:46 sborrill Exp $ A complete list of changes from the NetBSD 7.2 release to the NetBSD 7.3 release: @@ -819,3 +819,11 @@ sys/arch/amigappc/include/bus_defs.h 1. the bus methods since we already define them anyway. [is, ticket #1725] +sys/arch/xen/xen/xennet_checksum.c 1.4 + + Make the packet length check less strict, allow the physical + packet longer than IP payload. This fixes problem where checksum + was not recomputed for short packets coming from Windows domU + on same physical host as it seems Windows does some padding. + [jdolecek, ticket #1726] +
CVS commit: [netbsd-7] src/sys/arch/xen/xen
Module Name:src
Committed By: sborrill
Date: Mon Mar 16 12:08:37 UTC 2020
Modified Files:
src/sys/arch/xen/xen [netbsd-7]: xennet_checksum.c
Log Message:
Pull up the following revisions(s) (requested by jdolecek in ticket #1726):
sys/arch/xen/xen/xennet_checksum.c: revision 1.4
Make the packet length check less strict, allow the physical packet longer
than IP payload. This fixes problem where checksum was not recomputed for
short packets coming from Windows domU on same physical host as it seems
Windows does some padding.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.80.1 src/sys/arch/xen/xen/xennet_checksum.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/xennet_checksum.c
diff -u src/sys/arch/xen/xen/xennet_checksum.c:1.3 src/sys/arch/xen/xen/xennet_checksum.c:1.3.80.1
--- src/sys/arch/xen/xen/xennet_checksum.c:1.3 Thu Nov 22 16:17:10 2007
+++ src/sys/arch/xen/xen/xennet_checksum.c Mon Mar 16 12:08:37 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: xennet_checksum.c,v 1.3 2007/11/22 16:17:10 bouyer Exp $ */
+/* $NetBSD: xennet_checksum.c,v 1.3.80.1 2020/03/16 12:08:37 sborrill Exp $ */
/*-
* Copyright (c)2006 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xennet_checksum.c,v 1.3 2007/11/22 16:17:10 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xennet_checksum.c,v 1.3.80.1 2020/03/16 12:08:37 sborrill Exp $");
#include
#include
@@ -124,7 +124,7 @@ xennet_checksum_fill(struct mbuf **mp)
nxt = iph->ip_p;
iphlen = iph->ip_hl * 4;
iplen = ntohs(iph->ip_len);
- if (ehlen + iplen != m->m_pkthdr.len) {
+ if (ehlen + iplen > m->m_pkthdr.len) {
return EINVAL;
}
if (nxt == IPPROTO_UDP) {
CVS commit: src/sys/dev/pckbport
Module Name:src Committed By: nia Date: Mon Mar 16 11:13:19 UTC 2020 Modified Files: src/sys/dev/pckbport: synaptics.c Log Message: synaptics: Increase default scale_z for more precise scrolling To generate a diff of this commit: cvs rdiff -u -r1.61 -r1.62 src/sys/dev/pckbport/synaptics.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/pckbport/synaptics.c diff -u src/sys/dev/pckbport/synaptics.c:1.61 src/sys/dev/pckbport/synaptics.c:1.62 --- src/sys/dev/pckbport/synaptics.c:1.61 Sun Mar 15 22:44:32 2020 +++ src/sys/dev/pckbport/synaptics.c Mon Mar 16 11:13:19 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: synaptics.c,v 1.61 2020/03/15 22:44:32 nia Exp $ */ +/* $NetBSD: synaptics.c,v 1.62 2020/03/16 11:13:19 nia Exp $ */ /* * Copyright (c) 2005, Steve C. Woodford @@ -48,7 +48,7 @@ #include "opt_pms.h" #include -__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.61 2020/03/15 22:44:32 nia Exp $"); +__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.62 2020/03/16 11:13:19 nia Exp $"); #include #include @@ -115,7 +115,7 @@ static int synaptics_button3 = SYNAPTICS static int synaptics_two_fingers_emul = 0; static int synaptics_scale_x = 16; static int synaptics_scale_y = 16; -static int synaptics_scale_z = 32; +static int synaptics_scale_z = 64; static int synaptics_max_speed_x = 32; static int synaptics_max_speed_y = 32; static int synaptics_max_speed_z = 1;
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: sborrill Date: Mon Mar 16 11:11:47 UTC 2020 Modified Files: src/doc [netbsd-9]: CHANGES-9.1 Log Message: Ticket #781 To generate a diff of this commit: cvs rdiff -u -r1.1.2.18 -r1.1.2.19 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.18 src/doc/CHANGES-9.1:1.1.2.19 --- src/doc/CHANGES-9.1:1.1.2.18 Fri Mar 13 08:34:25 2020 +++ src/doc/CHANGES-9.1 Mon Mar 16 11:11:46 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.1,v 1.1.2.18 2020/03/13 08:34:25 martin Exp $ +# $NetBSD: CHANGES-9.1,v 1.1.2.19 2020/03/16 11:11:46 sborrill Exp $ A complete list of changes from the NetBSD 9.0 release to the NetBSD 9.1 release: @@ -526,3 +526,11 @@ sys/netipsec/key.c1.271 Fix kern/55066. [knakahara, ticket #780] +sys/arch/xen/xen/xennet_checksum.c 1.4 + + Make the packet length check less strict, allow the physical + packet longer than IP payload. This fixes problem where checksum + was not recomputed for short packets coming from Windows domU + on same physical host as it seems Windows does some padding. + [jdolecek, ticket #781] +
CVS commit: [netbsd-9] src/sys/arch/xen/xen
Module Name:src
Committed By: sborrill
Date: Mon Mar 16 11:11:13 UTC 2020
Modified Files:
src/sys/arch/xen/xen [netbsd-9]: xennet_checksum.c
Log Message:
Pull up the following revisions(s) (requested by jdolecek in ticket #781):
sys/arch/xen/xen/xennet_checksum.c: revision 1.4
Make the packet length check less strict, allow the physical packet longer
than IP payload. This fixes problem where checksum was not recomputed for
short packets coming from Windows domU on same physical host as it seems
Windows does some padding.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.110.1 src/sys/arch/xen/xen/xennet_checksum.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/xennet_checksum.c
diff -u src/sys/arch/xen/xen/xennet_checksum.c:1.3 src/sys/arch/xen/xen/xennet_checksum.c:1.3.110.1
--- src/sys/arch/xen/xen/xennet_checksum.c:1.3 Thu Nov 22 16:17:10 2007
+++ src/sys/arch/xen/xen/xennet_checksum.c Mon Mar 16 11:11:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: xennet_checksum.c,v 1.3 2007/11/22 16:17:10 bouyer Exp $ */
+/* $NetBSD: xennet_checksum.c,v 1.3.110.1 2020/03/16 11:11:13 sborrill Exp $ */
/*-
* Copyright (c)2006 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xennet_checksum.c,v 1.3 2007/11/22 16:17:10 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xennet_checksum.c,v 1.3.110.1 2020/03/16 11:11:13 sborrill Exp $");
#include
#include
@@ -124,7 +124,7 @@ xennet_checksum_fill(struct mbuf **mp)
nxt = iph->ip_p;
iphlen = iph->ip_hl * 4;
iplen = ntohs(iph->ip_len);
- if (ehlen + iplen != m->m_pkthdr.len) {
+ if (ehlen + iplen > m->m_pkthdr.len) {
return EINVAL;
}
if (nxt == IPPROTO_UDP) {
CVS commit: src/distrib/sparc64/instfs
Module Name:src
Committed By: rin
Date: Mon Mar 16 10:02:47 UTC 2020
Modified Files:
src/distrib/sparc64/instfs: list
Log Message:
Catch up with major bump in terminfo. Unbreak build.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/distrib/sparc64/instfs/list
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sparc64/instfs/list
diff -u src/distrib/sparc64/instfs/list:1.28 src/distrib/sparc64/instfs/list:1.29
--- src/distrib/sparc64/instfs/list:1.28 Mon Oct 1 17:50:08 2018
+++ src/distrib/sparc64/instfs/list Mon Mar 16 10:02:47 2020
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.28 2018/10/01 17:50:08 martin Exp $
+# $NetBSD: list,v 1.29 2020/03/16 10:02:47 rin Exp $
SRCDIRS bin sbin libexec external/bsd/less/bin usr.bin usr.sbin
@@ -87,7 +87,7 @@ COPY ${NETBSDSRCDIR}/etc/master.passwd e
COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig
COPY ${DISTRIBDIR}/common/protocols etc/protocols
COPY ${DISTRIBDIR}/common/services etc/services
-COPY ${DESTDIR}/usr/share/misc/terminfo.cdb usr/share/misc/terminfo.cdb
+COPY ${DESTDIR}/usr/share/misc/terminfo2.cdb usr/share/misc/terminfo2.cdb
# we need the boot block in /usr/mdec + the arch specific extras
COPY ${DESTDIR}/usr/mdec/binstall usr/mdec/binstall 555
CVS commit: src/etc/etc.amiga
Module Name:src
Committed By: rin
Date: Mon Mar 16 09:42:04 UTC 2020
Modified Files:
src/etc/etc.amiga: Makefile.inc
Log Message:
Fix build; add -f flag to "rm miniroot.fs" in case of its absence.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/etc/etc.amiga/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/etc.amiga/Makefile.inc
diff -u src/etc/etc.amiga/Makefile.inc:1.30 src/etc/etc.amiga/Makefile.inc:1.31
--- src/etc/etc.amiga/Makefile.inc:1.30 Sat Mar 14 16:27:19 2020
+++ src/etc/etc.amiga/Makefile.inc Mon Mar 16 09:42:04 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.30 2020/03/14 16:27:19 is Exp $
+# $NetBSD: Makefile.inc,v 1.31 2020/03/16 09:42:04 rin Exp $
#
# etc.amiga/Makefile.inc -- amiga-specific etc Makefile targets
#
@@ -15,7 +15,7 @@ INSTALLATION_DIRS+= installation/miniroo
snap_md_post:
${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc '*'
- rm ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/miniroot/miniroot.fs
+ rm -f ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/miniroot/miniroot.fs
${TOOL_GZIP} -cd ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/miniroot/miniroot.fs.gz > \
${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/miniroot/miniroot.fs
${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/miniroot '*.fs*'
CVS commit: src/share/man/man4
Module Name:src Committed By: nia Date: Mon Mar 16 09:31:41 UTC 2020 Modified Files: src/share/man/man4: pms.4 Log Message: pms.4: Typo. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/share/man/man4/pms.4 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/man4/pms.4 diff -u src/share/man/man4/pms.4:1.36 src/share/man/man4/pms.4:1.37 --- src/share/man/man4/pms.4:1.36 Sat Mar 14 19:29:39 2020 +++ src/share/man/man4/pms.4 Mon Mar 16 09:31:41 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: pms.4,v 1.36 2020/03/14 19:29:39 nia Exp $ +.\" $NetBSD: pms.4,v 1.37 2020/03/16 09:31:41 nia Exp $ .\" .\" Copyright (c) 1993 Christopher G. Demetriou .\" All rights reserved. @@ -174,7 +174,7 @@ ignored (default 4). Sets the top edge of the button emulation region on a clickpad. Since a clickpad only reports left clicks this region is used to emulate two or three buttons by detecting the finger location and reporting -either a button 2 or button 3 click iff the click occurs within +either a button 2 or button 3 click if the click occurs within the region bounded by button_boundary and the bottom of the clickpad. .It Dv hw.synaptics.button3_edge This defines the left hand edge of the button 3 region.
CVS commit: src/share/man/man4
Module Name:src Committed By: nia Date: Mon Mar 16 09:20:01 UTC 2020 Modified Files: src/share/man/man4: audio.4 Log Message: audio.4: O_NONBLOCK isn't the actual problem To generate a diff of this commit: cvs rdiff -u -r1.96 -r1.97 src/share/man/man4/audio.4 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/man4/audio.4 diff -u src/share/man/man4/audio.4:1.96 src/share/man/man4/audio.4:1.97 --- src/share/man/man4/audio.4:1.96 Mon Mar 16 08:50:06 2020 +++ src/share/man/man4/audio.4 Mon Mar 16 09:20:01 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: audio.4,v 1.96 2020/03/16 08:50:06 nia Exp $ +.\" $NetBSD: audio.4,v 1.97 2020/03/16 09:20:01 nia Exp $ .\" .\" Copyright (c) 1996 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -818,6 +818,8 @@ If the device is used in .Xr mmap 2 it is currently always mapped for writing (playing) due to VM system weirdness. .Sh CAVEATS -The audio device cannot be reliably used with O_NONBLOCK or event notification -mechanisms. Users are generally expected to only read and write a limited number -of samples at a time, limiting the time spent in the system call. +The audio device cannot be reliably used with event notification mechanisms +such as +.Xr poll 2 . +Most users are expected to only read and write a limited number of samples at +a time, limiting the time spent in the system call.
CVS commit: src/share/man/man4
Module Name:src Committed By: nia Date: Mon Mar 16 08:50:06 UTC 2020 Modified Files: src/share/man/man4: audio.4 Log Message: audio.4: Remove reference to using O_NONBLOCK It doesn't work properly, but this turns out to not be a problem in most code (code where it is generally uses threads)... Don't provide misleading information about using it, or programmers might start wondering why their code doesn't work. Noted by Yorick Hardy on current-users To generate a diff of this commit: cvs rdiff -u -r1.95 -r1.96 src/share/man/man4/audio.4 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/man4/audio.4 diff -u src/share/man/man4/audio.4:1.95 src/share/man/man4/audio.4:1.96 --- src/share/man/man4/audio.4:1.95 Sun Dec 8 10:57:17 2019 +++ src/share/man/man4/audio.4 Mon Mar 16 08:50:06 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: audio.4,v 1.95 2019/12/08 10:57:17 wiz Exp $ +.\" $NetBSD: audio.4,v 1.96 2020/03/16 08:50:06 nia Exp $ .\" .\" Copyright (c) 1996 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 November 12, 2019 +.Dd March 16, 2020 .Dt AUDIO 4 .Os .Sh NAME @@ -157,14 +157,6 @@ For historical reasons, only encodings t .Dv AUDIO_ENCODINGFLAG_EMULATED are able to .Xr mmap 2 . -.Pp -The audio device, like most devices, can be used in -.Xr select 2 , -can be set in non-blocking mode and can be set (with a -.Dv FIOASYNC -ioctl) to send a -.Dv SIGIO -when I/O is possible. The mixer device can be set to generate a .Dv SIGIO whenever a mixer value is changed. @@ -825,3 +817,7 @@ Support for virtual channels and mixing If the device is used in .Xr mmap 2 it is currently always mapped for writing (playing) due to VM system weirdness. +.Sh CAVEATS +The audio device cannot be reliably used with O_NONBLOCK or event notification +mechanisms. Users are generally expected to only read and write a limited number +of samples at a time, limiting the time spent in the system call.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: nisimura Date: Mon Mar 16 08:48:05 UTC 2020 Modified Files: src/sys/arch/evbarm/conf: GENERIC64 Log Message: redo the commit correctly To generate a diff of this commit: cvs rdiff -u -r1.141 -r1.142 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.141 src/sys/arch/evbarm/conf/GENERIC64:1.142 --- src/sys/arch/evbarm/conf/GENERIC64:1.141 Mon Mar 16 08:17:57 2020 +++ src/sys/arch/evbarm/conf/GENERIC64 Mon Mar 16 08:48:05 2020 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC64,v 1.141 2020/03/16 08:17:57 nisimura Exp $ +# $NetBSD: GENERIC64,v 1.142 2020/03/16 08:48:05 nisimura Exp $ # # GENERIC ARM (aarch64) kernel # @@ -325,7 +325,7 @@ pci* at ppb? awge* at fdt?# DesignWare Gigabit Ethernet emac* at fdt?# Allwinner Gigabit Ethernet (EMAC) enet* at fdt?# IMX FEC -scx* at fdt?# SocioNext Gigabit Ethernet +#scx* at fdt?# SocioNext Gigabit Ethernet aq* at pci? dev ? function ? # Aquantia AQC 10 gigabit ena* at pci? dev ? function ? # Amazon.com Elastic Network Adapter genet* at acpi? # Broadcom GENET v5 @@ -522,7 +522,7 @@ options FONT_BOLD8x16 options FONT_BOLD16x32 # GPU -nouveau* at fdt? # NVIDIA GPU +#nouveau* at fdt? # NVIDIA GPU # Backlight pwmbacklight* at fdt? # PWM Backlight controls
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: nisimura Date: Mon Mar 16 08:17:58 UTC 2020 Modified Files: src/sys/arch/evbarm/conf: GENERIC64 files.generic64 Log Message: include files.sociox for generic64 To generate a diff of this commit: cvs rdiff -u -r1.140 -r1.141 src/sys/arch/evbarm/conf/GENERIC64 cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/conf/files.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.140 src/sys/arch/evbarm/conf/GENERIC64:1.141 --- src/sys/arch/evbarm/conf/GENERIC64:1.140 Sat Feb 22 18:57:50 2020 +++ src/sys/arch/evbarm/conf/GENERIC64 Mon Mar 16 08:17:57 2020 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC64,v 1.140 2020/02/22 18:57:50 jmcneill Exp $ +# $NetBSD: GENERIC64,v 1.141 2020/03/16 08:17:57 nisimura Exp $ # # GENERIC ARM (aarch64) kernel # @@ -325,6 +325,7 @@ pci* at ppb? awge* at fdt?# DesignWare Gigabit Ethernet emac* at fdt?# Allwinner Gigabit Ethernet (EMAC) enet* at fdt?# IMX FEC +scx* at fdt?# SocioNext Gigabit Ethernet aq* at pci? dev ? function ? # Aquantia AQC 10 gigabit ena* at pci? dev ? function ? # Amazon.com Elastic Network Adapter genet* at acpi? # Broadcom GENET v5 @@ -521,7 +522,7 @@ options FONT_BOLD8x16 options FONT_BOLD16x32 # GPU -#nouveau* at fdt? # NVIDIA GPU +nouveau* at fdt? # NVIDIA GPU # Backlight pwmbacklight* at fdt? # PWM Backlight controls Index: src/sys/arch/evbarm/conf/files.generic64 diff -u src/sys/arch/evbarm/conf/files.generic64:1.15 src/sys/arch/evbarm/conf/files.generic64:1.16 --- src/sys/arch/evbarm/conf/files.generic64:1.15 Wed Jan 15 01:09:57 2020 +++ src/sys/arch/evbarm/conf/files.generic64 Mon Mar 16 08:17:58 2020 @@ -1,4 +1,4 @@ -# $NetBSD: files.generic64,v 1.15 2020/01/15 01:09:57 jmcneill Exp $ +# $NetBSD: files.generic64,v 1.16 2020/03/16 08:17:58 nisimura Exp $ # # A generic (aarch64) kernel configuration info # @@ -18,6 +18,7 @@ include "arch/arm/nvidia/files.tegra" include "arch/arm/rockchip/files.rockchip" include "arch/arm/sunxi/files.sunxi" include "arch/arm/virt/files.virt" +include "arch/arm/sociox/files.sociox" # # Stack-less Just-In-Time compiler
CVS commit: src/sys/arch/arm/sociox
Module Name:src Committed By: nisimura Date: Mon Mar 16 08:10:20 UTC 2020 Modified Files: src/sys/arch/arm/sociox: files.sociox Log Message: add a missing line To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/sociox/files.sociox 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/sociox/files.sociox diff -u src/sys/arch/arm/sociox/files.sociox:1.1 src/sys/arch/arm/sociox/files.sociox:1.2 --- src/sys/arch/arm/sociox/files.sociox:1.1 Sun Mar 15 12:01:41 2020 +++ src/sys/arch/arm/sociox/files.sociox Mon Mar 16 08:10:20 2020 @@ -1,4 +1,4 @@ -# $NetBSD: files.sociox,v 1.1 2020/03/15 12:01:41 nisimura Exp $ +# $NetBSD: files.sociox,v 1.2 2020/03/16 08:10:20 nisimura Exp $ # # Configuration info for Socionext Unifier/SC2A11 # @@ -15,6 +15,7 @@ attach ave at fdt file arch/arm/sociox/if_ave.c ave # Socionext eMMC +device sniemmc: sdmmcbus attach sdhc at fdt with sniemmc file arch/arm/sociox/sni_emmc.c sniemmc
CVS commit: src/sys/uvm
Module Name:src Committed By: rin Date: Mon Mar 16 08:03:58 UTC 2020 Modified Files: src/sys/uvm: uvm_page.h Log Message: Include for krwlock_t required by uvm_pagewait(). To generate a diff of this commit: cvs rdiff -u -r1.100 -r1.101 src/sys/uvm/uvm_page.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/uvm/uvm_page.h diff -u src/sys/uvm/uvm_page.h:1.100 src/sys/uvm/uvm_page.h:1.101 --- src/sys/uvm/uvm_page.h:1.100 Sat Mar 14 20:23:51 2020 +++ src/sys/uvm/uvm_page.h Mon Mar 16 08:03:58 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_page.h,v 1.100 2020/03/14 20:23:51 ad Exp $ */ +/* $NetBSD: uvm_page.h,v 1.101 2020/03/16 08:03:58 rin Exp $ */ /* * Copyright (c) 1997 Charles D. Cranor and Washington University. @@ -68,6 +68,8 @@ #include "opt_uvm_page_trkown.h" #endif +#include + #include #include
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Mon Mar 16 06:48:18 UTC 2020 Modified Files: src/usr.sbin/sysinst: defs.h Log Message: PR misc/54886: bump threshold for automatic/default creation of a tmpfs /tmp up slightly (to 384 MB ram). This will make sure the default install has a > 64 MB /tmp available (number pulled out of thin air, 64 MB is the minimum required by the ZFS tests). To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/usr.sbin/sysinst/defs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/sysinst/defs.h diff -u src/usr.sbin/sysinst/defs.h:1.56 src/usr.sbin/sysinst/defs.h:1.57 --- src/usr.sbin/sysinst/defs.h:1.56 Wed Feb 19 21:51:21 2020 +++ src/usr.sbin/sysinst/defs.h Mon Mar 16 06:48:17 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: defs.h,v 1.56 2020/02/19 21:51:21 martin Exp $ */ +/* $NetBSD: defs.h,v 1.57 2020/03/16 06:48:17 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -72,7 +72,7 @@ const char *getfslabelname(uint, uint); * if a system has less ram (in MB) than this, we will not create a * tmpfs /tmp by default (to workaround PR misc/54886) */ -#define SMALL_RAM_SIZE 256 +#define SMALL_RAM_SIZE 384 /* helper macros to create unique internal error messages */ #define STR_NO(STR) #STR
