CVS commit: src/sys/arch/cobalt/conf
Module Name:src Committed By: thorpej Date: Wed Mar 4 04:58:52 UTC 2020 Modified Files: src/sys/arch/cobalt/conf: majors.cobalt Log Message: panel -> lcdpanel Part of PR port-cobalt/55009 To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/arch/cobalt/conf/majors.cobalt 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/cobalt/conf/majors.cobalt diff -u src/sys/arch/cobalt/conf/majors.cobalt:1.33 src/sys/arch/cobalt/conf/majors.cobalt:1.34 --- src/sys/arch/cobalt/conf/majors.cobalt:1.33 Wed Jan 29 18:39:01 2020 +++ src/sys/arch/cobalt/conf/majors.cobalt Wed Mar 4 04:58:52 2020 @@ -1,4 +1,4 @@ -# $NetBSD: majors.cobalt,v 1.33 2020/01/29 18:39:01 maya Exp $ +# $NetBSD: majors.cobalt,v 1.34 2020/03/04 04:58:52 thorpej Exp $ # # Device majors for cobalt # @@ -39,7 +39,7 @@ device-major ld char 27 block 10 ld device-major clockctl char 33 clockctl #device-major obsolete char 34 obsolete (systrace) device-major cgd char 35 block 11 cgd -device-major panel char 36 panel +device-major lcdpanel char 36 lcdpanel device-major ksyms char 37 ksyms device-major pci char 38 pci device-major zstty char 39 zstty
CVS commit: src/sys/arch/cobalt/conf
Module Name:src Committed By: thorpej Date: Wed Mar 4 04:58:52 UTC 2020 Modified Files: src/sys/arch/cobalt/conf: majors.cobalt Log Message: panel -> lcdpanel Part of PR port-cobalt/55009 To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/arch/cobalt/conf/majors.cobalt Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/conf
On Wed, 4 Mar 2020, Paul Goyette wrote: Module Name:src Committed By: pgoyette Date: Wed Mar 4 02:20:57 UTC 2020 Modified Files: src/sys/conf: files Log Message: mips64 has compat_netbsd32 but cannot have exec_aout; all other users of compat_netbsd32 need exec_aout Addresses PR kern/55037. XXX pullup-9 Also XXX pullup-8
CVS commit: src/sys/conf
Module Name:src Committed By: pgoyette Date: Wed Mar 4 02:20:57 UTC 2020 Modified Files: src/sys/conf: files Log Message: mips64 has compat_netbsd32 but cannot have exec_aout; all other users of compat_netbsd32 need exec_aout Addresses PR kern/55037. XXX pullup-9 To generate a diff of this commit: cvs rdiff -u -r1.1256 -r1.1257 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/conf
Module Name:src Committed By: pgoyette Date: Wed Mar 4 02:20:57 UTC 2020 Modified Files: src/sys/conf: files Log Message: mips64 has compat_netbsd32 but cannot have exec_aout; all other users of compat_netbsd32 need exec_aout Addresses PR kern/55037. XXX pullup-9 To generate a diff of this commit: cvs rdiff -u -r1.1256 -r1.1257 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1256 src/sys/conf/files:1.1257 --- src/sys/conf/files:1.1256 Sat Feb 22 00:28:35 2020 +++ src/sys/conf/files Wed Mar 4 02:20:56 2020 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1256 2020/02/22 00:28:35 jmcneill Exp $ +# $NetBSD: files,v 1.1257 2020/03/04 02:20:56 pgoyette Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20171118 @@ -164,7 +164,15 @@ defflagCOMPAT_FREEBSD: COMPAT_09, CO defflagCOMPAT_LINUX: COMPAT_NETBSD, COMPAT_43 defflagCOMPAT_SUNOS: COMPAT_09, COMPAT_43 defflagCOMPAT_ULTRIX: COMPAT_50 + +# mips64 has COMPAT_NETBSD64 but cannot have EXEC_AOUT; all other users +# of COMPAT_NETBSD64 need EXEC_AOUT +ifdef mips defflagCOMPAT_NETBSD32 +else +defflagCOMPAT_NETBSD32 : EXEC_AOUT +endif + defflagCOMPAT_SYSV defflagSYSV_IPC : SYSVSHM, SYSVSEM, SYSVMSG defflagCOMPAT_NETBSD32_SYSVIPC : SYSV_IPC,
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: christos
Date: Wed Mar 4 01:23:08 UTC 2020
Modified Files:
src/sys/dev/usb: uhid.c usbhid.h
Log Message:
Add ioctls to get and set raw mode.
To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/sys/dev/usb/uhid.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/usb/usbhid.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/usb/uhid.c
diff -u src/sys/dev/usb/uhid.c:1.112 src/sys/dev/usb/uhid.c:1.113
--- src/sys/dev/usb/uhid.c:1.112 Mon Mar 2 13:15:28 2020
+++ src/sys/dev/usb/uhid.c Tue Mar 3 20:23:08 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uhid.c,v 1.112 2020/03/02 18:15:28 christos Exp $ */
+/* $NetBSD: uhid.c,v 1.113 2020/03/04 01:23:08 christos Exp $ */
/*
* Copyright (c) 1998, 2004, 2008, 2012 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.112 2020/03/02 18:15:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.113 2020/03/04 01:23:08 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -602,6 +602,14 @@ uhid_do_ioctl(struct uhid_softc *sc, u_l
mutex_exit(proc_lock);
break;
+ case USB_HID_GET_RAW:
+ *(int *)addr = sc->sc_raw;
+ break;
+
+ case USB_HID_SET_RAW:
+ sc->sc_raw = *(int *)addr;
+ break;
+
case USB_GET_REPORT_DESC:
uhidev_get_report_desc(sc->sc_hdev.sc_parent, , );
rd = (struct usb_ctl_report_desc *)addr;
Index: src/sys/dev/usb/usbhid.h
diff -u src/sys/dev/usb/usbhid.h:1.18 src/sys/dev/usb/usbhid.h:1.19
--- src/sys/dev/usb/usbhid.h:1.18 Sun Jul 15 14:36:51 2018
+++ src/sys/dev/usb/usbhid.h Tue Mar 3 20:23:08 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: usbhid.h,v 1.18 2018/07/15 18:36:51 maya Exp $ */
+/* $NetBSD: usbhid.h,v 1.19 2020/03/04 01:23:08 christos Exp $ */
/* $FreeBSD: src/sys/dev/usb/usbhid.h,v 1.7 1999/11/17 22:33:51 n_hibma Exp $ */
/*
@@ -36,6 +36,7 @@
#define _DEV_USB_USBHID_H_
#include
+#include
#define UR_GET_HID_DESCRIPTOR 0x06
#define UDESC_HID 0x21
@@ -66,4 +67,7 @@ typedef struct usb_hid_descriptor {
#define UHID_OUTPUT_REPORT 0x02
#define UHID_FEATURE_REPORT 0x03
+#define USB_HID_GET_RAW _IOR('h', 1, int)
+#define USB_HID_SET_RAW _IOW('h', 2, int)
+
#endif /* _DEV_USB_USBHID_H_ */
CVS commit: src/sys/dev/usb
Module Name:src Committed By: christos Date: Wed Mar 4 01:23:08 UTC 2020 Modified Files: src/sys/dev/usb: uhid.c usbhid.h Log Message: Add ioctls to get and set raw mode. To generate a diff of this commit: cvs rdiff -u -r1.112 -r1.113 src/sys/dev/usb/uhid.c cvs rdiff -u -r1.18 -r1.19 src/sys/dev/usb/usbhid.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/libexec/ld.elf_so
Module Name:src
Committed By: thorpej
Date: Wed Mar 4 01:21:17 UTC 2020
Modified Files:
src/libexec/ld.elf_so: headers.c map_object.c rtld.c
Log Message:
PT_GNU_RELRO segments are arranged such that their vaddr + memsz ends
on a linker common page size boundary. However, if the common page size
used by the linker is less than the VM page size being used by the kernel,
this can end up in the middle of a VM page and when the region is write-
protected, this can cause objects in neighboring .data to get incorrectly
write-protected, resulting in a crash.
Avoid this situation by calculating the end of the RELRO region not by
rounding memsz up to the VM page size, but rather by adding vaddr + memsz
and then truncating to the VM page size.
Fixes PR toolchain/55043.
XXX pullup-9
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/libexec/ld.elf_so/headers.c
cvs rdiff -u -r1.60 -r1.61 src/libexec/ld.elf_so/map_object.c
cvs rdiff -u -r1.202 -r1.203 src/libexec/ld.elf_so/rtld.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/headers.c
diff -u src/libexec/ld.elf_so/headers.c:1.67 src/libexec/ld.elf_so/headers.c:1.68
--- src/libexec/ld.elf_so/headers.c:1.67 Sat Feb 29 18:53:55 2020
+++ src/libexec/ld.elf_so/headers.c Wed Mar 4 01:21:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: headers.c,v 1.67 2020/02/29 18:53:55 kamil Exp $ */
+/* $NetBSD: headers.c,v 1.68 2020/03/04 01:21:17 thorpej Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: headers.c,v 1.67 2020/02/29 18:53:55 kamil Exp $");
+__RCSID("$NetBSD: headers.c,v 1.68 2020/03/04 01:21:17 thorpej Exp $");
#endif /* not lint */
#include
@@ -516,9 +516,9 @@ _rtld_digest_phdr(const Elf_Phdr *phdr,
#ifdef GNU_RELRO
case PT_GNU_RELRO:
- obj->relro_page = obj->relocbase
- + round_down(ph->p_vaddr);
- obj->relro_size = round_up(ph->p_memsz);
+ /* rounding happens later. */
+ obj->relro_page = obj->relocbase + ph->p_vaddr;
+ obj->relro_size = ph->p_memsz;
dbg(("headers: %s %p phsize %" PRImemsz,
"PT_GNU_RELRO", (void *)(uintptr_t)vaddr,
ph->p_memsz));
Index: src/libexec/ld.elf_so/map_object.c
diff -u src/libexec/ld.elf_so/map_object.c:1.60 src/libexec/ld.elf_so/map_object.c:1.61
--- src/libexec/ld.elf_so/map_object.c:1.60 Sun Jan 6 19:44:54 2019
+++ src/libexec/ld.elf_so/map_object.c Wed Mar 4 01:21:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: map_object.c,v 1.60 2019/01/06 19:44:54 joerg Exp $ */
+/* $NetBSD: map_object.c,v 1.61 2020/03/04 01:21:17 thorpej Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -34,7 +34,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: map_object.c,v 1.60 2019/01/06 19:44:54 joerg Exp $");
+__RCSID("$NetBSD: map_object.c,v 1.61 2020/03/04 01:21:17 thorpej Exp $");
#endif /* not lint */
#include
@@ -406,8 +406,9 @@ _rtld_map_object(const char *path, int f
obj->relocbase = mapbase - base_vaddr;
#ifdef GNU_RELRO
- obj->relro_page = obj->relocbase + round_down(relro_page);
- obj->relro_size = round_up(relro_size);
+ /* rounding happens later. */
+ obj->relro_page = obj->relocbase + relro_page;
+ obj->relro_size = relro_size;
#endif
if (obj->dynamic)
Index: src/libexec/ld.elf_so/rtld.c
diff -u src/libexec/ld.elf_so/rtld.c:1.202 src/libexec/ld.elf_so/rtld.c:1.203
--- src/libexec/ld.elf_so/rtld.c:1.202 Sat Feb 29 04:23:05 2020
+++ src/libexec/ld.elf_so/rtld.c Wed Mar 4 01:21:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: rtld.c,v 1.202 2020/02/29 04:23:05 kamil Exp $ */
+/* $NetBSD: rtld.c,v 1.203 2020/03/04 01:21:17 thorpej Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: rtld.c,v 1.202 2020/02/29 04:23:05 kamil Exp $");
+__RCSID("$NetBSD: rtld.c,v 1.203 2020/03/04 01:21:17 thorpej Exp $");
#endif /* not lint */
#include
@@ -1773,13 +1773,25 @@ int
_rtld_relro(const Obj_Entry *obj, bool wantmain)
{
#ifdef GNU_RELRO
- if (obj->relro_size == 0)
+ /*
+ * If our VM page size is larger than the page size used by the
+ * linker when laying out the object, we could end up making data
+ * read-only that is unintended. Detect and avoid this situation.
+ * It may mean we are unable to protect everything we'd like, but
+ * it's better than crashing.
+ */
+ uintptr_t relro_end = (uintptr_t)obj->relro_page + obj->relro_size;
+ uintptr_t relro_start = round_down((uintptr_t)obj->relro_page);
+ assert(relro_end >= relro_start);
+ size_t relro_size = round_down(relro_end) - relro_start;
+
+ if (relro_size == 0)
return 0;
if (wantmain != (obj ==_rtld_objmain))
return 0;
- dbg(("RELRO %s %p %zx\n", obj->path, obj->relro_page, obj->relro_size));
- if (mprotect(obj->relro_page, obj->relro_size, PROT_READ) == -1) {
+ dbg(("RELRO %s %p %zx\n", obj->path, (void *)relro_start, relro_size));
+ if (mprotect((void
CVS commit: src/libexec/ld.elf_so
Module Name:src Committed By: thorpej Date: Wed Mar 4 01:21:17 UTC 2020 Modified Files: src/libexec/ld.elf_so: headers.c map_object.c rtld.c Log Message: PT_GNU_RELRO segments are arranged such that their vaddr + memsz ends on a linker common page size boundary. However, if the common page size used by the linker is less than the VM page size being used by the kernel, this can end up in the middle of a VM page and when the region is write- protected, this can cause objects in neighboring .data to get incorrectly write-protected, resulting in a crash. Avoid this situation by calculating the end of the RELRO region not by rounding memsz up to the VM page size, but rather by adding vaddr + memsz and then truncating to the VM page size. Fixes PR toolchain/55043. XXX pullup-9 To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 src/libexec/ld.elf_so/headers.c cvs rdiff -u -r1.60 -r1.61 src/libexec/ld.elf_so/map_object.c cvs rdiff -u -r1.202 -r1.203 src/libexec/ld.elf_so/rtld.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/libcbor/lib
Module Name:src
Committed By: mlelstv
Date: Tue Mar 3 23:32:59 UTC 2020
Modified Files:
src/external/mit/libcbor/lib: Makefile
Log Message:
CLEANFILES can only do files
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/mit/libcbor/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/libcbor/lib/Makefile
diff -u src/external/mit/libcbor/lib/Makefile:1.1 src/external/mit/libcbor/lib/Makefile:1.2
--- src/external/mit/libcbor/lib/Makefile:1.1 Tue Mar 3 00:36:18 2020
+++ src/external/mit/libcbor/lib/Makefile Tue Mar 3 23:32:58 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/03/03 00:36:18 christos Exp $
+# $NetBSD: Makefile,v 1.2 2020/03/03 23:32:58 mlelstv Exp $
NOLINT=
NOMAN=
@@ -97,7 +97,7 @@ cbor/configuration.h: ${VERS_FILE}
echo '#define CBOR_RESTRICT_SPECIFIER restrict' && \
echo '#define CBOR_INLINE_SPECIFIER ') > ${.TARGET}
-CLEANFILES+= cbor/configuration.h cbor
+CLEANFILES+= cbor/configuration.h
.BEGIN:
CVS commit: src/external/mit/libcbor/lib
Module Name:src Committed By: mlelstv Date: Tue Mar 3 23:32:59 UTC 2020 Modified Files: src/external/mit/libcbor/lib: Makefile Log Message: CLEANFILES can only do files To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/mit/libcbor/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [ad-namecache] src/sys/kern
Module Name:src
Committed By: ad
Date: Tue Mar 3 22:30:57 UTC 2020
Modified Files:
src/sys/kern [ad-namecache]: vfs_lookup.c
Log Message:
lookup_fastforward(): bail out on mount -o union
To generate a diff of this commit:
cvs rdiff -u -r1.212.4.10 -r1.212.4.11 src/sys/kern/vfs_lookup.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/vfs_lookup.c
diff -u src/sys/kern/vfs_lookup.c:1.212.4.10 src/sys/kern/vfs_lookup.c:1.212.4.11
--- src/sys/kern/vfs_lookup.c:1.212.4.10 Sat Feb 29 20:21:03 2020
+++ src/sys/kern/vfs_lookup.c Tue Mar 3 22:30:57 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_lookup.c,v 1.212.4.10 2020/02/29 20:21:03 ad Exp $ */
+/* $NetBSD: vfs_lookup.c,v 1.212.4.11 2020/03/03 22:30:57 ad Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.212.4.10 2020/02/29 20:21:03 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.212.4.11 2020/03/03 22:30:57 ad Exp $");
#ifdef _KERNEL_OPT
#include "opt_magiclinks.h"
@@ -1308,6 +1308,13 @@ lookup_fastforward(struct namei_state *s
}
}
+ /* Can't deal with -o union lookups. */
+ if ((searchdir->v_vflag & VV_ROOT) != 0 &&
+ (searchdir->v_mount->mnt_flag & MNT_UNION) != 0) {
+ error = EOPNOTSUPP;
+ break;
+ }
+
/*
* Good, now look for it in cache. cache_lookup_linked()
* will fail if there's nothing there, or if there's no
@@ -1323,7 +1330,6 @@ lookup_fastforward(struct namei_state *s
/* Scored a hit. Negative is good too (ENOENT). */
if (foundobj == NULL) {
- /* XXXAD need to handle -o union mount. */
error = ENOENT;
break;
}
CVS commit: [ad-namecache] src/sys/kern
Module Name:src Committed By: ad Date: Tue Mar 3 22:30:57 UTC 2020 Modified Files: src/sys/kern [ad-namecache]: vfs_lookup.c Log Message: lookup_fastforward(): bail out on mount -o union To generate a diff of this commit: cvs rdiff -u -r1.212.4.10 -r1.212.4.11 src/sys/kern/vfs_lookup.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: jdolecek
Date: Tue Mar 3 21:42:31 UTC 2020
Modified Files:
src/sys/dev/pci: if_ena.c
Log Message:
replace #if condition for irq_slot with __diagused on the cleanup path
fixes PR kern/55044 by Uwe Toenjes
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/pci/if_ena.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/pci/if_ena.c
diff -u src/sys/dev/pci/if_ena.c:1.23 src/sys/dev/pci/if_ena.c:1.24
--- src/sys/dev/pci/if_ena.c:1.23 Mon Feb 24 12:20:30 2020
+++ src/sys/dev/pci/if_ena.c Tue Mar 3 21:42:31 2020
@@ -31,7 +31,7 @@
#if 0
__FBSDID("$FreeBSD: head/sys/dev/ena/ena.c 333456 2018-05-10 09:37:54Z mw $");
#endif
-__KERNEL_RCSID(0, "$NetBSD: if_ena.c,v 1.23 2020/02/24 12:20:30 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ena.c,v 1.24 2020/03/03 21:42:31 jdolecek Exp $");
#include
#include
@@ -2079,9 +2079,7 @@ err:
kcpuset_destroy(affinity);
for (i--; i >= 0; i--) {
-#if defined(DEBUG) || defined(DIAGNOSTIC)
- int irq_slot = i + irq_off;
-#endif
+ int irq_slot __diagused = i + irq_off;
KASSERT(adapter->sc_ihs[irq_slot] != NULL);
pci_intr_disestablish(adapter->sc_pa.pa_pc, adapter->sc_ihs[i]);
adapter->sc_ihs[i] = NULL;
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jdolecek Date: Tue Mar 3 21:42:31 UTC 2020 Modified Files: src/sys/dev/pci: if_ena.c Log Message: replace #if condition for irq_slot with __diagused on the cleanup path fixes PR kern/55044 by Uwe Toenjes To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/dev/pci/if_ena.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib
Module Name:src Committed By: christos Date: Tue Mar 3 20:01:01 UTC 2020 Modified Files: src/lib: Makefile Log Message: move the pam module after the trench where pam is being build To generate a diff of this commit: cvs rdiff -u -r1.278 -r1.279 src/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib
Module Name:src
Committed By: christos
Date: Tue Mar 3 20:01:01 UTC 2020
Modified Files:
src/lib: Makefile
Log Message:
move the pam module after the trench where pam is being build
To generate a diff of this commit:
cvs rdiff -u -r1.278 -r1.279 src/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/Makefile
diff -u src/lib/Makefile:1.278 src/lib/Makefile:1.279
--- src/lib/Makefile:1.278 Tue Mar 3 09:29:57 2020
+++ src/lib/Makefile Tue Mar 3 15:01:01 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.278 2020/03/03 14:29:57 rin Exp $
+# $NetBSD: Makefile,v 1.279 2020/03/03 20:01:01 christos Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include
@@ -266,7 +266,6 @@ SUBDIR+= .WAIT
.if (${MKPAM} != "no")
SUBDIR+= libpam # depends on heimdal, libssh
-SUBDIR+= ../external/bsd/pam-u2f/lib
.endif
@@ -279,6 +278,10 @@ SUBDIR+= ../crypto/external/cpl/trousers
# 5th library dependency barrier
SUBDIR+= .WAIT
+.if (${MKPAM} != "no")
+SUBDIR+= ../external/bsd/pam-u2f/lib # depends on libpam
+.endif
+
SUBDIR+= libp2k # depends on libukfs, librumpvfs, libpuffs
.if (${MKTPM} != "no")
Re: CVS commit: src/sys/kern
On Tue, Mar 03, 2020 at 02:55:16PM -0500, Christos Zoulas wrote: > Module Name: src > Committed By: christos > Date: Tue Mar 3 19:55:16 UTC 2020 > > Modified Files: > src/sys/kern: vfs_syscalls.c > > Log Message: > don't skip the rdir check for the lazy case; breaks chroot df(1) hiding. That's likely my mistake. Thank you. Andrew
CVS commit: src/sys/kern
Module Name:src
Committed By: christos
Date: Tue Mar 3 19:55:16 UTC 2020
Modified Files:
src/sys/kern: vfs_syscalls.c
Log Message:
don't skip the rdir check for the lazy case; breaks chroot df(1) hiding.
To generate a diff of this commit:
cvs rdiff -u -r1.542 -r1.543 src/sys/kern/vfs_syscalls.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/vfs_syscalls.c
diff -u src/sys/kern/vfs_syscalls.c:1.542 src/sys/kern/vfs_syscalls.c:1.543
--- src/sys/kern/vfs_syscalls.c:1.542 Sun Feb 23 17:14:04 2020
+++ src/sys/kern/vfs_syscalls.c Tue Mar 3 14:55:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls.c,v 1.542 2020/02/23 22:14:04 ad Exp $ */
+/* $NetBSD: vfs_syscalls.c,v 1.543 2020/03/03 19:55:16 christos Exp $ */
/*-
* Copyright (c) 2008, 2009, 2019, 2020 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.542 2020/02/23 22:14:04 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.543 2020/03/03 19:55:16 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_fileassoc.h"
@@ -1108,18 +1108,19 @@ dostatvfs(struct mount *mp, struct statv
* refresh the fsstat cache. MNT_WAIT or MNT_LAZY
* overrides MNT_NOWAIT.
*/
+ KASSERT(l == curlwp);
+ rvp = cwdrdir();
if (flags == MNT_NOWAIT || flags == MNT_LAZY ||
(flags != MNT_WAIT && flags != 0)) {
memcpy(sp, >mnt_stat, sizeof(*sp));
- rvp = NULL;
} else {
/* Get the filesystem stats now */
memset(sp, 0, sizeof(*sp));
if ((error = VFS_STATVFS(mp, sp)) != 0) {
+ if (rvp)
+vrele(rvp);
return error;
}
- KASSERT(l == curlwp);
- rvp = cwdrdir();
if (rvp == NULL)
(void)memcpy(>mnt_stat, sp, sizeof(mp->mnt_stat));
}
CVS commit: src/sys/kern
Module Name:src Committed By: christos Date: Tue Mar 3 19:55:16 UTC 2020 Modified Files: src/sys/kern: vfs_syscalls.c Log Message: don't skip the rdir check for the lazy case; breaks chroot df(1) hiding. To generate a diff of this commit: cvs rdiff -u -r1.542 -r1.543 src/sys/kern/vfs_syscalls.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: Tue Mar 3 18:56:35 UTC 2020 Modified Files: src/doc [netbsd-9]: CHANGES-9.1 Log Message: Tickets #753 - #756 To generate a diff of this commit: cvs rdiff -u -r1.1.2.8 -r1.1.2.9 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.8 src/doc/CHANGES-9.1:1.1.2.9 --- src/doc/CHANGES-9.1:1.1.2.8 Mon Mar 2 08:02:16 2020 +++ src/doc/CHANGES-9.1 Tue Mar 3 18:56:34 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.1,v 1.1.2.8 2020/03/02 08:02:16 martin Exp $ +# $NetBSD: CHANGES-9.1,v 1.1.2.9 2020/03/03 18:56:34 martin Exp $ A complete list of changes from the NetBSD 9.0 release to the NetBSD 9.1 release: @@ -313,3 +313,37 @@ sys/arch/powerpc/booke/copyin.c 1.8 NUL-terminated. [rin, ticket #752] +sys/fs/tmpfs/tmpfs_vfsops.c 1.75 + + Remove an always false check. + [rin, ticket #753] + +sys/kern/files.kern1.44 + + Include kern_crashme.c in non-DEBUG kernels. + This is useful for simulating crashes in production to test failover. + [rin, ticket #754] + +common/lib/libc/arch/powerpc/atomic/atomic_cas.S 1.9 +common/lib/libc/arch/powerpc/atomic/atomic_op_asm.h 1.7 +common/lib/libc/arch/powerpc/atomic/atomic_swap.S 1.8 +sys/arch/evbppc/conf/std.obs200 1.5 +sys/arch/evbppc/conf/std.obs266 1.3 +sys/arch/evbppc/conf/std.virtex 1.4 +sys/arch/evbppc/conf/std.walnut 1.9 +sys/arch/powerpc/ibm4xx/4xx_trap_subr.S 1.8 +sys/arch/powerpc/ibm4xx/trap_subr.S 1.28 +sys/arch/powerpc/include/asm.h 1.49 +sys/arch/powerpc/include/lock.h 1.15 +sys/arch/powerpc/powerpc/lock_stubs.S 1.12 +sys/arch/powerpc/powerpc/locore_subr.S 1.61 +sys/arch/powerpc/powerpc/trap_subr.S 1.81 + + Work around IBM405 Errata 77 (CPU_210) for kernel and userland. + [rin, ticket #755] + +lib/Makefile 1.276 + + Avoid running useless makes in every subdirectory. + [riastradh, ticket #756] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Tue Mar 3 18:56:35 UTC 2020 Modified Files: src/doc [netbsd-9]: CHANGES-9.1 Log Message: Tickets #753 - #756 To generate a diff of this commit: cvs rdiff -u -r1.1.2.8 -r1.1.2.9 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-9] src
Module Name:src Committed By: martin Date: Tue Mar 3 18:54:59 UTC 2020 Modified Files: src/common/lib/libc/arch/powerpc/atomic [netbsd-9]: atomic_cas.S atomic_op_asm.h atomic_swap.S src/sys/arch/evbppc/conf [netbsd-9]: std.obs200 std.obs266 std.virtex std.walnut src/sys/arch/powerpc/ibm4xx [netbsd-9]: 4xx_trap_subr.S trap_subr.S src/sys/arch/powerpc/include [netbsd-9]: asm.h lock.h src/sys/arch/powerpc/powerpc [netbsd-9]: lock_stubs.S locore_subr.S trap_subr.S Log Message: Pull up following revision(s) (requested by rin in ticket #755): sys/arch/evbppc/conf/std.virtex: revision 1.4 sys/arch/powerpc/powerpc/trap_subr.S: revision 1.81 sys/arch/powerpc/ibm4xx/4xx_trap_subr.S: revision 1.8 sys/arch/evbppc/conf/std.walnut: revision 1.9 common/lib/libc/arch/powerpc/atomic/atomic_op_asm.h: revision 1.7 sys/arch/powerpc/include/asm.h: revision 1.49 common/lib/libc/arch/powerpc/atomic/atomic_cas.S: revision 1.9 sys/arch/powerpc/ibm4xx/trap_subr.S: revision 1.28 sys/arch/powerpc/include/lock.h: revision 1.15 sys/arch/evbppc/conf/std.obs266: revision 1.3 common/lib/libc/arch/powerpc/atomic/atomic_swap.S: revision 1.8 sys/arch/powerpc/powerpc/locore_subr.S: revision 1.61 sys/arch/powerpc/powerpc/lock_stubs.S: revision 1.12 sys/arch/evbppc/conf/std.obs200: revision 1.5 Implement workaround for IBM405 Errata 77 (aka CPU_210), where interrupted stwcx. may errantly write data to memory: https://elinux.org/images/1/1d/Ppc405gp-errata.pdf This is because stwcx. is split into two pieces in the pipeline. We need to (1) insert dcbt before every stwcx. instruction, as well as (2) insert sync before every rfi/rfci instruction. It is unclear which processors are affected, but according to Linux, all 405-based cores up until 405GPR and 405EP are affected: https://github.com/torvalds/linux/blob/master/arch/powerpc/platforms/40x/Kconfig#L140 For kernel, this workaround can be restricted to affected processors. However, for kernel modules and userland, we have to enable it for all 32bit powerpc archs in order to share common binaries as before. Proposed on port-powerpc: http://mail-index.netbsd.org/port-powerpc/2020/02/21/msg003583.html To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.8.28.1 \ src/common/lib/libc/arch/powerpc/atomic/atomic_cas.S cvs rdiff -u -r1.6 -r1.6.28.1 \ src/common/lib/libc/arch/powerpc/atomic/atomic_op_asm.h cvs rdiff -u -r1.7 -r1.7.28.1 \ src/common/lib/libc/arch/powerpc/atomic/atomic_swap.S cvs rdiff -u -r1.4 -r1.4.64.1 src/sys/arch/evbppc/conf/std.obs200 cvs rdiff -u -r1.2 -r1.2.60.1 src/sys/arch/evbppc/conf/std.obs266 cvs rdiff -u -r1.3 -r1.3.58.1 src/sys/arch/evbppc/conf/std.virtex cvs rdiff -u -r1.8 -r1.8.58.1 src/sys/arch/evbppc/conf/std.walnut cvs rdiff -u -r1.7 -r1.7.60.1 src/sys/arch/powerpc/ibm4xx/4xx_trap_subr.S cvs rdiff -u -r1.27 -r1.27.4.1 src/sys/arch/powerpc/ibm4xx/trap_subr.S cvs rdiff -u -r1.48 -r1.48.22.1 src/sys/arch/powerpc/include/asm.h cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/arch/powerpc/include/lock.h cvs rdiff -u -r1.10 -r1.10.34.1 src/sys/arch/powerpc/powerpc/lock_stubs.S cvs rdiff -u -r1.57.4.1 -r1.57.4.2 src/sys/arch/powerpc/powerpc/locore_subr.S cvs rdiff -u -r1.80 -r1.80.4.1 src/sys/arch/powerpc/powerpc/trap_subr.S 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: Tue Mar 3 18:54:59 UTC 2020
Modified Files:
src/common/lib/libc/arch/powerpc/atomic [netbsd-9]: atomic_cas.S
atomic_op_asm.h atomic_swap.S
src/sys/arch/evbppc/conf [netbsd-9]: std.obs200 std.obs266 std.virtex
std.walnut
src/sys/arch/powerpc/ibm4xx [netbsd-9]: 4xx_trap_subr.S trap_subr.S
src/sys/arch/powerpc/include [netbsd-9]: asm.h lock.h
src/sys/arch/powerpc/powerpc [netbsd-9]: lock_stubs.S locore_subr.S
trap_subr.S
Log Message:
Pull up following revision(s) (requested by rin in ticket #755):
sys/arch/evbppc/conf/std.virtex: revision 1.4
sys/arch/powerpc/powerpc/trap_subr.S: revision 1.81
sys/arch/powerpc/ibm4xx/4xx_trap_subr.S: revision 1.8
sys/arch/evbppc/conf/std.walnut: revision 1.9
common/lib/libc/arch/powerpc/atomic/atomic_op_asm.h: revision 1.7
sys/arch/powerpc/include/asm.h: revision 1.49
common/lib/libc/arch/powerpc/atomic/atomic_cas.S: revision 1.9
sys/arch/powerpc/ibm4xx/trap_subr.S: revision 1.28
sys/arch/powerpc/include/lock.h: revision 1.15
sys/arch/evbppc/conf/std.obs266: revision 1.3
common/lib/libc/arch/powerpc/atomic/atomic_swap.S: revision 1.8
sys/arch/powerpc/powerpc/locore_subr.S: revision 1.61
sys/arch/powerpc/powerpc/lock_stubs.S: revision 1.12
sys/arch/evbppc/conf/std.obs200: revision 1.5
Implement workaround for IBM405 Errata 77 (aka CPU_210), where
interrupted stwcx. may errantly write data to memory:
https://elinux.org/images/1/1d/Ppc405gp-errata.pdf
This is because stwcx. is split into two pieces in the pipeline.
We need to
(1) insert dcbt before every stwcx. instruction, as well as
(2) insert sync before every rfi/rfci instruction.
It is unclear which processors are affected, but according to Linux,
all 405-based cores up until 405GPR and 405EP are affected:
https://github.com/torvalds/linux/blob/master/arch/powerpc/platforms/40x/Kconfig#L140
For kernel, this workaround can be restricted to affected processors.
However, for kernel modules and userland, we have to enable it for all
32bit powerpc archs in order to share common binaries as before.
Proposed on port-powerpc:
http://mail-index.netbsd.org/port-powerpc/2020/02/21/msg003583.html
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.28.1 \
src/common/lib/libc/arch/powerpc/atomic/atomic_cas.S
cvs rdiff -u -r1.6 -r1.6.28.1 \
src/common/lib/libc/arch/powerpc/atomic/atomic_op_asm.h
cvs rdiff -u -r1.7 -r1.7.28.1 \
src/common/lib/libc/arch/powerpc/atomic/atomic_swap.S
cvs rdiff -u -r1.4 -r1.4.64.1 src/sys/arch/evbppc/conf/std.obs200
cvs rdiff -u -r1.2 -r1.2.60.1 src/sys/arch/evbppc/conf/std.obs266
cvs rdiff -u -r1.3 -r1.3.58.1 src/sys/arch/evbppc/conf/std.virtex
cvs rdiff -u -r1.8 -r1.8.58.1 src/sys/arch/evbppc/conf/std.walnut
cvs rdiff -u -r1.7 -r1.7.60.1 src/sys/arch/powerpc/ibm4xx/4xx_trap_subr.S
cvs rdiff -u -r1.27 -r1.27.4.1 src/sys/arch/powerpc/ibm4xx/trap_subr.S
cvs rdiff -u -r1.48 -r1.48.22.1 src/sys/arch/powerpc/include/asm.h
cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/arch/powerpc/include/lock.h
cvs rdiff -u -r1.10 -r1.10.34.1 src/sys/arch/powerpc/powerpc/lock_stubs.S
cvs rdiff -u -r1.57.4.1 -r1.57.4.2 src/sys/arch/powerpc/powerpc/locore_subr.S
cvs rdiff -u -r1.80 -r1.80.4.1 src/sys/arch/powerpc/powerpc/trap_subr.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/powerpc/atomic/atomic_cas.S
diff -u src/common/lib/libc/arch/powerpc/atomic/atomic_cas.S:1.8 src/common/lib/libc/arch/powerpc/atomic/atomic_cas.S:1.8.28.1
--- src/common/lib/libc/arch/powerpc/atomic/atomic_cas.S:1.8 Fri Mar 7 07:17:54 2014
+++ src/common/lib/libc/arch/powerpc/atomic/atomic_cas.S Tue Mar 3 18:54:59 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_cas.S,v 1.8 2014/03/07 07:17:54 matt Exp $ */
+/* $NetBSD: atomic_cas.S,v 1.8.28.1 2020/03/03 18:54:59 martin Exp $ */
/*-
* Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include "atomic_op_asm.h"
-__RCSID("$NetBSD: atomic_cas.S,v 1.8 2014/03/07 07:17:54 matt Exp $")
+__RCSID("$NetBSD: atomic_cas.S,v 1.8.28.1 2020/03/03 18:54:59 martin Exp $")
.text
ENTRY(_atomic_cas_32)
@@ -39,6 +39,7 @@ ENTRY(_atomic_cas_32)
1: lwarx %r3,0,%r10
cmpw %r3,%r4
bnelr-
+ IBM405_ERRATA77_DCBT(0,%r10)
stwcx. %r5,0,%r10
beqlr+
b 1b
Index: src/common/lib/libc/arch/powerpc/atomic/atomic_op_asm.h
diff -u src/common/lib/libc/arch/powerpc/atomic/atomic_op_asm.h:1.6 src/common/lib/libc/arch/powerpc/atomic/atomic_op_asm.h:1.6.28.1
--- src/common/lib/libc/arch/powerpc/atomic/atomic_op_asm.h:1.6 Fri Mar 7 07:17:54 2014
+++ src/common/lib/libc/arch/powerpc/atomic/atomic_op_asm.h Tue Mar 3 18:54:59 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_op_asm.h,v 1.6 2014/03/07 07:17:54 matt Exp $ */
CVS commit: [netbsd-9] src/sys/kern
Module Name:src Committed By: martin Date: Tue Mar 3 18:51:03 UTC 2020 Modified Files: src/sys/kern [netbsd-9]: files.kern Log Message: Pull up following revision(s) (requested by rin in ticket #754): sys/kern/files.kern: revision 1.44 Include kern_crashme.c in non-DEBUG kernels. This is useful for simulating crashes in production to test failover. To generate a diff of this commit: cvs rdiff -u -r1.34.4.1 -r1.34.4.2 src/sys/kern/files.kern 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/kern
Module Name:src Committed By: martin Date: Tue Mar 3 18:51:03 UTC 2020 Modified Files: src/sys/kern [netbsd-9]: files.kern Log Message: Pull up following revision(s) (requested by rin in ticket #754): sys/kern/files.kern: revision 1.44 Include kern_crashme.c in non-DEBUG kernels. This is useful for simulating crashes in production to test failover. To generate a diff of this commit: cvs rdiff -u -r1.34.4.1 -r1.34.4.2 src/sys/kern/files.kern 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/files.kern diff -u src/sys/kern/files.kern:1.34.4.1 src/sys/kern/files.kern:1.34.4.2 --- src/sys/kern/files.kern:1.34.4.1 Tue Jan 21 15:33:33 2020 +++ src/sys/kern/files.kern Tue Mar 3 18:51:03 2020 @@ -1,4 +1,4 @@ -# $NetBSD: files.kern,v 1.34.4.1 2020/01/21 15:33:33 martin Exp $ +# $NetBSD: files.kern,v 1.34.4.2 2020/03/03 18:51:03 martin Exp $ # # kernel sources @@ -77,7 +77,7 @@ file kern/kern_rwlock.c kern file kern/kern_rwlock_obj.c kern file kern/kern_scdebug.c kern file kern/kern_sdt.c kdtrace_hooks -file kern/kern_crashme.c debug +file kern/kern_crashme.c kern file kern/kern_sig.c kern file kern/kern_sleepq.c kern file kern/kern_softint.c kern
CVS commit: [netbsd-9] src/sys/fs/tmpfs
Module Name:src
Committed By: martin
Date: Tue Mar 3 18:48:40 UTC 2020
Modified Files:
src/sys/fs/tmpfs [netbsd-9]: tmpfs_vfsops.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #753):
sys/fs/tmpfs/tmpfs_vfsops.c: revision 1.75
remove an always false check and its' "This can never happen?" comment.
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.74.4.1 src/sys/fs/tmpfs/tmpfs_vfsops.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/fs/tmpfs/tmpfs_vfsops.c
diff -u src/sys/fs/tmpfs/tmpfs_vfsops.c:1.74 src/sys/fs/tmpfs/tmpfs_vfsops.c:1.74.4.1
--- src/sys/fs/tmpfs/tmpfs_vfsops.c:1.74 Tue Jan 1 10:06:54 2019
+++ src/sys/fs/tmpfs/tmpfs_vfsops.c Tue Mar 3 18:48:40 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: tmpfs_vfsops.c,v 1.74 2019/01/01 10:06:54 hannken Exp $ */
+/* $NetBSD: tmpfs_vfsops.c,v 1.74.4.1 2020/03/03 18:48:40 martin Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tmpfs_vfsops.c,v 1.74 2019/01/01 10:06:54 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tmpfs_vfsops.c,v 1.74.4.1 2020/03/03 18:48:40 martin Exp $");
#include
#include
@@ -132,10 +132,6 @@ tmpfs_mount(struct mount *mp, const char
if (args->ta_root_uid == VNOVAL || args->ta_root_gid == VNOVAL)
return EINVAL;
- /* This can never happen? */
- if ((args->ta_root_mode & ALLPERMS) == VNOVAL)
- return EINVAL;
-
/* Get the memory usage limit for this file-system. */
if (args->ta_size_max < PAGE_SIZE) {
memlimit = UINT64_MAX;
CVS commit: [netbsd-9] src/sys/fs/tmpfs
Module Name:src Committed By: martin Date: Tue Mar 3 18:48:40 UTC 2020 Modified Files: src/sys/fs/tmpfs [netbsd-9]: tmpfs_vfsops.c Log Message: Pull up following revision(s) (requested by rin in ticket #753): sys/fs/tmpfs/tmpfs_vfsops.c: revision 1.75 remove an always false check and its' "This can never happen?" comment. To generate a diff of this commit: cvs rdiff -u -r1.74 -r1.74.4.1 src/sys/fs/tmpfs/tmpfs_vfsops.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/lib
Module Name:src Committed By: martin Date: Tue Mar 3 18:44:21 UTC 2020 Modified Files: src/lib [netbsd-9]: Makefile Log Message: Pull up following revision(s) (requested by riastradh in ticket #756): lib/Makefile: revision 1.276 Remove unfinished hack I accidentally committed in 2017. This caused make to unconditionally take ages running useless submakes in every subdirectory. Accidentally committed during the MKCRYPTO option removal when I was presumably experimenting with automating library dependency generation in lib. Should shave a few seconds at least off every build! To generate a diff of this commit: cvs rdiff -u -r1.271 -r1.271.2.1 src/lib/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/lib
Module Name:src
Committed By: martin
Date: Tue Mar 3 18:44:21 UTC 2020
Modified Files:
src/lib [netbsd-9]: Makefile
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #756):
lib/Makefile: revision 1.276
Remove unfinished hack I accidentally committed in 2017.
This caused make to unconditionally take ages running useless
submakes in every subdirectory. Accidentally committed during the
MKCRYPTO option removal when I was presumably experimenting with
automating library dependency generation in lib.
Should shave a few seconds at least off every build!
To generate a diff of this commit:
cvs rdiff -u -r1.271 -r1.271.2.1 src/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/Makefile
diff -u src/lib/Makefile:1.271 src/lib/Makefile:1.271.2.1
--- src/lib/Makefile:1.271 Fri May 10 09:42:46 2019
+++ src/lib/Makefile Tue Mar 3 18:44:20 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.271 2019/05/10 09:42:46 nakayama Exp $
+# $NetBSD: Makefile,v 1.271.2.1 2020/03/03 18:44:20 martin Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include
@@ -291,21 +291,5 @@ SUBDIR+= lua
# Needed by rump and rescue which are outside the smbfs tree
SUBDIR+= ../external/bsd/smbfs/lib
-.for S in ${SUBDIR}
-.if ${S} != ".WAIT"
-SUBLIB_${S}!= cd ${S} && ${MAKE} -V LIB
-SUBDEP_${S}!= cd ${S} && ${MAKE} -V LIBDPLIBS
-.endif
-.endfor
-
-showdeps:
-.for S in ${SUBDIR}
-.if ${S} != ".WAIT"
-.for DL DD in ${SUBDEP_${S}}
- @echo ${S} ${SUBLIB_${S}} ${DL} ${DD:C,^${.CURDIR}/,,}
-.endfor
-.endif
-.endfor
-
.include
.include
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Tue Mar 3 18:41:42 UTC 2020 Modified Files: src/doc [netbsd-8]: CHANGES-8.2 Log Message: Ticket #1513 To generate a diff of this commit: cvs rdiff -u -r1.1.2.102 -r1.1.2.103 src/doc/CHANGES-8.2 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: Tue Mar 3 18:41:42 UTC 2020 Modified Files: src/doc [netbsd-8]: CHANGES-8.2 Log Message: Ticket #1513 To generate a diff of this commit: cvs rdiff -u -r1.1.2.102 -r1.1.2.103 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.102 src/doc/CHANGES-8.2:1.1.2.103 --- src/doc/CHANGES-8.2:1.1.2.102 Mon Mar 2 08:10:28 2020 +++ src/doc/CHANGES-8.2 Tue Mar 3 18:41:42 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.2,v 1.1.2.102 2020/03/02 08:10:28 martin Exp $ +# $NetBSD: CHANGES-8.2,v 1.1.2.103 2020/03/03 18:41:42 martin Exp $ A complete list of changes from the NetBSD 8.1 release to the NetBSD 8.2 release: @@ -2087,3 +2087,8 @@ sys/ufs/ufs/ufs_lookup.c 1.149 Zero out struct dirent padding, to avoid kernel memory disclosure. [maxv, ticket #1511] +lib/Makefile 1.276 + + Avoid running useless makes in every subdirectory. + [riastradh, ticket #1513] +
CVS commit: [netbsd-8] src/lib
Module Name:src
Committed By: martin
Date: Tue Mar 3 18:40:41 UTC 2020
Modified Files:
src/lib [netbsd-8]: Makefile
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1513):
lib/Makefile: revision 1.276
Remove unfinished hack I accidentally committed in 2017.
This caused make to unconditionally take ages running useless
submakes in every subdirectory. Accidentally committed during the
MKCRYPTO option removal when I was presumably experimenting with
automating library dependency generation in lib.
Should shave a few seconds at least off every build!
To generate a diff of this commit:
cvs rdiff -u -r1.251 -r1.251.2.1 src/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/Makefile
diff -u src/lib/Makefile:1.251 src/lib/Makefile:1.251.2.1
--- src/lib/Makefile:1.251 Sun May 21 15:28:41 2017
+++ src/lib/Makefile Tue Mar 3 18:40:41 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.251 2017/05/21 15:28:41 riastradh Exp $
+# $NetBSD: Makefile,v 1.251.2.1 2020/03/03 18:40:41 martin Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include
@@ -267,21 +267,5 @@ SUBDIR+= lua
# Needed by rump and rescue which are outside the smbfs tree
SUBDIR+= ../external/bsd/smbfs/lib
-.for S in ${SUBDIR}
-.if ${S} != ".WAIT"
-SUBLIB_${S}!= cd ${S} && ${MAKE} -V LIB
-SUBDEP_${S}!= cd ${S} && ${MAKE} -V LIBDPLIBS
-.endif
-.endfor
-
-showdeps:
-.for S in ${SUBDIR}
-.if ${S} != ".WAIT"
-.for DL DD in ${SUBDEP_${S}}
- @echo ${S} ${SUBLIB_${S}} ${DL} ${DD:C,^${.CURDIR}/,,}
-.endfor
-.endif
-.endfor
-
.include
.include
CVS commit: [netbsd-8] src/lib
Module Name:src Committed By: martin Date: Tue Mar 3 18:40:41 UTC 2020 Modified Files: src/lib [netbsd-8]: Makefile Log Message: Pull up following revision(s) (requested by riastradh in ticket #1513): lib/Makefile: revision 1.276 Remove unfinished hack I accidentally committed in 2017. This caused make to unconditionally take ages running useless submakes in every subdirectory. Accidentally committed during the MKCRYPTO option removal when I was presumably experimenting with automating library dependency generation in lib. Should shave a few seconds at least off every build! To generate a diff of this commit: cvs rdiff -u -r1.251 -r1.251.2.1 src/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libc/sys
Module Name:src Committed By: kamil Date: Tue Mar 3 17:09:22 UTC 2020 Modified Files: src/tests/lib/libc/sys: t_ptrace_wait.h Log Message: Mark find_event_count() with __used To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/tests/lib/libc/sys/t_ptrace_wait.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libc/sys
Module Name:src
Committed By: kamil
Date: Tue Mar 3 17:09:22 UTC 2020
Modified Files:
src/tests/lib/libc/sys: t_ptrace_wait.h
Log Message:
Mark find_event_count() with __used
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/tests/lib/libc/sys/t_ptrace_wait.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/sys/t_ptrace_wait.h
diff -u src/tests/lib/libc/sys/t_ptrace_wait.h:1.22 src/tests/lib/libc/sys/t_ptrace_wait.h:1.23
--- src/tests/lib/libc/sys/t_ptrace_wait.h:1.22 Sat Feb 22 19:44:07 2020
+++ src/tests/lib/libc/sys/t_ptrace_wait.h Tue Mar 3 17:09:22 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ptrace_wait.h,v 1.22 2020/02/22 19:44:07 kamil Exp $ */
+/* $NetBSD: t_ptrace_wait.h,v 1.23 2020/03/03 17:09:22 kamil Exp $ */
/*-
* Copyright (c) 2016, 2017, 2018, 2019 The NetBSD Foundation, Inc.
@@ -684,7 +684,7 @@ struct lwp_event_count {
int lec_count;
};
-static int *
+static int * __used
find_event_count(struct lwp_event_count list[], lwpid_t lwp, size_t max_lwps)
{
size_t i;
CVS commit: src/lib
Module Name:src Committed By: rin Date: Tue Mar 3 14:29:57 UTC 2020 Modified Files: src/lib: Makefile Log Message: Comment that libpam depends on libssh. To generate a diff of this commit: cvs rdiff -u -r1.277 -r1.278 src/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib
Module Name:src
Committed By: rin
Date: Tue Mar 3 14:29:57 UTC 2020
Modified Files:
src/lib: Makefile
Log Message:
Comment that libpam depends on libssh.
To generate a diff of this commit:
cvs rdiff -u -r1.277 -r1.278 src/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/Makefile
diff -u src/lib/Makefile:1.277 src/lib/Makefile:1.278
--- src/lib/Makefile:1.277 Tue Mar 3 12:54:51 2020
+++ src/lib/Makefile Tue Mar 3 14:29:57 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.277 2020/03/03 12:54:51 christos Exp $
+# $NetBSD: Makefile,v 1.278 2020/03/03 14:29:57 rin Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include
@@ -265,7 +265,7 @@ SUBDIR+= ../external/bsd/mdocml/lib
SUBDIR+= .WAIT
.if (${MKPAM} != "no")
-SUBDIR+= libpam # depends on heimdal
+SUBDIR+= libpam # depends on heimdal, libssh
SUBDIR+= ../external/bsd/pam-u2f/lib
.endif
Re: CVS commit: src/lib
> Date: Tue, 03 Mar 2020 20:05:14 +1100 > from: matthew green > > thanksand can you please have this pulled up to other > branches it's present on. Already done: https://releng.NetBSD.org/cgi-bin/req-9.cgi?show=756 https://releng.NetBSD.org/cgi-bin/req-8.cgi?show=1513
CVS commit: src/sys/uvm
Module Name:src Committed By: rjs Date: Tue Mar 3 13:32:44 UTC 2020 Modified Files: src/sys/uvm: uvm_vnode.c Log Message: Make some wait channel names unique to six characters. To generate a diff of this commit: cvs rdiff -u -r1.107 -r1.108 src/sys/uvm/uvm_vnode.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/uvm
Module Name:src
Committed By: rjs
Date: Tue Mar 3 13:32:44 UTC 2020
Modified Files:
src/sys/uvm: uvm_vnode.c
Log Message:
Make some wait channel names unique to six characters.
To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 src/sys/uvm/uvm_vnode.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_vnode.c
diff -u src/sys/uvm/uvm_vnode.c:1.107 src/sys/uvm/uvm_vnode.c:1.108
--- src/sys/uvm/uvm_vnode.c:1.107 Thu Feb 27 22:12:54 2020
+++ src/sys/uvm/uvm_vnode.c Tue Mar 3 13:32:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_vnode.c,v 1.107 2020/02/27 22:12:54 ad Exp $ */
+/* $NetBSD: uvm_vnode.c,v 1.108 2020/03/03 13:32:44 rjs Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -45,7 +45,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvm_vnode.c,v 1.107 2020/02/27 22:12:54 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_vnode.c,v 1.108 2020/03/03 13:32:44 rjs Exp $");
#ifdef _KERNEL_OPT
#include "opt_uvmhist.h"
@@ -314,7 +314,7 @@ uvn_findpage(struct uvm_object *uobj, vo
return 0;
}
rw_exit(uobj->vmobjlock);
-uvm_wait("uvn_fp1");
+uvm_wait("uvnfp1");
uvm_page_array_clear(a);
rw_enter(uobj->vmobjlock, RW_WRITER);
continue;
@@ -339,7 +339,7 @@ uvn_findpage(struct uvm_object *uobj, vo
UVMHIST_LOG(ubchist, "wait %#jx (color %ju)",
(uintptr_t)pg, VM_PGCOLOR(pg), 0, 0);
UVM_UNLOCK_AND_WAIT_RW(pg, uobj->vmobjlock, 0,
- "uvn_fp2", 0);
+ "uvnfp2", 0);
uvm_page_array_clear(a);
rw_enter(uobj->vmobjlock, RW_WRITER);
continue;
Re: CVS commit: src/sys/dev
Yes, I thought about providing an ioctl to do this, but it would mean that everything that talks to those devices would need to be modified to issue the ioctl. Raw mode means to call the underlying uhidev write which is the raw usb writes instead of using the report mechanism. My devices did not work using the report mechanism. Linux provides a /dev/uhidrawN node. christos > On Mar 2, 2020, at 11:26 PM, matthew green wrote: > > "Christos Zoulas" writes: >> Module Name: src >> Committed By:christos >> Date:Mon Mar 2 18:15:29 UTC 2020 >> >> Modified Files: >> src/sys/dev/hid: hid.h >> src/sys/dev/usb: uhid.c >> >> Log Message: >> Add fido constants, and turn hid "raw" mode for fido devices. > > this is gross. > > please don't put device specific stuff into uhid like this. > > without really understanding, it seems that there should be > a uhid ioctl to enable this mode, and then your userland code > sets it, instead of this hack. > > also, please actually explain what this "raw" mode means. is > there perhaps a way to avoid this entirely? what's the real > underlying need here..? > > > .mrg. signature.asc Description: Message signed with OpenPGP
CVS commit: src/lib
Module Name:src
Committed By: christos
Date: Tue Mar 3 12:54:51 UTC 2020
Modified Files:
src/lib: Makefile
Log Message:
Move libpam to the next trench since it depends on ssh
To generate a diff of this commit:
cvs rdiff -u -r1.276 -r1.277 src/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/Makefile
diff -u src/lib/Makefile:1.276 src/lib/Makefile:1.277
--- src/lib/Makefile:1.276 Mon Mar 2 23:20:50 2020
+++ src/lib/Makefile Tue Mar 3 07:54:51 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.276 2020/03/03 04:20:50 riastradh Exp $
+# $NetBSD: Makefile,v 1.277 2020/03/03 12:54:51 christos Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include
@@ -257,11 +257,6 @@ SUBDIR+= librumpnet # depends on librump
SUBDIR+= librumpvfs # depends on librump
.endif
-.if (${MKPAM} != "no")
-SUBDIR+= libpam # depends on heimdal
-SUBDIR+= ../external/bsd/pam-u2f/lib
-.endif
-
SUBDIR+= ../crypto/external/bsd/libsaslc # depends on heimdal, openssl
SUBDIR+= ../external/bsd/mdocml/lib
@@ -269,6 +264,12 @@ SUBDIR+= ../external/bsd/mdocml/lib
# 4th library dependency barrier
SUBDIR+= .WAIT
+.if (${MKPAM} != "no")
+SUBDIR+= libpam # depends on heimdal
+SUBDIR+= ../external/bsd/pam-u2f/lib
+.endif
+
+
SUBDIR+= libukfs # depends on librumpvfs, librump
.if (${MKTPM} != "no")
CVS commit: src/lib
Module Name:src Committed By: christos Date: Tue Mar 3 12:54:51 UTC 2020 Modified Files: src/lib: Makefile Log Message: Move libpam to the next trench since it depends on ssh To generate a diff of this commit: cvs rdiff -u -r1.276 -r1.277 src/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
re: CVS commit: src/sys/dev
Martin Husemann writes: > On Tue, Mar 03, 2020 at 03:26:47PM +1100, matthew green wrote: > > without really understanding, it seems that there should be > > a uhid ioctl to enable this mode, and then your userland code > > sets it, instead of this hack. > > Or make uhid not attach at all on FIDO devices and instead use ugen from > userland? no... see below. > Or solve the long standing "every usb devices should be able to eject > its driver and be used as ugen instead" problem, see also the various > JTAG devices showing up as dual uftdi and you need to override in your > kernel config like: > > # GuruPlug JTAG debug interface > ugenif* at uhub? vendor 0x9e88 product 0x9e8f interface 0 flags 1 yes.. this. but not for this device :-) > Most devices go via uhid to make userland access easy on windows, but for us > it makes no real difference. in this instance, i would rather not use ugen since it's such a very simple API need. ugen == generic access, and it's hard with our system to protect against that. usb device numbers are volatile, so you can't simply trust chmod in /dev. uhid is a fairly isolated interface, and i think it's right to use a real driver here than ugen: crw--- 1 root wheel 64, 0 Feb 27 09:08 /dev/ugen0.00 crw-rw-rw- 1 root wheel 56, 0 Feb 27 09:08 /dev/uhid0 ie, your method would require being root or opening up all the usb devices... .mrg.
re: CVS commit: src/lib
> Committed By: riastradh > Date: Tue Mar 3 04:20:50 UTC 2020 > > Modified Files: > src/lib: Makefile > > Log Message: > Remove unfinished hack I accidentally committed in 2017. > > This caused make to unconditionally take ages running useless > submakes in every subdirectory. Accidentally committed during the > MKCRYPTO option removal when I was presumably experimenting with > automating library dependency generation in lib. > > Should shave a few seconds at least off every build! more than a few! it takes at least 2 seconds on a really fast system to startup in this subdir, and we enter here a bunch of times each build, about twice as many on MKCOMPAT=yes platform... and it's serialised. i'll test.. this could be as much as 1% of the amd64 build time! thanksand can you please have this pulled up to other branches it's present on. .mrg.
CVS commit: src/usr.sbin/ifmcstat
Module Name:src Committed By: nisimura Date: Tue Mar 3 08:56:05 UTC 2020 Modified Files: src/usr.sbin/ifmcstat: ifmcstat.c Log Message: - show " refcount %d" for consistency - fix an extra : bug which was introduced rev 1.17 To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/usr.sbin/ifmcstat/ifmcstat.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/ifmcstat
Module Name:src
Committed By: nisimura
Date: Tue Mar 3 08:56:05 UTC 2020
Modified Files:
src/usr.sbin/ifmcstat: ifmcstat.c
Log Message:
- show " refcount %d" for consistency
- fix an extra : bug which was introduced rev 1.17
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/usr.sbin/ifmcstat/ifmcstat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/ifmcstat/ifmcstat.c
diff -u src/usr.sbin/ifmcstat/ifmcstat.c:1.21 src/usr.sbin/ifmcstat/ifmcstat.c:1.22
--- src/usr.sbin/ifmcstat/ifmcstat.c:1.21 Thu Feb 23 07:57:10 2017
+++ src/usr.sbin/ifmcstat/ifmcstat.c Tue Mar 3 08:56:05 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ifmcstat.c,v 1.21 2017/02/23 07:57:10 ozaki-r Exp $ */
+/* $NetBSD: ifmcstat.c,v 1.22 2020/03/03 08:56:05 nisimura Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -29,7 +29,7 @@
* SUCH DAMAGE.
*/
#include
-__RCSID("$NetBSD: ifmcstat.c,v 1.21 2017/02/23 07:57:10 ozaki-r Exp $");
+__RCSID("$NetBSD: ifmcstat.c,v 1.22 2020/03/03 08:56:05 nisimura Exp $");
#include
#include
@@ -114,7 +114,7 @@ static void
print_hwaddr(const uint8_t *hwaddr, size_t len)
{
while (len)
- printf("%02x%s", *hwaddr++, len-- == 0 ? "" : ":");
+ printf("%02x%s", *hwaddr++, --len > 0 ? ":" : "");
}
static void
@@ -167,10 +167,10 @@ print_ether_mcast(u_short ifindex)
for (i = 0; i < ems_len; ++i) {
printf("\t\t");
- print_hwaddr(ems[i].enm_addrlo, sizeof(ems[i].enm_addrlo));
+ print_hwaddr(ems[i].enm_addrlo, sdl_len);
printf(" -- ");
- print_hwaddr(ems[i].enm_addrhi, sizeof(ems[i].enm_addrhi));
- printf(" %d\n", ems[i].enm_refcount);
+ print_hwaddr(ems[i].enm_addrhi, sdl_len);
+ printf(" refcount %d\n", ems[i].enm_refcount);
}
free(ems);
free(hwaddr);
CVS commit: src/sys/uvm
Module Name:src
Committed By: skrll
Date: Tue Mar 3 08:13:44 UTC 2020
Modified Files:
src/sys/uvm: uvm_page.c
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.229 -r1.230 src/sys/uvm/uvm_page.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.c
diff -u src/sys/uvm/uvm_page.c:1.229 src/sys/uvm/uvm_page.c:1.230
--- src/sys/uvm/uvm_page.c:1.229 Tue Mar 3 07:51:26 2020
+++ src/sys/uvm/uvm_page.c Tue Mar 3 08:13:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_page.c,v 1.229 2020/03/03 07:51:26 skrll Exp $ */
+/* $NetBSD: uvm_page.c,v 1.230 2020/03/03 08:13:44 skrll Exp $ */
/*-
* Copyright (c) 2019, 2020 The NetBSD Foundation, Inc.
@@ -95,7 +95,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.229 2020/03/03 07:51:26 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.230 2020/03/03 08:13:44 skrll Exp $");
#include "opt_ddb.h"
#include "opt_uvm.h"
@@ -778,7 +778,7 @@ uvm_page_redim(int newncolors, int newnb
struct pgfreelist npgfl;
struct pgflbucket *opgb, *npgb;
struct pgflist *ohead, *nhead;
- struct vm_page *pg;
+ struct vm_page *pg;
size_t bucketsize, bucketmemsize, oldbucketmemsize;
int fl, ob, oc, nb, nc, obuckets, ocolors;
char *bucketarray, *oldbucketmem, *bucketmem;
@@ -940,7 +940,7 @@ uvm_page_rebucket(void)
* locality strategy.
*/
aprint_debug("UVM: using NUMA allocation scheme\n");
- for (CPU_INFO_FOREACH(cii, ci)) {
+ for (CPU_INFO_FOREACH(cii, ci)) {
ci->ci_data.cpu_uvm->pgflbucket = ci->ci_numa_id;
}
uvm.numa_alloc = true;
@@ -957,7 +957,7 @@ uvm_page_rebucket(void)
* freeing CPU's preferred bucket on free.
*/
npackage = curcpu()->ci_nsibling[CPUREL_PACKAGE1ST];
-
+
/*
* Figure out how to arrange the packages & buckets, and the total
* number of buckets we need. XXX 2 may not be the best factor.
@@ -1102,7 +1102,7 @@ uvm_pagealloc_pgb(struct uvm_cpu *ucpu,
KASSERT(pg->flags & PG_FREE);
pg->flags &= PG_ZERO;
pgb->pgb_nfree--;
-
+
/*
* While we have the bucket locked and our data
* structures fresh in L1 cache, we have an ideal
@@ -1891,7 +1891,7 @@ uvm_pageactivate(struct vm_page *pg)
/*
* uvm_pagedequeue: remove a page from any paging queue
- *
+ *
* => caller must lock objects
* => caller must hold pg->interlock
*/
@@ -1953,7 +1953,7 @@ uvm_pagelock2(struct vm_page *pg1, struc
/*
* uvm_pageunlock: release page interlock, and if a page replacement intent
* is set on the page, pass it to uvmpdpol to make real.
- *
+ *
* => caller must hold pg->interlock
*/
void
@@ -1974,7 +1974,7 @@ uvm_pageunlock(struct vm_page *pg)
* uvm_pageunlock2: release two page interlocks, and for both pages if a
* page replacement intent is set on the page, pass it to uvmpdpol to make
* real.
- *
+ *
* => caller must hold pg->interlock
*/
void
@@ -2284,7 +2284,7 @@ uvm_page_print_freelists(void (*pr)(cons
(*pr)("There are %d freelists with %d buckets of %d colors.\n\n",
VM_NFREELIST, uvm.bucketcount, uvmexp.ncolors);
-
+
for (fl = 0; fl < VM_NFREELIST; fl++) {
pgfl = _free[fl];
(*pr)("freelist(%d) @ %p\n", fl, pgfl);
CVS commit: src/sys/uvm
Module Name:src Committed By: skrll Date: Tue Mar 3 08:13:44 UTC 2020 Modified Files: src/sys/uvm: uvm_page.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.229 -r1.230 src/sys/uvm/uvm_page.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
