From owner-dev-commits-src-main@freebsd.org Wed Jul 14 06:01:03 2021 Return-Path: Delivered-To: dev-commits-src-main@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 5DBA666CA53; Wed, 14 Jul 2021 06:01:03 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GPn1W2DNXz4fBh; Wed, 14 Jul 2021 06:01:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2AB2710C3B; Wed, 14 Jul 2021 06:01:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16E613f9082627; Wed, 14 Jul 2021 06:01:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16E613Cv082626; Wed, 14 Jul 2021 06:01:03 GMT (envelope-from git) Date: Wed, 14 Jul 2021 06:01:03 GMT Message-Id: <202107140601.16E613Cv082626@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Peter Holm Subject: git: 8616f8aff1f0 - main - stress2: Pass program exit code to shell script exit. Do not loop forever in test program MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pho X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8616f8aff1f0575f2895cf092aa013d38be274a9 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Jul 2021 06:01:03 -0000 The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=8616f8aff1f0575f2895cf092aa013d38be274a9 commit 8616f8aff1f0575f2895cf092aa013d38be274a9 Author: Peter Holm AuthorDate: 2021-07-14 05:59:48 +0000 Commit: Peter Holm CommitDate: 2021-07-14 05:59:48 +0000 stress2: Pass program exit code to shell script exit. Do not loop forever in test program --- tools/test/stress2/misc/radix.sh | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/tools/test/stress2/misc/radix.sh b/tools/test/stress2/misc/radix.sh index 4bca761c08b9..9107f528deb9 100755 --- a/tools/test/stress2/misc/radix.sh +++ b/tools/test/stress2/misc/radix.sh @@ -31,10 +31,13 @@ # "panic: default pager with handle" seen with WiP kernel code. # https://people.freebsd.org/~pho/stress/log/kostik1243.txt +# "panic: ASan: Invalid access, 8-byte read at ..., MallocRedZone(fb)" seen + [ `sysctl vm.swap_total | sed 's/.* //'` -eq 0 ] && exit 0 . ../default.cfg +log=/tmp/radix.log dir=/tmp odir=`pwd` cd $dir @@ -49,8 +52,9 @@ usermem=`sysctl hw.usermem | sed 's/.* //'` pagesize=`pagesize` start=`date +%s` while true; do - /tmp/radix $parallel > /tmp/radix.log 2>&1 - used=`awk '{print $4}' < /tmp/radix.log` + /tmp/radix $parallel > $log; s=$? + [ $s -ne 0 ] && cat $log + used=`awk '{print $4}' < $log` [ -z "$used" ] && break [ $((`date +%s` - start)) -gt 300 ] && break [ $used -gt $((usermem / pagesize)) ] && break @@ -61,8 +65,8 @@ while true; do done cat /tmp/radix.log -rm -f /tmp/radix #/tmp/radix.log -exit +rm -f /tmp/radix $log +exit $s EOF /* @@ -169,7 +173,7 @@ handler(int s __unused) static void ihandler(int s __unused) { - _exit(0); + _exit(1); } static int @@ -191,7 +195,7 @@ test(void) { state_t state; off_t offset; - int fd; + int fd, i; signal(SIGHUP, ihandler); for (;;) { @@ -214,7 +218,7 @@ test(void) if (write(fds[1], &pgs, sizeof(pgs)) != sizeof(pgs)) err(1, "ewrite pipe"); kill(getppid(), SIGHUP); - for (;;) + for (i = 0; i < 180; i++) sleep(1); close(fd); @@ -233,6 +237,7 @@ main(int argc, char **argv) parallel = atoi(argv[1]); ps = getpagesize(); + signal(SIGALRM, ihandler); signal(SIGHUP, handler); unlink("rendezvous"); pids = malloc(parallel * sizeof(pid_t)); @@ -246,10 +251,10 @@ main(int argc, char **argv) if ((rfd = open("rendezvous", O_CREAT, 0644)) == -1) err(1, "open()"); close(rfd); - alarm(60); - while (s1 != parallel) + alarm(300); + while (s1 != parallel) { usleep(10000); - alarm(0); + } r2 = radix(); pages = 0; for (i = 0; i < parallel; i++) { @@ -258,7 +263,7 @@ main(int argc, char **argv) err(1, "read pipe"); pages += pgs; } - fprintf(stderr, "A total of %jd pages (%.1f MB) touched, %d" + fprintf(stdout, "A total of %jd pages (%.1f MB) touched, %d" " RADIX nodes used, p/r = %.1f, parallel = %d.\n", pages, pages * ps / 1024. / 1024, r2 - r1, pages / (r2 - r1 + 0.), parallel);