From owner-svn-src-user@freebsd.org Fri Oct 9 20:28:47 2020 Return-Path: Delivered-To: svn-src-user@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D7B5542C3A5 for ; Fri, 9 Oct 2020 20:28:47 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C7KR35RyDz4qsr; Fri, 9 Oct 2020 20:28:47 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9F6031ECEE; Fri, 9 Oct 2020 20:28:47 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 099KSlCu037437; Fri, 9 Oct 2020 20:28:47 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 099KSlAm037436; Fri, 9 Oct 2020 20:28:47 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <202010092028.099KSlAm037436@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Fri, 9 Oct 2020 20:28:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r366585 - in user/cperciva/freebsd-update-build/scripts/12.2-RC2: . amd64 i386 X-SVN-Group: user X-SVN-Commit-Author: gordon X-SVN-Commit-Paths: in user/cperciva/freebsd-update-build/scripts/12.2-RC2: . amd64 i386 X-SVN-Commit-Revision: 366585 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Oct 2020 20:28:47 -0000 Author: gordon Date: Fri Oct 9 20:28:46 2020 New Revision: 366585 URL: https://svnweb.freebsd.org/changeset/base/366585 Log: Add 12.2-RC2. Added: user/cperciva/freebsd-update-build/scripts/12.2-RC2/ user/cperciva/freebsd-update-build/scripts/12.2-RC2/amd64/ user/cperciva/freebsd-update-build/scripts/12.2-RC2/amd64/build.conf (contents, props changed) user/cperciva/freebsd-update-build/scripts/12.2-RC2/i386/ user/cperciva/freebsd-update-build/scripts/12.2-RC2/i386/build.conf (contents, props changed) Added: user/cperciva/freebsd-update-build/scripts/12.2-RC2/amd64/build.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/cperciva/freebsd-update-build/scripts/12.2-RC2/amd64/build.conf Fri Oct 9 20:28:46 2020 (r366585) @@ -0,0 +1,10 @@ +export RELH=6ebc547a7488f6a3533f7d30802bf810937a2c8cab25370051fd07bcc3ca3d733b01ce8e6ee773d53db7926c1cbebe96baad418e4afd0bcd37f02868675cef00 +export FTP=https://people.freebsd.org/~gjb/12.2-RC2 + +# Components of the world, source, and kernels +export WORLDPARTS="base base-dbg doc lib32 lib32-dbg" +export SOURCEPARTS="src" +export KERNELPARTS="kernel kernel-dbg" + +# EOL date +export EOL=1604793600 Added: user/cperciva/freebsd-update-build/scripts/12.2-RC2/i386/build.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/cperciva/freebsd-update-build/scripts/12.2-RC2/i386/build.conf Fri Oct 9 20:28:46 2020 (r366585) @@ -0,0 +1,10 @@ +export RELH=93b050d0dc432197606f27e929f10db3811b4f4c9abca58c0d2ec6e1c46a5853419118f79b5c21416da0ff77b54384423270e2d8b3b5fa33b4e59abfd49ceb55 +export FTP=https://people.freebsd.org/~gjb/12.2-RC2 + +# Components of the world, source, and kernels +export WORLDPARTS="base base-dbg doc" +export SOURCEPARTS="src" +export KERNELPARTS="kernel kernel-dbg" + +# EOL date +export EOL=1604793600 From owner-svn-src-user@freebsd.org Fri Oct 9 20:30:28 2020 Return-Path: Delivered-To: svn-src-user@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A493F42C1C6 for ; Fri, 9 Oct 2020 20:30:28 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C7KT03sVqz4r1k; Fri, 9 Oct 2020 20:30:28 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 639AC1F29A; Fri, 9 Oct 2020 20:30:28 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 099KUS1C037609; Fri, 9 Oct 2020 20:30:28 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 099KUSHf037608; Fri, 9 Oct 2020 20:30:28 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <202010092030.099KUSHf037608@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Fri, 9 Oct 2020 20:30:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r366586 - user/cperciva/freebsd-update-build X-SVN-Group: user X-SVN-Commit-Author: gordon X-SVN-Commit-Paths: user/cperciva/freebsd-update-build X-SVN-Commit-Revision: 366586 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Oct 2020 20:30:28 -0000 Author: gordon Date: Fri Oct 9 20:30:27 2020 New Revision: 366586 URL: https://svnweb.freebsd.org/changeset/base/366586 Log: Change job handling to use the same construct I moved to later. This could probably be abstracted into a function. Modified: user/cperciva/freebsd-update-build/build-upgrade-patches.sh Modified: user/cperciva/freebsd-update-build/build-upgrade-patches.sh ============================================================================== --- user/cperciva/freebsd-update-build/build-upgrade-patches.sh Fri Oct 9 20:28:46 2020 (r366585) +++ user/cperciva/freebsd-update-build/build-upgrade-patches.sh Fri Oct 9 20:30:27 2020 (r366586) @@ -82,13 +82,8 @@ zcat ${WWWDIR}/${TARGETREL}/${ARCH}/m/* | genpatch & - jobs="$(jobs)" - numjobs=$(echo "$jobs" | wc -l) - while [ $numjobs -ge $MAXJOBS ]; do + while [ $(ls -d ${TMPDIR:-/tmp}/genpatch* 2>/dev/null | wc -l) -ge $MAXJOBS ]; do sleep 2 - - jobs="$(jobs)" - numjobs=$(echo "$jobs" | wc -l) done done From owner-svn-src-user@freebsd.org Sat Oct 10 08:02:24 2020 Return-Path: Delivered-To: svn-src-user@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 504AE440181 for ; Sat, 10 Oct 2020 08:02:24 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C7cqN1WJZz4RDY; Sat, 10 Oct 2020 08:02:24 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 18B1C27997; Sat, 10 Oct 2020 08:02:24 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09A82N1c078397; Sat, 10 Oct 2020 08:02:23 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09A82Nnp078394; Sat, 10 Oct 2020 08:02:23 GMT (envelope-from pho@FreeBSD.org) Message-Id: <202010100802.09A82Nnp078394@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Sat, 10 Oct 2020 08:02:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r366601 - user/pho/stress2/misc X-SVN-Group: user X-SVN-Commit-Author: pho X-SVN-Commit-Paths: user/pho/stress2/misc X-SVN-Commit-Revision: 366601 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Oct 2020 08:02:24 -0000 Author: pho Date: Sat Oct 10 08:02:23 2020 New Revision: 366601 URL: https://svnweb.freebsd.org/changeset/base/366601 Log: Handle sysctl name change from 'vm.max_wired' to 'vm.max_user_wired'. Handle sysent.h changes. Modified: user/pho/stress2/misc/contigmalloc.sh user/pho/stress2/misc/contigmalloc2.sh user/pho/stress2/misc/contigmalloc3.sh Modified: user/pho/stress2/misc/contigmalloc.sh ============================================================================== --- user/pho/stress2/misc/contigmalloc.sh Sat Oct 10 07:20:59 2020 (r366600) +++ user/pho/stress2/misc/contigmalloc.sh Sat Oct 10 08:02:23 2020 (r366601) @@ -92,7 +92,7 @@ test(int argc, char *argv[]) ps = getpagesize(); s = 0; n = arc4random() % N + 1; - mw = mw / 100 * 10 * ps; /* Use 10% of vm.max_wired */ + mw = mw / 100 * 10 * ps; /* Use 10% of vm.max_user_wired */ mw = min(mw, CAP); for (i = 0; i < n; i++) { size[i] = round_page((arc4random() % MAXBUF) + 1); @@ -102,6 +102,7 @@ test(int argc, char *argv[]) if (res == -1) { warn("contigmalloc(%lu pages) failed at loop %d", size[i] / ps, i); + usleep(200000); } else { #if defined(TEST) fprintf(stderr, "contigmalloc(%lu pages)\n", @@ -154,7 +155,7 @@ make || exit 1 kldload $dir/cmalloc.ko || exit 1 cd $odir -mw=`sysctl -n vm.max_wired` || exit 1 +mw=`sysctl -n vm.max_user_wired` || exit 1 /tmp/ctest `sysctl -n debug.cmalloc_offset` $mw 2>&1 | tail -5 kldunload $dir/cmalloc.ko rm -rf $dir /tmp/ctest @@ -219,8 +220,8 @@ cmalloc(struct thread *td, struct cmalloc_args *uap) * The sysent for the new syscall */ static struct sysent cmalloc_sysent = { - 3, /* sy_narg */ - (sy_call_t *) cmalloc /* sy_call */ + .sy_narg = 3, /* sy_narg */ + .sy_call = (sy_call_t *) cmalloc /* sy_call */ }; /* Modified: user/pho/stress2/misc/contigmalloc2.sh ============================================================================== --- user/pho/stress2/misc/contigmalloc2.sh Sat Oct 10 07:20:59 2020 (r366600) +++ user/pho/stress2/misc/contigmalloc2.sh Sat Oct 10 08:02:23 2020 (r366601) @@ -75,7 +75,7 @@ test(int argc, char *argv[]) errx(1, "Usage: %s ", argv[0]); ps = getpagesize(); - size = mw / 100 * 80 * ps; /* Use 80% of vm.max_wired */ + size = mw / 100 * 80 * ps; /* Use 80% of vm.max_user_wired */ while (size > 0) { res = syscall(no, TALLOC, &p, &size); if (res == -1) { @@ -122,8 +122,8 @@ make depend all || exit 1 kldload $dir/cmalloc2.ko || exit 1 cd $odir -mw=$((`sysctl -n vm.max_wired` - `sysctl -n vm.stats.vm.v_wire_count`)) || - exit 1 +mw=$((`sysctl -n vm.max_user_wired` - \ + `sysctl -n vm.stats.vm.v_user_wire_count`)) || exit 1 /tmp/ctest2 `sysctl -n debug.cmalloc_offset` $mw #2>&1 | tail -5 kldunload $dir/cmalloc2.ko rm -rf $dir /tmp/ctest2 @@ -188,8 +188,8 @@ cmalloc(struct thread *td, struct cmalloc_args *uap) * The sysent for the new syscall */ static struct sysent cmalloc_sysent = { - 3, /* sy_narg */ - (sy_call_t *) cmalloc /* sy_call */ + .sy_narg = 3, /* sy_narg */ + .sy_call = (sy_call_t *) cmalloc /* sy_call */ }; /* Modified: user/pho/stress2/misc/contigmalloc3.sh ============================================================================== --- user/pho/stress2/misc/contigmalloc3.sh Sat Oct 10 07:20:59 2020 (r366600) +++ user/pho/stress2/misc/contigmalloc3.sh Sat Oct 10 08:02:23 2020 (r366601) @@ -76,7 +76,7 @@ test(int argc, char *argv[]) ps = getpagesize(); if (mw < MAXBUF / ps) { - fprintf(stderr, "max_wired too small for this test\n"); + fprintf(stderr, "max_user_wired too small for this test\n"); exit (0); } i = 0; @@ -125,7 +125,7 @@ make || exit 1 kldload $dir/cmalloc.ko || exit 1 cd $odir -mw=`sysctl -n vm.max_wired` || exit 1 +mw=`sysctl -n vm.max_user_wired` || exit 1 /tmp/ctest `sysctl -n debug.cmalloc_offset` $mw 2>&1 | tail -5 kldunload $dir/cmalloc.ko rm -rf $dir /tmp/ctest @@ -190,8 +190,8 @@ cmalloc(struct thread *td, struct cmalloc_args *uap) * The sysent for the new syscall */ static struct sysent cmalloc_sysent = { - 3, /* sy_narg */ - (sy_call_t *) cmalloc /* sy_call */ + .sy_narg = 3, /* sy_narg */ + .sy_call = (sy_call_t *) cmalloc /* sy_call */ }; /*