CVS commit: src/sys/dev/pci
Module Name:src Committed By: simonb Date: Wed May 4 02:38:27 UTC 2022 Modified Files: src/sys/dev/pci: if_vioif.c Log Message: White space KNF nits. To generate a diff of this commit: cvs rdiff -u -r1.80 -r1.81 src/sys/dev/pci/if_vioif.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: simonb
Date: Wed May 4 02:38:27 UTC 2022
Modified Files:
src/sys/dev/pci: if_vioif.c
Log Message:
White space KNF nits.
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 src/sys/dev/pci/if_vioif.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_vioif.c
diff -u src/sys/dev/pci/if_vioif.c:1.80 src/sys/dev/pci/if_vioif.c:1.81
--- src/sys/dev/pci/if_vioif.c:1.80 Sat Apr 16 18:15:22 2022
+++ src/sys/dev/pci/if_vioif.c Wed May 4 02:38:27 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vioif.c,v 1.80 2022/04/16 18:15:22 andvar Exp $ */
+/* $NetBSD: if_vioif.c,v 1.81 2022/05/04 02:38:27 simonb Exp $ */
/*
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.80 2022/04/16 18:15:22 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.81 2022/05/04 02:38:27 simonb Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -819,7 +819,7 @@ vioif_attach(device_t parent, device_t s
uint64_t features, req_features;
struct ifnet *ifp = >sc_ethercom.ec_if;
u_int softint_flags;
- int r, i, nvqs=0, req_flags;
+ int r, i, nvqs = 0, req_flags;
char xnamebuf[MAXCOMLEN];
if (virtio_child(vsc) != NULL) {
@@ -1233,7 +1233,7 @@ vioif_stop(struct ifnet *ifp, int disabl
* 1. stop interrupt handlers by rxq_stopping and txq_stopping
* 2. wait for stopping workqueue for packet processing
*/
- for (i =0; i < sc->sc_act_nvq_pairs; i++) {
+ for (i = 0; i < sc->sc_act_nvq_pairs; i++) {
txq = >sc_txq[i];
rxq = >sc_rxq[i];
CVS commit: src/tests/lib/libcurses
Module Name:src Committed By: blymn Date: Tue May 3 22:18:16 UTC 2022 Modified Files: src/tests/lib/libcurses: t_curses.sh src/tests/lib/libcurses/tests: mutt_test Log Message: Add mutt_test to the test runs, this test tries to emulate a real curses application to test the interaction of various curses calls. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/tests/lib/libcurses/t_curses.sh cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libcurses/tests/mutt_test Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libcurses
Module Name:src
Committed By: blymn
Date: Tue May 3 22:18:16 UTC 2022
Modified Files:
src/tests/lib/libcurses: t_curses.sh
src/tests/lib/libcurses/tests: mutt_test
Log Message:
Add mutt_test to the test runs, this test tries to emulate a real
curses application to test the interaction of various curses calls.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/tests/lib/libcurses/t_curses.sh
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libcurses/tests/mutt_test
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/libcurses/t_curses.sh
diff -u src/tests/lib/libcurses/t_curses.sh:1.31 src/tests/lib/libcurses/t_curses.sh:1.32
--- src/tests/lib/libcurses/t_curses.sh:1.31 Tue Apr 26 22:48:36 2022
+++ src/tests/lib/libcurses/t_curses.sh Tue May 3 22:18:16 2022
@@ -2187,6 +2187,20 @@ wunderscore_body()
h_run wunderscore
}
+##
+# Simulate curses application behaviour
+##
+
+atf_test_case mutt_test
+mutt_test_head()
+{
+ atf_set "descr" "Try to emulate a curses application"
+}
+mutt_test_body()
+{
+ h_run mutt_test
+}
+
atf_init_test_cases()
{
# testframe utility functions
@@ -2444,4 +2458,7 @@ atf_init_test_cases()
# curses underscore attribute manipulation routines
atf_add_test_case underscore
atf_add_test_case wunderscore
+
+ # emulate a curses application
+ atf_add_test_case mutt_test
}
Index: src/tests/lib/libcurses/tests/mutt_test
diff -u src/tests/lib/libcurses/tests/mutt_test:1.2 src/tests/lib/libcurses/tests/mutt_test:1.3
--- src/tests/lib/libcurses/tests/mutt_test:1.2 Thu Sep 19 11:31:58 2019
+++ src/tests/lib/libcurses/tests/mutt_test Tue May 3 22:18:16 2022
@@ -1,3 +1,8 @@
+#
+# This test attempts to emulate some of the behaviours of mutt, it is neither
+# an exact nor complete emulation of what mutt does but it does test the
+# interaction of various call types.
+#
include start_color
include fill_screen
comparend mutt_test1.chk
CVS commit: src/doc
Module Name:src Committed By: rillig Date: Tue May 3 22:12:54 UTC 2022 Modified Files: src/doc: CHANGES Log Message: doc/CHANGES: add indent(1), lint(1), make(1) To generate a diff of this commit: cvs rdiff -u -r1.2871 -r1.2872 src/doc/CHANGES 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 diff -u src/doc/CHANGES:1.2871 src/doc/CHANGES:1.2872 --- src/doc/CHANGES:1.2871 Sat Apr 30 15:45:41 2022 +++ src/doc/CHANGES Tue May 3 22:12:54 2022 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2871 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2872 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -490,3 +490,7 @@ Changes from NetBSD 9.0 to NetBSD 10.0: OpenSSH: Import 9.0. [christos 20220415] gpio: Allow /etc/rc.d/gpio to use a '!' character like /etc/rc.d/network can to run a shell script. [brad 20220430] + indent(1): Support for C99, lots of bug fixes. [rillig 20220503] + lint(1): Reduce amount of wrong warnings. [rillig 20220503] + make(1): Speed up evaluation of conditions, reduce memory leaks. + [rillig 20220503]
CVS commit: src/doc
Module Name:src Committed By: rillig Date: Tue May 3 22:12:54 UTC 2022 Modified Files: src/doc: CHANGES Log Message: doc/CHANGES: add indent(1), lint(1), make(1) To generate a diff of this commit: cvs rdiff -u -r1.2871 -r1.2872 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libcurses/check_files
Module Name:src Committed By: blymn Date: Tue May 3 22:01:13 UTC 2022 Modified Files: src/tests/lib/libcurses/check_files: mutt_test1.chk mutt_test3.chk mutt_test4.chk mutt_test5.chk mutt_test6.chk mutt_test8.chk mutt_test9.chk Log Message: Update check files, changes due to bug fixes. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libcurses/check_files/mutt_test1.chk \ src/tests/lib/libcurses/check_files/mutt_test3.chk \ src/tests/lib/libcurses/check_files/mutt_test8.chk \ src/tests/lib/libcurses/check_files/mutt_test9.chk cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libcurses/check_files/mutt_test4.chk \ src/tests/lib/libcurses/check_files/mutt_test5.chk \ src/tests/lib/libcurses/check_files/mutt_test6.chk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libcurses/check_files
Module Name:src Committed By: blymn Date: Tue May 3 22:01:13 UTC 2022 Modified Files: src/tests/lib/libcurses/check_files: mutt_test1.chk mutt_test3.chk mutt_test4.chk mutt_test5.chk mutt_test6.chk mutt_test8.chk mutt_test9.chk Log Message: Update check files, changes due to bug fixes. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libcurses/check_files/mutt_test1.chk \ src/tests/lib/libcurses/check_files/mutt_test3.chk \ src/tests/lib/libcurses/check_files/mutt_test8.chk \ src/tests/lib/libcurses/check_files/mutt_test9.chk cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libcurses/check_files/mutt_test4.chk \ src/tests/lib/libcurses/check_files/mutt_test5.chk \ src/tests/lib/libcurses/check_files/mutt_test6.chk 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/libcurses/check_files/mutt_test1.chk diff -u src/tests/lib/libcurses/check_files/mutt_test1.chk:1.1 src/tests/lib/libcurses/check_files/mutt_test1.chk:1.2 --- src/tests/lib/libcurses/check_files/mutt_test1.chk:1.1 Sun May 26 09:54:33 2019 +++ src/tests/lib/libcurses/check_files/mutt_test1.chk Tue May 3 22:01:13 2022 @@ -1 +0,0 @@ -setaf7Xsetab0X \ No newline at end of file Index: src/tests/lib/libcurses/check_files/mutt_test3.chk diff -u src/tests/lib/libcurses/check_files/mutt_test3.chk:1.1 src/tests/lib/libcurses/check_files/mutt_test3.chk:1.2 --- src/tests/lib/libcurses/check_files/mutt_test3.chk:1.1 Sun May 26 09:54:33 2019 +++ src/tests/lib/libcurses/check_files/mutt_test3.chk Tue May 3 22:01:13 2022 @@ -1 +1 @@ -homesetaf7Xsetab0Xboldcup13;1Xcup23;1Xsgr0op \ No newline at end of file +homeboldcup13;1Xcup23;1Xsgr0op \ No newline at end of file Index: src/tests/lib/libcurses/check_files/mutt_test8.chk diff -u src/tests/lib/libcurses/check_files/mutt_test8.chk:1.1 src/tests/lib/libcurses/check_files/mutt_test8.chk:1.2 --- src/tests/lib/libcurses/check_files/mutt_test8.chk:1.1 Sun May 26 09:54:33 2019 +++ src/tests/lib/libcurses/check_files/mutt_test8.chk Tue May 3 22:01:13 2022 @@ -1 +1 @@ -smkxopsetaf7Xsetab0Xcup13;73Xcup14;1Xboldcup15;1Xsgr0opsetaf7Xsetab0Xcup15;1Xboldcup16;1Xsgr0opsetaf7Xsetab0Xcup16;1Xboldcup16;73Xcup17;1Xsgr0op \ No newline at end of file +smkxopcup13;73Xcup14;1Xboldcup15;1Xsgr0opcup15;1Xboldcup16;1Xsgr0opcup16;1Xboldcup16;73Xcup17;1Xsgr0op \ No newline at end of file Index: src/tests/lib/libcurses/check_files/mutt_test9.chk diff -u src/tests/lib/libcurses/check_files/mutt_test9.chk:1.1 src/tests/lib/libcurses/check_files/mutt_test9.chk:1.2 --- src/tests/lib/libcurses/check_files/mutt_test9.chk:1.1 Sun May 26 09:54:33 2019 +++ src/tests/lib/libcurses/check_files/mutt_test9.chk Tue May 3 22:01:13 2022 @@ -1 +1 @@ -cup15;11Xsetaf7Xsetab0XsmsoRRRcup24;1Xrmsoopopcup15;15Xsetaf7Xsetab0XHHHopop \ No newline at end of file +cup15;11XsmsoRRRcup24;1Xrmsoopopcup15;15XHHHopop \ No newline at end of file Index: src/tests/lib/libcurses/check_files/mutt_test4.chk diff -u src/tests/lib/libcurses/check_files/mutt_test4.chk:1.2 src/tests/lib/libcurses/check_files/mutt_test4.chk:1.3 --- src/tests/lib/libcurses/check_files/mutt_test4.chk:1.2 Sun Jun 9 07:49:42 2019 +++ src/tests/lib/libcurses/check_files/mutt_test4.chk Tue May 3 22:01:13 2022 @@ -1,2 +1,2 @@ -setaf7Xsetab0Xrev123456789sgr0opsetaf7Xsetab0Xiop \ No newline at end of file +rev123456789sgr0opiop \ No newline at end of file Index: src/tests/lib/libcurses/check_files/mutt_test5.chk diff -u src/tests/lib/libcurses/check_files/mutt_test5.chk:1.2 src/tests/lib/libcurses/check_files/mutt_test5.chk:1.3 --- src/tests/lib/libcurses/check_files/mutt_test5.chk:1.2 Thu Sep 19 11:31:57 2019 +++ src/tests/lib/libcurses/check_files/mutt_test5.chk Tue May 3
CVS commit: src
Module Name:src Committed By: andvar Date: Tue May 3 20:52:32 UTC 2022 Modified Files: src/distrib/atari/floppies/prepare: install.sh src/distrib/miniroot: install.sh src/doc: TODO.smpnet src/sys/arch/acorn32/podulebus: sbic.c src/sys/arch/amiga/dev: grf_rh.c grf_rhreg.h grf_rt.c grf_rtreg.h src/sys/arch/arc/include: isa_machdep.h src/sys/arch/atari/dev: fd.c src/sys/arch/mipsco/obio: asc.c src/sys/arch/pmax/tc: asc_ioasic.c src/sys/arch/powerpc/powerpc: powerpc_machdep.c src/sys/arch/sparc64/sparc64: ipifuncs.c src/sys/arch/sun3/sun3x: pmap.c src/sys/coda: coda_psdev.c src/sys/dev/ic: ispreg.h sl811hs.c src/sys/dev/pci: if_sk.c src/sys/fs/udf: udf_vnops.c src/usr.bin/rdist: main.c Log Message: fix various typos, mainly s/trasfering/transferring/ and s/theese/these/. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/distrib/atari/floppies/prepare/install.sh cvs rdiff -u -r1.27 -r1.28 src/distrib/miniroot/install.sh cvs rdiff -u -r1.45 -r1.46 src/doc/TODO.smpnet cvs rdiff -u -r1.17 -r1.18 src/sys/arch/acorn32/podulebus/sbic.c cvs rdiff -u -r1.61 -r1.62 src/sys/arch/amiga/dev/grf_rh.c \ src/sys/arch/amiga/dev/grf_rt.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/amiga/dev/grf_rhreg.h \ src/sys/arch/amiga/dev/grf_rtreg.h cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arc/include/isa_machdep.h cvs rdiff -u -r1.90 -r1.91 src/sys/arch/atari/dev/fd.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/mipsco/obio/asc.c cvs rdiff -u -r1.26 -r1.27 src/sys/arch/pmax/tc/asc_ioasic.c cvs rdiff -u -r1.83 -r1.84 src/sys/arch/powerpc/powerpc/powerpc_machdep.c cvs rdiff -u -r1.56 -r1.57 src/sys/arch/sparc64/sparc64/ipifuncs.c cvs rdiff -u -r1.118 -r1.119 src/sys/arch/sun3/sun3x/pmap.c cvs rdiff -u -r1.61 -r1.62 src/sys/coda/coda_psdev.c cvs rdiff -u -r1.34 -r1.35 src/sys/dev/ic/ispreg.h cvs rdiff -u -r1.111 -r1.112 src/sys/dev/ic/sl811hs.c cvs rdiff -u -r1.109 -r1.110 src/sys/dev/pci/if_sk.c cvs rdiff -u -r1.124 -r1.125 src/sys/fs/udf/udf_vnops.c cvs rdiff -u -r1.20 -r1.21 src/usr.bin/rdist/main.c 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: andvar Date: Tue May 3 20:52:32 UTC 2022 Modified Files: src/distrib/atari/floppies/prepare: install.sh src/distrib/miniroot: install.sh src/doc: TODO.smpnet src/sys/arch/acorn32/podulebus: sbic.c src/sys/arch/amiga/dev: grf_rh.c grf_rhreg.h grf_rt.c grf_rtreg.h src/sys/arch/arc/include: isa_machdep.h src/sys/arch/atari/dev: fd.c src/sys/arch/mipsco/obio: asc.c src/sys/arch/pmax/tc: asc_ioasic.c src/sys/arch/powerpc/powerpc: powerpc_machdep.c src/sys/arch/sparc64/sparc64: ipifuncs.c src/sys/arch/sun3/sun3x: pmap.c src/sys/coda: coda_psdev.c src/sys/dev/ic: ispreg.h sl811hs.c src/sys/dev/pci: if_sk.c src/sys/fs/udf: udf_vnops.c src/usr.bin/rdist: main.c Log Message: fix various typos, mainly s/trasfering/transferring/ and s/theese/these/. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/distrib/atari/floppies/prepare/install.sh cvs rdiff -u -r1.27 -r1.28 src/distrib/miniroot/install.sh cvs rdiff -u -r1.45 -r1.46 src/doc/TODO.smpnet cvs rdiff -u -r1.17 -r1.18 src/sys/arch/acorn32/podulebus/sbic.c cvs rdiff -u -r1.61 -r1.62 src/sys/arch/amiga/dev/grf_rh.c \ src/sys/arch/amiga/dev/grf_rt.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/amiga/dev/grf_rhreg.h \ src/sys/arch/amiga/dev/grf_rtreg.h cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arc/include/isa_machdep.h cvs rdiff -u -r1.90 -r1.91 src/sys/arch/atari/dev/fd.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/mipsco/obio/asc.c cvs rdiff -u -r1.26 -r1.27 src/sys/arch/pmax/tc/asc_ioasic.c cvs rdiff -u -r1.83 -r1.84 src/sys/arch/powerpc/powerpc/powerpc_machdep.c cvs rdiff -u -r1.56 -r1.57 src/sys/arch/sparc64/sparc64/ipifuncs.c cvs rdiff -u -r1.118 -r1.119 src/sys/arch/sun3/sun3x/pmap.c cvs rdiff -u -r1.61 -r1.62 src/sys/coda/coda_psdev.c cvs rdiff -u -r1.34 -r1.35 src/sys/dev/ic/ispreg.h cvs rdiff -u -r1.111 -r1.112 src/sys/dev/ic/sl811hs.c cvs rdiff -u -r1.109 -r1.110 src/sys/dev/pci/if_sk.c cvs rdiff -u -r1.124 -r1.125 src/sys/fs/udf/udf_vnops.c cvs rdiff -u -r1.20 -r1.21 src/usr.bin/rdist/main.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/atari/floppies/prepare/install.sh diff -u src/distrib/atari/floppies/prepare/install.sh:1.3 src/distrib/atari/floppies/prepare/install.sh:1.4 --- src/distrib/atari/floppies/prepare/install.sh:1.3 Sun Sep 18 18:24:00 2016 +++ src/distrib/atari/floppies/prepare/install.sh Tue May 3 20:52:30 2022 @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: install.sh,v 1.3 2016/09/18 18:24:00 christos Exp $ +# $NetBSD: install.sh,v 1.4 2022/05/03 20:52:30 andvar Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. @@ -33,7 +33,7 @@ # In a perfect world, this would be a nice C program, with a reasonable # user interface. -FILESYSTEMS="/tmp/filesystems" # used thoughout +FILESYSTEMS="/tmp/filesystems" # used throughout MODE="install" # include machine-dependent functions Index: src/distrib/miniroot/install.sh diff -u src/distrib/miniroot/install.sh:1.27 src/distrib/miniroot/install.sh:1.28 --- src/distrib/miniroot/install.sh:1.27 Thu Apr 4 20:51:35 2019 +++ src/distrib/miniroot/install.sh Tue May 3 20:52:30 2022 @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: install.sh,v 1.27 2019/04/04 20:51:35 christos Exp $ +# $NetBSD: install.sh,v 1.28 2022/05/03 20:52:30 andvar Exp $ # # Copyright (c) 1996,1997,1999,2000,2006 The NetBSD Foundation, Inc. # All rights reserved. @@ -33,7 +33,7 @@ # In a perfect world, this would be a nice C program, with a reasonable # user interface. -FILESYSTEMS="/tmp/filesystems" # used thoughout +FILESYSTEMS="/tmp/filesystems" # used throughout FQDN="" # domain name trap "umount /tmp > /dev/null 2>&1" 0 Index: src/doc/TODO.smpnet diff -u src/doc/TODO.smpnet:1.45 src/doc/TODO.smpnet:1.46 --- src/doc/TODO.smpnet:1.45 Fri Dec 31 00:57:12 2021 +++ src/doc/TODO.smpnet Tue May 3 20:52:30 2022 @@ -1,4 +1,4 @@ -$NetBSD: TODO.smpnet,v 1.45 2021/12/31 00:57:12 riastradh Exp $ +$NetBSD: TODO.smpnet,v 1.46 2022/05/03 20:52:30 andvar Exp $ MP-safe components == @@ -171,7 +171,7 @@ netstat(1) accesses ifnet_list, the head (struct ifnet), and traverses each object through ifnet#if_list member variable. ifnet_list and ifnet#if_list is obsoleted by ifnet_pslist and ifnet#if_pslist_entry respectively. netstat also accesses the IP address list -of an interface throught ifnet#if_addrlist. struct ifaddr, struct in_ifaddr +of an interface through ifnet#if_addrlist. struct ifaddr, struct in_ifaddr and struct in6_ifaddr are accessed and the following obsolete member variables are stuck: ifaddr#ifa_list, in_ifaddr#ia_hash, in_ifaddr#ia_list, in6_ifaddr#ia_next and in6_ifaddr#_ia6_multiaddrs. Note that netstat already Index: src/sys/arch/acorn32/podulebus/sbic.c diff -u
CVS commit: src/sys/arch/arm
Module Name:src
Committed By: skrll
Date: Tue May 3 20:12:28 UTC 2022
Modified Files:
src/sys/arch/arm/arm: efi_machdep.c
src/sys/arch/arm/arm32: pmap.c
Log Message:
Catch up with aarch64 TTBR0 handling in pmap_{,de}activate_efirt and
kpreempt_{en,dis}able.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/arm/efi_machdep.c
cvs rdiff -u -r1.436 -r1.437 src/sys/arch/arm/arm32/pmap.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/arm
Module Name:src
Committed By: skrll
Date: Tue May 3 20:12:28 UTC 2022
Modified Files:
src/sys/arch/arm/arm: efi_machdep.c
src/sys/arch/arm/arm32: pmap.c
Log Message:
Catch up with aarch64 TTBR0 handling in pmap_{,de}activate_efirt and
kpreempt_{en,dis}able.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/arm/efi_machdep.c
cvs rdiff -u -r1.436 -r1.437 src/sys/arch/arm/arm32/pmap.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/arm/arm/efi_machdep.c
diff -u src/sys/arch/arm/arm/efi_machdep.c:1.1 src/sys/arch/arm/arm/efi_machdep.c:1.2
--- src/sys/arch/arm/arm/efi_machdep.c:1.1 Sat Apr 2 11:16:06 2022
+++ src/sys/arch/arm/arm/efi_machdep.c Tue May 3 20:12:27 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: efi_machdep.c,v 1.1 2022/04/02 11:16:06 skrll Exp $ */
+/* $NetBSD: efi_machdep.c,v 1.2 2022/05/03 20:12:27 skrll Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: efi_machdep.c,v 1.1 2022/04/02 11:16:06 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: efi_machdep.c,v 1.2 2022/05/03 20:12:27 skrll Exp $");
#include
#include
@@ -50,6 +50,10 @@ static struct {
int
arm_efirt_md_enter(void)
{
+ kpreempt_disable();
+
+ struct lwp * const l = curlwp;
+
arm_efirt_state.aert_tpidrprw = armreg_tpidrprw_read();
/* Disable the VFP. */
@@ -65,6 +69,9 @@ arm_efirt_md_enter(void)
if (err)
return err;
+ if ((l->l_flag & LW_SYSTEM) == 0) {
+ pmap_deactivate(l);
+ }
pmap_activate_efirt();
return 0;
@@ -73,7 +80,12 @@ arm_efirt_md_enter(void)
void
arm_efirt_md_exit(void)
{
+ struct lwp * const l = curlwp;
+
pmap_deactivate_efirt();
+ if ((l->l_flag & LW_SYSTEM) == 0) {
+ pmap_activate(l);
+ }
armreg_tpidrprw_write(arm_efirt_state.aert_tpidrprw);
@@ -83,6 +95,8 @@ arm_efirt_md_exit(void)
/* Remove custom fault handler */
cpu_unset_onfault();
+
+ kpreempt_enable();
}
Index: src/sys/arch/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.436 src/sys/arch/arm/arm32/pmap.c:1.437
--- src/sys/arch/arm/arm32/pmap.c:1.436 Sat Apr 9 23:38:31 2022
+++ src/sys/arch/arm/arm32/pmap.c Tue May 3 20:12:28 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.436 2022/04/09 23:38:31 riastradh Exp $ */
+/* $NetBSD: pmap.c,v 1.437 2022/05/03 20:12:28 skrll Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -193,7 +193,7 @@
#endif
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.436 2022/04/09 23:38:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.437 2022/05/03 20:12:28 skrll Exp $");
#include
#include
@@ -4986,15 +4986,16 @@ pmap_md_pdetab_deactivate(pmap_t pm)
void
pmap_activate_efirt(void)
{
- kpreempt_disable();
-
- struct cpu_info * const ci = curcpu();
struct pmap * const pm = _pmap;
- struct pmap_asid_info * const pai = PMAP_PAI(pm, cpu_tlb_info(ci));
UVMHIST_FUNC(__func__);
UVMHIST_CALLARGS(maphist, " (pm=%#jx)", (uintptr_t)pm, 0, 0, 0);
+ KASSERT(kpreempt_disabled());
+
+ struct cpu_info * const ci = curcpu();
+ struct pmap_asid_info * const pai = PMAP_PAI(pm, cpu_tlb_info(ci));
+
PMAPCOUNT(activations);
/*
@@ -5038,6 +5039,10 @@ pmap_activate(struct lwp *l)
UVMHIST_CALLARGS(maphist, "l=%#jx pm=%#jx", (uintptr_t)l,
(uintptr_t)npm, 0, 0);
+#ifdef ARM_MMU_EXTENDED
+ KASSERT(kpreempt_disabled());
+#endif
+
struct cpu_info * const ci = curcpu();
/*
@@ -5197,6 +5202,7 @@ pmap_deactivate(struct lwp *l)
(uintptr_t)pm, 0, 0);
#ifdef ARM_MMU_EXTENDED
+ KASSERT(kpreempt_disabled());
pmap_md_pdetab_deactivate(pm);
#else
/*
@@ -5219,6 +5225,7 @@ pmap_deactivate_efirt(void)
{
UVMHIST_FUNC(__func__); UVMHIST_CALLED(maphist);
+ KASSERT(kpreempt_disabled());
struct cpu_info * const ci = curcpu();
/*
@@ -5234,7 +5241,6 @@ pmap_deactivate_efirt(void)
KASSERTMSG(ci->ci_pmap_asid_cur == KERNEL_PID, "ci_pmap_asid_cur %u",
ci->ci_pmap_asid_cur);
- kpreempt_enable();
UVMHIST_LOG(maphist, " <-- done", 0, 0, 0, 0);
}
CVS commit: src/sys/arch/aarch64/aarch64
Module Name:src
Committed By: skrll
Date: Tue May 3 20:10:20 UTC 2022
Modified Files:
src/sys/arch/aarch64/aarch64: efi_machdep.c
Log Message:
Style. NFCI.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/aarch64/aarch64/efi_machdep.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/aarch64/aarch64/efi_machdep.c
diff -u src/sys/arch/aarch64/aarch64/efi_machdep.c:1.12 src/sys/arch/aarch64/aarch64/efi_machdep.c:1.13
--- src/sys/arch/aarch64/aarch64/efi_machdep.c:1.12 Wed Apr 27 23:38:31 2022
+++ src/sys/arch/aarch64/aarch64/efi_machdep.c Tue May 3 20:10:20 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: efi_machdep.c,v 1.12 2022/04/27 23:38:31 ryo Exp $ */
+/* $NetBSD: efi_machdep.c,v 1.13 2022/05/03 20:10:20 skrll Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: efi_machdep.c,v 1.12 2022/04/27 23:38:31 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: efi_machdep.c,v 1.13 2022/05/03 20:10:20 skrll Exp $");
#include
#include
@@ -106,11 +106,9 @@ arm_efirt_md_map_range(vaddr_t va, paddr
int
arm_efirt_md_enter(void)
{
- struct lwp *l;
- int err;
-
kpreempt_disable();
- l = curlwp;
+
+ struct lwp * const l = curlwp;
/* Save FPU state */
arm_efirt_state.fpu_used = fpu_used_p(l) != 0;
@@ -125,7 +123,7 @@ arm_efirt_md_enter(void)
* Install custom fault handler. EFI lock is held across calls so
* shared faultbuf is safe here.
*/
- err = cpu_set_onfault(_efirt_state.faultbuf);
+ int err = cpu_set_onfault(_efirt_state.faultbuf);
if (err)
return err;
@@ -142,7 +140,7 @@ arm_efirt_md_enter(void)
void
arm_efirt_md_exit(void)
{
- struct lwp *l = curlwp;
+ struct lwp * const l = curlwp;
if (efi_userva) {
pmap_deactivate_efirt();
@@ -151,7 +149,6 @@ arm_efirt_md_exit(void)
}
}
-
/* Disable FP access */
reg_cpacr_el1_write(CPACR_FPEN_NONE);
isb();
CVS commit: src/sys/arch/aarch64/aarch64
Module Name:src Committed By: skrll Date: Tue May 3 20:10:20 UTC 2022 Modified Files: src/sys/arch/aarch64/aarch64: efi_machdep.c Log Message: Style. NFCI. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/aarch64/aarch64/efi_machdep.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/aarch64/aarch64
Module Name:src Committed By: skrll Date: Tue May 3 20:09:54 UTC 2022 Modified Files: src/sys/arch/aarch64/aarch64: pmap.c Log Message: Sprinkle some KASSERT(kpreempt_disabled()); To generate a diff of this commit: cvs rdiff -u -r1.136 -r1.137 src/sys/arch/aarch64/aarch64/pmap.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/aarch64/aarch64
Module Name:src Committed By: skrll Date: Tue May 3 20:09:54 UTC 2022 Modified Files: src/sys/arch/aarch64/aarch64: pmap.c Log Message: Sprinkle some KASSERT(kpreempt_disabled()); To generate a diff of this commit: cvs rdiff -u -r1.136 -r1.137 src/sys/arch/aarch64/aarch64/pmap.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/aarch64/aarch64/pmap.c diff -u src/sys/arch/aarch64/aarch64/pmap.c:1.136 src/sys/arch/aarch64/aarch64/pmap.c:1.137 --- src/sys/arch/aarch64/aarch64/pmap.c:1.136 Wed Apr 27 23:38:31 2022 +++ src/sys/arch/aarch64/aarch64/pmap.c Tue May 3 20:09:54 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.136 2022/04/27 23:38:31 ryo Exp $ */ +/* $NetBSD: pmap.c,v 1.137 2022/05/03 20:09:54 skrll Exp $ */ /* * Copyright (c) 2017 Ryo Shimizu @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.136 2022/04/27 23:38:31 ryo Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.137 2022/05/03 20:09:54 skrll Exp $"); #include "opt_arm_debug.h" #include "opt_cpuoptions.h" @@ -1502,6 +1502,8 @@ pmap_activate_efirt(void) UVMHIST_FUNC(__func__); UVMHIST_CALLARGS(pmaphist, " (pm=%#jx)", (uintptr_t)pm, 0, 0, 0); + KASSERT(kpreempt_disabled()); + ci->ci_pmap_asid_cur = pai->pai_asid; UVMHIST_LOG(pmaphist, "setting asid to %#jx", pai->pai_asid, 0, 0, 0); @@ -1527,6 +1529,7 @@ pmap_activate(struct lwp *l) UVMHIST_CALLARGS(pmaphist, "lwp=%p (pid=%d, kernel=%u)", l, l->l_proc->p_pid, pm == pmap_kernel() ? 1 : 0, 0); + KASSERT(kpreempt_disabled()); KASSERT((reg_tcr_el1_read() & TCR_EPD0) != 0); if (pm == pmap_kernel()) @@ -1561,6 +1564,8 @@ pmap_deactivate_efirt(void) UVMHIST_FUNC(__func__); UVMHIST_CALLED(pmaphist); + KASSERT(kpreempt_disabled()); + /* Disable translation table walks using TTBR0 */ uint64_t tcr = reg_tcr_el1_read(); reg_tcr_el1_write(tcr | TCR_EPD0); @@ -1588,6 +1593,8 @@ pmap_deactivate(struct lwp *l) UVMHIST_CALLARGS(pmaphist, "lwp=%p (pid=%d, (kernel=%u))", l, l->l_proc->p_pid, pm == pmap_kernel() ? 1 : 0, 0); + KASSERT(kpreempt_disabled()); + /* Disable translation table walks using TTBR0 */ tcr = reg_tcr_el1_read(); reg_tcr_el1_write(tcr | TCR_EPD0);
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Tue May 3 19:05:34 UTC 2022 Modified Files: src/usr.bin/make: Makefile test-variants.mk Log Message: make: remove test scenarios for old GCC versions These had been useful for NetBSD 8, which used GCC 5. To generate a diff of this commit: cvs rdiff -u -r1.121 -r1.122 src/usr.bin/make/Makefile cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/test-variants.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Tue May 3 19:05:34 UTC 2022
Modified Files:
src/usr.bin/make: Makefile test-variants.mk
Log Message:
make: remove test scenarios for old GCC versions
These had been useful for NetBSD 8, which used GCC 5.
To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 src/usr.bin/make/Makefile
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/test-variants.mk
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/make/Makefile
diff -u src/usr.bin/make/Makefile:1.121 src/usr.bin/make/Makefile:1.122
--- src/usr.bin/make/Makefile:1.121 Wed Jan 26 23:00:55 2022
+++ src/usr.bin/make/Makefile Tue May 3 19:05:34 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.121 2022/01/26 23:00:55 rillig Exp $
+# $NetBSD: Makefile,v 1.122 2022/05/03 19:05:34 rillig Exp $
# @(#)Makefile 5.2 (Berkeley) 12/28/90
PROG= make
@@ -54,39 +54,6 @@ COPTS+= -fsanitize=undefined
LDADD+= -fsanitize=undefined
.endif
-# Whether to compile with GCC 10 from pkgsrc, during development.
-USE_GCC10?= no
-.if ${USE_GCC10} == "yes"
-# CC is set further down in this file
-COPTS+= -Wno-attributes # for abs and labs
-COPTS.arch.c+= -Wno-error=format-truncation
-COPTS.dir.c+= -Wno-error=format-truncation
-COPTS.main.c+= -Wno-error=format-truncation
-COPTS.meta.c+= -Wno-error=format-truncation
-.endif
-
-# Whether to compile with GCC 9 from pkgsrc, during development.
-USE_GCC9?= no
-.if ${USE_GCC9} == "yes"
-# CC is set further down in this file
-COPTS+= -Wno-attributes # for abs and labs
-COPTS.arch.c+= -Wno-error=format-truncation
-COPTS.dir.c+= -Wno-error=format-truncation
-COPTS.main.c+= -Wno-error=format-truncation
-COPTS.meta.c+= -Wno-error=format-truncation
-.endif
-
-# Whether to compile with GCC 8 from pkgsrc, during development.
-USE_GCC8?= no
-.if ${USE_GCC8} == "yes"
-# CC is set further down in this file
-COPTS+= -Wno-attributes # for abs and labs
-COPTS.arch.c+= -Wno-error=format-truncation
-COPTS.dir.c+= -Wno-error=format-truncation
-COPTS.main.c+= -Wno-error=format-truncation
-COPTS.meta.c+= -Wno-error=format-truncation
-.endif
-
USE_META?= yes
.if ${USE_META:tl} != "no"
@@ -129,24 +96,6 @@ COPTS.var.c+= -Wno-format-nonliteral # s
CPPFLAGS+= -DMAKE_NATIVE
-.if ${USE_GCC10} == "yes"
-GCC10BASE?= /usr/pkg/gcc10
-LATE_CC= ${GCC10BASE}/bin/gcc
-GCOV= ${GCC10BASE}/bin/gcov
-.endif
-
-.if ${USE_GCC9} == "yes"
-GCC9BASE?= /usr/pkg/gcc9
-LATE_CC= ${GCC9BASE}/bin/gcc
-GCOV= ${GCC9BASE}/bin/gcov
-.endif
-
-.if ${USE_GCC8} == "yes"
-GCC8BASE?= /usr/pkg/gcc8
-LATE_CC= ${GCC8BASE}/bin/gcc
-GCOV= ${GCC8BASE}/bin/gcov
-.endif
-
.if defined(TOOLDIR)
# This is a native NetBSD build, use libutil rather than the local emalloc etc.
CPPFLAGS+= -DUSE_EMALLOC
@@ -204,6 +153,3 @@ report-coverage: .PHONY
CPPFLAGS+= ${USER_CPPFLAGS}
# For overriding -std=gnu99 or similar options.
CFLAGS+= ${USER_CFLAGS}
-.if defined(LATE_CC)
-CC= ${LATE_CC}
-.endif
Index: src/usr.bin/make/test-variants.mk
diff -u src/usr.bin/make/test-variants.mk:1.2 src/usr.bin/make/test-variants.mk:1.3
--- src/usr.bin/make/test-variants.mk:1.2 Thu Mar 3 20:03:19 2022
+++ src/usr.bin/make/test-variants.mk Tue May 3 19:05:34 2022
@@ -1,4 +1,4 @@
-# $NetBSD: test-variants.mk,v 1.2 2022/03/03 20:03:19 rillig Exp $
+# $NetBSD: test-variants.mk,v 1.3 2022/05/03 19:05:34 rillig Exp $
#
# Build several variants of make and run the tests on them.
#
@@ -27,12 +27,6 @@ TESTS+= default
TESTS+= llvm
ENV.llvm= HAVE_LLVM="yes"
-TESTS+= gcc8
-ENV.gcc8= USE_GCC8="yes"
-
-TESTS+= gcc9
-ENV.gcc9= USE_GCC9="yes"
-
# Use emalloc for memory allocation.
TESTS+= emalloc
ENV.emalloc= TOOLDIR=""
@@ -182,37 +176,36 @@ ENV.fort= USE_FORT="yes"
TESTS+= abs
ENV.abs= USE_ABSOLUTE_TESTNAMES="yes"
-# This test is the result of reading through the GCC "Warning Options"
+# This test is the result of reading through the GCC 10 "Warning Options"
# documentation, noting down everything that sounded interesting.
#
-TESTS+= gcc10-warn
-ENV.gcc10-warn= USE_GCC10=yes
-CFLAGS.gcc10-warn= -Wmisleading-indentation
-CFLAGS.gcc10-warn+= -Wmissing-attributes
-CFLAGS.gcc10-warn+= -Wmissing-braces
-CFLAGS.gcc10-warn+= -Wextra
-CFLAGS.gcc10-warn+= -Wnonnull
-CFLAGS.gcc10-warn+= -Wnonnull-compare
-CFLAGS.gcc10-warn+= -Wnull-dereference
-CFLAGS.gcc10-warn+= -Wimplicit
-CFLAGS.gcc10-warn+= -Wimplicit-fallthrough=4
-CFLAGS.gcc10-warn+= -Wignored-qualifiers
-CFLAGS.gcc10-warn+= -Wunused
-CFLAGS.gcc10-warn+= -Wunused-but-set-variable
-CFLAGS.gcc10-warn+= -Wunused-parameter
-CFLAGS.gcc10-warn+= -Wduplicated-branches
-CFLAGS.gcc10-warn+= -Wduplicated-cond
-CFLAGS.gcc10-warn+= -Wunused-macros
-CFLAGS.gcc10-warn+= -Wcast-function-type
-CFLAGS.gcc10-warn+= -Wconversion
-CFLAGS.gcc10-warn+= -Wenum-compare
-CFLAGS.gcc10-warn+= -Wmissing-field-initializers
-CFLAGS.gcc10-warn+= -Wredundant-decls
-CFLAGS.gcc10-warn+=
CVS commit: src/external/bsd/elftoolchain/dist/common
Module Name:src
Committed By: jkoshy
Date: Tue May 3 16:47:15 UTC 2022
Modified Files:
src/external/bsd/elftoolchain/dist/common: _elftc.h
Log Message:
Catch up with Elftoolchain head: changes to support 'tools' builds
out of the box.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/elftoolchain/dist/common/_elftc.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/elftoolchain/dist/common/_elftc.h
diff -u src/external/bsd/elftoolchain/dist/common/_elftc.h:1.8 src/external/bsd/elftoolchain/dist/common/_elftc.h:1.9
--- src/external/bsd/elftoolchain/dist/common/_elftc.h:1.8 Wed Mar 10 21:36:29 2021
+++ src/external/bsd/elftoolchain/dist/common/_elftc.h Tue May 3 16:47:15 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: _elftc.h,v 1.8 2021/03/10 21:36:29 jkoshy Exp $ */
+/* $NetBSD: _elftc.h,v 1.9 2022/05/03 16:47:15 jkoshy Exp $ */
/*-
* Copyright (c) 2009 Joseph Koshy
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * Id: _elftc.h 3933 2021-03-10 21:09:49Z jkoshy
+ * Id: _elftc.h 3975 2022-04-30 20:10:58Z jkoshy
*/
/**
@@ -285,11 +285,11 @@ struct name { \
/*
* VCS Ids.
*
- * The marker below is intended to be replaced with a project-specific
+ * The place holder below is intended to be replaced with a project-specific
* definition of the ELFTC_VCSID macro.
*/
-#ifndef ELFTC_VCSID
+#ifndef ELFTC_VCSID
#define ELFTC_VCSID(ID) /**/
#endif
@@ -317,6 +317,20 @@ struct name { \
#endif /* ELFTC_VCSID */
/*
+ * The place holder below is meant to be replaced by a declaration
+ * of the downstream project's revision control macro.
+ *
+ * E.g. on NetBSD, this place holder would be replaced by:
+ *
+ * #if !defined(__RCSID)
+ * #define __RCSID(ID)
+ * #endif
+ */
+#if !defined(__RCSID)
+#define __RCSID(ID) /**/
+#endif /* !defined(__RCSID) */
+
+/*
* Provide an equivalent for getprogname(3).
*/
CVS commit: src/external/bsd/elftoolchain/dist/common
Module Name:src Committed By: jkoshy Date: Tue May 3 16:47:15 UTC 2022 Modified Files: src/external/bsd/elftoolchain/dist/common: _elftc.h Log Message: Catch up with Elftoolchain head: changes to support 'tools' builds out of the box. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/bsd/elftoolchain/dist/common/_elftc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/landisk/landisk
Module Name:src
Committed By: mlelstv
Date: Tue May 3 14:20:24 UTC 2022
Modified Files:
src/sys/arch/landisk/landisk: autoconf.c
Log Message:
Fix vnode locking around VOP_OPEN.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/landisk/landisk/autoconf.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/landisk/landisk/autoconf.c
diff -u src/sys/arch/landisk/landisk/autoconf.c:1.9 src/sys/arch/landisk/landisk/autoconf.c:1.10
--- src/sys/arch/landisk/landisk/autoconf.c:1.9 Sat Mar 19 13:49:21 2022
+++ src/sys/arch/landisk/landisk/autoconf.c Tue May 3 14:20:24 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.9 2022/03/19 13:49:21 hannken Exp $ */
+/* $NetBSD: autoconf.c,v 1.10 2022/05/03 14:20:24 mlelstv Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.9 2022/03/19 13:49:21 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.10 2022/05/03 14:20:24 mlelstv Exp $");
#include
#include
@@ -122,6 +122,7 @@ match_bootdisk(device_t dv, struct btinf
vput(tmpvn);
return (0);
}
+ VOP_UNLOCK(tmpvn);
error = VOP_IOCTL(tmpvn, DIOCGDINFO, , FREAD, NOCRED);
if (error) {
/*
@@ -140,6 +141,7 @@ match_bootdisk(device_t dv, struct btinf
found = 1;
closeout:
+ vn_lock(tmpvn, LK_EXCLUSIVE | LK_RETRY);
VOP_CLOSE(tmpvn, FREAD, NOCRED);
vput(tmpvn);
return (found);
CVS commit: src/sys/arch/landisk/landisk
Module Name:src Committed By: mlelstv Date: Tue May 3 14:20:24 UTC 2022 Modified Files: src/sys/arch/landisk/landisk: autoconf.c Log Message: Fix vnode locking around VOP_OPEN. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/landisk/landisk/autoconf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/dev/lib/libwsemul_vt100
Module Name:src
Committed By: uwe
Date: Tue May 3 14:11:59 UTC 2022
Added Files:
src/sys/rump/dev/lib/libwsemul_vt100: Makefile
Log Message:
libwsemul_vt100: Rumpified wscons vt100 emulator (wsvt25).
This library provides wscons vt100 emulation (aka TERM=wsvt25). This
is internal module, not a device, so there's no RUMP_COMPONENT. The
public interface provided by this module is wsemul_vt100_ops and it
needs the user to provide (in rump namespace) wsdisplay_emulinput and
wsdisplay_emulbell, provided in the real kernel by wsdisplay.
This subdirectory is not hooked into the build.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libwsemul_vt100/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/rump/dev/lib/libwsemul_vt100/Makefile
diff -u /dev/null src/sys/rump/dev/lib/libwsemul_vt100/Makefile:1.1
--- /dev/null Tue May 3 14:11:59 2022
+++ src/sys/rump/dev/lib/libwsemul_vt100/Makefile Tue May 3 14:11:59 2022
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile,v 1.1 2022/05/03 14:11:59 uwe Exp $
+#
+
+# This library provides wscons vt100 emulation (aka TERM=wsvt25).
+# This is internal module, not a device, so there's no RUMP_COMPONENT.
+# The public interface provided by this module is wsemul_vt100_ops and
+# it needs the user to provide (in rump namespace) wsdisplay_emulinput
+# and wsdisplay_emulbell, provided in the real kernel by wsdisplay.
+
+.PATH: ${.CURDIR}/../../../../dev/wscons
+
+LIB= rumpdev_wsemul_vt100
+COMMENT=Workstation console VT100 emulation
+
+SRCS+= wsemul_vt100.c
+SRCS+= wsemul_vt100_chars.c
+SRCS+= wsemul_vt100_keys.c
+SRCS+= wsemul_vt100_subr.c
+
+.include
+.include
CVS commit: src/sys/rump/dev/lib/libwsemul_vt100
Module Name:src Committed By: uwe Date: Tue May 3 14:11:59 UTC 2022 Added Files: src/sys/rump/dev/lib/libwsemul_vt100: Makefile Log Message: libwsemul_vt100: Rumpified wscons vt100 emulator (wsvt25). This library provides wscons vt100 emulation (aka TERM=wsvt25). This is internal module, not a device, so there's no RUMP_COMPONENT. The public interface provided by this module is wsemul_vt100_ops and it needs the user to provide (in rump namespace) wsdisplay_emulinput and wsdisplay_emulbell, provided in the real kernel by wsdisplay. This subdirectory is not hooked into the build. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libwsemul_vt100/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: hannken
Date: Tue May 3 13:55:29 UTC 2022
Modified Files:
src/sys/kern: vnode_if.c
src/sys/rump/include/rump: rumpvnode_if.h
src/sys/rump/librump/rumpvfs: rumpvnode_if.c
src/sys/sys: vnode_if.h
Log Message:
Regen.
To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.117 src/sys/kern/vnode_if.c
cvs rdiff -u -r1.38 -r1.39 src/sys/rump/include/rump/rumpvnode_if.h
cvs rdiff -u -r1.38 -r1.39 src/sys/rump/librump/rumpvfs/rumpvnode_if.c
cvs rdiff -u -r1.109 -r1.110 src/sys/sys/vnode_if.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/vnode_if.c
diff -u src/sys/kern/vnode_if.c:1.116 src/sys/kern/vnode_if.c:1.117
--- src/sys/kern/vnode_if.c:1.116 Tue May 3 08:35:11 2022
+++ src/sys/kern/vnode_if.c Tue May 3 13:55:29 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: vnode_if.c,v 1.116 2022/05/03 08:35:11 hannken Exp $ */
+/* $NetBSD: vnode_if.c,v 1.117 2022/05/03 13:55:29 hannken Exp $ */
/*
* Warning: DO NOT EDIT! This file is automatically generated!
@@ -7,7 +7,7 @@
* Created from the file:
* NetBSD: vnode_if.src,v 1.84 2022/05/03 08:33:59 hannken Exp
* by the script:
- * NetBSD: vnode_if.sh,v 1.74 2022/05/03 08:33:59 hannken Exp
+ * NetBSD: vnode_if.sh,v 1.75 2022/05/03 13:54:18 hannken Exp
*/
/*
@@ -40,7 +40,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vnode_if.c,v 1.116 2022/05/03 08:35:11 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnode_if.c,v 1.117 2022/05/03 13:55:29 hannken Exp $");
#ifdef _KERNEL_OPT
#include "opt_vnode_lockdebug.h"
@@ -303,28 +303,34 @@ vop_post(vnode_t *vp, struct mount *mp,
static inline void
assert_vop_unlocked(vnode_t *vp, const char *str)
{
+#if defined(VNODE_LOCKDEBUG)
if (VOP_ISLOCKED(vp) == LK_EXCLUSIVE)
panic("%s: %p %d/%d is locked but should not be",
str, vp, vp->v_tag, vp->v_type);
+#endif
}
static inline void
assert_vop_locked(vnode_t *vp, const char *str)
{
+#if defined(VNODE_LOCKDEBUG)
if (VOP_ISLOCKED(vp) == LK_NONE)
panic("%s: %p %d/%d is not locked but should be",
str, vp, vp->v_tag, vp->v_type);
+#endif
}
static inline void
assert_vop_elocked(vnode_t *vp, const char *str)
{
+#if defined(VNODE_LOCKDEBUG)
if (VOP_ISLOCKED(vp) != LK_EXCLUSIVE)
panic("%s: %p %d/%d is not exclusive locked but should be",
str, vp, vp->v_tag, vp->v_type);
+#endif
}
const struct vnodeop_desc vop_default_desc = {
Index: src/sys/rump/include/rump/rumpvnode_if.h
diff -u src/sys/rump/include/rump/rumpvnode_if.h:1.38 src/sys/rump/include/rump/rumpvnode_if.h:1.39
--- src/sys/rump/include/rump/rumpvnode_if.h:1.38 Tue May 3 08:35:11 2022
+++ src/sys/rump/include/rump/rumpvnode_if.h Tue May 3 13:55:29 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpvnode_if.h,v 1.38 2022/05/03 08:35:11 hannken Exp $ */
+/* $NetBSD: rumpvnode_if.h,v 1.39 2022/05/03 13:55:29 hannken Exp $ */
/*
* Warning: DO NOT EDIT! This file is automatically generated!
@@ -7,7 +7,7 @@
* Created from the file:
* NetBSD: vnode_if.src,v 1.84 2022/05/03 08:33:59 hannken Exp
* by the script:
- * NetBSD: vnode_if.sh,v 1.74 2022/05/03 08:33:59 hannken Exp
+ * NetBSD: vnode_if.sh,v 1.75 2022/05/03 13:54:18 hannken Exp
*/
/*
Index: src/sys/rump/librump/rumpvfs/rumpvnode_if.c
diff -u src/sys/rump/librump/rumpvfs/rumpvnode_if.c:1.38 src/sys/rump/librump/rumpvfs/rumpvnode_if.c:1.39
--- src/sys/rump/librump/rumpvfs/rumpvnode_if.c:1.38 Tue May 3 08:35:11 2022
+++ src/sys/rump/librump/rumpvfs/rumpvnode_if.c Tue May 3 13:55:29 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpvnode_if.c,v 1.38 2022/05/03 08:35:11 hannken Exp $ */
+/* $NetBSD: rumpvnode_if.c,v 1.39 2022/05/03 13:55:29 hannken Exp $ */
/*
* Warning: DO NOT EDIT! This file is automatically generated!
@@ -7,7 +7,7 @@
* Created from the file:
* NetBSD: vnode_if.src,v 1.84 2022/05/03 08:33:59 hannken Exp
* by the script:
- * NetBSD: vnode_if.sh,v 1.74 2022/05/03 08:33:59 hannken Exp
+ * NetBSD: vnode_if.sh,v 1.75 2022/05/03 13:54:18 hannken Exp
*/
/*
@@ -40,7 +40,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rumpvnode_if.c,v 1.38 2022/05/03 08:35:11 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpvnode_if.c,v 1.39 2022/05/03 13:55:29 hannken Exp $");
#include
#include
Index: src/sys/sys/vnode_if.h
diff -u src/sys/sys/vnode_if.h:1.109 src/sys/sys/vnode_if.h:1.110
--- src/sys/sys/vnode_if.h:1.109 Tue May 3 08:35:11 2022
+++ src/sys/sys/vnode_if.h Tue May 3 13:55:29 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: vnode_if.h,v 1.109 2022/05/03 08:35:11 hannken Exp $ */
+/* $NetBSD: vnode_if.h,v 1.110 2022/05/03 13:55:29 hannken Exp $ */
/*
* Warning: DO NOT EDIT! This file is automatically generated!
@@ -7,7 +7,7 @@
* Created from the file:
* NetBSD: vnode_if.src,v 1.84 2022/05/03 08:33:59 hannken Exp
* by the script:
- * NetBSD: vnode_if.sh,v 1.74 2022/05/03 08:33:59 hannken Exp
+ * NetBSD:
CVS commit: src/sys
Module Name:src Committed By: hannken Date: Tue May 3 13:55:29 UTC 2022 Modified Files: src/sys/kern: vnode_if.c src/sys/rump/include/rump: rumpvnode_if.h src/sys/rump/librump/rumpvfs: rumpvnode_if.c src/sys/sys: vnode_if.h Log Message: Regen. To generate a diff of this commit: cvs rdiff -u -r1.116 -r1.117 src/sys/kern/vnode_if.c cvs rdiff -u -r1.38 -r1.39 src/sys/rump/include/rump/rumpvnode_if.h cvs rdiff -u -r1.38 -r1.39 src/sys/rump/librump/rumpvfs/rumpvnode_if.c cvs rdiff -u -r1.109 -r1.110 src/sys/sys/vnode_if.h 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: Tue May 3 13:54:18 UTC 2022 Modified Files: src/sys/kern: vnode_if.sh Log Message: Really depend the lockdebug checks on option VNODE_LOCKDEBUG -- were enabled by accident. To generate a diff of this commit: cvs rdiff -u -r1.74 -r1.75 src/sys/kern/vnode_if.sh 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: Tue May 3 13:54:18 UTC 2022
Modified Files:
src/sys/kern: vnode_if.sh
Log Message:
Really depend the lockdebug checks on option VNODE_LOCKDEBUG -- were
enabled by accident.
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/sys/kern/vnode_if.sh
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/vnode_if.sh
diff -u src/sys/kern/vnode_if.sh:1.74 src/sys/kern/vnode_if.sh:1.75
--- src/sys/kern/vnode_if.sh:1.74 Tue May 3 08:33:59 2022
+++ src/sys/kern/vnode_if.sh Tue May 3 13:54:18 2022
@@ -29,7 +29,7 @@ copyright="\
* SUCH DAMAGE.
*/
"
-SCRIPT_ID='$NetBSD: vnode_if.sh,v 1.74 2022/05/03 08:33:59 hannken Exp $'
+SCRIPT_ID='$NetBSD: vnode_if.sh,v 1.75 2022/05/03 13:54:18 hannken Exp $'
# Script to produce VFS front-end sugar.
#
@@ -610,28 +610,34 @@ vop_post(vnode_t *vp, struct mount *mp,
static inline void
assert_vop_unlocked(vnode_t *vp, const char *str)
{
+#if defined(VNODE_LOCKDEBUG)
if (VOP_ISLOCKED(vp) == LK_EXCLUSIVE)
panic(\"%s: %p %d/%d is locked but should not be\",
str, vp, vp->v_tag, vp->v_type);
+#endif
}
static inline void
assert_vop_locked(vnode_t *vp, const char *str)
{
+#if defined(VNODE_LOCKDEBUG)
if (VOP_ISLOCKED(vp) == LK_NONE)
panic(\"%s: %p %d/%d is not locked but should be\",
str, vp, vp->v_tag, vp->v_type);
+#endif
}
static inline void
assert_vop_elocked(vnode_t *vp, const char *str)
{
+#if defined(VNODE_LOCKDEBUG)
if (VOP_ISLOCKED(vp) != LK_EXCLUSIVE)
panic(\"%s: %p %d/%d is not exclusive locked but should be\",
str, vp, vp->v_tag, vp->v_type);
+#endif
}
const struct vnodeop_desc vop_default_desc = {"
CVS commit: src
Module Name:src Committed By: uwe Date: Tue May 3 13:46:22 UTC 2022 Modified Files: src/distrib/sets/lists/xcomp: mi src/external/mit/xorg/lib/libXcursor: Makefile Log Message: libXcursor: Add missing MLINKS. To generate a diff of this commit: cvs rdiff -u -r1.232 -r1.233 src/distrib/sets/lists/xcomp/mi cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libXcursor/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/xcomp/mi diff -u src/distrib/sets/lists/xcomp/mi:1.232 src/distrib/sets/lists/xcomp/mi:1.233 --- src/distrib/sets/lists/xcomp/mi:1.232 Tue May 3 00:29:23 2022 +++ src/distrib/sets/lists/xcomp/mi Tue May 3 13:46:22 2022 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.232 2022/05/03 00:29:23 uwe Exp $ +# $NetBSD: mi,v 1.233 2022/05/03 13:46:22 uwe Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -2455,6 +2455,37 @@ ./usr/X11R7/man/cat3/XcupQueryVersion.0 xcomp-libXext-catman .cat,xorg ./usr/X11R7/man/cat3/XcupStoreColors.0 xcomp-libXext-catman .cat,xorg ./usr/X11R7/man/cat3/Xcursor.0xcomp-libXcursor-catman .cat,xorg +./usr/X11R7/man/cat3/XcursorCursorsCreate.0 xcomp-libXcursor-catman .cat,xorg +./usr/X11R7/man/cat3/XcursorCursorsDestroy.0 xcomp-libXcursor-catman .cat,xorg +./usr/X11R7/man/cat3/XcursorFilenameLoad.0 xcomp-libXcursor-catman .cat,xorg +./usr/X11R7/man/cat3/XcursorFilenameLoadAllImages.0 xcomp-libXcursor-catman .cat,xorg +./usr/X11R7/man/cat3/XcursorFilenameLoadCursor.0 xcomp-libXcursor-catman .cat,xorg +./usr/X11R7/man/cat3/XcursorFilenameLoadImage.0 xcomp-libXcursor-catman .cat,xorg +./usr/X11R7/man/cat3/XcursorFilenameLoadImages.0 xcomp-libXcursor-catman .cat,xorg +./usr/X11R7/man/cat3/XcursorFilenameSave.0 xcomp-libXcursor-catman .cat,xorg +./usr/X11R7/man/cat3/XcursorFilenameSaveImages.0 xcomp-libXcursor-catman .cat,xorg +./usr/X11R7/man/cat3/XcursorGetDefaultSize.0 xcomp-libXcursor-catman .cat,xorg +./usr/X11R7/man/cat3/XcursorGetTheme.0 xcomp-libXcursor-catman .cat,xorg +./usr/X11R7/man/cat3/XcursorImageCreate.0 xcomp-libXcursor-catman .cat,xorg +./usr/X11R7/man/cat3/XcursorImageDestroy.0 xcomp-libXcursor-catman .cat,xorg +./usr/X11R7/man/cat3/XcursorImagesCreate.0 xcomp-libXcursor-catman .cat,xorg +./usr/X11R7/man/cat3/XcursorImagesDestroy.0 xcomp-libXcursor-catman .cat,xorg +./usr/X11R7/man/cat3/XcursorLibraryLoadCursor.0 xcomp-libXcursor-catman .cat,xorg +./usr/X11R7/man/cat3/XcursorLibraryLoadCursors.0 xcomp-libXcursor-catman .cat,xorg +./usr/X11R7/man/cat3/XcursorLibraryLoadImage.0 xcomp-libXcursor-catman .cat,xorg +./usr/X11R7/man/cat3/XcursorLibraryLoadImages.0 xcomp-libXcursor-catman .cat,xorg +./usr/X11R7/man/cat3/XcursorSetDefaultSize.0 xcomp-libXcursor-catman .cat,xorg +./usr/X11R7/man/cat3/XcursorSetTheme.0 xcomp-libXcursor-catman .cat,xorg +./usr/X11R7/man/cat3/XcursorShapeLoadCursor.0 xcomp-libXcursor-catman .cat,xorg +./usr/X11R7/man/cat3/XcursorShapeLoadCursors.0 xcomp-libXcursor-catman .cat,xorg +./usr/X11R7/man/cat3/XcursorShapeLoadImage.0 xcomp-libXcursor-catman .cat,xorg +./usr/X11R7/man/cat3/XcursorShapeLoadImages.0 xcomp-libXcursor-catman .cat,xorg +./usr/X11R7/man/cat3/XcursorSupportsARGB.0 xcomp-libXcursor-catman .cat,xorg +./usr/X11R7/man/cat3/XcursorXcFileLoad.0 xcomp-libXcursor-catman .cat,xorg +./usr/X11R7/man/cat3/XcursorXcFileLoadAllImages.0 xcomp-libXcursor-catman .cat,xorg +./usr/X11R7/man/cat3/XcursorXcFileLoadImage.0 xcomp-libXcursor-catman .cat,xorg +./usr/X11R7/man/cat3/XcursorXcFileLoadImages.0 xcomp-libXcursor-catman .cat,xorg +./usr/X11R7/man/cat3/XcursorXcFileSave.0 xcomp-libXcursor-catman .cat,xorg ./usr/X11R7/man/cat3/XdbeAllocateBackBufferName.0 xcomp-libXext-catman .cat,xorg ./usr/X11R7/man/cat3/XdbeBeginIdiom.0 xcomp-libXext-catman .cat,xorg ./usr/X11R7/man/cat3/XdbeDeallocateBackBufferName.0 xcomp-libXext-catman .cat,xorg @@ -3890,6 +3921,37 @@ ./usr/X11R7/man/html3/XcupQueryVersion.html xcomp-libXext-htmlman html,xorg ./usr/X11R7/man/html3/XcupStoreColors.html xcomp-libXext-htmlman html,xorg ./usr/X11R7/man/html3/Xcursor.html xcomp-libXcursor-htmlman html,xorg +./usr/X11R7/man/html3/XcursorCursorsCreate.html xcomp-libXcursor-htmlman html,xorg +./usr/X11R7/man/html3/XcursorCursorsDestroy.html xcomp-libXcursor-htmlman html,xorg +./usr/X11R7/man/html3/XcursorFilenameLoad.html xcomp-libXcursor-htmlman html,xorg +./usr/X11R7/man/html3/XcursorFilenameLoadAllImages.html xcomp-libXcursor-htmlman html,xorg +./usr/X11R7/man/html3/XcursorFilenameLoadCursor.html xcomp-libXcursor-htmlman html,xorg +./usr/X11R7/man/html3/XcursorFilenameLoadImage.html xcomp-libXcursor-htmlman html,xorg +./usr/X11R7/man/html3/XcursorFilenameLoadImages.html xcomp-libXcursor-htmlman html,xorg +./usr/X11R7/man/html3/XcursorFilenameSave.html xcomp-libXcursor-htmlman html,xorg +./usr/X11R7/man/html3/XcursorFilenameSaveImages.html
CVS commit: src
Module Name:src Committed By: uwe Date: Tue May 3 13:46:22 UTC 2022 Modified Files: src/distrib/sets/lists/xcomp: mi src/external/mit/xorg/lib/libXcursor: Makefile Log Message: libXcursor: Add missing MLINKS. To generate a diff of this commit: cvs rdiff -u -r1.232 -r1.233 src/distrib/sets/lists/xcomp/mi cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libXcursor/Makefile 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: uwe Date: Tue May 3 12:53:52 UTC 2022 Modified Files: src/distrib/sets/lists/xserver: md.alpha md.amd64 md.amiga md.bebox md.cats md.dreamcast md.evbarm md.evbmips md.evbppc md.ews4800mips md.hp300 md.hpcarm md.hpcmips md.hpcsh md.hppa md.i386 md.ibmnws md.iyonix md.luna68k md.mac68k md.macppc md.netwinder md.newsmips md.ofppc md.pmax md.prep md.sgimips md.shark md.sparc md.sparc64 md.vax md.zaurus src/external/mit/xorg/server/xorg-server.old/hw/xfree86/doc: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/doc: Makefile Log Message: xorg-server: Add xorg.conf.d(5) MLINKS. To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/distrib/sets/lists/xserver/md.alpha cvs rdiff -u -r1.118 -r1.119 src/distrib/sets/lists/xserver/md.amd64 cvs rdiff -u -r1.31 -r1.32 src/distrib/sets/lists/xserver/md.amiga cvs rdiff -u -r1.22 -r1.23 src/distrib/sets/lists/xserver/md.bebox \ src/distrib/sets/lists/xserver/md.luna68k \ src/distrib/sets/lists/xserver/md.vax cvs rdiff -u -r1.64 -r1.65 src/distrib/sets/lists/xserver/md.cats cvs rdiff -u -r1.30 -r1.31 src/distrib/sets/lists/xserver/md.dreamcast cvs rdiff -u -r1.25 -r1.26 src/distrib/sets/lists/xserver/md.evbarm \ src/distrib/sets/lists/xserver/md.ews4800mips \ src/distrib/sets/lists/xserver/md.hp300 \ src/distrib/sets/lists/xserver/md.prep \ src/distrib/sets/lists/xserver/md.zaurus cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/lists/xserver/md.evbmips cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/xserver/md.evbppc cvs rdiff -u -r1.29 -r1.30 src/distrib/sets/lists/xserver/md.hpcarm cvs rdiff -u -r1.35 -r1.36 src/distrib/sets/lists/xserver/md.hpcmips cvs rdiff -u -r1.28 -r1.29 src/distrib/sets/lists/xserver/md.hpcsh cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/xserver/md.hppa cvs rdiff -u -r1.134 -r1.135 src/distrib/sets/lists/xserver/md.i386 cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/xserver/md.ibmnws cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/xserver/md.iyonix cvs rdiff -u -r1.24 -r1.25 src/distrib/sets/lists/xserver/md.mac68k \ src/distrib/sets/lists/xserver/md.newsmips cvs rdiff -u -r1.84 -r1.85 src/distrib/sets/lists/xserver/md.macppc cvs rdiff -u -r1.42 -r1.43 src/distrib/sets/lists/xserver/md.netwinder cvs rdiff -u -r1.34 -r1.35 src/distrib/sets/lists/xserver/md.ofppc cvs rdiff -u -r1.13 -r1.14 src/distrib/sets/lists/xserver/md.pmax cvs rdiff -u -r1.63 -r1.64 src/distrib/sets/lists/xserver/md.sgimips cvs rdiff -u -r1.57 -r1.58 src/distrib/sets/lists/xserver/md.shark cvs rdiff -u -r1.76 -r1.77 src/distrib/sets/lists/xserver/md.sparc cvs rdiff -u -r1.72 -r1.73 src/distrib/sets/lists/xserver/md.sparc64 cvs rdiff -u -r1.2 -r1.3 \ src/external/mit/xorg/server/xorg-server.old/hw/xfree86/doc/Makefile cvs rdiff -u -r1.8 -r1.9 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/doc/Makefile 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: uwe Date: Tue May 3 12:53:52 UTC 2022 Modified Files: src/distrib/sets/lists/xserver: md.alpha md.amd64 md.amiga md.bebox md.cats md.dreamcast md.evbarm md.evbmips md.evbppc md.ews4800mips md.hp300 md.hpcarm md.hpcmips md.hpcsh md.hppa md.i386 md.ibmnws md.iyonix md.luna68k md.mac68k md.macppc md.netwinder md.newsmips md.ofppc md.pmax md.prep md.sgimips md.shark md.sparc md.sparc64 md.vax md.zaurus src/external/mit/xorg/server/xorg-server.old/hw/xfree86/doc: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/doc: Makefile Log Message: xorg-server: Add xorg.conf.d(5) MLINKS. To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/distrib/sets/lists/xserver/md.alpha cvs rdiff -u -r1.118 -r1.119 src/distrib/sets/lists/xserver/md.amd64 cvs rdiff -u -r1.31 -r1.32 src/distrib/sets/lists/xserver/md.amiga cvs rdiff -u -r1.22 -r1.23 src/distrib/sets/lists/xserver/md.bebox \ src/distrib/sets/lists/xserver/md.luna68k \ src/distrib/sets/lists/xserver/md.vax cvs rdiff -u -r1.64 -r1.65 src/distrib/sets/lists/xserver/md.cats cvs rdiff -u -r1.30 -r1.31 src/distrib/sets/lists/xserver/md.dreamcast cvs rdiff -u -r1.25 -r1.26 src/distrib/sets/lists/xserver/md.evbarm \ src/distrib/sets/lists/xserver/md.ews4800mips \ src/distrib/sets/lists/xserver/md.hp300 \ src/distrib/sets/lists/xserver/md.prep \ src/distrib/sets/lists/xserver/md.zaurus cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/lists/xserver/md.evbmips cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/xserver/md.evbppc cvs rdiff -u -r1.29 -r1.30 src/distrib/sets/lists/xserver/md.hpcarm cvs rdiff -u -r1.35 -r1.36 src/distrib/sets/lists/xserver/md.hpcmips cvs rdiff -u -r1.28 -r1.29 src/distrib/sets/lists/xserver/md.hpcsh cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/xserver/md.hppa cvs rdiff -u -r1.134 -r1.135 src/distrib/sets/lists/xserver/md.i386 cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/xserver/md.ibmnws cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/xserver/md.iyonix cvs rdiff -u -r1.24 -r1.25 src/distrib/sets/lists/xserver/md.mac68k \ src/distrib/sets/lists/xserver/md.newsmips cvs rdiff -u -r1.84 -r1.85 src/distrib/sets/lists/xserver/md.macppc cvs rdiff -u -r1.42 -r1.43 src/distrib/sets/lists/xserver/md.netwinder cvs rdiff -u -r1.34 -r1.35 src/distrib/sets/lists/xserver/md.ofppc cvs rdiff -u -r1.13 -r1.14 src/distrib/sets/lists/xserver/md.pmax cvs rdiff -u -r1.63 -r1.64 src/distrib/sets/lists/xserver/md.sgimips cvs rdiff -u -r1.57 -r1.58 src/distrib/sets/lists/xserver/md.shark cvs rdiff -u -r1.76 -r1.77 src/distrib/sets/lists/xserver/md.sparc cvs rdiff -u -r1.72 -r1.73 src/distrib/sets/lists/xserver/md.sparc64 cvs rdiff -u -r1.2 -r1.3 \ src/external/mit/xorg/server/xorg-server.old/hw/xfree86/doc/Makefile cvs rdiff -u -r1.8 -r1.9 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/doc/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/xserver/md.alpha diff -u src/distrib/sets/lists/xserver/md.alpha:1.54 src/distrib/sets/lists/xserver/md.alpha:1.55 --- src/distrib/sets/lists/xserver/md.alpha:1.54 Fri Feb 25 17:42:59 2022 +++ src/distrib/sets/lists/xserver/md.alpha Tue May 3 12:53:51 2022 @@ -1,4 +1,4 @@ -# $NetBSD: md.alpha,v 1.54 2022/02/25 17:42:59 mrg Exp $ +# $NetBSD: md.alpha,v 1.55 2022/05/03 12:53:51 uwe Exp $ ./usr/X11R7/bin/X xserver-xorg-server-bin xorg ./usr/X11R7/bin/Xorg xserver-xorg-server-bin xorg ./usr/X11R7/bin/cvt xserver-xorg-server-bin xorg @@ -287,6 +287,7 @@ ./usr/X11R7/man/cat4/ws.0xserver-xf86-input-ws-catman .cat,xorg ./usr/X11R7/man/cat4/wsfb.0xserver-xf86-video-wsfb-catman .cat,xorg ./usr/X11R7/man/cat5/xorg.conf.0 xserver-xorg-server-catman .cat,xorg +./usr/X11R7/man/cat5/xorg.conf.d.0 xserver-xorg-server-catman .cat,xorg ./usr/X11R7/man/html1/Xorg.htmlxserver-xorg-server-htmlman html,xorg ./usr/X11R7/man/html1/cvt.htmlxserver-xorg-server-htmlman html,xorg ./usr/X11R7/man/html1/gtf.htmlxserver-xorg-server-htmlman html,xorg @@ -346,6 +347,7 @@ ./usr/X11R7/man/html4/ws.htmlxserver-xf86-input-ws-htmlman html,xorg ./usr/X11R7/man/html4/wsfb.htmlxserver-xf86-video-wsfb-htmlman html,xorg ./usr/X11R7/man/html5/xorg.conf.html xserver-xorg-server-htmlman html,xorg +./usr/X11R7/man/html5/xorg.conf.d.html xserver-xorg-server-htmlman html,xorg ./usr/X11R7/man/man1/Xorg.1xserver-xorg-server-man .man,xorg ./usr/X11R7/man/man1/cvt.1xserver-xorg-server-man .man,xorg ./usr/X11R7/man/man1/gtf.1xserver-xorg-server-man .man,xorg @@ -405,4 +407,5 @@ ./usr/X11R7/man/man4/ws.4xserver-xf86-input-ws-man .man,xorg ./usr/X11R7/man/man4/wsfb.4xserver-xf86-video-wsfb-man .man,xorg ./usr/X11R7/man/man5/xorg.conf.5 xserver-xorg-server-man .man,xorg
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: jkoshy Date: Tue May 3 12:09:19 UTC 2022 Modified Files: src/external/cddl/osnet/sys/sys: README Log Message: Minor: fix a typo. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/sys/sys/README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/cddl/osnet/sys/sys/README diff -u src/external/cddl/osnet/sys/sys/README:1.1 src/external/cddl/osnet/sys/sys/README:1.2 --- src/external/cddl/osnet/sys/sys/README:1.1 Sun Jun 3 20:59:49 2018 +++ src/external/cddl/osnet/sys/sys/README Tue May 3 12:09:19 2022 @@ -1,4 +1,4 @@ -# $NetBSD: README,v 1.1 2018/06/03 20:59:49 christos Exp $ +# $NetBSD: README,v 1.2 2022/05/03 12:09:19 jkoshy Exp $ General guidelines for system wrapper header maintainance. @@ -26,7 +26,7 @@ solaris/foo.h: #endif /* SOLARIS_SYS_FOO_H */ -Now there caaes where the solaris headers expose more stuff than ours, +Now there cases where the solaris headers expose more stuff than ours, so we need to include more of our system headers from theirs. When that happens the rule should be that:
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: jkoshy Date: Tue May 3 12:09:19 UTC 2022 Modified Files: src/external/cddl/osnet/sys/sys: README Log Message: Minor: fix a typo. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/sys/sys/README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/libctf
Module Name:src
Committed By: jkoshy
Date: Tue May 3 10:50:42 UTC 2022
Modified Files:
src/tools/libctf: Makefile
Log Message:
Prepare the ground for to be used by the 'tools'
build of 'libctf'.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/tools/libctf/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/libctf/Makefile
diff -u src/tools/libctf/Makefile:1.8 src/tools/libctf/Makefile:1.9
--- src/tools/libctf/Makefile:1.8 Tue May 1 19:59:47 2018
+++ src/tools/libctf/Makefile Tue May 3 10:50:42 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2018/05/01 19:59:47 christos Exp $
+# $NetBSD: Makefile,v 1.9 2022/05/03 10:50:42 jkoshy Exp $
HOSTLIB= ctf
@@ -34,7 +34,8 @@ CPPFLAGS+= -I${.CURDIR}/../compat \
-I${OPENSOLARIS_DISTDIR}/common/ctf \
-I${OPENSOLARIS_DISTDIR}/lib/libctf/common \
-I${OPENSOLARIS_DISTDIR}/uts/common \
- -I${LIBELF_DIR}
+ -I${LIBELF_DIR} \
+ -I${TOOLDIR}/include
BUILD_OSTYPE!= uname -s
CVS commit: src/tools/libctf
Module Name:src Committed By: jkoshy Date: Tue May 3 10:50:42 UTC 2022 Modified Files: src/tools/libctf: Makefile Log Message: Prepare the ground for to be used by the 'tools' build of 'libctf'. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/tools/libctf/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/i386/stand/lib
Module Name:src
Committed By: jmcneill
Date: Tue May 3 10:09:40 UTC 2022
Modified Files:
src/sys/arch/i386/stand/lib: biosdisk.c
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/i386/stand/lib/biosdisk.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/i386/stand/lib/biosdisk.c
diff -u src/sys/arch/i386/stand/lib/biosdisk.c:1.57 src/sys/arch/i386/stand/lib/biosdisk.c:1.58
--- src/sys/arch/i386/stand/lib/biosdisk.c:1.57 Tue Dec 28 00:37:16 2021
+++ src/sys/arch/i386/stand/lib/biosdisk.c Tue May 3 10:09:40 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: biosdisk.c,v 1.57 2021/12/28 00:37:16 simonb Exp $ */
+/* $NetBSD: biosdisk.c,v 1.58 2022/05/03 10:09:40 jmcneill Exp $ */
/*
* Copyright (c) 1996, 1998
@@ -544,7 +544,7 @@ ingest_label(struct biosdisk *d, struct
d->part[part].size = lp->d_partitions[part].p_size;
}
}
-
+
static int
check_label(struct biosdisk *d, daddr_t sector)
{
@@ -787,7 +787,6 @@ read_partitions(struct biosdisk *d, dadd
#endif
#ifndef NO_DISKLABEL
error = read_label(d, offset);
-
#endif
return error;
}
@@ -893,7 +892,7 @@ biosdisk_probe(void)
if (read_partitions(d, 0, 0) != 0)
goto next_disk;
-
+
for (part = 0; part < BIOSDISKNPART; part++) {
if (d->part[part].size == 0)
continue;
@@ -969,7 +968,7 @@ next_disk:
raidframe[i].offset + RF_PROTECTED_SECTORS,
raidframe[i].size) != 0)
goto next_raidrame;
-
+
first = 1;
for (part = 0; part < BIOSDISKNPART; part++) {
#ifndef NO_GPT
@@ -1240,7 +1239,7 @@ raidframe_part_offset(struct biosdisk *d
return RF_PROTECTED_SECTORS + raidframe.part[candidate].offset;
}
#endif
-
+
int
biosdisk_open(struct open_file *f, ...)
/* struct open_file *f, int biosdev, int partition */
@@ -1356,7 +1355,7 @@ biosdisk_find_name(const char *fname, in
if (read_partitions(d, 0, 0) != 0)
goto next_disk;
-
+
for (part = 0; part < BIOSDISKNPART; part++) {
if (d->part[part].size == 0)
continue;
@@ -1401,7 +1400,7 @@ next_disk:
raidframe[i].offset + RF_PROTECTED_SECTORS,
raidframe[i].size) != 0)
goto next_raidframe;
-
+
for (part = 0; part < BIOSDISKNPART; part++) {
bool bootme = d->part[part].attr & GPT_ENT_ATTR_BOOTME;
if (d->part[part].size == 0)
@@ -1499,7 +1498,7 @@ biosdisk_find_raid(const char *name, int
if (read_partitions(d, 0, 0) != 0)
goto next_disk;
-
+
for (part = 0; part < BIOSDISKNPART; part++) {
if (d->part[part].size == 0)
continue;
@@ -1527,7 +1526,7 @@ next_disk:
raidframe[i].offset + RF_PROTECTED_SECTORS,
raidframe[i].size) != 0)
goto next_raidframe;
-
+
for (part = 0; part < BIOSDISKNPART; part++) {
if (d->part[part].size == 0)
continue;
CVS commit: src/sys/arch/i386/stand/lib
Module Name:src Committed By: jmcneill Date: Tue May 3 10:09:40 UTC 2022 Modified Files: src/sys/arch/i386/stand/lib: biosdisk.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/sys/arch/i386/stand/lib/biosdisk.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: hannken
Date: Tue May 3 08:35:11 UTC 2022
Modified Files:
src/sys/kern: vnode_if.c
src/sys/rump/include/rump: rumpvnode_if.h
src/sys/rump/librump/rumpvfs: rumpvnode_if.c
src/sys/sys: vnode_if.h
Log Message:
Regen.
To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 src/sys/kern/vnode_if.c
cvs rdiff -u -r1.37 -r1.38 src/sys/rump/include/rump/rumpvnode_if.h
cvs rdiff -u -r1.37 -r1.38 src/sys/rump/librump/rumpvfs/rumpvnode_if.c
cvs rdiff -u -r1.108 -r1.109 src/sys/sys/vnode_if.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/vnode_if.c
diff -u src/sys/kern/vnode_if.c:1.115 src/sys/kern/vnode_if.c:1.116
--- src/sys/kern/vnode_if.c:1.115 Wed Oct 20 03:13:14 2021
+++ src/sys/kern/vnode_if.c Tue May 3 08:35:11 2022
@@ -1,13 +1,13 @@
-/* $NetBSD: vnode_if.c,v 1.115 2021/10/20 03:13:14 thorpej Exp $ */
+/* $NetBSD: vnode_if.c,v 1.116 2022/05/03 08:35:11 hannken Exp $ */
/*
* Warning: DO NOT EDIT! This file is automatically generated!
* (Modifications made here may easily be lost!)
*
* Created from the file:
- * NetBSD: vnode_if.src,v 1.83 2021/10/20 03:08:18 thorpej Exp
+ * NetBSD: vnode_if.src,v 1.84 2022/05/03 08:33:59 hannken Exp
* by the script:
- * NetBSD: vnode_if.sh,v 1.72 2021/10/20 03:08:18 thorpej Exp
+ * NetBSD: vnode_if.sh,v 1.74 2022/05/03 08:33:59 hannken Exp
*/
/*
@@ -40,7 +40,11 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vnode_if.c,v 1.115 2021/10/20 03:13:14 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnode_if.c,v 1.116 2022/05/03 08:35:11 hannken Exp $");
+
+#ifdef _KERNEL_OPT
+#include "opt_vnode_lockdebug.h"
+#endif /* _KERNEL_OPT */
#include
#include
@@ -296,6 +300,33 @@ vop_post(vnode_t *vp, struct mount *mp,
}
}
+static inline void
+assert_vop_unlocked(vnode_t *vp, const char *str)
+{
+
+ if (VOP_ISLOCKED(vp) == LK_EXCLUSIVE)
+ panic("%s: %p %d/%d is locked but should not be",
+ str, vp, vp->v_tag, vp->v_type);
+}
+
+static inline void
+assert_vop_locked(vnode_t *vp, const char *str)
+{
+
+ if (VOP_ISLOCKED(vp) == LK_NONE)
+ panic("%s: %p %d/%d is not locked but should be",
+ str, vp, vp->v_tag, vp->v_type);
+}
+
+static inline void
+assert_vop_elocked(vnode_t *vp, const char *str)
+{
+
+ if (VOP_ISLOCKED(vp) != LK_EXCLUSIVE)
+ panic("%s: %p %d/%d is not exclusive locked but should be",
+ str, vp, vp->v_tag, vp->v_type);
+}
+
const struct vnodeop_desc vop_default_desc = {
0,
"default",
@@ -399,6 +430,7 @@ VOP_LOOKUP(struct vnode *dvp,
a.a_dvp = dvp;
a.a_vpp = vpp;
a.a_cnp = cnp;
+ assert_vop_locked(dvp, "vop_lookup: dvp");
error = vop_pre(dvp, , , FST_NO);
if (error)
return error;
@@ -440,6 +472,7 @@ VOP_CREATE(struct vnode *dvp,
a.a_vpp = vpp;
a.a_cnp = cnp;
a.a_vap = vap;
+ assert_vop_elocked(dvp, "vop_create: dvp");
error = vop_pre(dvp, , , FST_NO);
if (error)
return error;
@@ -482,6 +515,7 @@ VOP_MKNOD(struct vnode *dvp,
a.a_vpp = vpp;
a.a_cnp = cnp;
a.a_vap = vap;
+ assert_vop_elocked(dvp, "vop_mknod: dvp");
error = vop_pre(dvp, , , FST_NO);
if (error)
return error;
@@ -522,6 +556,7 @@ VOP_OPEN(struct vnode *vp,
a.a_vp = vp;
a.a_mode = mode;
a.a_cred = cred;
+ assert_vop_locked(vp, "vop_open: vp");
error = vop_pre(vp, , , FST_NO);
if (error)
return error;
@@ -557,6 +592,7 @@ VOP_CLOSE(struct vnode *vp,
a.a_vp = vp;
a.a_fflag = fflag;
a.a_cred = cred;
+ assert_vop_locked(vp, "vop_close: vp");
error = vop_pre(vp, , , FST_NO);
if (error)
return error;
@@ -592,6 +628,7 @@ VOP_ACCESS(struct vnode *vp,
a.a_vp = vp;
a.a_accmode = accmode;
a.a_cred = cred;
+ assert_vop_locked(vp, "vop_access: vp");
error = vop_pre(vp, , , FST_NO);
if (error)
return error;
@@ -626,6 +663,7 @@ VOP_ACCESSX(struct vnode *vp,
a.a_vp = vp;
a.a_accmode = accmode;
a.a_cred = cred;
+ assert_vop_locked(vp, "vop_accessx: vp");
error = vop_pre(vp, , , FST_NO);
if (error)
return error;
@@ -660,6 +698,7 @@ VOP_GETATTR(struct vnode *vp,
a.a_vp = vp;
a.a_vap = vap;
a.a_cred = cred;
+ assert_vop_locked(vp, "vop_getattr: vp");
error = vop_pre(vp, , , FST_NO);
if (error)
return error;
@@ -694,6 +733,7 @@ VOP_SETATTR(struct vnode *vp,
a.a_vp = vp;
a.a_vap = vap;
a.a_cred = cred;
+ assert_vop_elocked(vp, "vop_setattr: vp");
vop_setattr_pre();
error = vop_pre(vp, , , FST_NO);
if (error)
@@ -732,6 +772,7 @@ VOP_READ(struct vnode *vp,
a.a_uio = uio;
a.a_ioflag = ioflag;
a.a_cred = cred;
+ assert_vop_locked(vp, "vop_read: vp");
error = vop_pre(vp, , , FST_NO);
if (error)
return error;
@@ -769,6 +810,7 @@ VOP_WRITE(struct vnode *vp,
a.a_uio = uio;
a.a_ioflag = ioflag;
a.a_cred = cred;
+ assert_vop_locked(vp, "vop_write: vp");
vop_write_pre();
error = vop_pre(vp, , , FST_NO);
if (error)
@@ -805,6 +847,7 @@ VOP_FALLOCATE(struct vnode *vp,
CVS commit: src/sys
Module Name:src Committed By: hannken Date: Tue May 3 08:35:11 UTC 2022 Modified Files: src/sys/kern: vnode_if.c src/sys/rump/include/rump: rumpvnode_if.h src/sys/rump/librump/rumpvfs: rumpvnode_if.c src/sys/sys: vnode_if.h Log Message: Regen. To generate a diff of this commit: cvs rdiff -u -r1.115 -r1.116 src/sys/kern/vnode_if.c cvs rdiff -u -r1.37 -r1.38 src/sys/rump/include/rump/rumpvnode_if.h cvs rdiff -u -r1.37 -r1.38 src/sys/rump/librump/rumpvfs/rumpvnode_if.c cvs rdiff -u -r1.108 -r1.109 src/sys/sys/vnode_if.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: hannken
Date: Tue May 3 08:34:00 UTC 2022
Modified Files:
src/sys/kern: vnode_if.sh vnode_if.src
src/sys/rump: Makefile.rump README.compileopts
Log Message:
Make option VNODE_LOCKDEBUG more functional.
- Add "LOCKED=EXCL" option for vnode operations needing exclusive locked nodes.
- As it is impossible to check for shared locks held by current thread avoid
false assertions by testing for exclusive lock only in the "LOCKED=NO" case.
- New option "RUMP_VNODE_LOCKDEBUG" enables VNODE_LOCKDEBUG for the rump kernel.
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/sys/kern/vnode_if.sh
cvs rdiff -u -r1.83 -r1.84 src/sys/kern/vnode_if.src
cvs rdiff -u -r1.133 -r1.134 src/sys/rump/Makefile.rump
cvs rdiff -u -r1.14 -r1.15 src/sys/rump/README.compileopts
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/vnode_if.sh
diff -u src/sys/kern/vnode_if.sh:1.73 src/sys/kern/vnode_if.sh:1.74
--- src/sys/kern/vnode_if.sh:1.73 Sat Mar 19 13:53:32 2022
+++ src/sys/kern/vnode_if.sh Tue May 3 08:33:59 2022
@@ -29,7 +29,7 @@ copyright="\
* SUCH DAMAGE.
*/
"
-SCRIPT_ID='$NetBSD: vnode_if.sh,v 1.73 2022/03/19 13:53:32 hannken Exp $'
+SCRIPT_ID='$NetBSD: vnode_if.sh,v 1.74 2022/05/03 08:33:59 hannken Exp $'
# Script to produce VFS front-end sugar.
#
@@ -53,7 +53,7 @@ out_h=../sys/vnode_if.h
out_rumph=../rump/include/rump/rumpvnode_if.h
# generate VNODE_LOCKDEBUG checks (not fully functional)
-lockdebug=0
+lockdebug=1
# Awk program (must support nawk extensions)
# Use "awk" at Berkeley, "nawk" or "gawk" elsewhere.
@@ -150,14 +150,17 @@ awk_parser='
i=2;
if (is_context == 0) {
- if ($2 == "LOCKED=YES") {
- lockstate[argc] = 1;
+ if ($2 == "LOCKED=EXCL") {
+ lockstate[argc] = "elocked";
+ i++;
+ } else if ($2 == "LOCKED=YES") {
+ lockstate[argc] = "locked";
i++;
} else if ($2 == "LOCKED=NO") {
- lockstate[argc] = 0;
+ lockstate[argc] = "unlocked";
i++;
} else
- lockstate[argc] = -1;
+ lockstate[argc] = "";
if ($2 == "WILLRELE" ||
$3 == "WILLRELE") {
@@ -175,7 +178,8 @@ awk_parser='
i++;
}
if (argc == 0 && fstrans == "") {
- if (lockstate[0] == 1)
+ if (lockstate[0] == "locked" ||
+ lockstate[0] == "elocked")
fstrans = "NO";
else
fstrans = "YES";
@@ -249,12 +253,6 @@ echo -n "$copyright"
echo ''
echo "#ifndef _${SYS}VNODE_IF_H_"
echo "#define _${SYS}VNODE_IF_H_"
-if [ ${lockdebug} -ne 0 ] ; then
- echo ''
- echo '#ifdef _KERNEL_OPT'
- echo '#include "opt_vnode_lockdebug.h"'
- echo '#endif /* _KERNEL_OPT */'
-fi
[ -z "${rump}" ] && echo "
extern const struct vnodeop_desc ${rump}vop_default_desc;"
echo
@@ -343,7 +341,12 @@ echo "
#include
__KERNEL_RCSID(0, \"\$NetBSD\$\");"
-[ ${lockdebug} -ne 0 ] && echo && echo '#include "opt_vnode_lockdebug.h"'
+if [ -z "${rump}" -a ${lockdebug} -ne 0 ] ; then
+ echo ''
+ echo '#ifdef _KERNEL_OPT'
+ echo '#include "opt_vnode_lockdebug.h"'
+ echo '#endif /* _KERNEL_OPT */'
+fi
echo '
#include
@@ -604,6 +607,33 @@ vop_post(vnode_t *vp, struct mount *mp,
}
}
+static inline void
+assert_vop_unlocked(vnode_t *vp, const char *str)
+{
+
+ if (VOP_ISLOCKED(vp) == LK_EXCLUSIVE)
+ panic(\"%s: %p %d/%d is locked but should not be\",
+ str, vp, vp->v_tag, vp->v_type);
+}
+
+static inline void
+assert_vop_locked(vnode_t *vp, const char *str)
+{
+
+ if (VOP_ISLOCKED(vp) == LK_NONE)
+ panic(\"%s: %p %d/%d is not locked but should be\",
+ str, vp, vp->v_tag, vp->v_type);
+}
+
+static inline void
+assert_vop_elocked(vnode_t *vp, const char *str)
+{
+
+ if (VOP_ISLOCKED(vp) != LK_EXCLUSIVE)
+ panic(\"%s: %p %d/%d is not exclusive locked but should be\",
+ str, vp, vp->v_tag, vp->v_type);
+}
+
const struct vnodeop_desc vop_default_desc = {"
echo ' 0,
"default",
@@ -691,25 +721,16 @@ function bodynorm() {
printf("{\n\tint error;\n\tbool mpsafe;\n\tstruct %s_args a;\n",
args_name);
printf("\tstruct mount *mp;\n");
- if (lockdebug) {
- printf("#ifdef VNODE_LOCKDEBUG\n");
- for (i=0; i
effect: Iff defined, build with -DLOCKDEBUG.
+RUMP_VNODE_LOCKDEBUG
+
+values: /
+defval:
+effect: Iff defined, build with -DVNODE_LOCKDEBUG.
+
+
RUMP_KTRACE
values: yes|no
CVS commit: src/sys
Module Name:src Committed By: hannken Date: Tue May 3 08:34:00 UTC 2022 Modified Files: src/sys/kern: vnode_if.sh vnode_if.src src/sys/rump: Makefile.rump README.compileopts Log Message: Make option VNODE_LOCKDEBUG more functional. - Add "LOCKED=EXCL" option for vnode operations needing exclusive locked nodes. - As it is impossible to check for shared locks held by current thread avoid false assertions by testing for exclusive lock only in the "LOCKED=NO" case. - New option "RUMP_VNODE_LOCKDEBUG" enables VNODE_LOCKDEBUG for the rump kernel. To generate a diff of this commit: cvs rdiff -u -r1.73 -r1.74 src/sys/kern/vnode_if.sh cvs rdiff -u -r1.83 -r1.84 src/sys/kern/vnode_if.src cvs rdiff -u -r1.133 -r1.134 src/sys/rump/Makefile.rump cvs rdiff -u -r1.14 -r1.15 src/sys/rump/README.compileopts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/rump/rumpvfs
Module Name:src Committed By: hannken Date: Tue May 3 07:36:20 UTC 2022 Modified Files: src/tests/rump/rumpvfs: t_p2kifs.c Log Message: Lock vnode for VOP_LOOKUP(). To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/tests/rump/rumpvfs/t_p2kifs.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/rump/rumpvfs/t_p2kifs.c diff -u src/tests/rump/rumpvfs/t_p2kifs.c:1.6 src/tests/rump/rumpvfs/t_p2kifs.c:1.7 --- src/tests/rump/rumpvfs/t_p2kifs.c:1.6 Fri Jan 13 21:30:43 2017 +++ src/tests/rump/rumpvfs/t_p2kifs.c Tue May 3 07:36:20 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: t_p2kifs.c,v 1.6 2017/01/13 21:30:43 christos Exp $ */ +/* $NetBSD: t_p2kifs.c,v 1.7 2022/05/03 07:36:20 hannken Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -70,6 +70,9 @@ ATF_TC_BODY(makecn, tc) /* need stable lwp for componentname */ RZ(rump_pub_lwproc_rfork(RUMP_RFCFDG)); + /* obey vnode locking rules */ + RZ(RUMP_VOP_LOCK(rumpns_rootvnode, RUMP_LK_EXCLUSIVE)); + /* try it once with the right path */ cn = rump_pub_makecn(RUMP_NAMEI_LOOKUP, 0, pathstr, strlen(pathstr), rump_pub_cred_create(0, 0, 0, NULL), rump_pub_lwproc_curlwp()); @@ -81,6 +84,8 @@ ATF_TC_BODY(makecn, tc) rump_pub_cred_create(0, 0, 0, NULL), rump_pub_lwproc_curlwp()); strcpy(pathstr, "/muuta"); RZ(RUMP_VOP_LOOKUP(rumpns_rootvnode, , cn)); + + RZ(RUMP_VOP_UNLOCK(rumpns_rootvnode)); rump_pub_freecn(cn, RUMPCN_FREECRED); }
CVS commit: src/tests/rump/rumpvfs
Module Name:src Committed By: hannken Date: Tue May 3 07:36:20 UTC 2022 Modified Files: src/tests/rump/rumpvfs: t_p2kifs.c Log Message: Lock vnode for VOP_LOOKUP(). To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/tests/rump/rumpvfs/t_p2kifs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/fs/udf
Module Name:src Committed By: hannken Date: Tue May 3 07:35:43 UTC 2022 Modified Files: src/sys/fs/udf: udf_vnops.c Log Message: No IO_NODELOCKED for unlocked vnode. To generate a diff of this commit: cvs rdiff -u -r1.123 -r1.124 src/sys/fs/udf/udf_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/fs/udf
Module Name:src Committed By: hannken Date: Tue May 3 07:35:43 UTC 2022 Modified Files: src/sys/fs/udf: udf_vnops.c Log Message: No IO_NODELOCKED for unlocked vnode. To generate a diff of this commit: cvs rdiff -u -r1.123 -r1.124 src/sys/fs/udf/udf_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/fs/udf/udf_vnops.c diff -u src/sys/fs/udf/udf_vnops.c:1.123 src/sys/fs/udf/udf_vnops.c:1.124 --- src/sys/fs/udf/udf_vnops.c:1.123 Sun Apr 10 09:50:46 2022 +++ src/sys/fs/udf/udf_vnops.c Tue May 3 07:35:43 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: udf_vnops.c,v 1.123 2022/04/10 09:50:46 andvar Exp $ */ +/* $NetBSD: udf_vnops.c,v 1.124 2022/05/03 07:35:43 hannken Exp $ */ /* * Copyright (c) 2006, 2008 Reinoud Zandijk @@ -32,7 +32,7 @@ #include #ifndef lint -__KERNEL_RCSID(0, "$NetBSD: udf_vnops.c,v 1.123 2022/04/10 09:50:46 andvar Exp $"); +__KERNEL_RCSID(0, "$NetBSD: udf_vnops.c,v 1.124 2022/05/03 07:35:43 hannken Exp $"); #endif /* not lint */ @@ -1701,7 +1701,7 @@ udf_do_symlink(struct udf_node *udf_node /* write out structure on the new file */ error = vn_rdwr(UIO_WRITE, udf_node->vnode, pathbuf, pathlen, 0, - UIO_SYSSPACE, IO_NODELOCKED | IO_ALTSEMANTICS, + UIO_SYSSPACE, IO_ALTSEMANTICS, FSCRED, NULL, NULL); /* return status of symlink contents writeout */
CVS commit: src/sys/fs
Module Name:src
Committed By: hannken
Date: Tue May 3 07:34:38 UTC 2022
Modified Files:
src/sys/fs/sysvbfs: sysvbfs_vfsops.c
src/sys/fs/v7fs: v7fs_vfsops.c
Log Message:
Lock devvp for kauth KAUTH_REQ_SYSTEM_MOUNT_DEVICE.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/fs/sysvbfs/sysvbfs_vfsops.c
cvs rdiff -u -r1.18 -r1.19 src/sys/fs/v7fs/v7fs_vfsops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/sysvbfs/sysvbfs_vfsops.c
diff -u src/sys/fs/sysvbfs/sysvbfs_vfsops.c:1.47 src/sys/fs/sysvbfs/sysvbfs_vfsops.c:1.48
--- src/sys/fs/sysvbfs/sysvbfs_vfsops.c:1.47 Fri Jan 17 20:08:08 2020
+++ src/sys/fs/sysvbfs/sysvbfs_vfsops.c Tue May 3 07:34:38 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: sysvbfs_vfsops.c,v 1.47 2020/01/17 20:08:08 ad Exp $ */
+/* $NetBSD: sysvbfs_vfsops.c,v 1.48 2022/05/03 07:34:38 hannken Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sysvbfs_vfsops.c,v 1.47 2020/01/17 20:08:08 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysvbfs_vfsops.c,v 1.48 2022/05/03 07:34:38 hannken Exp $");
#include
#include
@@ -139,9 +139,11 @@ sysvbfs_mount(struct mount *mp, const ch
(mp->mnt_flag & MNT_RDONLY) == 0)
accessmode |= VWRITE;
+ vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY);
error = kauth_authorize_system(l->l_cred, KAUTH_SYSTEM_MOUNT,
KAUTH_REQ_SYSTEM_MOUNT_DEVICE, mp, devvp,
KAUTH_ARG(accessmode));
+ VOP_UNLOCK(devvp);
}
if (error) {
Index: src/sys/fs/v7fs/v7fs_vfsops.c
diff -u src/sys/fs/v7fs/v7fs_vfsops.c:1.18 src/sys/fs/v7fs/v7fs_vfsops.c:1.19
--- src/sys/fs/v7fs/v7fs_vfsops.c:1.18 Sat Feb 5 14:11:52 2022
+++ src/sys/fs/v7fs/v7fs_vfsops.c Tue May 3 07:34:38 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: v7fs_vfsops.c,v 1.18 2022/02/05 14:11:52 zafer Exp $ */
+/* $NetBSD: v7fs_vfsops.c,v 1.19 2022/05/03 07:34:38 hannken Exp $ */
/*-
* Copyright (c) 2004, 2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: v7fs_vfsops.c,v 1.18 2022/02/05 14:11:52 zafer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: v7fs_vfsops.c,v 1.19 2022/05/03 07:34:38 hannken Exp $");
#if defined _KERNEL_OPT
#include "opt_v7fs.h"
#endif
@@ -157,9 +157,12 @@ v7fs_mount(struct mount *mp, const char
(mp->mnt_iflag & IMNT_WANTRDWR) != 0 :
(mp->mnt_flag & MNT_RDONLY) == 0)
accessmode |= VWRITE;
+
+ vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY);
error = kauth_authorize_system(l->l_cred, KAUTH_SYSTEM_MOUNT,
KAUTH_REQ_SYSTEM_MOUNT_DEVICE, mp, devvp,
KAUTH_ARG(accessmode));
+ VOP_UNLOCK(devvp);
}
if (error) {
CVS commit: src/sys/fs
Module Name:src Committed By: hannken Date: Tue May 3 07:34:38 UTC 2022 Modified Files: src/sys/fs/sysvbfs: sysvbfs_vfsops.c src/sys/fs/v7fs: v7fs_vfsops.c Log Message: Lock devvp for kauth KAUTH_REQ_SYSTEM_MOUNT_DEVICE. To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/sys/fs/sysvbfs/sysvbfs_vfsops.c cvs rdiff -u -r1.18 -r1.19 src/sys/fs/v7fs/v7fs_vfsops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/fs
Module Name:src Committed By: hannken Date: Tue May 3 07:33:07 UTC 2022 Modified Files: src/sys/fs/cd9660: cd9660_vfsops.c src/sys/fs/udf: udf_vfsops.c Log Message: Lock devvp for vinvalbuf(). To generate a diff of this commit: cvs rdiff -u -r1.96 -r1.97 src/sys/fs/cd9660/cd9660_vfsops.c cvs rdiff -u -r1.84 -r1.85 src/sys/fs/udf/udf_vfsops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/fs/cd9660/cd9660_vfsops.c diff -u src/sys/fs/cd9660/cd9660_vfsops.c:1.96 src/sys/fs/cd9660/cd9660_vfsops.c:1.97 --- src/sys/fs/cd9660/cd9660_vfsops.c:1.96 Sat Apr 4 20:49:30 2020 +++ src/sys/fs/cd9660/cd9660_vfsops.c Tue May 3 07:33:07 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: cd9660_vfsops.c,v 1.96 2020/04/04 20:49:30 ad Exp $ */ +/* $NetBSD: cd9660_vfsops.c,v 1.97 2022/05/03 07:33:07 hannken Exp $ */ /*- * Copyright (c) 1994 @@ -37,7 +37,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: cd9660_vfsops.c,v 1.96 2020/04/04 20:49:30 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cd9660_vfsops.c,v 1.97 2022/05/03 07:33:07 hannken Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" @@ -358,7 +358,10 @@ iso_mountfs(struct vnode *devvp, struct return EROFS; /* Flush out any old buffers remaining from a previous use. */ - if ((error = vinvalbuf(devvp, V_SAVE, l->l_cred, l, 0, 0)) != 0) + vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY); + error = vinvalbuf(devvp, V_SAVE, l->l_cred, l, 0, 0); + VOP_UNLOCK(devvp); + if (error != 0) return (error); /* This is the "logical sector size". The standard says this Index: src/sys/fs/udf/udf_vfsops.c diff -u src/sys/fs/udf/udf_vfsops.c:1.84 src/sys/fs/udf/udf_vfsops.c:1.85 --- src/sys/fs/udf/udf_vfsops.c:1.84 Wed Mar 23 13:06:06 2022 +++ src/sys/fs/udf/udf_vfsops.c Tue May 3 07:33:07 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: udf_vfsops.c,v 1.84 2022/03/23 13:06:06 andvar Exp $ */ +/* $NetBSD: udf_vfsops.c,v 1.85 2022/05/03 07:33:07 hannken Exp $ */ /* * Copyright (c) 2006, 2008 Reinoud Zandijk @@ -28,7 +28,7 @@ #include #ifndef lint -__KERNEL_RCSID(0, "$NetBSD: udf_vfsops.c,v 1.84 2022/03/23 13:06:06 andvar Exp $"); +__KERNEL_RCSID(0, "$NetBSD: udf_vfsops.c,v 1.85 2022/05/03 07:33:07 hannken Exp $"); #endif /* not lint */ @@ -574,7 +574,10 @@ udf_mountfs(struct vnode *devvp, struct intnum_anchors, error; /* flush out any old buffers remaining from a previous use. */ - if ((error = vinvalbuf(devvp, V_SAVE, l->l_cred, l, 0, 0))) + vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY); + error = vinvalbuf(devvp, V_SAVE, l->l_cred, l, 0, 0); + VOP_UNLOCK(devvp); + if (error) return error; /* setup basic mount information */
CVS commit: src/sys/fs
Module Name:src Committed By: hannken Date: Tue May 3 07:33:07 UTC 2022 Modified Files: src/sys/fs/cd9660: cd9660_vfsops.c src/sys/fs/udf: udf_vfsops.c Log Message: Lock devvp for vinvalbuf(). To generate a diff of this commit: cvs rdiff -u -r1.96 -r1.97 src/sys/fs/cd9660/cd9660_vfsops.c cvs rdiff -u -r1.84 -r1.85 src/sys/fs/udf/udf_vfsops.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/libcurses/check_files
Module Name:src Committed By: blymn Date: Tue May 3 07:26:19 UTC 2022 Modified Files: src/tests/lib/libcurses/check_files: background4.chk bkgrndset1.chk Log Message: Output changed due to bug fixes in curses. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libcurses/check_files/background4.chk cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libcurses/check_files/bkgrndset1.chk 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/libcurses/check_files/background4.chk diff -u src/tests/lib/libcurses/check_files/background4.chk:1.2 src/tests/lib/libcurses/check_files/background4.chk:1.3 --- src/tests/lib/libcurses/check_files/background4.chk:1.2 Fri Sep 16 08:05:28 2011 +++ src/tests/lib/libcurses/check_files/background4.chk Tue May 3 07:26:19 2022 @@ -1,5 +1,5 @@ cup1;14Xcup3;6Xrevwindow -B1 + 1 BB BB BB Index: src/tests/lib/libcurses/check_files/bkgrndset1.chk diff -u src/tests/lib/libcurses/check_files/bkgrndset1.chk:1.1 src/tests/lib/libcurses/check_files/bkgrndset1.chk:1.2 --- src/tests/lib/libcurses/check_files/bkgrndset1.chk:1.1 Wed Apr 20 07:43:05 2022 +++ src/tests/lib/libcurses/check_files/bkgrndset1.chk Tue May 3 07:26:19 2022 @@ -1 +1 @@ -thissmsoArmsoissmsoArmsoasmsoArmsotestsmsoAAcup2;1Xcup3;1Xcup4;1Xcup5;1Xcup6;1Xcup7;1Xcup8;1Xcup9;1Xcup10;1Xcup11;1Xcup12;1XA AAAcup13;1Xcup14;1Xcup15;1Xcup16;1Xcup17;1Xcup18;1Xcup19;1Xcup20;1Xcup21;1Xcup22;1Xcup23;1XAA AAcup24;1XAAArmamAsmamcup1;15Xrmso \ No newline at end of file +this is a testsmsoAAcup2;1Xcup3;1Xcup4;1Xcup5;1Xcup6;1Xcup7;1Xcup8;1Xcup9;1Xcup10;1Xcup11;1Xcup12;1XA
CVS commit: src/tests/lib/libcurses/check_files
Module Name:src Committed By: blymn Date: Tue May 3 07:26:19 UTC 2022 Modified Files: src/tests/lib/libcurses/check_files: background4.chk bkgrndset1.chk Log Message: Output changed due to bug fixes in curses. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libcurses/check_files/background4.chk cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libcurses/check_files/bkgrndset1.chk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libcurses
Module Name:src
Committed By: blymn
Date: Tue May 3 07:25:34 UTC 2022
Modified Files:
src/lib/libcurses: add_wchstr.c addbytes.c background.c border.c
clrtobot.c curses.c curses_private.h delch.c erase.c newwin.c
refresh.c
Log Message:
* Don't redraw the background if the new background character is the
same as the old one. This prevents excessive redraws in some
applications.
* Fix bug introduced when wbkgrndset was fixed, we cannot blindly
replace any instance of the old background character with the new one
because some of those characters were put there by the application
leading to display corruption. So flag characters as background when
they are erased and only update the flagged characters when setting
the background.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/lib/libcurses/add_wchstr.c
cvs rdiff -u -r1.62 -r1.63 src/lib/libcurses/addbytes.c
cvs rdiff -u -r1.30 -r1.31 src/lib/libcurses/background.c
cvs rdiff -u -r1.23 -r1.24 src/lib/libcurses/border.c
cvs rdiff -u -r1.29 -r1.30 src/lib/libcurses/clrtobot.c \
src/lib/libcurses/curses.c
cvs rdiff -u -r1.79 -r1.80 src/lib/libcurses/curses_private.h
cvs rdiff -u -r1.28 -r1.29 src/lib/libcurses/delch.c
cvs rdiff -u -r1.35 -r1.36 src/lib/libcurses/erase.c
cvs rdiff -u -r1.66 -r1.67 src/lib/libcurses/newwin.c
cvs rdiff -u -r1.122 -r1.123 src/lib/libcurses/refresh.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libcurses/add_wchstr.c
diff -u src/lib/libcurses/add_wchstr.c:1.12 src/lib/libcurses/add_wchstr.c:1.13
--- src/lib/libcurses/add_wchstr.c:1.12 Tue Apr 12 07:03:04 2022
+++ src/lib/libcurses/add_wchstr.c Tue May 3 07:25:34 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: add_wchstr.c,v 1.12 2022/04/12 07:03:04 blymn Exp $ */
+/* $NetBSD: add_wchstr.c,v 1.13 2022/05/03 07:25:34 blymn Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation Inc.
@@ -36,7 +36,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: add_wchstr.c,v 1.12 2022/04/12 07:03:04 blymn Exp $");
+__RCSID("$NetBSD: add_wchstr.c,v 1.13 2022/05/03 07:25:34 blymn Exp $");
#endif/* not lint */
#include
@@ -210,6 +210,7 @@ wadd_wchnstr(WINDOW *win, const cchar_t
== ERR)
return ERR;
lp->attr = win->battr;
+ lp->cflags |= CA_BACKGROUND;
(*lp).wcols = 1;
lp++, ex++;
}
@@ -229,6 +230,7 @@ wadd_wchnstr(WINDOW *win, const cchar_t
}
lp->ch = chp->vals[0];
lp->attr = chp->attributes & WA_ATTRIBUTES;
+ lp->cflags &= ~CA_BACKGROUND;
(*lp).wcols = cw;
if (chp->elements > 1) {
for (i = 1; i < chp->elements; i++) {
Index: src/lib/libcurses/addbytes.c
diff -u src/lib/libcurses/addbytes.c:1.62 src/lib/libcurses/addbytes.c:1.63
--- src/lib/libcurses/addbytes.c:1.62 Tue Apr 12 07:03:04 2022
+++ src/lib/libcurses/addbytes.c Tue May 3 07:25:34 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: addbytes.c,v 1.62 2022/04/12 07:03:04 blymn Exp $ */
+/* $NetBSD: addbytes.c,v 1.63 2022/05/03 07:25:34 blymn Exp $ */
/*
* Copyright (c) 1987, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)addbytes.c 8.4 (Berkeley) 5/4/94";
#else
-__RCSID("$NetBSD: addbytes.c,v 1.62 2022/04/12 07:03:04 blymn Exp $");
+__RCSID("$NetBSD: addbytes.c,v 1.63 2022/05/03 07:25:34 blymn Exp $");
#endif
#endif/* not lint */
@@ -311,6 +311,8 @@ _cursesi_addbyte(WINDOW *win, __LINE **l
#endif
}
+ (*lp)->line[*x].cflags &= ~ CA_BACKGROUND;
+
if (attributes & __COLOR)
(*lp)->line[*x].attr =
attributes | (win->battr & ~__COLOR);
@@ -449,6 +451,7 @@ _cursesi_addwchar(WINDOW *win, __LINE **
*y, sx);
tp = >alines[*y]->line[sx];
tp->ch = win->bch;
+ tp->cflags |= CA_BACKGROUND;
if (_cursesi_copy_nsp(win->bnsp, tp) == ERR)
return ERR;
@@ -513,6 +516,7 @@ _cursesi_addwchar(WINDOW *win, __LINE **
}
lp->ch = wch->vals[0];
+ lp->cflags &= ~CA_BACKGROUND;
attributes = (win->wattr | wch->attributes)
& (WA_ATTRIBUTES & ~__COLOR);
@@ -559,7 +563,7 @@ _cursesi_addwchar(WINDOW *win, __LINE **
tp->ch = wch->vals[0];
tp->attr = lp->attr & WA_ATTRIBUTES;
/* Mark as "continuation" cell */
- tp->wflags |= WCA_CONTINUATION;
+ tp->cflags |= CA_CONTINUATION;
}
@@ -596,6 +600,7 @@ _cursesi_addwchar(WINDOW *win, __LINE **
"remaining of current char (%d,%d)nn",
*y, ex);
tp->ch = win->bch;
+tp->cflags |= CA_BACKGROUND;
if (_cursesi_copy_nsp(win->bnsp, tp) == ERR)
return ERR;
tp->attr = win->battr;
Index: src/lib/libcurses/background.c
diff -u src/lib/libcurses/background.c:1.30 src/lib/libcurses/background.c:1.31
--- src/lib/libcurses/background.c:1.30 Tue Apr 19 22:26:57 2022
+++ src/lib/libcurses/background.c Tue May 3 07:25:34 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: background.c,v 1.30 2022/04/19 22:26:57 blymn Exp $ */
+/* $NetBSD: background.c,v 1.31 2022/05/03
CVS commit: src/lib/libcurses
Module Name:src Committed By: blymn Date: Tue May 3 07:25:34 UTC 2022 Modified Files: src/lib/libcurses: add_wchstr.c addbytes.c background.c border.c clrtobot.c curses.c curses_private.h delch.c erase.c newwin.c refresh.c Log Message: * Don't redraw the background if the new background character is the same as the old one. This prevents excessive redraws in some applications. * Fix bug introduced when wbkgrndset was fixed, we cannot blindly replace any instance of the old background character with the new one because some of those characters were put there by the application leading to display corruption. So flag characters as background when they are erased and only update the flagged characters when setting the background. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/lib/libcurses/add_wchstr.c cvs rdiff -u -r1.62 -r1.63 src/lib/libcurses/addbytes.c cvs rdiff -u -r1.30 -r1.31 src/lib/libcurses/background.c cvs rdiff -u -r1.23 -r1.24 src/lib/libcurses/border.c cvs rdiff -u -r1.29 -r1.30 src/lib/libcurses/clrtobot.c \ src/lib/libcurses/curses.c cvs rdiff -u -r1.79 -r1.80 src/lib/libcurses/curses_private.h cvs rdiff -u -r1.28 -r1.29 src/lib/libcurses/delch.c cvs rdiff -u -r1.35 -r1.36 src/lib/libcurses/erase.c cvs rdiff -u -r1.66 -r1.67 src/lib/libcurses/newwin.c cvs rdiff -u -r1.122 -r1.123 src/lib/libcurses/refresh.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
