CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Wed Feb 16 03:15:27 UTC 2022 Modified Files: src/sys/dev/pci: if_wm.c Log Message: Remove duplicated break. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.726 -r1.727 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: msaitoh Date: Wed Feb 16 03:15:27 UTC 2022 Modified Files: src/sys/dev/pci: if_wm.c Log Message: Remove duplicated break. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.726 -r1.727 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.726 src/sys/dev/pci/if_wm.c:1.727 --- src/sys/dev/pci/if_wm.c:1.726 Fri Dec 31 14:25:23 2021 +++ src/sys/dev/pci/if_wm.c Wed Feb 16 03:15:27 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: if_wm.c,v 1.726 2021/12/31 14:25:23 riastradh Exp $ */ +/* $NetBSD: if_wm.c,v 1.727 2022/02/16 03:15:27 msaitoh Exp $ */ /* * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc. @@ -82,7 +82,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.726 2021/12/31 14:25:23 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.727 2022/02/16 03:15:27 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_net_mpsafe.h" @@ -10572,7 +10572,6 @@ wm_gmii_setup_phytype(struct wm_softc *s case MII_MODEL_INTEL_I350: new_phytype = WMPHY_I350; break; -break; default: break; }
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: uwe Date: Wed Feb 16 01:26:31 UTC 2022 Modified Files: src/distrib/sets/lists/games: mi src/distrib/sets/lists/man: mi Log Message: Add missing cat pages to fix MKCATPAGES build. To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/distrib/sets/lists/games/mi cvs rdiff -u -r1.1733 -r1.1734 src/distrib/sets/lists/man/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/games/mi diff -u src/distrib/sets/lists/games/mi:1.60 src/distrib/sets/lists/games/mi:1.61 --- src/distrib/sets/lists/games/mi:1.60 Sat Jan 2 03:24:01 2021 +++ src/distrib/sets/lists/games/mi Wed Feb 16 01:26:30 2022 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.60 2021/01/02 03:24:01 nat Exp $ +# $NetBSD: mi,v 1.61 2022/02/16 01:26:30 uwe Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -261,6 +261,7 @@ ./usr/share/man/cat6/tetris.0 games-games-catman .cat ./usr/share/man/cat6/trek.0 games-games-catman .cat ./usr/share/man/cat6/wargames.0 games-games-catman .cat +./usr/share/man/cat6/warp.0 games-games-catman .cat ./usr/share/man/cat6/worm.0 games-games-catman .cat ./usr/share/man/cat6/worms.0 games-games-catman .cat ./usr/share/man/cat6/wtf.0 games-utils-catman .cat Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1733 src/distrib/sets/lists/man/mi:1.1734 --- src/distrib/sets/lists/man/mi:1.1733 Sun Jan 23 14:35:44 2022 +++ src/distrib/sets/lists/man/mi Wed Feb 16 01:26:30 2022 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1733 2022/01/23 14:35:44 christos Exp $ +# $NetBSD: mi,v 1.1734 2022/02/16 01:26:30 uwe Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -1301,6 +1301,7 @@ ./usr/share/man/cat4/i386/omms.0 man-obsolete obsolete ./usr/share/man/cat4/i386/opms.0 man-obsolete obsolete ./usr/share/man/cat4/i386/pcibios.0 man-sys-catman .cat +./usr/share/man/cat4/i386/pcmb.0 man-sys-catman .cat ./usr/share/man/cat4/i386/pcvt.0 man-obsolete obsolete ./usr/share/man/cat4/i386/pms.0 man-obsolete obsolete ./usr/share/man/cat4/i386/pnpbios.0 man-sys-catman .cat @@ -1572,9 +1573,11 @@ ./usr/share/man/cat4/pc532/plip.0 man-obsolete obsolete ./usr/share/man/cat4/pc532/scn.0 man-obsolete obsolete ./usr/share/man/cat4/pcdisplay.0 man-sys-catman .cat +./usr/share/man/cat4/pceb.0 man-sys-catman .cat ./usr/share/man/cat4/pcf8563rtc.0 man-sys-catman .cat ./usr/share/man/cat4/pchb.0 man-sys-catman .cat ./usr/share/man/cat4/pci.0 man-sys-catman .cat +./usr/share/man/cat4/pcib.0 man-sys-catman .cat ./usr/share/man/cat4/pciback.0 man-sys-catman .cat ./usr/share/man/cat4/pcic.0 man-sys-catman .cat ./usr/share/man/cat4/pciide.0 man-sys-catman .cat @@ -1659,6 +1662,7 @@ ./usr/share/man/cat4/rcons.0 man-sys-catman .cat ./usr/share/man/cat4/rdcphy.0 man-sys-catman .cat ./usr/share/man/cat4/re.0 man-sys-catman .cat +./usr/share/man/cat4/rge.0 man-sys-catman .cat ./usr/share/man/cat4/rgephy.0 man-sys-catman .cat ./usr/share/man/cat4/rl.0 man-obsolete obsolete ./usr/share/man/cat4/rlphy.0 man-sys-catman .cat
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: uwe Date: Wed Feb 16 01:26:31 UTC 2022 Modified Files: src/distrib/sets/lists/games: mi src/distrib/sets/lists/man: mi Log Message: Add missing cat pages to fix MKCATPAGES build. To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/distrib/sets/lists/games/mi cvs rdiff -u -r1.1733 -r1.1734 src/distrib/sets/lists/man/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man9
Module Name:src Committed By: wiz Date: Tue Feb 15 22:58:25 UTC 2022 Modified Files: src/share/man/man9: KERNEL_LOCK.9 Log Message: Fix typo, use Nm instead of Xr to itself. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man9/KERNEL_LOCK.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/KERNEL_LOCK.9 diff -u src/share/man/man9/KERNEL_LOCK.9:1.1 src/share/man/man9/KERNEL_LOCK.9:1.2 --- src/share/man/man9/KERNEL_LOCK.9:1.1 Tue Feb 15 22:46:29 2022 +++ src/share/man/man9/KERNEL_LOCK.9 Tue Feb 15 22:58:25 2022 @@ -1,4 +1,4 @@ -.\" $NetBSD: KERNEL_LOCK.9,v 1.1 2022/02/15 22:46:29 riastradh Exp $ +.\" $NetBSD: KERNEL_LOCK.9,v 1.2 2022/02/15 22:58:25 wiz Exp $ .\" .\" Copyright (c) 2022 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -149,7 +149,7 @@ and .Xr mutex_exit 9 can break kernel-locked assumptions. Subsystems need to be consistently converted from -.Xr KERNEL_LOCK 9 +.Nm and .Xr spl 9 to @@ -237,7 +237,7 @@ which mean the same thing. .Sh NOTES Some .Nx -kernel abstractions execute caller-specified funtions with the kernel +kernel abstractions execute caller-specified functions with the kernel lock held by default, for compatibility with legacy code, but can be explicitly instructed .Em not
CVS commit: src/share/man/man9
Module Name:src Committed By: wiz Date: Tue Feb 15 22:58:25 UTC 2022 Modified Files: src/share/man/man9: KERNEL_LOCK.9 Log Message: Fix typo, use Nm instead of Xr to itself. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man9/KERNEL_LOCK.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/linux
Module Name:src
Committed By: riastradh
Date: Tue Feb 15 22:51:03 UTC 2022
Modified Files:
src/sys/external/bsd/drm2/linux: linux_dma_resv.c
Log Message:
drm: Use KM_SLEEP to allocate reservation fence arrays.
Except as a fast path in an RCU reader.
The array sizes appear to be reasonably small and not trivially
controlled by userland, from what I can tell, so if my impression is
accurate, it is reasonable to sleep for allocation here.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/external/bsd/drm2/linux/linux_dma_resv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/linux/linux_dma_resv.c
diff -u src/sys/external/bsd/drm2/linux/linux_dma_resv.c:1.21 src/sys/external/bsd/drm2/linux/linux_dma_resv.c:1.22
--- src/sys/external/bsd/drm2/linux/linux_dma_resv.c:1.21 Sun Dec 19 12:36:02 2021
+++ src/sys/external/bsd/drm2/linux/linux_dma_resv.c Tue Feb 15 22:51:03 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_dma_resv.c,v 1.21 2021/12/19 12:36:02 riastradh Exp $ */
+/* $NetBSD: linux_dma_resv.c,v 1.22 2022/02/15 22:51:03 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: linux_dma_resv.c,v 1.21 2021/12/19 12:36:02 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_dma_resv.c,v 1.22 2022/02/15 22:51:03 riastradh Exp $");
#include
#include
@@ -56,6 +56,17 @@ objlist_tryalloc(uint32_t n)
return list;
}
+static struct dma_resv_list *
+objlist_alloc(uint32_t n)
+{
+ struct dma_resv_list *list;
+
+ list = kmem_alloc(offsetof(typeof(*list), shared[n]), KM_SLEEP);
+ list->shared_max = n;
+
+ return list;
+}
+
static void
objlist_free(struct dma_resv_list *list)
{
@@ -346,9 +357,7 @@ dma_resv_reserve_shared(struct dma_resv
/* Try to double its capacity. */
nalloc = n > UINT32_MAX/2 ? UINT32_MAX : 2*n;
- prealloc = objlist_tryalloc(nalloc);
- if (prealloc == NULL)
- return -ENOMEM;
+ prealloc = objlist_alloc(nalloc);
/* Swap the new preallocated list and free the old one. */
objlist_free(robj->robj_prealloc);
@@ -356,9 +365,8 @@ dma_resv_reserve_shared(struct dma_resv
} else {
/* Start with some spare. */
nalloc = n > UINT32_MAX/2 ? UINT32_MAX : MAX(2*n, 4);
- prealloc = objlist_tryalloc(nalloc);
- if (prealloc == NULL)
- return -ENOMEM;
+ prealloc = objlist_alloc(nalloc);
+
/* Save the new preallocated list. */
robj->robj_prealloc = prealloc;
}
@@ -689,8 +697,10 @@ dma_resv_add_shared_fence(struct dma_res
prealloc->shared_count = shared_count;
/* If we didn't find one, add it at the end. */
- if (replace == NULL)
+ if (replace == NULL) {
+ KASSERT(prealloc->shared_count < prealloc->shared_max);
prealloc->shared[prealloc->shared_count++] = fence;
+ }
/*
* Now ready to replace the list. Begin an update.
@@ -919,11 +929,20 @@ top: KASSERT(fence == NULL);
if (!dma_resv_get_shared_reader(src_robj, &src_list, &shared_count,
&read_ticket))
goto restart;
- if (src_list != NULL) {
- /* Allocate a new list. */
- dst_list = objlist_tryalloc(shared_count);
+ if (src_list) {
+ /* Allocate a new list, if necessary. */
if (dst_list == NULL)
- return -ENOMEM;
+ dst_list = objlist_tryalloc(shared_count);
+ if (dst_list == NULL || dst_list->shared_max < shared_count) {
+ rcu_read_unlock();
+ if (dst_list) {
+objlist_free(dst_list);
+dst_list = NULL;
+ }
+ dst_list = objlist_alloc(shared_count);
+ dst_list->shared_count = 0; /* paranoia */
+ goto top;
+ }
/* Copy over all fences that are not yet signalled. */
dst_list->shared_count = 0;
@@ -1005,8 +1024,7 @@ restart:
dma_fence_put(dst_list->shared[i]);
dst_list->shared[i] = NULL; /* paranoia */
}
- objlist_free(dst_list);
- dst_list = NULL;
+ /* reuse dst_list allocation for the next attempt */
}
goto top;
}
CVS commit: src/sys/external/bsd/drm2/linux
Module Name:src Committed By: riastradh Date: Tue Feb 15 22:51:03 UTC 2022 Modified Files: src/sys/external/bsd/drm2/linux: linux_dma_resv.c Log Message: drm: Use KM_SLEEP to allocate reservation fence arrays. Except as a fast path in an RCU reader. The array sizes appear to be reasonably small and not trivially controlled by userland, from what I can tell, so if my impression is accurate, it is reasonable to sleep for allocation here. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/external/bsd/drm2/linux/linux_dma_resv.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/atomic
Module Name:src Committed By: riastradh Date: Tue Feb 15 22:46:53 UTC 2022 Modified Files: src/lib/libc/atomic: membar_ops.3 Log Message: membar_ops(3): xref bus_dma, bus_space in SEE ALSO section too To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/lib/libc/atomic/membar_ops.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/atomic/membar_ops.3 diff -u src/lib/libc/atomic/membar_ops.3:1.8 src/lib/libc/atomic/membar_ops.3:1.9 --- src/lib/libc/atomic/membar_ops.3:1.8 Fri Oct 9 19:41:02 2020 +++ src/lib/libc/atomic/membar_ops.3 Tue Feb 15 22:46:53 2022 @@ -1,4 +1,4 @@ -.\" $NetBSD: membar_ops.3,v 1.8 2020/10/09 19:41:02 uwe Exp $ +.\" $NetBSD: membar_ops.3,v 1.9 2022/02/15 22:46:53 riastradh Exp $ .\" .\" Copyright (c) 2007, 2008 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -358,7 +358,9 @@ if the load is in an atomic read/modify/ .El .Sh SEE ALSO .Xr atomic_ops 3 , -.Xr atomic_loadstore 9 +.Xr atomic_loadstore 9 , +.Xr bus_dma 9 , +.Xr bus_space 9 .Sh HISTORY The .Nm membar_ops
CVS commit: src/lib/libc/atomic
Module Name:src Committed By: riastradh Date: Tue Feb 15 22:46:53 UTC 2022 Modified Files: src/lib/libc/atomic: membar_ops.3 Log Message: membar_ops(3): xref bus_dma, bus_space in SEE ALSO section too To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/lib/libc/atomic/membar_ops.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: riastradh Date: Tue Feb 15 22:46:29 UTC 2022 Modified Files: src/distrib/sets/lists/comp: mi src/share/man/man9: Makefile Added Files: src/share/man/man9: KERNEL_LOCK.9 Log Message: KERNEL_LOCK(9): New man page for old not-dead-yet hack. I'm not documenting this to encourage anyone to use it. I'm only documenting this to remind myself what the semantics is, because it's kind of confusing and not at all like mutex(9). To generate a diff of this commit: cvs rdiff -u -r1.2411 -r1.2412 src/distrib/sets/lists/comp/mi cvs rdiff -u -r0 -r1.1 src/share/man/man9/KERNEL_LOCK.9 cvs rdiff -u -r1.463 -r1.464 src/share/man/man9/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.2411 src/distrib/sets/lists/comp/mi:1.2412 --- src/distrib/sets/lists/comp/mi:1.2411 Sat Feb 12 17:10:20 2022 +++ src/distrib/sets/lists/comp/mi Tue Feb 15 22:46:29 2022 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.2411 2022/02/12 17:10:20 riastradh Exp $ +# $NetBSD: mi,v 1.2412 2022/02/15 22:46:29 riastradh Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. ./etc/mtree/set.compcomp-sys-root @@ -11162,6 +11162,11 @@ ./usr/share/man/cat9/KASSERTMSG.0 comp-sys-catman .cat ./usr/share/man/cat9/KDASSERT.0 comp-sys-catman .cat ./usr/share/man/cat9/KDASSERTMSG.0 comp-sys-catman .cat +./usr/share/man/cat9/KERNEL_LOCK.0 comp-sys-catman .cat +./usr/share/man/cat9/KERNEL_LOCKED_P.0 comp-sys-catman .cat +./usr/share/man/cat9/KERNEL_UNLOCK_ALL.0 comp-sys-catman .cat +./usr/share/man/cat9/KERNEL_UNLOCK_LAST.0 comp-sys-catman .cat +./usr/share/man/cat9/KERNEL_UNLOCK_ONE.0 comp-sys-catman .cat ./usr/share/man/cat9/KNOTE.0 comp-sys-catman .cat ./usr/share/man/cat9/LWP_CACHE_CREDS.0 comp-sys-catman .cat ./usr/share/man/cat9/MALLOC.0 comp-sys-catman .cat @@ -19411,6 +19416,11 @@ ./usr/share/man/html9/KASSERTMSG.html comp-sys-htmlman html ./usr/share/man/html9/KDASSERT.html comp-sys-htmlman html ./usr/share/man/html9/KDASSERTMSG.html comp-sys-htmlman html +./usr/share/man/html9/KERNEL_LOCK.html comp-sys-htmlman html +./usr/share/man/html9/KERNEL_LOCKED_P.html comp-sys-htmlman html +./usr/share/man/html9/KERNEL_UNLOCK_ALL.html comp-sys-htmlman html +./usr/share/man/html9/KERNEL_UNLOCK_LAST.html comp-sys-htmlman html +./usr/share/man/html9/KERNEL_UNLOCK_ONE.html comp-sys-htmlman html ./usr/share/man/html9/KNOTE.html comp-sys-htmlman html ./usr/share/man/html9/LWP_CACHE_CREDS.html comp-sys-htmlman html ./usr/share/man/html9/MALLOC.html comp-sys-htmlman html @@ -27741,6 +27751,11 @@ ./usr/share/man/man9/KASSERTMSG.9 comp-sys-man .man ./usr/share/man/man9/KDASSERT.9 comp-sys-man .man ./usr/share/man/man9/KDASSERTMSG.9 comp-sys-man .man +./usr/share/man/man9/KERNEL_LOCK.9 comp-sys-man .man +./usr/share/man/man9/KERNEL_LOCKED_P.9 comp-sys-man .man +./usr/share/man/man9/KERNEL_UNLOCK_ALL.9 comp-sys-man .man +./usr/share/man/man9/KERNEL_UNLOCK_LAST.9 comp-sys-man .man +./usr/share/man/man9/KERNEL_UNLOCK_ONE.9 comp-sys-man .man ./usr/share/man/man9/KNOTE.9 comp-sys-man .man ./usr/share/man/man9/LWP_CACHE_CREDS.9 comp-sys-man .man ./usr/share/man/man9/MALLOC.9 comp-sys-man .man Index: src/share/man/man9/Makefile diff -u src/share/man/man9/Makefile:1.463 src/share/man/man9/Makefile:1.464 --- src/share/man/man9/Makefile:1.463 Sat Feb 12 17:10:20 2022 +++ src/share/man/man9/Makefile Tue Feb 15 22:46:29 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.463 2022/02/12 17:10:20 riastradh Exp $ +# $NetBSD: Makefile,v 1.464 2022/02/15 22:46:29 riastradh Exp $ # Makefile for section 9 (kernel function and variable) manual pages. @@ -125,6 +125,12 @@ MLINKS+=KASSERT.9 KASSERTMSG.9 \ KASSERT.9 KDASSERT.9 \ KASSERT.9 KDASSERTMSG.9 +MAN+= KERNEL_LOCK.9 +MLINKS+=KERNEL_LOCK.9 KERNEL_LOCKED_P.9 \ + KERNEL_LOCK.9 KERNEL_UNLOCK_ALL.9 \ + KERNEL_LOCK.9 KERNEL_UNLOCK_LAST.9 \ + KERNEL_LOCK.9 KERNEL_UNLOCK_ONE.9 + MLINKS+=accept_filter.9 accept_filt_add.9 MLINKS+=accept_filter.9 accept_filt_del.9 MLINKS+=accept_filter.9 accept_filt_generic_mod_event.9 Added files: Index: src/share/man/man9/KERNEL_LOCK.9 diff -u /dev/null src/share/man/man9/KERNEL_LOCK.9:1.1 --- /dev/null Tue Feb 15 22:46:29 2022 +++ src/share/man/man9/KERNEL_LOCK.9 Tue Feb 15 22:46:29 2022 @@ -0,0 +1,312 @@ +.\" $NetBSD: KERNEL_LOCK.9,v 1.1 2022/02/15 22:46:29 riastradh Exp $ +.\" +.\" Copyright (c) 2022 The NetBSD Foundation, Inc. +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\"notice, this list of conditions and the following disclaimer. +.\" 2. Redistri
CVS commit: src
Module Name:src Committed By: riastradh Date: Tue Feb 15 22:46:29 UTC 2022 Modified Files: src/distrib/sets/lists/comp: mi src/share/man/man9: Makefile Added Files: src/share/man/man9: KERNEL_LOCK.9 Log Message: KERNEL_LOCK(9): New man page for old not-dead-yet hack. I'm not documenting this to encourage anyone to use it. I'm only documenting this to remind myself what the semantics is, because it's kind of confusing and not at all like mutex(9). To generate a diff of this commit: cvs rdiff -u -r1.2411 -r1.2412 src/distrib/sets/lists/comp/mi cvs rdiff -u -r0 -r1.1 src/share/man/man9/KERNEL_LOCK.9 cvs rdiff -u -r1.463 -r1.464 src/share/man/man9/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sparc/include
Module Name:src
Committed By: palle
Date: Tue Feb 15 20:35:37 UTC 2022
Modified Files:
src/sys/arch/sparc/include: frame.h
Log Message:
Document the calculation of CC64FSZ
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sparc/include/frame.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/sparc/include/frame.h
diff -u src/sys/arch/sparc/include/frame.h:1.10 src/sys/arch/sparc/include/frame.h:1.11
--- src/sys/arch/sparc/include/frame.h:1.10 Wed Apr 11 19:37:58 2018
+++ src/sys/arch/sparc/include/frame.h Tue Feb 15 20:35:37 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: frame.h,v 1.10 2018/04/11 19:37:58 palle Exp $ */
+/* $NetBSD: frame.h,v 1.11 2022/02/15 20:35:37 palle Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -125,7 +125,8 @@ struct frame64 {
/*
* CC64FSZ (C Compiler 64-bit Frame SiZe) is the size of a stack frame used
- * by the compiler in 64-bit mode. It is (16)*8; space for 8 ins, 8 outs.
+ * by the compiler in 64-bit mode (see struct frame64 above).
+ * It is 8*8 + 6*8 + 8 + 8 + 6*8 + 0*8 = 176 bytes.
*/
#define CC64FSZ 176
CVS commit: src/sys/arch/sparc/include
Module Name:src Committed By: palle Date: Tue Feb 15 20:35:37 UTC 2022 Modified Files: src/sys/arch/sparc/include: frame.h Log Message: Document the calculation of CC64FSZ To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sparc/include/frame.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: othersrc/external/bsd/merkletree
Module Name:othersrc
Committed By: agc
Date: Tue Feb 15 19:32:32 UTC 2022
Modified Files:
othersrc/external/bsd/merkletree/bin: Makefile
othersrc/external/bsd/merkletree/dist/tests: 16.expected
Log Message:
... and point merkletree at the correct test directory
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 othersrc/external/bsd/merkletree/bin/Makefile
cvs rdiff -u -r1.2 -r1.3 \
othersrc/external/bsd/merkletree/dist/tests/16.expected
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/external/bsd/merkletree/bin/Makefile
diff -u othersrc/external/bsd/merkletree/bin/Makefile:1.3 othersrc/external/bsd/merkletree/bin/Makefile:1.4
--- othersrc/external/bsd/merkletree/bin/Makefile:1.3 Tue Feb 15 19:29:07 2022
+++ othersrc/external/bsd/merkletree/bin/Makefile Tue Feb 15 19:32:32 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2022/02/15 19:29:07 agc Exp $
+# $NetBSD: Makefile,v 1.4 2022/02/15 19:32:32 agc Exp $
.include
@@ -102,7 +102,7 @@ t: ${PROG}
rm -f 15.out
@echo "16. -p path"
d=$$(./mktestdir.sh ${TESTDIR});\
- env LD_LIBRARY_PATH=${LIB_MERKLETREE_DIR} ./${PROG} -l -p ${TESTDIR}/dir . > 16.out; \
+ env LD_LIBRARY_PATH=${LIB_MERKLETREE_DIR} ./${PROG} -l -p $$d . > 16.out; \
diff ${TESTDIR}/16.expected 16.out || exit 1; \
rm -rf $$d
rm -f 16.out
Index: othersrc/external/bsd/merkletree/dist/tests/16.expected
diff -u othersrc/external/bsd/merkletree/dist/tests/16.expected:1.2 othersrc/external/bsd/merkletree/dist/tests/16.expected:1.3
--- othersrc/external/bsd/merkletree/dist/tests/16.expected:1.2 Tue Feb 15 19:29:07 2022
+++ othersrc/external/bsd/merkletree/dist/tests/16.expected Tue Feb 15 19:32:32 2022
@@ -1,8 +1,12 @@
-sha512/1024 (./CVS/Template)
-[0:0] 40809df6cf9c38ab2d5e7202f14ab4b9e76084f29741be8c4c93b2c439a606a821d591a622f2cb259ef38333eb8da177db6343d81d47ccc026cff245e1835d5c
-sha512/1024 (./CVS/Repository)
-[0:0] d3fb8cbff5170a47fe0e1aad14d24e0e1ae69640fe579411d8be476809f7ec9ceb5ed18bf9529e8af6f50211363719bcc47cdf7d0d82735155166ba54e0eb77f
-sha512/1024 (./CVS/Entries)
-[0:0] 0341365c2dc7fc5fa09fa295e3c819b39f5adefbdbfbbd8af91d515de3bfe272eef7a2c32b55c96ca4768a22eeca06786c51314b44946435eeef6e79cf941602
-sha512/1024 (./CVS/Root)
-[0:0] 25bb805fa05ceb08a96fef703303dbaa164fb1f46cd3e1324b1c6e9fb7b7913ce0e5de38aec31520dfa0ef3a0a20fb1a6712d725ff18e4279d35c3cf51a4
+sha512/1024 (./1.in)
+[0:0] e481d5d54aa2e1372bcc0f2f61250a5f3f9da4897dbea76033d4b86fcf227253c35d0951ccfa99e05a9d45d6a3f796e13e97f471a0956c5ef2f372a536f13543
+[0:1024] 1b51d590e649ba166b69713000dc476e7625fc19940f978aa5b3a3ddd560ae19059ea47ef531da833b21911a96229bb879c2f415ab1125492f736f4c289143e0
+[0:2048] e4ec3182f61352cf6eff2345f9e81e3cc8a98f2f36aead5ebd632c193606ba188e31b7e7eb150c679c97ca95745b40eef3817e5fb7e2a1066cc1df3fe4364256
+[0:3072] 99b961e0a45b52a99cd4a6876cd6fe54738131ff4662c04a33a318b6ffd2040c8fa9dc2ea7c9d52c2d0c9ee6d106219f9f4d986ac100e939bb7c4b7961acdf01
+[1:0] 902387724175187f42a6bce7ab7f1a88a4ce536662880747347dc5ea761fed5a7dac5e98962c60b5c3d7988258c0c9e2a14e37cfeb7972fe9086e693381324c8
+sha512/1024 (./1.expected)
+[0:0] f4fd1ca9cb7d3833fd3824f103cae3e9901eeace852f30a76199f052ec9e5d1d32969b734adc3cb2f248cfeffe66a6e6db671b053eeb146c69fc3337edf505f1
+sha512/1024 (./7.expected)
+[0:0] a1d931bfa74a61e669fec43531c1d62d4c3aa5e4172f35dc494a4728ccbea9dd49ad47b476da282aad1d4435f012cfc97207f42de1bf77c3a3119e35bbe5e1e3
+sha512/1024 (./1.symlink)
+[0:0] c92811be76681fe89507f4cd767b16d80f61a9afc27d3d71608b617eba73d4e85cfcd3bf33e9cfcfa44c1f907ab4aaa54748b469fd63bce5d87e14a5af4840ff
CVS commit: othersrc/external/bsd/merkletree
Module Name:othersrc Committed By: agc Date: Tue Feb 15 19:32:32 UTC 2022 Modified Files: othersrc/external/bsd/merkletree/bin: Makefile othersrc/external/bsd/merkletree/dist/tests: 16.expected Log Message: ... and point merkletree at the correct test directory To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 othersrc/external/bsd/merkletree/bin/Makefile cvs rdiff -u -r1.2 -r1.3 \ othersrc/external/bsd/merkletree/dist/tests/16.expected Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: othersrc/external/bsd/merkletree
Module Name:othersrc
Committed By: agc
Date: Tue Feb 15 19:29:07 UTC 2022
Modified Files:
othersrc/external/bsd/merkletree/bin: Makefile
othersrc/external/bsd/merkletree/dist/tests: 15.expected 16.expected
Added Files:
othersrc/external/bsd/merkletree/bin: mktestdir.sh
Removed Files:
othersrc/external/bsd/merkletree/bin: 1.expected 1.in 1.sum 10.expected
11.expected 12.expected 13.expected 14.expected 15.expected
2.expected 2.in 3.expected 4.expected 5.expected 6.expected
7.expected 8.expected 9.expected
othersrc/external/bsd/merkletree/dist/tests/dir: 1.expected 1.in
1.symlink 7.expected
Log Message:
clean up old test files
do the path and directory test in a different way (cvs has issues with
symlinks, yay - create the test directory on the fly each time
remove the hardcoded test directory
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 othersrc/external/bsd/merkletree/bin/1.expected \
othersrc/external/bsd/merkletree/bin/1.sum \
othersrc/external/bsd/merkletree/bin/10.expected \
othersrc/external/bsd/merkletree/bin/11.expected \
othersrc/external/bsd/merkletree/bin/12.expected \
othersrc/external/bsd/merkletree/bin/13.expected \
othersrc/external/bsd/merkletree/bin/14.expected \
othersrc/external/bsd/merkletree/bin/15.expected \
othersrc/external/bsd/merkletree/bin/2.expected \
othersrc/external/bsd/merkletree/bin/2.in \
othersrc/external/bsd/merkletree/bin/3.expected \
othersrc/external/bsd/merkletree/bin/4.expected \
othersrc/external/bsd/merkletree/bin/5.expected \
othersrc/external/bsd/merkletree/bin/6.expected \
othersrc/external/bsd/merkletree/bin/7.expected \
othersrc/external/bsd/merkletree/bin/8.expected \
othersrc/external/bsd/merkletree/bin/9.expected
cvs rdiff -u -r1.2 -r0 othersrc/external/bsd/merkletree/bin/1.in
cvs rdiff -u -r1.2 -r1.3 othersrc/external/bsd/merkletree/bin/Makefile
cvs rdiff -u -r0 -r1.1 othersrc/external/bsd/merkletree/bin/mktestdir.sh
cvs rdiff -u -r1.1 -r1.2 \
othersrc/external/bsd/merkletree/dist/tests/15.expected \
othersrc/external/bsd/merkletree/dist/tests/16.expected
cvs rdiff -u -r1.1 -r0 \
othersrc/external/bsd/merkletree/dist/tests/dir/1.expected \
othersrc/external/bsd/merkletree/dist/tests/dir/1.in \
othersrc/external/bsd/merkletree/dist/tests/dir/1.symlink \
othersrc/external/bsd/merkletree/dist/tests/dir/7.expected
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/external/bsd/merkletree/bin/Makefile
diff -u othersrc/external/bsd/merkletree/bin/Makefile:1.2 othersrc/external/bsd/merkletree/bin/Makefile:1.3
--- othersrc/external/bsd/merkletree/bin/Makefile:1.2 Tue Feb 15 18:48:32 2022
+++ othersrc/external/bsd/merkletree/bin/Makefile Tue Feb 15 19:29:07 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2022/02/15 18:48:32 agc Exp $
+# $NetBSD: Makefile,v 1.3 2022/02/15 19:29:07 agc Exp $
.include
@@ -95,12 +95,16 @@ t: ${PROG}
diff ${TESTDIR}/14.expected 14.out
rm -f 14.out
@echo "15. json, path directory and symlinks"
- env LD_LIBRARY_PATH=${LIB_MERKLETREE_DIR} ./${PROG} -j -p ${TESTDIR}/dir . > 15.out
- diff ${TESTDIR}/15.expected 15.out
+ d=$$(./mktestdir.sh ${TESTDIR});\
+ env LD_LIBRARY_PATH=${LIB_MERKLETREE_DIR} ./${PROG} -j -p $$d . > 15.out; \
+ diff ${TESTDIR}/15.expected 15.out || exit 1; \
+ rm -rf $$d
rm -f 15.out
@echo "16. -p path"
- env LD_LIBRARY_PATH=${LIB_MERKLETREE_DIR} ./${PROG} -l -p ${TESTDIR}/dir . > 16.out
- diff ${TESTDIR}/16.expected 16.out
+ d=$$(./mktestdir.sh ${TESTDIR});\
+ env LD_LIBRARY_PATH=${LIB_MERKLETREE_DIR} ./${PROG} -l -p ${TESTDIR}/dir . > 16.out; \
+ diff ${TESTDIR}/16.expected 16.out || exit 1; \
+ rm -rf $$d
rm -f 16.out
@echo "17. non-existent file"
-env LD_LIBRARY_PATH=${LIB_MERKLETREE_DIR} ./${PROG} skdjvsjfsvdfjbnldkbmdgkb
Index: othersrc/external/bsd/merkletree/dist/tests/15.expected
diff -u othersrc/external/bsd/merkletree/dist/tests/15.expected:1.1 othersrc/external/bsd/merkletree/dist/tests/15.expected:1.2
--- othersrc/external/bsd/merkletree/dist/tests/15.expected:1.1 Tue Feb 15 18:48:32 2022
+++ othersrc/external/bsd/merkletree/dist/tests/15.expected Tue Feb 15 19:29:07 2022
@@ -1,4 +1,4 @@
{"name":"./1.in","blocksize":1024,"digest":"sha512","1:0":"902387724175187f42a6bce7ab7f1a88a4ce536662880747347dc5ea761fed5a7dac5e98962c60b5c3d7988258c0c9e2a14e37cfeb7972fe9086e693381324c8"}
-{"name":"./7.expected","blocksize":1024,"digest":"sha512","0:0":"e4f51d07a871d2a74660fe327cfd6ff8183bebb011dbe442d8115e45a744af09ee9907427f968cc9c0db5a9fc8b03f57e942a8964c8e75701cd3b66db60ead3f"}
+{"name":"./1.expected","blocksize":1024,"digest":"sha512","0:0":"f4fd1ca9cb7d3833fd3824f103cae3e9901eeace852f30a76199f052ec9e5d1d32969b734adc3cb2f248cfeffe66a6e6db671b053eeb146c69fc3337edf505f1"}
+{"name"
CVS commit: othersrc/external/bsd/merkletree
Module Name:othersrc Committed By: agc Date: Tue Feb 15 19:29:07 UTC 2022 Modified Files: othersrc/external/bsd/merkletree/bin: Makefile othersrc/external/bsd/merkletree/dist/tests: 15.expected 16.expected Added Files: othersrc/external/bsd/merkletree/bin: mktestdir.sh Removed Files: othersrc/external/bsd/merkletree/bin: 1.expected 1.in 1.sum 10.expected 11.expected 12.expected 13.expected 14.expected 15.expected 2.expected 2.in 3.expected 4.expected 5.expected 6.expected 7.expected 8.expected 9.expected othersrc/external/bsd/merkletree/dist/tests/dir: 1.expected 1.in 1.symlink 7.expected Log Message: clean up old test files do the path and directory test in a different way (cvs has issues with symlinks, yay - create the test directory on the fly each time remove the hardcoded test directory To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 othersrc/external/bsd/merkletree/bin/1.expected \ othersrc/external/bsd/merkletree/bin/1.sum \ othersrc/external/bsd/merkletree/bin/10.expected \ othersrc/external/bsd/merkletree/bin/11.expected \ othersrc/external/bsd/merkletree/bin/12.expected \ othersrc/external/bsd/merkletree/bin/13.expected \ othersrc/external/bsd/merkletree/bin/14.expected \ othersrc/external/bsd/merkletree/bin/15.expected \ othersrc/external/bsd/merkletree/bin/2.expected \ othersrc/external/bsd/merkletree/bin/2.in \ othersrc/external/bsd/merkletree/bin/3.expected \ othersrc/external/bsd/merkletree/bin/4.expected \ othersrc/external/bsd/merkletree/bin/5.expected \ othersrc/external/bsd/merkletree/bin/6.expected \ othersrc/external/bsd/merkletree/bin/7.expected \ othersrc/external/bsd/merkletree/bin/8.expected \ othersrc/external/bsd/merkletree/bin/9.expected cvs rdiff -u -r1.2 -r0 othersrc/external/bsd/merkletree/bin/1.in cvs rdiff -u -r1.2 -r1.3 othersrc/external/bsd/merkletree/bin/Makefile cvs rdiff -u -r0 -r1.1 othersrc/external/bsd/merkletree/bin/mktestdir.sh cvs rdiff -u -r1.1 -r1.2 \ othersrc/external/bsd/merkletree/dist/tests/15.expected \ othersrc/external/bsd/merkletree/dist/tests/16.expected cvs rdiff -u -r1.1 -r0 \ othersrc/external/bsd/merkletree/dist/tests/dir/1.expected \ othersrc/external/bsd/merkletree/dist/tests/dir/1.in \ othersrc/external/bsd/merkletree/dist/tests/dir/1.symlink \ othersrc/external/bsd/merkletree/dist/tests/dir/7.expected Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: othersrc/external/bsd/merkletree
Module Name:othersrc
Committed By: agc
Date: Tue Feb 15 18:48:32 UTC 2022
Modified Files:
othersrc/external/bsd/merkletree: Makefile
othersrc/external/bsd/merkletree/bin: 1.in Makefile
othersrc/external/bsd/merkletree/dist: Makefile libmerkletree.3 main.c
merkletree.1 merkletree.h
othersrc/external/bsd/merkletree/lib: Makefile
Added Files:
othersrc/external/bsd/merkletree/dist: blake2.c blake2.h blake2b-hl.c
blake2b.c blake2b.h blake2s-hl.c blake2s.c blake2s.h edstring.c
edstring.h keccak.c keccak.h libdigest.c libdigest.h merkletree.c
sha2.c sha2.h sha3.c sha3.h sha3hl.c
othersrc/external/bsd/merkletree/dist/tests: 1.expected 1.in
10.expected 11.expected 12.expected 13.expected 14.expected
15.expected 16.expected 19.expected 2.expected 20.expected
21.expected 22.expected 3.expected 4.expected 5.expected 6.expected
7.expected 9.expected
othersrc/external/bsd/merkletree/dist/tests/dir: 1.expected 1.in
1.symlink 7.expected
Removed Files:
othersrc/external/bsd/merkletree/dist: Makefile.in Makefile.lib.in
Makefile.libtool.in
Log Message:
This is the updated version of the Merkletree code, version 20220204
Digests supported are a bit more up to date:
blake2b
blake2s
sha256
sha3_256
sha3_512
sha512
The default algorithm is sha512, with an input blocksize of 1024.
Input can either be in the form of files, other directory entries, or
from standard input.
Output is in either standard format (similar to digest(1)),
% merkletree 1.in
sha512/1024 (1.in)
902387724175187f42a6bce7ab7f1a88a4ce536662880747347dc5ea761fed5a7dac5e98962c60b5c3d7988258c0c9e2a14e37cfeb7972fe9086e693381324c8
% merkletree < 1.in
902387724175187f42a6bce7ab7f1a88a4ce536662880747347dc5ea761fed5a7dac5e98962c60b5c3d7988258c0c9e2a14e37cfeb7972fe9086e693381324c8
%
or can be in JSON format:
{"name":"1.in","blocksize":1024,"digest":"sha512","1:0":"902387724175187f42a6bce7ab7f1a88a4ce536662880747347dc5ea761fed5a7dac5e98962c60b5c3d7988258c0c9e2a14e37cfeb7972fe9086e693381324c8"}
(or, run through jq):
% jq . < dist/tests/11.expected
{
"name": "1.in",
"blocksize": 1024,
"digest": "sha512",
"1:0":
"902387724175187f42a6bce7ab7f1a88a4ce536662880747347dc5ea761fed5a7dac5e98962c60b5c3d7988258c0c9e2a14e37cfeb7972fe9086e693381324c8"
}
%
The input blocksize can be specified by the user, but must be twice
the size of the selected digest's algorithm in raw bytes.
It is possible to run merkletree on a hierarchy by using the "-p path"
argument:
% merkletree -a sha3_256 -p / bin
sha3_256/1024 (bin/chgrp)
39e8cc74388ffe34469b1ca91f63d49982662b1c942c9afbd32f48185c3df5ca
sha3_256/1024 (bin/cat)
edc35ffbe3ee8c022bb7914530562a3da46680a5e7f3b37749f04ee04cb87cdb
sha3_256/1024 (bin/chmod)
c58fca83a80c83f645e80365374be1d9191324cd490a78b99e3ab33fedebacb5
sha3_256/1024 (bin/chio)
d8a00ff730bc8a4a108d170ab6f2d690e7f6c201b164b23f256f6013ee08ffef
sha3_256/1024 (bin/domainname)
b04a2dafa1a9b14257f63e49acac8c91150c09649519daa3fc0e2f6add79644e
sha3_256/1024 (bin/cp)
7c97f28d4257e6743e315b46d8119baa3718adf6b1b25e4221016dd90db266c6
sha3_256/1024 (bin/cpio)
7e2371ff80c900f31783e147ded8a5a2b87cebdff6eda3638d52611aefe63243
sha3_256/1024 (bin/csh)
16e4e9acd76b3ca6de71a796c77a0593e365048037d0e433cba96d5a8d2b27d4
sha3_256/1024 (bin/date)
05891939e39d7180e8bf252b8b8fc087b309a46e4845b4980bbc3fea1f5307ae
sha3_256/1024 (bin/dd)
67b28e1d3399a2edef52b39683a0d8b56f812fa37b56aeda92a427b0db50dfb8
sha3_256/1024 (bin/df)
a360c756b2d64003247140924b8223b1dbe161f9b70ce96a915c85d9bab23e51
sha3_256/1024 (bin/hostname)
ddba878bc063a3123cdb4cf8d272a0438ab2f6a4141618e70726fda45f41b1cb
sha3_256/1024 (bin/echo)
cd3c415f168bb4a8df2e2f12b1238137b7004453affa5497741175761e516cc0
sha3_256/1024 (bin/ed)
7a915104df73a5682d091fb0214af110e4c1c6bec306d9ccf2ffd527c09c856e
sha3_256/1024 (bin/expr)
aaf51c742e02ca40abc402a6fdd283488c11d3e549039d0d62e7c29795987185
sha3_256/1024 (bin/mkdir)
e425ae2f2c7771d4e4bfae0f335c44016548a37eb1915b5ed665ba4e4feeb1b6
sha3_256/1024 (bin/kill)
999a17e8c03e022180fe842e92273f7656719027618bb9de90b46ada48ab518f
sha3_256/1024 (bin/ksh)
a862c37708a7417a4e35ed04363ef3d83c141efc5659eb04c141063fe0ec7ba2
sha3_256/1024 (bin/ln)
a0e93d49eba74b0b48a712fa143faaf9735cf7a82343e992cb12b3cc8fa485c2
sha3_256/1024 (bin/ls)
006d65534a13845efa9af7c252174e54a75c142a1db4dfd86c78f95c7f5297b6
sha3_256/1024 (bin/pax)
0fb2c7557feb33ea9073b36db01a44ef4b2609386a4fb771db21ad44fd48064f
sha3_256/1024 (bin/sleep)
d548731fc8b401d2070ab4ab84c012d69c9
CVS commit: src/sys/external/bsd/drm2/dist/drm/i915
Module Name:src Committed By: riastradh Date: Tue Feb 15 18:14:18 UTC 2022 Modified Files: src/sys/external/bsd/drm2/dist/drm/i915: i915_active.c Log Message: Revert "i915: Defer final wakeup on active until after retirement." This reverts i915_active.c 1.11. ref->retire might free the object, so touching it is not allowed -- that would use-after-free. Linux uses the object only for its address with wake_up_var. The reason I made this change was that I guessed i915_active_wait has to wait until after ref->retire finishes -- after all, Linux seems to defer the wakeup until then. However, even the Linux code doesn't guarantee this, because i915_active_wait could be called _during_ ref->retire, and would witness ref->count == 0, and would not wait until it has completed in that case. So maybe my guess was wrong, and it is OK for i915_active_wait to return while ref->retire is still in flight -- I don't see any logic that obviously requires it to wait for ref->retire, in any case. Or maybe something does rely on i915_active_wait to wait for ref->retire to finish, in which case we need a different mechanism for i915_active_release itself to wait until i915_active_retire has woken up, without dereferencing ref since it might be dead after ref->retire. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 \ src/sys/external/bsd/drm2/dist/drm/i915/i915_active.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/drm/i915
Module Name:src
Committed By: riastradh
Date: Tue Feb 15 18:14:18 UTC 2022
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_active.c
Log Message:
Revert "i915: Defer final wakeup on active until after retirement."
This reverts i915_active.c 1.11. ref->retire might free the object,
so touching it is not allowed -- that would use-after-free. Linux
uses the object only for its address with wake_up_var.
The reason I made this change was that I guessed i915_active_wait has
to wait until after ref->retire finishes -- after all, Linux seems to
defer the wakeup until then. However, even the Linux code doesn't
guarantee this, because i915_active_wait could be called _during_
ref->retire, and would witness ref->count == 0, and would not wait
until it has completed in that case. So maybe my guess was wrong,
and it is OK for i915_active_wait to return while ref->retire is
still in flight -- I don't see any logic that obviously requires it
to wait for ref->retire, in any case.
Or maybe something does rely on i915_active_wait to wait for
ref->retire to finish, in which case we need a different mechanism
for i915_active_release itself to wait until i915_active_retire has
woken up, without dereferencing ref since it might be dead after
ref->retire.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_active.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_active.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_active.c:1.11 src/sys/external/bsd/drm2/dist/drm/i915/i915_active.c:1.12
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_active.c:1.11 Mon Feb 14 20:37:51 2022
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_active.c Tue Feb 15 18:14:18 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_active.c,v 1.11 2022/02/14 20:37:51 riastradh Exp $ */
+/* $NetBSD: i915_active.c,v 1.12 2022/02/15 18:14:18 riastradh Exp $ */
/*
* SPDX-License-Identifier: MIT
@@ -7,7 +7,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: i915_active.c,v 1.11 2022/02/14 20:37:51 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_active.c,v 1.12 2022/02/15 18:14:18 riastradh Exp $");
#include
@@ -195,6 +195,8 @@ __active_retire(struct i915_active *ref)
#endif
ref->cache = NULL;
+ DRM_SPIN_WAKEUP_ALL(&ref->tree_wq, &ref->tree_lock);
+
spin_unlock_irqrestore(&ref->tree_lock, flags);
/* After the final retire, the entire struct may be freed */
@@ -202,9 +204,6 @@ __active_retire(struct i915_active *ref)
ref->retire(ref);
/* ... except if you wait on it, you must manage your own references! */
- spin_lock(&ref->tree_lock);
- DRM_SPIN_WAKEUP_ALL(&ref->tree_wq, &ref->tree_lock);
- spin_unlock(&ref->tree_lock);
rbtree_postorder_for_each_entry_safe(it, n, &root, node) {
GEM_BUG_ON(i915_active_fence_isset(&it->base));
CVS commit: src/usr.bin/units
Module Name:src Committed By: jakllsch Date: Tue Feb 15 16:21:35 UTC 2022 Modified Files: src/usr.bin/units: units.lib Log Message: Define becquerels in base units (like curies and rutherfords already are), rather than in terms of curies. Add symbol Bq for becquerel. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/usr.bin/units/units.lib Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/units
Module Name:src Committed By: jakllsch Date: Tue Feb 15 16:21:35 UTC 2022 Modified Files: src/usr.bin/units: units.lib Log Message: Define becquerels in base units (like curies and rutherfords already are), rather than in terms of curies. Add symbol Bq for becquerel. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/usr.bin/units/units.lib Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/units/units.lib diff -u src/usr.bin/units/units.lib:1.25 src/usr.bin/units/units.lib:1.26 --- src/usr.bin/units/units.lib:1.25 Tue Feb 15 13:44:47 2022 +++ src/usr.bin/units/units.lib Tue Feb 15 16:21:35 2022 @@ -1,4 +1,4 @@ -/ $NetBSD: units.lib,v 1.25 2022/02/15 13:44:47 jakllsch Exp $ +/ $NetBSD: units.lib,v 1.26 2022/02/15 16:21:35 jakllsch Exp $ / primitive units @@ -612,7 +612,8 @@ neutronmass 1.6606e-27 kg V volt eV e V bohrradius hbar2-C2/8.988e9 N m2-e2-electronmass -becquerel 1|3.7e10 curie +becquerel /sec +Bq becquerel fresnel 1e12 hertz statcoul 1|2.99792458e9 coul statamp 1|2.99792458e9 amp
CVS commit: src/usr.bin/units
Module Name:src Committed By: jakllsch Date: Tue Feb 15 13:44:47 UTC 2022 Modified Files: src/usr.bin/units: units.lib Log Message: fix inconsistent whitespace in units.lib To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/usr.bin/units/units.lib Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/units/units.lib diff -u src/usr.bin/units/units.lib:1.24 src/usr.bin/units/units.lib:1.25 --- src/usr.bin/units/units.lib:1.24 Thu Apr 23 09:38:17 2020 +++ src/usr.bin/units/units.lib Tue Feb 15 13:44:47 2022 @@ -1,4 +1,4 @@ -/ $NetBSD: units.lib,v 1.24 2020/04/23 09:38:17 kre Exp $ +/ $NetBSD: units.lib,v 1.25 2022/02/15 13:44:47 jakllsch Exp $ / primitive units @@ -271,7 +271,7 @@ denmarkkrone .15 $ ecuadorsucre .000539 $ europeeuro 0.9142 $ greatbritainpound britainpound -hongkongdollar .13 $ +hongkongdollar .13 $ hungaryforint .011 $ indiarupee .03211 $ indonesiarupiah .0004782 $ @@ -292,7 +292,7 @@ polandzloty .59 $ saudiarabiariyal .26702 $ singaporedollar .6157 $ slovakkoruna .034 $ -southafricarand .21 $ +southafricarand .21 $ southkoreawon .001 $ swedenkrona .13 $ switzerlandfranc .66 $
CVS commit: src/usr.bin/units
Module Name:src Committed By: jakllsch Date: Tue Feb 15 13:44:47 UTC 2022 Modified Files: src/usr.bin/units: units.lib Log Message: fix inconsistent whitespace in units.lib To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/usr.bin/units/units.lib 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: msaitoh
Date: Tue Feb 15 12:01:55 UTC 2022
Modified Files:
src/sys/dev/pci: pcidevs.h pcidevs_data.h
Log Message:
Regen.
To generate a diff of this commit:
cvs rdiff -u -r1.1432 -r1.1433 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1431 -r1.1432 src/sys/dev/pci/pcidevs_data.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/pci/pcidevs.h
diff -u src/sys/dev/pci/pcidevs.h:1.1432 src/sys/dev/pci/pcidevs.h:1.1433
--- src/sys/dev/pci/pcidevs.h:1.1432 Wed Feb 2 15:18:53 2022
+++ src/sys/dev/pci/pcidevs.h Tue Feb 15 12:01:54 2022
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs.h,v 1.1432 2022/02/02 15:18:53 msaitoh Exp $ */
+/* $NetBSD: pcidevs.h,v 1.1433 2022/02/15 12:01:54 msaitoh Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.1448 2022/02/02 15:18:21 msaitoh Exp
+ * NetBSD: pcidevs,v 1.1449 2022/02/15 12:01:28 msaitoh Exp
*/
/*
@@ -9554,6 +9554,8 @@
#define PCI_PRODUCT_VMWARE_VMPCIE 0x07a0 /* Virtual PCI Express Root Port */
#define PCI_PRODUCT_VMWARE_VMXNET3 0x07b0 /* Virtual Network 3 */
#define PCI_PRODUCT_VMWARE_PVSCSI 0x07c0 /* PVSCSI */
+#define PCI_PRODUCT_VMWARE_AHCI 0x07e0 /* AHCI */
+#define PCI_PRODUCT_VMWARE_NVME 0x07f0 /* NVMe */
#define PCI_PRODUCT_VMWARE_VMI3 0x0801 /* VMI option ROM */
/* Weitek products */
Index: src/sys/dev/pci/pcidevs_data.h
diff -u src/sys/dev/pci/pcidevs_data.h:1.1431 src/sys/dev/pci/pcidevs_data.h:1.1432
--- src/sys/dev/pci/pcidevs_data.h:1.1431 Wed Feb 2 15:18:52 2022
+++ src/sys/dev/pci/pcidevs_data.h Tue Feb 15 12:01:54 2022
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs_data.h,v 1.1431 2022/02/02 15:18:52 msaitoh Exp $ */
+/* $NetBSD: pcidevs_data.h,v 1.1432 2022/02/15 12:01:54 msaitoh Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.1448 2022/02/02 15:18:21 msaitoh Exp
+ * NetBSD: pcidevs,v 1.1449 2022/02/15 12:01:28 msaitoh Exp
*/
/*
@@ -17191,6 +17191,10 @@ static const uint32_t pci_products[] = {
19246, 3879, 6380, 0,
PCI_VENDOR_VMWARE, PCI_PRODUCT_VMWARE_PVSCSI,
42330, 0,
+ PCI_VENDOR_VMWARE, PCI_PRODUCT_VMWARE_AHCI,
+ 8517, 0,
+ PCI_VENDOR_VMWARE, PCI_PRODUCT_VMWARE_NVME,
+ 7937, 0,
PCI_VENDOR_VMWARE, PCI_PRODUCT_VMWARE_VMI3,
42337, 42341, 42348, 0,
PCI_VENDOR_WEITEK, PCI_PRODUCT_WEITEK_P9000,
@@ -18348,7 +18352,7 @@ static const char pci_words[] = { "."
"AC1003\0" /* 1 refs @ 7908 */
"16650-compatible\0" /* 1 refs @ 7915 */
"UART\0" /* 92 refs @ 7932 */
- "NVMe\0" /* 14 refs @ 7937 */
+ "NVMe\0" /* 15 refs @ 7937 */
"SSD\0" /* 19 refs @ 7942 */
"Elastic\0" /* 1 refs @ 7946 */
"K8\0" /* 4 refs @ 7954 */
@@ -18430,7 +18434,7 @@ static const char pci_words[] = { "."
"300\0" /* 114 refs @ 8504 */
"SATA\0" /* 260 refs @ 8508 */
"400\0" /* 125 refs @ 8513 */
- "AHCI\0" /* 88 refs @ 8517 */
+ "AHCI\0" /* 89 refs @ 8517 */
"500\0" /* 122 refs @ 8522 */
"AMD751\0" /* 2 refs @ 8526 */
"PCI-PCI\0" /* 80 refs @ 8533 */
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Tue Feb 15 12:01:55 UTC 2022 Modified Files: src/sys/dev/pci: pcidevs.h pcidevs_data.h Log Message: Regen. To generate a diff of this commit: cvs rdiff -u -r1.1432 -r1.1433 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1431 -r1.1432 src/sys/dev/pci/pcidevs_data.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: msaitoh Date: Tue Feb 15 12:01:28 UTC 2022 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add VMware AHCI and NVMe. To generate a diff of this commit: cvs rdiff -u -r1.1448 -r1.1449 src/sys/dev/pci/pcidevs 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/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1448 src/sys/dev/pci/pcidevs:1.1449 --- src/sys/dev/pci/pcidevs:1.1448 Wed Feb 2 15:18:21 2022 +++ src/sys/dev/pci/pcidevs Tue Feb 15 12:01:28 2022 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1448 2022/02/02 15:18:21 msaitoh Exp $ +$NetBSD: pcidevs,v 1.1449 2022/02/15 12:01:28 msaitoh Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -9547,6 +9547,8 @@ product VMWARE VMPCIB 0x0790 Virtual PCI product VMWARE VMPCIE 0x07a0 Virtual PCI Express Root Port product VMWARE VMXNET3 0x07b0 Virtual Network 3 product VMWARE PVSCSI 0x07c0 PVSCSI +product VMWARE AHCI 0x07e0 AHCI +product VMWARE NVME 0x07f0 NVMe product VMWARE VMI3 0x0801 VMI option ROM /* Weitek products */
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Tue Feb 15 12:01:28 UTC 2022 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add VMware AHCI and NVMe. To generate a diff of this commit: cvs rdiff -u -r1.1448 -r1.1449 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
