CVS commit: src/sbin/gpt
Module Name:src Committed By: gutteridge Date: Tue Nov 7 00:53:39 UTC 2023 Modified Files: src/sbin/gpt: gpt.8 Log Message: gpt.8: fix grammar in a sentence To generate a diff of this commit: cvs rdiff -u -r1.79 -r1.80 src/sbin/gpt/gpt.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/gpt/gpt.8 diff -u src/sbin/gpt/gpt.8:1.79 src/sbin/gpt/gpt.8:1.80 --- src/sbin/gpt/gpt.8:1.79 Tue Oct 31 12:09:48 2023 +++ src/sbin/gpt/gpt.8 Tue Nov 7 00:53:39 2023 @@ -1,4 +1,4 @@ -.\" $NetBSD: gpt.8,v 1.79 2023/10/31 12:09:48 martin Exp $ +.\" $NetBSD: gpt.8,v 1.80 2023/11/07 00:53:39 gutteridge Exp $ .\" .\" Copyright (c) 2002 Marcel Moolenaar .\" All rights reserved. @@ -659,7 +659,7 @@ option, all information for all GPT part .Fl i Ar index ) will be printed. None of the options have any effect on non-GPT partitions. -The order of precedence for the options are: +The order of precedence for the options is: .Fl a , .Fl i , .Fl l ,
CVS commit: src/sbin/gpt
Module Name:src Committed By: gutteridge Date: Tue Nov 7 00:53:39 UTC 2023 Modified Files: src/sbin/gpt: gpt.8 Log Message: gpt.8: fix grammar in a sentence To generate a diff of this commit: cvs rdiff -u -r1.79 -r1.80 src/sbin/gpt/gpt.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src Committed By: christos Date: Mon Nov 6 22:35:48 UTC 2023 Modified Files: src/share/mk: bsd.sys.mk Log Message: Add -fmacro-prefix-map set like -fdebug-prefix-map (Jan-Benedict Glaw) See: https://gcc.gnu.org/onlinedocs/gcc/Preprocessor-Options.html\ #index-fmacro-prefix-map https://gcc.gnu.org/onlinedocs/gcc/Debugging-Options.html\ #index-fdebug-prefix-map To generate a diff of this commit: cvs rdiff -u -r1.314 -r1.315 src/share/mk/bsd.sys.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Mon Nov 6 22:35:48 UTC 2023
Modified Files:
src/share/mk: bsd.sys.mk
Log Message:
Add -fmacro-prefix-map set like -fdebug-prefix-map (Jan-Benedict Glaw)
See:
https://gcc.gnu.org/onlinedocs/gcc/Preprocessor-Options.html\
#index-fmacro-prefix-map
https://gcc.gnu.org/onlinedocs/gcc/Debugging-Options.html\
#index-fdebug-prefix-map
To generate a diff of this commit:
cvs rdiff -u -r1.314 -r1.315 src/share/mk/bsd.sys.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.314 src/share/mk/bsd.sys.mk:1.315
--- src/share/mk/bsd.sys.mk:1.314 Sat Jun 3 17:24:57 2023
+++ src/share/mk/bsd.sys.mk Mon Nov 6 17:35:48 2023
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sys.mk,v 1.314 2023/06/03 21:24:57 lukem Exp $
+# $NetBSD: bsd.sys.mk,v 1.315 2023/11/06 22:35:48 christos Exp $
#
# Build definitions used for NetBSD source tree builds.
@@ -21,6 +21,7 @@ error2:
.if !empty(DESTDIR)
CPPFLAGS+= -Wp,-iremap,${DESTDIR}:
REPROFLAGS+= -fdebug-prefix-map=\$$DESTDIR=
+REPROFLAGS+= -fmacro-prefix-map=\$$DESTDIR=
.endif
CPPFLAGS+= -Wp,-fno-canonical-system-headers
@@ -28,7 +29,9 @@ CPPFLAGS+= -Wp,-iremap,${NETBSDSRCDIR}:/
CPPFLAGS+= -Wp,-iremap,${X11SRCDIR}:/usr/xsrc
REPROFLAGS+= -fdebug-prefix-map=\$$NETBSDSRCDIR=/usr/src
+REPROFLAGS+= -fmacro-prefix-map=\$$NETBSDSRCDIR=/usr/src
REPROFLAGS+= -fdebug-prefix-map=\$$X11SRCDIR=/usr/xsrc
+REPROFLAGS+= -fmacro-prefix-map=\$$X11SRCDIR=/usr/xsrc
.if defined(MAKEOBJDIRPREFIX)
NETBSDOBJDIR= ${MAKEOBJDIRPREFIX}${NETBSDSRCDIR}
.endif
@@ -36,6 +39,7 @@ NETBSDOBJDIR= ${MAKEOBJDIRPREFIX}${NETBS
.if defined(NETBSDOBJDIR)
.export NETBSDOBJDIR
REPROFLAGS+= -fdebug-prefix-map=\$$NETBSDOBJDIR=/usr/obj
+REPROFLAGS+= -fmacro-prefix-map=\$$NETBSDOBJDIR=/usr/obj
.endif
LINTFLAGS+= -R${NETBSDSRCDIR}=/usr/src -R${X11SRCDIR}=/usr/xsrc
CVS commit: src/sys/dev/nvmm/x86
Module Name:src
Committed By: rin
Date: Mon Nov 6 17:02:17 UTC 2023
Modified Files:
src/sys/dev/nvmm/x86: nvmm_x86_vmx.c
Log Message:
nvmm_x86_vmx: vmx_vmptrst: Sprinkle __diagused to fix clang !DIAGNOSTIC build
To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sys/dev/nvmm/x86/nvmm_x86_vmx.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/nvmm/x86/nvmm_x86_vmx.c
diff -u src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.85 src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.86
--- src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.85 Tue Sep 13 20:10:04 2022
+++ src/sys/dev/nvmm/x86/nvmm_x86_vmx.c Mon Nov 6 17:02:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm_x86_vmx.c,v 1.85 2022/09/13 20:10:04 riastradh Exp $ */
+/* $NetBSD: nvmm_x86_vmx.c,v 1.86 2023/11/06 17:02:17 rin Exp $ */
/*
* Copyright (c) 2018-2020 Maxime Villard, m00nbsd.net
@@ -29,7 +29,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.85 2022/09/13 20:10:04 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.86 2023/11/06 17:02:17 rin Exp $");
#include
#include
@@ -135,7 +135,7 @@ vmx_vmwrite(uint64_t field, uint64_t val
);
}
-static inline paddr_t
+static inline paddr_t __diagused
vmx_vmptrst(void)
{
paddr_t pa;
CVS commit: src/sys/dev/nvmm/x86
Module Name:src Committed By: rin Date: Mon Nov 6 17:02:17 UTC 2023 Modified Files: src/sys/dev/nvmm/x86: nvmm_x86_vmx.c Log Message: nvmm_x86_vmx: vmx_vmptrst: Sprinkle __diagused to fix clang !DIAGNOSTIC build To generate a diff of this commit: cvs rdiff -u -r1.85 -r1.86 src/sys/dev/nvmm/x86/nvmm_x86_vmx.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/xen/x86
Module Name:src Committed By: rin Date: Mon Nov 6 17:01:07 UTC 2023 Modified Files: src/sys/arch/xen/x86: xen_ipi.c Log Message: xen_ipi: valid_ipimask: Sprinkle __diagused to fix clang !DIAGNOSTIC build To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/sys/arch/xen/x86/xen_ipi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/xen/x86
Module Name:src
Committed By: rin
Date: Mon Nov 6 17:01:07 UTC 2023
Modified Files:
src/sys/arch/xen/x86: xen_ipi.c
Log Message:
xen_ipi: valid_ipimask: Sprinkle __diagused to fix clang !DIAGNOSTIC build
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/xen/x86/xen_ipi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/xen/x86/xen_ipi.c
diff -u src/sys/arch/xen/x86/xen_ipi.c:1.41 src/sys/arch/xen/x86/xen_ipi.c:1.42
--- src/sys/arch/xen/x86/xen_ipi.c:1.41 Sun Aug 6 16:07:53 2023
+++ src/sys/arch/xen/x86/xen_ipi.c Mon Nov 6 17:01:07 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: xen_ipi.c,v 1.41 2023/08/06 16:07:53 riastradh Exp $ */
+/* $NetBSD: xen_ipi.c,v 1.42 2023/11/06 17:01:07 rin Exp $ */
/*-
* Copyright (c) 2011, 2019 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
* Based on: x86/ipi.c
*/
-__KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.41 2023/08/06 16:07:53 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.42 2023/11/06 17:01:07 rin Exp $");
#include "opt_ddb.h"
@@ -149,7 +149,7 @@ xen_ipi_init(void)
hypervisor_unmask_event(evtchn);
}
-static inline bool /* helper */
+static inline bool __diagused
valid_ipimask(uint32_t ipimask)
{
uint32_t masks = XEN_IPI_GENERIC | XEN_IPI_HVCB | XEN_IPI_XCALL |
CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon
Module Name:src
Committed By: tnn
Date: Mon Nov 6 14:33:51 UTC 2023
Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_bios.c
Log Message:
radeon: fix and enable ACPI methods for getting ROM BIOS
The hacky way of getting the BIOS mapped only works on x86. ACPI
should be preferred if available. Makes BIOS reading though VFCT
work on aarch64 with EDK2. (But only if EDK2 has POSTed the GPU.)
XXX amdgpu should get the same treatment.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.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/radeon/radeon_bios.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c:1.12 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c:1.13
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c:1.12 Sat May 28 01:07:47 2022
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c Mon Nov 6 14:33:51 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_bios.c,v 1.12 2022/05/28 01:07:47 manu Exp $ */
+/* $NetBSD: radeon_bios.c,v 1.13 2023/11/06 14:33:51 tnn Exp $ */
/*
* Copyright 2008 Advanced Micro Devices, Inc.
@@ -29,7 +29,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: radeon_bios.c,v 1.12 2022/05/28 01:07:47 manu Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_bios.c,v 1.13 2023/11/06 14:33:51 tnn Exp $");
#include
#include
@@ -42,6 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: radeon_bios.
#include "radeon_reg.h"
#if defined(__NetBSD__) && NACPICA > 0
+#define CONFIG_ACPI
#include
#define _COMPONENT ACPI_DISPLAY_COMPONENT
ACPI_MODULE_NAME("radeon_acpi")
@@ -252,10 +253,15 @@ static bool radeon_atrm_get_bios(struct
if (rdev->flags & RADEON_IS_IGP)
return false;
- while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, pdev)) != NULL) {
#ifdef __NetBSD__
+ pdev = rdev->pdev;
+ while (pdev != NULL) {
dhandle = (pdev->pd_ad ? pdev->pd_ad->ad_handle : NULL);
+ pdev = NULL;
+ if (rdev->pdev->class != PCI_CLASS_DISPLAY_VGA)
+ continue;
#else
+ while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, pdev)) != NULL) {
dhandle = ACPI_HANDLE(>dev);
#endif
if (!dhandle)
@@ -269,11 +275,16 @@ static bool radeon_atrm_get_bios(struct
}
if (!found) {
- while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_OTHER << 8, pdev)) != NULL) {
#ifdef __NetBSD__
+ pdev = rdev->pdev;
+ while (pdev != NULL) {
dhandle = (pdev->pd_ad ? pdev->pd_ad->ad_handle
: NULL);
+ pdev = NULL;
+ if (rdev->pdev->class != PCI_CLASS_DISPLAY_OTHER)
+continue;
#else
+ while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_OTHER << 8, pdev)) != NULL) {
dhandle = ACPI_HANDLE(>dev);
#endif
if (!dhandle)
CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon
Module Name:src Committed By: tnn Date: Mon Nov 6 14:33:51 UTC 2023 Modified Files: src/sys/external/bsd/drm2/dist/drm/radeon: radeon_bios.c Log Message: radeon: fix and enable ACPI methods for getting ROM BIOS The hacky way of getting the BIOS mapped only works on x86. ACPI should be preferred if available. Makes BIOS reading though VFCT work on aarch64 with EDK2. (But only if EDK2 has POSTed the GPU.) XXX amdgpu should get the same treatment. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 \ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libm
Module Name:src
Committed By: riastradh
Date: Mon Nov 6 13:48:13 UTC 2023
Modified Files:
src/tests/lib/libm: t_fenv.c
Log Message:
t_fenv: Factor checks out of switch in checkrounding.
No functional change intended, just tidies up a bit.
PR port-mips/57680
XXX pullup-10
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/tests/lib/libm/t_fenv.c
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/libm/t_fenv.c
diff -u src/tests/lib/libm/t_fenv.c:1.12 src/tests/lib/libm/t_fenv.c:1.13
--- src/tests/lib/libm/t_fenv.c:1.12 Mon Nov 6 13:48:00 2023
+++ src/tests/lib/libm/t_fenv.c Mon Nov 6 13:48:12 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: t_fenv.c,v 1.12 2023/11/06 13:48:00 riastradh Exp $ */
+/* $NetBSD: t_fenv.c,v 1.13 2023/11/06 13:48:12 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__RCSID("$NetBSD: t_fenv.c,v 1.12 2023/11/06 13:48:00 riastradh Exp $");
+__RCSID("$NetBSD: t_fenv.c,v 1.13 2023/11/06 13:48:12 riastradh Exp $");
#include
@@ -128,52 +128,33 @@ checkrounding(int feround, const char *n
volatile double y1 = -1 + ulp1/4;
volatile double y2 = 1 + 3*(ulp1/2);
+ double z1, z2;
+
switch (feround) {
- case FE_TONEAREST: {
- double z1 = -1;
- double z2 = 1 + 2*ulp1;
- ATF_CHECK_EQ_MSG(y1, z1, "%s[-1 + ulp(1)/4]"
- " expected=%a actual=%a",
- name, y1, z1);
- ATF_CHECK_EQ_MSG(y2, z2, "%s[1 + 3*(ulp(1)/2)]"
- " expected=%a actual=%a",
- name, y2, z2);
+ case FE_TONEAREST:
+ z1 = -1;
+ z2 = 1 + 2*ulp1;
break;
- }
- case FE_TOWARDZERO: {
- double z1 = -1 + ulp1/2;
- double z2 = 1 + ulp1;
- ATF_CHECK_EQ_MSG(y1, z1, "%s[-1 + ulp(1)/4]"
- " expected=%a actual=%a",
- name, y1, z1);
- ATF_CHECK_EQ_MSG(y2, z2, "%s[1 + 3*(ulp(1)/2)]"
- " expected=%a actual=%a",
- name, y2, z2);
+ case FE_TOWARDZERO:
+ z1 = -1 + ulp1/2;
+ z2 = 1 + ulp1;
break;
- }
- case FE_UPWARD: {
- double z1 = -1 + ulp1/2;
- double z2 = 1 + 2*ulp1;
- ATF_CHECK_EQ_MSG(y1, z1, "%s[-1 + ulp(1)/4]"
- " expected=%a actual=%a",
- name, y1, z1);
- ATF_CHECK_EQ_MSG(y2, z2, "%s[1 + 3*(ulp(1)/2)]"
- " expected=%a actual=%a",
- name, y2, z2);
+ case FE_UPWARD:
+ z1 = -1 + ulp1/2;
+ z2 = 1 + 2*ulp1;
break;
- }
- case FE_DOWNWARD: {
- double z1 = -1;
- double z2 = 1 + ulp1;
- ATF_CHECK_EQ_MSG(y1, z1, "%s[-1 + ulp(1)/4]"
- " expected=%a actual=%a",
- name, y1, z1);
- ATF_CHECK_EQ_MSG(y2, z2, "%s[1 + 3*(ulp(1)/2)]"
- " expected=%a actual=%a",
- name, y2, z2);
+ case FE_DOWNWARD:
+ z1 = -1;
+ z2 = 1 + ulp1;
break;
+ default:
+ atf_tc_fail("unknown rounding mode %d (%s)", feround, name);
}
- }
+
+ ATF_CHECK_EQ_MSG(y1, z1, "%s[-1 + ulp(1)/4] expected=%a actual=%a",
+ name, y1, z1);
+ ATF_CHECK_EQ_MSG(y2, z2, "%s[1 + 3*(ulp(1)/2)] expected=%a actual=%a",
+ name, y2, z2);
}
ATF_TC(fegetround);
CVS commit: src/tests/lib/libm
Module Name:src Committed By: riastradh Date: Mon Nov 6 13:48:13 UTC 2023 Modified Files: src/tests/lib/libm: t_fenv.c Log Message: t_fenv: Factor checks out of switch in checkrounding. No functional change intended, just tidies up a bit. PR port-mips/57680 XXX pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/tests/lib/libm/t_fenv.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libm
Module Name:src
Committed By: riastradh
Date: Mon Nov 6 13:48:00 UTC 2023
Modified Files:
src/tests/lib/libm: t_fenv.c
Log Message:
t_fenv: Use volatile intermediate to force rounding to double.
See comment for details about why this is necessary.
Should fix these tests on i386 (and perhaps m68k too).
PR port-mips/57680
XXX pullup-10
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/tests/lib/libm/t_fenv.c
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/libm/t_fenv.c
diff -u src/tests/lib/libm/t_fenv.c:1.11 src/tests/lib/libm/t_fenv.c:1.12
--- src/tests/lib/libm/t_fenv.c:1.11 Sun Nov 5 21:13:06 2023
+++ src/tests/lib/libm/t_fenv.c Mon Nov 6 13:48:00 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: t_fenv.c,v 1.11 2023/11/05 21:13:06 riastradh Exp $ */
+/* $NetBSD: t_fenv.c,v 1.12 2023/11/06 13:48:00 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__RCSID("$NetBSD: t_fenv.c,v 1.11 2023/11/05 21:13:06 riastradh Exp $");
+__RCSID("$NetBSD: t_fenv.c,v 1.12 2023/11/06 13:48:00 riastradh Exp $");
#include
@@ -114,8 +114,19 @@ static void
checkrounding(int feround, const char *name)
{
volatile double ulp1 = DBL_EPSILON;
- double y1 = -1 + ulp1/4;
- double y2 = 1 + 3*(ulp1/2);
+
+ /*
+ * XXX These must be volatile to force rounding to double when
+ * the intermediate quantities are evaluated in long double
+ * precision, e.g. on 32-bit x86 with x87 long double. Under
+ * the C standard (C99, C11, C17, ), cast and assignment
+ * operators are required to remove all extra range and
+ * precision, i.e., round double to long double. But we build
+ * this code with -std=gnu99, which diverges from this
+ * requirement -- unless you add a volatile qualifier.
+ */
+ volatile double y1 = -1 + ulp1/4;
+ volatile double y2 = 1 + 3*(ulp1/2);
switch (feround) {
case FE_TONEAREST: {
CVS commit: src/tests/lib/libm
Module Name:src Committed By: riastradh Date: Mon Nov 6 13:48:00 UTC 2023 Modified Files: src/tests/lib/libm: t_fenv.c Log Message: t_fenv: Use volatile intermediate to force rounding to double. See comment for details about why this is necessary. Should fix these tests on i386 (and perhaps m68k too). PR port-mips/57680 XXX pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/tests/lib/libm/t_fenv.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/dumpfs
Module Name:src
Committed By: hannken
Date: Mon Nov 6 12:18:59 UTC 2023
Modified Files:
src/usr.sbin/dumpfs: dumpfs.c
Log Message:
Print the inode numbers of persistent snapshots.
PR kern/57675 "persistent file system snapshots aren't obvious"
To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/usr.sbin/dumpfs/dumpfs.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/dumpfs/dumpfs.c
diff -u src/usr.sbin/dumpfs/dumpfs.c:1.68 src/usr.sbin/dumpfs/dumpfs.c:1.69
--- src/usr.sbin/dumpfs/dumpfs.c:1.68 Sat Jan 7 19:41:30 2023
+++ src/usr.sbin/dumpfs/dumpfs.c Mon Nov 6 12:18:59 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: dumpfs.c,v 1.68 2023/01/07 19:41:30 chs Exp $ */
+/* $NetBSD: dumpfs.c,v 1.69 2023/11/06 12:18:59 hannken Exp $ */
/*
* Copyright (c) 1983, 1992, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = "@(#)dumpfs.c 8.5 (Berkeley) 4/29/95";
#else
-__RCSID("$NetBSD: dumpfs.c,v 1.68 2023/01/07 19:41:30 chs Exp $");
+__RCSID("$NetBSD: dumpfs.c,v 1.69 2023/11/06 12:18:59 hannken Exp $");
#endif
#endif /* not lint */
@@ -410,6 +410,11 @@ print_superblock(struct fs *fs, uint16_t
fs->fs_journallocs[0], fs->fs_journallocs[1]);
printf("\tloc2 %" PRIu64 "\tloc3 %" PRIu64 "\n",
fs->fs_journallocs[2], fs->fs_journallocs[3]);
+ printf("snapshot inodes");
+ for (int s = 0; s < FSMAXSNAP; s++) {
+ printf(" %u", fs->fs_snapinum[s]);
+ }
+ printf("\n");
printf("usrquota %" PRIu64 "\tgrpquota %" PRIu64 "\n",
fs->fs_quotafile[USRQUOTA], fs->fs_quotafile[GRPQUOTA]);
printf("flags\t");
CVS commit: src/usr.sbin/dumpfs
Module Name:src Committed By: hannken Date: Mon Nov 6 12:18:59 UTC 2023 Modified Files: src/usr.sbin/dumpfs: dumpfs.c Log Message: Print the inode numbers of persistent snapshots. PR kern/57675 "persistent file system snapshots aren't obvious" To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.69 src/usr.sbin/dumpfs/dumpfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src
Committed By: hannken
Date: Mon Nov 6 12:17:50 UTC 2023
Modified Files:
src/sys/kern: vfs_vnode.c
Log Message:
As the number of allocated vnodes goes beyond 106% of desiredvnodes
start throttling threads allocating new vnodes at a rate of ~100 new
vnodes per second and thread.
To generate a diff of this commit:
cvs rdiff -u -r1.149 -r1.150 src/sys/kern/vfs_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/kern/vfs_vnode.c
diff -u src/sys/kern/vfs_vnode.c:1.149 src/sys/kern/vfs_vnode.c:1.150
--- src/sys/kern/vfs_vnode.c:1.149 Fri Feb 24 11:02:27 2023
+++ src/sys/kern/vfs_vnode.c Mon Nov 6 12:17:50 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_vnode.c,v 1.149 2023/02/24 11:02:27 riastradh Exp $ */
+/* $NetBSD: vfs_vnode.c,v 1.150 2023/11/06 12:17:50 hannken 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.149 2023/02/24 11:02:27 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.150 2023/11/06 12:17:50 hannken Exp $");
#ifdef _KERNEL_OPT
#include "opt_pax.h"
@@ -539,6 +539,8 @@ lru_requeue(vnode_t *vp, vnodelst_t *lis
if ((d > 0 && numvnodes > desiredvnodes) ||
listhd == _list[LRU_VRELE])
cv_signal(_cv);
+ if (d > 0 && numvnodes > desiredvnodes + desiredvnodes / 16)
+ kpause("vnfull", false, mstohz(10), _lock);
mutex_exit(_lock);
}
@@ -689,7 +691,7 @@ vdrain_thread(void *cookie)
for (;;) {
vdrain_retry = false;
- target = desiredvnodes - desiredvnodes/10;
+ target = desiredvnodes - desiredvnodes / 16;
for (i = 0; i < LRU_COUNT; i++) {
TAILQ_INSERT_HEAD(_list[i], marker, vi_lrulist);
CVS commit: src/sys/kern
Module Name:src Committed By: hannken Date: Mon Nov 6 12:17:50 UTC 2023 Modified Files: src/sys/kern: vfs_vnode.c Log Message: As the number of allocated vnodes goes beyond 106% of desiredvnodes start throttling threads allocating new vnodes at a rate of ~100 new vnodes per second and thread. To generate a diff of this commit: cvs rdiff -u -r1.149 -r1.150 src/sys/kern/vfs_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/dev/usb
Module Name:src Committed By: hannken Date: Mon Nov 6 12:16:52 UTC 2023 Modified Files: src/sys/dev/usb: ugen.c Log Message: Undo the DPRINTFN part of the last commit. It breaks i386 at least when KERNHIST_LOG casts the pointer to uintmax_t. Kernel ALL/i386 compiles again. To generate a diff of this commit: cvs rdiff -u -r1.174 -r1.175 src/sys/dev/usb/ugen.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/usb
Module Name:src Committed By: hannken Date: Mon Nov 6 12:16:52 UTC 2023 Modified Files: src/sys/dev/usb: ugen.c Log Message: Undo the DPRINTFN part of the last commit. It breaks i386 at least when KERNHIST_LOG casts the pointer to uintmax_t. Kernel ALL/i386 compiles again. To generate a diff of this commit: cvs rdiff -u -r1.174 -r1.175 src/sys/dev/usb/ugen.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/ugen.c diff -u src/sys/dev/usb/ugen.c:1.174 src/sys/dev/usb/ugen.c:1.175 --- src/sys/dev/usb/ugen.c:1.174 Tue Oct 10 10:58:03 2023 +++ src/sys/dev/usb/ugen.c Mon Nov 6 12:16:52 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: ugen.c,v 1.174 2023/10/10 10:58:03 simonb Exp $ */ +/* $NetBSD: ugen.c,v 1.175 2023/11/06 12:16:52 hannken Exp $ */ /* * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.174 2023/10/10 10:58:03 simonb Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.175 2023/11/06 12:16:52 hannken Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -1346,8 +1346,8 @@ ugenintr(struct usbd_xfer *xfer, void *a usbd_get_xfer_status(xfer, NULL, NULL, , NULL); ibuf = sce->ibuf; - DPRINTFN(5, "xfer=%p status=%d count=%d", - xfer, status, count, 0); + DPRINTFN(5, "xfer=%#jx status=%d count=%d", + (uintptr_t)xfer, status, count, 0); DPRINTFN(5, " data = %02x %02x %02x", ibuf[0], ibuf[1], ibuf[2], 0);
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: rin Date: Mon Nov 6 08:56:12 UTC 2023 Modified Files: src/distrib/sets/lists/debug: mi Log Message: lists/debug/mi: Sprinkle gcc to lib[al]san_g.a to fix clang build To generate a diff of this commit: cvs rdiff -u -r1.421 -r1.422 src/distrib/sets/lists/debug/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/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.421 src/distrib/sets/lists/debug/mi:1.422 --- src/distrib/sets/lists/debug/mi:1.421 Tue Oct 17 13:51:52 2023 +++ src/distrib/sets/lists/debug/mi Mon Nov 6 08:56:12 2023 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.421 2023/10/17 13:51:52 rjs Exp $ +# $NetBSD: mi,v 1.422 2023/11/06 08:56:12 rin Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib comp-sys-usr compatdir ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile @@ -26,7 +26,7 @@ ./usr/lib/i18n/libmapper_zone_g.a comp-c-debuglib debuglib,compatfile ./usr/lib/libamu_g.acomp-c-debuglib debuglib,compatfile ./usr/lib/libarchive_g.a comp-c-debuglib debuglib,compatfile -./usr/lib/libasan_g.acomp-c-debuglib debuglib,compatfile,cxx +./usr/lib/libasan_g.acomp-c-debuglib debuglib,compatfile,cxx,gcc ./usr/lib/libasn1_g.acomp-c-debuglib debuglib,compatfile,kerberos ./usr/lib/libatf-c++_g.a comp-c-debuglib debuglib,compatfile,atf ./usr/lib/libatf-c_g.acomp-c-debuglib debuglib,compatfile,atf @@ -100,7 +100,7 @@ ./usr/lib/liblber_g.acomp-c-debuglib debuglib,ldap,compatfile ./usr/lib/libldap_g.acomp-c-debuglib debuglib,ldap,compatfile ./usr/lib/libldap_r_g.acomp-c-debuglib debuglib,ldap,compatfile -./usr/lib/liblsan_g.acomp-c-debuglib debuglib,compatfile,cxx +./usr/lib/liblsan_g.acomp-c-debuglib debuglib,compatfile,cxx,gcc ./usr/lib/liblua_g.acomp-c-debuglib debuglib,compatfile ./usr/lib/liblwres_g.acomp-obsolete obsolete ./usr/lib/liblzf_g.acomp-c-debuglib debuglib,compatfile
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: rin Date: Mon Nov 6 08:56:12 UTC 2023 Modified Files: src/distrib/sets/lists/debug: mi Log Message: lists/debug/mi: Sprinkle gcc to lib[al]san_g.a to fix clang build To generate a diff of this commit: cvs rdiff -u -r1.421 -r1.422 src/distrib/sets/lists/debug/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
