CVS commit: src/sys/dev/pci
Module Name:src Committed By: skrll Date: Fri Aug 5 05:50:54 UTC 2022 Modified Files: src/sys/dev/pci: if_wm.c Log Message: Sprinkle const on splfoo call results. To generate a diff of this commit: cvs rdiff -u -r1.751 -r1.752 src/sys/dev/pci/if_wm.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: skrll Date: Fri Aug 5 05:50:54 UTC 2022 Modified Files: src/sys/dev/pci: if_wm.c Log Message: Sprinkle const on splfoo call results. To generate a diff of this commit: cvs rdiff -u -r1.751 -r1.752 src/sys/dev/pci/if_wm.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_wm.c diff -u src/sys/dev/pci/if_wm.c:1.751 src/sys/dev/pci/if_wm.c:1.752 --- src/sys/dev/pci/if_wm.c:1.751 Wed Aug 3 05:29:04 2022 +++ src/sys/dev/pci/if_wm.c Fri Aug 5 05:50:54 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: if_wm.c,v 1.751 2022/08/03 05:29:04 skrll Exp $ */ +/* $NetBSD: if_wm.c,v 1.752 2022/08/05 05:50:54 skrll Exp $ */ /* * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc. @@ -82,7 +82,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.751 2022/08/03 05:29:04 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.752 2022/08/05 05:50:54 skrll Exp $"); #ifdef _KERNEL_OPT #include "opt_net_mpsafe.h" @@ -3967,7 +3967,7 @@ wm_ioctl(struct ifnet *ifp, u_long cmd, struct ifreq *ifr = (struct ifreq *)data; struct ifaddr *ifa = (struct ifaddr *)data; struct sockaddr_dl *sdl; - int s, error; + int error; DPRINTF(sc, WM_DEBUG_INIT, ("%s: %s called\n", device_xname(sc->sc_dev), __func__)); @@ -3981,7 +3981,7 @@ wm_ioctl(struct ifnet *ifp, u_long cmd, } #ifndef WM_MPSAFE - s = splnet(); + const int s = splnet(); #endif switch (cmd) { case SIOCSIFMEDIA: @@ -4034,7 +4034,7 @@ wm_ioctl(struct ifnet *ifp, u_long cmd, } } #ifdef WM_MPSAFE - s = splnet(); + const int s = splnet(); #endif /* It may call wm_start, so unlock here */ error = ether_ioctl(ifp, cmd, data);
CVS commit: src/sys
Module Name:src Committed By: thorpej Date: Fri Aug 5 05:20:39 UTC 2022 Modified Files: src/sys/kern: vfs_vnode.c src/sys/sys: vnode.h Log Message: In vcache_reclaim(), post NOTE_REVOKE immediately after changing the vnode state to VS_RECLAIMING, before we actually call VOP_RECLAIM(), which will release the reference on the lower node of a stacked FS vnode, which is likely to free the upper node's v_klist backing store. Acquire the vnode interlock when checking for kevent interest now, because the vp->v_klist pointer is now volatile. PR kern/56950 To generate a diff of this commit: cvs rdiff -u -r1.144 -r1.145 src/sys/kern/vfs_vnode.c cvs rdiff -u -r1.302 -r1.303 src/sys/sys/vnode.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/kern/vfs_vnode.c diff -u src/sys/kern/vfs_vnode.c:1.144 src/sys/kern/vfs_vnode.c:1.145 --- src/sys/kern/vfs_vnode.c:1.144 Mon Jul 18 04:30:30 2022 +++ src/sys/kern/vfs_vnode.c Fri Aug 5 05:20:39 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: vfs_vnode.c,v 1.144 2022/07/18 04:30:30 thorpej Exp $ */ +/* $NetBSD: vfs_vnode.c,v 1.145 2022/08/05 05:20:39 thorpej Exp $ */ /*- * Copyright (c) 1997-2011, 2019, 2020 The NetBSD Foundation, Inc. @@ -148,7 +148,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.144 2022/07/18 04:30:30 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.145 2022/08/05 05:20:39 thorpej Exp $"); #ifdef _KERNEL_OPT #include "opt_pax.h" @@ -1455,8 +1455,7 @@ vcache_free(vnode_impl_t *vip) mutex_obj_free(vp->v_interlock); rw_destroy(&vip->vi_lock); uvm_obj_destroy(&vp->v_uobj, true); - KASSERT(vp->v_klist == &vip->vi_klist || - SLIST_EMPTY(&vip->vi_klist.vk_klist)); + KASSERT(vp->v_klist == &vip->vi_klist); klist_fini(&vip->vi_klist.vk_klist); cv_destroy(&vp->v_cv); cache_vnode_fini(vp); @@ -1830,6 +1829,19 @@ vcache_reclaim(vnode_t *vp) * while we clean it out. */ VSTATE_CHANGE(vp, VS_BLOCKED, VS_RECLAIMING); + + /* + * Send NOTE_REVOKE now, before we call VOP_RECLAIM(), + * because VOP_RECLAIM() could cause vp->v_klist to + * become invalid. Don't check for interest in NOTE_REVOKE + * here; it's always posted because it sets EV_EOF. + * + * Once it's been posted, reset vp->v_klist to point to + * our own local storage, in case we were sharing with + * someone else. + */ + KNOTE(&vp->v_klist->vk_klist, NOTE_REVOKE); + vp->v_klist = &vip->vi_klist; mutex_exit(vp->v_interlock); rw_enter(vp->v_uobj.vmobjlock, RW_WRITER); @@ -1916,11 +1928,6 @@ vcache_reclaim(vnode_t *vp) vp->v_op = dead_vnodeop_p; VSTATE_CHANGE(vp, VS_RECLAIMING, VS_RECLAIMED); vp->v_tag = VT_NON; - /* - * Don't check for interest in NOTE_REVOKE; it's always posted - * because it sets EV_EOF. - */ - KNOTE(&vp->v_klist->vk_klist, NOTE_REVOKE); mutex_exit(vp->v_interlock); /* Index: src/sys/sys/vnode.h diff -u src/sys/sys/vnode.h:1.302 src/sys/sys/vnode.h:1.303 --- src/sys/sys/vnode.h:1.302 Mon Jul 18 04:30:30 2022 +++ src/sys/sys/vnode.h Fri Aug 5 05:20:39 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: vnode.h,v 1.302 2022/07/18 04:30:30 thorpej Exp $ */ +/* $NetBSD: vnode.h,v 1.303 2022/08/05 05:20:39 thorpej Exp $ */ /*- * Copyright (c) 2008, 2020 The NetBSD Foundation, Inc. @@ -427,24 +427,26 @@ void vref(struct vnode *); /* * Macro to determine kevent interest on a vnode. */ -#define VN_KEVENT_INTEREST(vp, n) \ +#define _VN_KEVENT_INTEREST(vp, n) \ (((vp)->v_klist->vk_interest & (n)) != 0) +static inline bool +VN_KEVENT_INTEREST(struct vnode *vp, long hint) +{ + mutex_enter(vp->v_interlock); + bool rv = _VN_KEVENT_INTEREST(vp, hint); + mutex_exit(vp->v_interlock); + return rv; +} + static inline void VN_KNOTE(struct vnode *vp, long hint) { - /* - * Testing for klist interest unlocked is fine here, as registering - * interest in vnode events is inherently racy with respect to other - * system activity anyway. Having knotes attached to vnodes is - * actually incredibly rare, so we want to void having to take locks, - * etc. in what is the overwhelmingly common case. - */ - if (__predict_false(VN_KEVENT_INTEREST(vp, hint))) { - mutex_enter(vp->v_interlock); + mutex_enter(vp->v_interlock); + if (__predict_false(_VN_KEVENT_INTEREST(vp, hint))) { knote(&vp->v_klist->vk_klist, hint); - mutex_exit(vp->v_interlock); } + mutex_exit(vp->v_interlock); } void vn_knote_attach(struct vnode *, struct knote *);
CVS commit: src/sys
Module Name:src Committed By: thorpej Date: Fri Aug 5 05:20:39 UTC 2022 Modified Files: src/sys/kern: vfs_vnode.c src/sys/sys: vnode.h Log Message: In vcache_reclaim(), post NOTE_REVOKE immediately after changing the vnode state to VS_RECLAIMING, before we actually call VOP_RECLAIM(), which will release the reference on the lower node of a stacked FS vnode, which is likely to free the upper node's v_klist backing store. Acquire the vnode interlock when checking for kevent interest now, because the vp->v_klist pointer is now volatile. PR kern/56950 To generate a diff of this commit: cvs rdiff -u -r1.144 -r1.145 src/sys/kern/vfs_vnode.c cvs rdiff -u -r1.302 -r1.303 src/sys/sys/vnode.h 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: andvar Date: Thu Aug 4 21:11:52 UTC 2022 Modified Files: src/sys/dev/pci: if_bnx.c Log Message: s/bufferred/buffered/ in memory description.L: To generate a diff of this commit: cvs rdiff -u -r1.110 -r1.111 src/sys/dev/pci/if_bnx.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: andvar Date: Thu Aug 4 21:11:52 UTC 2022 Modified Files: src/sys/dev/pci: if_bnx.c Log Message: s/bufferred/buffered/ in memory description.L: To generate a diff of this commit: cvs rdiff -u -r1.110 -r1.111 src/sys/dev/pci/if_bnx.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_bnx.c diff -u src/sys/dev/pci/if_bnx.c:1.110 src/sys/dev/pci/if_bnx.c:1.111 --- src/sys/dev/pci/if_bnx.c:1.110 Sun Dec 5 02:52:17 2021 +++ src/sys/dev/pci/if_bnx.c Thu Aug 4 21:11:52 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: if_bnx.c,v 1.110 2021/12/05 02:52:17 msaitoh Exp $ */ +/* $NetBSD: if_bnx.c,v 1.111 2022/08/04 21:11:52 andvar Exp $ */ /* $OpenBSD: if_bnx.c,v 1.101 2013/03/28 17:21:44 brad Exp $ */ /*- @@ -35,7 +35,7 @@ #if 0 __FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.3 2006/04/13 14:12:26 ru Exp $"); #endif -__KERNEL_RCSID(0, "$NetBSD: if_bnx.c,v 1.110 2021/12/05 02:52:17 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_bnx.c,v 1.111 2022/08/04 21:11:52 andvar Exp $"); /* * The following controllers are supported by this driver: @@ -216,12 +216,12 @@ static struct flash_spec flash_table[] = {0x1902, 0x5b808201, 0x000500db, 0x03840253, 0xaf020406, NONBUFFERED_FLAGS, ST_MICRO_FLASH_PAGE_BITS, ST_MICRO_FLASH_PAGE_SIZE, ST_MICRO_FLASH_BYTE_ADDR_MASK, ST_MICRO_FLASH_BASE_TOTAL_SIZE*2, - "Entry 0101: ST M45PE10 (128kB non-bufferred)"}, + "Entry 0101: ST M45PE10 (128kB non-buffered)"}, /* Entry 0110: ST M45PE20 (non-buffered flash)*/ {0x1501, 0x57808201, 0x000500db, 0x03840253, 0xaf020406, NONBUFFERED_FLAGS, ST_MICRO_FLASH_PAGE_BITS, ST_MICRO_FLASH_PAGE_SIZE, ST_MICRO_FLASH_BYTE_ADDR_MASK, ST_MICRO_FLASH_BASE_TOTAL_SIZE*4, - "Entry 0110: ST M45PE20 (256kB non-bufferred)"}, + "Entry 0110: ST M45PE20 (256kB non-buffered)"}, /* Saifun SA25F005 (non-buffered flash) */ /* strap, cfg1, & write1 need updates */ {0x1d03, 0x5f808201, 0x00050081, 0x03840253, 0xaf020406,
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Thu Aug 4 15:30:37 UTC 2022 Modified Files: src/doc [netbsd-9]: CHANGES-9.3 LAST_MINUTE src/external/gpl2/groff/tmac [netbsd-9]: mdoc.local src/sys/sys [netbsd-9]: param.h Log Message: Welcome to 9.3! To generate a diff of this commit: cvs rdiff -u -r1.1.2.118 -r1.1.2.119 src/doc/CHANGES-9.3 cvs rdiff -u -r1.2.66.2 -r1.2.66.3 src/doc/LAST_MINUTE cvs rdiff -u -r1.5.6.9 -r1.5.6.10 src/external/gpl2/groff/tmac/mdoc.local cvs rdiff -u -r1.599.2.11 -r1.599.2.12 src/sys/sys/param.h 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.3 diff -u src/doc/CHANGES-9.3:1.1.2.118 src/doc/CHANGES-9.3:1.1.2.119 --- src/doc/CHANGES-9.3:1.1.2.118 Wed Aug 3 16:02:25 2022 +++ src/doc/CHANGES-9.3 Thu Aug 4 15:30:36 2022 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.3,v 1.1.2.118 2022/08/03 16:02:25 martin Exp $ +# $NetBSD: CHANGES-9.3,v 1.1.2.119 2022/08/04 15:30:36 martin Exp $ A complete list of changes from the NetBSD 9.2 release to the NetBSD 9.3 release: @@ -2057,3 +2057,10 @@ sys/dev/ic/tpmvar.h1.8-1.10 tpm(4): HWRNG and fixed suspend/resume. [riastradh, ticket #1495] +doc/LAST_MINUTE (manually edited) +external/gpl2/groff/tmac/mdoc.local (manually edited) +sys/sys/param.h (manually edited) + + Update version numbers - welcome to NetBSD 9.3! + [martin] + Index: src/doc/LAST_MINUTE diff -u src/doc/LAST_MINUTE:1.2.66.2 src/doc/LAST_MINUTE:1.2.66.3 --- src/doc/LAST_MINUTE:1.2.66.2 Wed May 12 13:15:55 2021 +++ src/doc/LAST_MINUTE Thu Aug 4 15:30:36 2022 @@ -1,6 +1,6 @@ -# $NetBSD: LAST_MINUTE,v 1.2.66.2 2021/05/12 13:15:55 martin Exp $ +# $NetBSD: LAST_MINUTE,v 1.2.66.3 2022/08/04 15:30:36 martin Exp $ -This file contains important information on the NetBSD 9.2 release that +This file contains important information on the NetBSD 9.3 release that did not make it into the main documentation. [all] Index: src/external/gpl2/groff/tmac/mdoc.local diff -u src/external/gpl2/groff/tmac/mdoc.local:1.5.6.9 src/external/gpl2/groff/tmac/mdoc.local:1.5.6.10 --- src/external/gpl2/groff/tmac/mdoc.local:1.5.6.9 Mon May 17 15:46:21 2021 +++ src/external/gpl2/groff/tmac/mdoc.local Thu Aug 4 15:30:37 2022 @@ -1,4 +1,4 @@ -.\" $NetBSD: mdoc.local,v 1.5.6.9 2021/05/17 15:46:21 martin Exp $ +.\" $NetBSD: mdoc.local,v 1.5.6.10 2022/08/04 15:30:37 martin Exp $ .\" .\" Copyright (c) 2003, 2004 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -44,9 +44,9 @@ .as doc-str-St--ieee1275-94 " (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[doc-str-St]\*[Rq]) . .\" Default .Os value -.ds doc-operating-system NetBSD\~9.2_STABLE +.ds doc-operating-system NetBSD\~9.3 .\" Default footer operating system value -.ds doc-default-operating-system NetBSD\~9.2_STABLE +.ds doc-default-operating-system NetBSD\~9.3 .\" Other known versions, not yet in groff distribution .ds doc-operating-system-NetBSD-1.3.3 1.3.3 .ds doc-operating-system-NetBSD-1.6.3 1.6.3 @@ -66,6 +66,7 @@ .ds doc-operating-system-NetBSD-9.09.0 .ds doc-operating-system-NetBSD-9.19.1 .ds doc-operating-system-NetBSD-9.29.2 +.ds doc-operating-system-NetBSD-9.39.3 .ds doc-operating-system-FreeBSD-4.11 4.11 .ds doc-operating-system-FreeBSD-5.4 5.4 .ds doc-operating-system-FreeBSD-5.5 5.5 Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.599.2.11 src/sys/sys/param.h:1.599.2.12 --- src/sys/sys/param.h:1.599.2.11 Mon May 17 15:46:21 2021 +++ src/sys/sys/param.h Thu Aug 4 15:30:36 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.599.2.11 2021/05/17 15:46:21 martin Exp $ */ +/* $NetBSD: param.h,v 1.599.2.12 2022/08/04 15:30:36 martin Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -67,7 +67,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 90200 /* NetBSD 9.2_STABLE */ +#define __NetBSD_Version__ 90300 /* NetBSD 9.3 */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) <= __NetBSD_Version__)
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Thu Aug 4 15:30:37 UTC 2022 Modified Files: src/doc [netbsd-9]: CHANGES-9.3 LAST_MINUTE src/external/gpl2/groff/tmac [netbsd-9]: mdoc.local src/sys/sys [netbsd-9]: param.h Log Message: Welcome to 9.3! To generate a diff of this commit: cvs rdiff -u -r1.1.2.118 -r1.1.2.119 src/doc/CHANGES-9.3 cvs rdiff -u -r1.2.66.2 -r1.2.66.3 src/doc/LAST_MINUTE cvs rdiff -u -r1.5.6.9 -r1.5.6.10 src/external/gpl2/groff/tmac/mdoc.local cvs rdiff -u -r1.599.2.11 -r1.599.2.12 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/fdt
Module Name:src Committed By: ryo Date: Thu Aug 4 11:58:55 UTC 2022 Modified Files: src/sys/dev/fdt: fdt_memory.c Log Message: Don't pass a block of size 0 to fdt_memory_add_range(). There are some environments where size 0 blocks are passed from the loader. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/dev/fdt/fdt_memory.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/fdt/fdt_memory.c diff -u src/sys/dev/fdt/fdt_memory.c:1.4 src/sys/dev/fdt/fdt_memory.c:1.5 --- src/sys/dev/fdt/fdt_memory.c:1.4 Fri Jan 7 07:25:37 2022 +++ src/sys/dev/fdt/fdt_memory.c Thu Aug 4 11:58:55 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: fdt_memory.c,v 1.4 2022/01/07 07:25:37 mlelstv Exp $ */ +/* $NetBSD: fdt_memory.c,v 1.5 2022/08/04 11:58:55 ryo Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ #include "opt_fdt.h" #include -__KERNEL_RCSID(0, "$NetBSD: fdt_memory.c,v 1.4 2022/01/07 07:25:37 mlelstv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fdt_memory.c,v 1.5 2022/08/04 11:58:55 ryo Exp $"); #include #include @@ -88,6 +88,8 @@ fdt_memory_get(uint64_t *pstart, uint64_ for (index = 0; fdtbus_get_reg64(memory, index, &cur_addr, &cur_size) == 0; index++) { + if (cur_size == 0) + continue; fdt_memory_add_range(cur_addr, cur_size); if (index == 0) {
CVS commit: src/sys/dev/fdt
Module Name:src Committed By: ryo Date: Thu Aug 4 11:58:55 UTC 2022 Modified Files: src/sys/dev/fdt: fdt_memory.c Log Message: Don't pass a block of size 0 to fdt_memory_add_range(). There are some environments where size 0 blocks are passed from the loader. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/dev/fdt/fdt_memory.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/common/lib/libprop
Module Name:src Committed By: riastradh Date: Thu Aug 4 09:02:29 UTC 2022 Modified Files: src/common/lib/libprop: prop_object.c Log Message: proplib: Fix mistake in previous -- use strncmp for prefix matching. To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/common/lib/libprop/prop_object.c 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/libprop/prop_object.c diff -u src/common/lib/libprop/prop_object.c:1.33 src/common/lib/libprop/prop_object.c:1.34 --- src/common/lib/libprop/prop_object.c:1.33 Wed Aug 3 21:20:21 2022 +++ src/common/lib/libprop/prop_object.c Thu Aug 4 09:02:29 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: prop_object.c,v 1.33 2022/08/03 21:20:21 riastradh Exp $ */ +/* $NetBSD: prop_object.c,v 1.34 2022/08/04 09:02:29 riastradh Exp $ */ /*- * Copyright (c) 2006, 2007 The NetBSD Foundation, Inc. @@ -735,7 +735,7 @@ _prop_object_internalize_context_alloc(c if (_PROP_EOF(*xml) || *xml != '<') goto bad; -#define MATCH(str) (strcmp(&xml[1], str) == 0) +#define MATCH(str) (strncmp(&xml[1], str, strlen(str)) == 0) /* * Skip over the XML preamble that Apple XML property
CVS commit: src/common/lib/libprop
Module Name:src Committed By: riastradh Date: Thu Aug 4 09:02:29 UTC 2022 Modified Files: src/common/lib/libprop: prop_object.c Log Message: proplib: Fix mistake in previous -- use strncmp for prefix matching. To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/common/lib/libprop/prop_object.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.