From nobody Wed Jan 05 09:28:05 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 75407193AF6C; Wed, 5 Jan 2022 09:28:06 +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 4JTPKf12Yfz4h8y; Wed, 5 Jan 2022 09:28:06 +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 0315E1B6E; Wed, 5 Jan 2022 09:28:06 +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 2059S56d056714; Wed, 5 Jan 2022 09:28:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2059S5eP056713; Wed, 5 Jan 2022 09:28:05 GMT (envelope-from git) Date: Wed, 5 Jan 2022 09:28:05 GMT Message-Id: <202201050928.2059S5eP056713@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: dfc383201f97 - main - stress2: Added new test cases List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org 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: dfc383201f97272e4307bc90b82dc7ed870fc54a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641374886; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dwSvlwHDcMIiXOco+MisAHAyQcdXjXZD0pkm+kw4Y0k=; b=wfk/ij4/lNwcvsR+zBLc0VOhO9LhARh6dJ5jO+TbVv5peokzCMMQgow4SR06+OW4aFHqKo F+rKt8UJK96RjR8R/UVKF2abFnKGa5v+z4yxv3o9/++HTX9D9CwRuMGHUUTbH2AWyVuT+W TFDMOTM2yb4N6jZRRmyQGlNOpKFtrtX0ecrJJoNTRf2t/0473ry5F2Q6VFPH5LDhJWnY7+ tjXhBnerIz3UpC/FhtK7sY3gfTQijUD8UZ1dYNbRlwnxXCOpDW6+ZkWh3zCS/tT4BQF247 wN6t6fiU+lBEHoGXjInsm/he0arQpldQmjipvbeUYHz2rdVRVAUAxbKgJaz+mQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641374886; a=rsa-sha256; cv=none; b=EqEJ8ALCqpokhQcNSAPHkZdhaSifcE6EbGX3OOAWzzKyiCrLbaGVn0+u1TdJG44z66S9Ag ae0HjLcJoGMOc6T9Gm45LUXJPFmjg3e7f2BK3HsQYeNXBTV8HmuBtsX3AEhiHRGoaKPsQa cQu88XD+1wyg9bsEZEjrFPA0RkF+Jf5HBhLNOKNTsVuN7aZXmFcCNTdKyZI4boWyZO5/WM 8PNs2drsoFr4dklQ7rZTJEmK2A1MYSrPmbkFWZ1Na2SRryKSkO6CU9sZgn8G6FRqH3GTTm OZKlwbrj/Qfc3fyqKqyXhe1rs34FevE79KrW3t4kpp08H1CTGAi7WHPe9bckZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=dfc383201f97272e4307bc90b82dc7ed870fc54a commit dfc383201f97272e4307bc90b82dc7ed870fc54a Author: Peter Holm AuthorDate: 2022-01-05 09:27:29 +0000 Commit: Peter Holm CommitDate: 2022-01-05 09:27:29 +0000 stress2: Added new test cases --- tools/test/stress2/misc/syzkaller48.sh | 85 ++++++++++ tools/test/stress2/misc/syzkaller49.sh | 299 +++++++++++++++++++++++++++++++++ tools/test/stress2/misc/unionfs13.sh | 72 ++++++++ 3 files changed, 456 insertions(+) diff --git a/tools/test/stress2/misc/syzkaller48.sh b/tools/test/stress2/misc/syzkaller48.sh new file mode 100755 index 000000000000..6cb59576bbfd --- /dev/null +++ b/tools/test/stress2/misc/syzkaller48.sh @@ -0,0 +1,85 @@ +#!/bin/sh + +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 + +# Fixed by: +# 628c3b307fb2 - main - cache: only let non-dir descriptors through when doing EMPTYPATH lookups + +. ../default.cfg +[ `id -u` -ne 0 ] && echo "Must be root!" && exit 1 + +cat > /tmp/syzkaller48.c < +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifndef SYS___realpathat +#define SYS___realpathat 574 +#endif + +uint64_t r[1] = {0xffffffffffffffff}; + +int main(void) +{ + int i; + + syscall(SYS_mmap, 0x20000000ul, 0x1000000ul, 7ul, 0x1012ul, -1, 0ul); + intptr_t res = 0; + memcpy((void*)0x200000c0, "./file0\000", 8); + for (i = 0; i < 1000; i++) { + res = syscall(SYS_open, 0x200000c0ul, 0x48300ul, 0ul); + if (res != -1) + r[0] = res; + memcpy((void*)0x20000080, ".\000", 2); + syscall(SYS___realpathat, r[0], 0x20000080ul, 0x200002c0ul, 0xabul, 0ul); + close(res); + } + return 0; +} +EOF + +set -e +mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint +[ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart +mdconfig -a -t swap -s 5g -u $mdstart +newfs $newfs_flags -n md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint +set +e + +mkdir $mntpoint/work +mycc -o $mntpoint/work/syzkaller48 -Wall -Wextra -O0 /tmp/syzkaller48.c || exit 1 + +while true; do + touch $mntpoint/work/file0 + rm $mntpoint/work/file0 +done & + +start=`date +%s` +while [ $((`date +%s` - start)) -lt 120 ]; do + (cd $mntpoint/work; ./syzkaller48) +done +kill $! +wait +ls -l $mntpoint/work + +for i in `jot 6`; do + mount | grep -q "on $mntpoint " || break + umount $mntpoint && break || sleep 10 + [ $i -eq 6 ] && + { echo FATAL; fstat -mf $mntpoint; exit 1; } +done +mdconfig -d -u $mdstart + +rm -rf /tmp/syzkaller48.c +exit 0 diff --git a/tools/test/stress2/misc/syzkaller49.sh b/tools/test/stress2/misc/syzkaller49.sh new file mode 100755 index 000000000000..d2810be64c87 --- /dev/null +++ b/tools/test/stress2/misc/syzkaller49.sh @@ -0,0 +1,299 @@ +#!/bin/sh + +# Fatal trap 12: page fault while in kernel mode +# cpuid = 10; apic id = 0a +# fault virtual address = 0x0 +# fault code = supervisor read data, page not present +# instruction pointer = 0x20:0xffffffff80e04f35 +# stack pointer = 0x28:0xfffffe014fd0fbc0 +# frame pointer = 0x28:0xfffffe014fd0fc00 +# code segment = base 0x0, limit 0xfffff, type 0x1b +# = DPL 0, pres 1, long 1, def32 0, gran 1 +# processor eflags = interrupt enabled, resume, IOPL = 0 +# current process = 13332 (repro77) +# trap number = 12 +# panic: page fault +# cpuid = 10 +# time = 1640585179 +# KDB: stack backtrace: +# db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0xfffffe014fd0f980 +# vpanic() at vpanic+0x17f/frame 0xfffffe014fd0f9d0 +# panic() at panic+0x43/frame 0xfffffe014fd0fa30 +# trap_fatal() at trap_fatal+0x385/frame 0xfffffe014fd0fa90 +# trap_pfault() at trap_pfault+0xab/frame 0xfffffe014fd0faf0 +# calltrap() at calltrap+0x8/frame 0xfffffe014fd0faf0 +# --- trap 0xc, rip = 0xffffffff80e04f35, rsp = 0xfffffe014fd0fbc0, rbp = 0xfffffe014fd0fc00 --- +# tcp_usr_rcvd() at tcp_usr_rcvd+0x65/frame 0xfffffe014fd0fc00 +# soreceive_generic() at soreceive_generic+0xe44/frame 0xfffffe014fd0fcc0 +# soreceive() at soreceive+0x4b/frame 0xfffffe014fd0fce0 +# kern_recvit() at kern_recvit+0x1ba/frame 0xfffffe014fd0fd90 +# sys_recvmsg() at sys_recvmsg+0x6f/frame 0xfffffe014fd0fe00 +# amd64_syscall() at amd64_syscall+0x145/frame 0xfffffe014fd0ff30 +# fast_syscall_common() at fast_syscall_common+0xf8/frame 0xfffffe014fd0ff30 +# --- syscall (0, FreeBSD ELF64, nosys), rip = 0x8020e328a, rsp = 0x22f48, rbp = 0x22f70 --- +# KDB: enter: panic +# [ thread pid 13332 tid 103311 ] +# Stopped at kdb_enter+0x37: movq $0,0x128720e(%rip) +# db> x/s version +# version: FreeBSD 14.0-CURRENT #0 ufs-n251956-c3008785b91: Mon Dec 27 06:11:30 CET 2021 +# pho@mercat1.netperf.freebsd.org:/var/tmp/deviant3/sys/amd64/compile/PHO +# db> + +. ../default.cfg +[ `id -u` -ne 0 ] && echo "Must be root!" && exit 1 + +cat > /tmp/syzkaller49.c < +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static void sleep_ms(uint64_t ms) +{ + usleep(ms * 1000); +} + +static uint64_t current_time_ms(void) +{ + struct timespec ts; + if (clock_gettime(CLOCK_MONOTONIC, &ts)) + exit(1); + return (uint64_t)ts.tv_sec * 1000 + (uint64_t)ts.tv_nsec / 1000000; +} + +static void thread_start(void* (*fn)(void*), void* arg) +{ + pthread_t th; + pthread_attr_t attr; + pthread_attr_init(&attr); + pthread_attr_setstacksize(&attr, 128 << 10); + int i = 0; + for (; i < 100; i++) { + if (pthread_create(&th, &attr, fn, arg) == 0) { + pthread_attr_destroy(&attr); + return; + } + if (errno == EAGAIN) { + usleep(50); + continue; + } + break; + } + exit(1); +} + +typedef struct { + pthread_mutex_t mu; + pthread_cond_t cv; + int state; +} event_t; + +static void event_init(event_t* ev) +{ + if (pthread_mutex_init(&ev->mu, 0)) + exit(1); + if (pthread_cond_init(&ev->cv, 0)) + exit(1); + ev->state = 0; +} + +static void event_reset(event_t* ev) +{ + ev->state = 0; +} + +static void event_set(event_t* ev) +{ + pthread_mutex_lock(&ev->mu); + if (ev->state) + exit(1); + ev->state = 1; + pthread_mutex_unlock(&ev->mu); + pthread_cond_broadcast(&ev->cv); +} + +static void event_wait(event_t* ev) +{ + pthread_mutex_lock(&ev->mu); + while (!ev->state) + pthread_cond_wait(&ev->cv, &ev->mu); + pthread_mutex_unlock(&ev->mu); +} + +static int event_isset(event_t* ev) +{ + pthread_mutex_lock(&ev->mu); + int res = ev->state; + pthread_mutex_unlock(&ev->mu); + return res; +} + +static int event_timedwait(event_t* ev, uint64_t timeout) +{ + uint64_t start = current_time_ms(); + uint64_t now = start; + pthread_mutex_lock(&ev->mu); + for (;;) { + if (ev->state) + break; + uint64_t remain = timeout - (now - start); + struct timespec ts; + ts.tv_sec = remain / 1000; + ts.tv_nsec = (remain % 1000) * 1000 * 1000; + pthread_cond_timedwait(&ev->cv, &ev->mu, &ts); + now = current_time_ms(); + if (now - start > timeout) + break; + } + int res = ev->state; + pthread_mutex_unlock(&ev->mu); + return res; +} + +struct thread_t { + int created, call; + event_t ready, done; +}; + +static struct thread_t threads[16]; +static void execute_call(int call); +static int running; + +static void* thr(void* arg) +{ + struct thread_t* th = (struct thread_t*)arg; + for (;;) { + event_wait(&th->ready); + event_reset(&th->ready); + execute_call(th->call); + __atomic_fetch_sub(&running, 1, __ATOMIC_RELAXED); + event_set(&th->done); + } + return 0; +} + +static void loop(void) +{ + int i, call, thread; + for (call = 0; call < 6; call++) { + for (thread = 0; thread < (int)(sizeof(threads) / sizeof(threads[0])); + thread++) { + struct thread_t* th = &threads[thread]; + if (!th->created) { + th->created = 1; + event_init(&th->ready); + event_init(&th->done); + event_set(&th->done); + thread_start(thr, th); + } + if (!event_isset(&th->done)) + continue; + event_reset(&th->done); + th->call = call; + __atomic_fetch_add(&running, 1, __ATOMIC_RELAXED); + event_set(&th->ready); + event_timedwait(&th->done, 50); + break; + } + } + for (i = 0; i < 100 && __atomic_load_n(&running, __ATOMIC_RELAXED); i++) + sleep_ms(1); +} + +uint64_t r[1] = {0xffffffffffffffff}; + +void execute_call(int call) +{ + intptr_t res = 0; + switch (call) { + case 0: + res = syscall(SYS_socket, 2ul, 1ul, 0); + if (res != -1) + r[0] = res; + break; + case 1: + *(uint8_t*)0x20000140 = 0x10; + *(uint8_t*)0x20000141 = 2; + *(uint16_t*)0x20000142 = htobe16(0x4e23); + *(uint32_t*)0x20000144 = htobe32(0x7f000001); + memset((void*)0x20000148, 0, 8); + syscall(SYS_bind, r[0], 0x20000140ul, 0x10ul); + break; + case 2: + *(uint8_t*)0x20000080 = 0x10; + *(uint8_t*)0x20000081 = 2; + *(uint16_t*)0x20000082 = htobe16(0x4e23); + *(uint32_t*)0x20000084 = htobe32(0x7f000001); + memset((void*)0x20000088, 0, 8); + syscall(SYS_sendto, r[0], 0ul, 0ul, 0ul, 0x20000080ul, 0x10ul); + break; + case 3: + memset((void*)0x20000100, 69, 1); + syscall(SYS_sendto, r[0], 0x20000100ul, 0xfda4ul, 0ul, 0ul, 0ul); + break; + case 4: + *(uint64_t*)0x200003c0 = 0; + *(uint32_t*)0x200003c8 = 0; + *(uint64_t*)0x200003d0 = 0x20000340; + *(uint64_t*)0x20000340 = 0x20000680; + *(uint64_t*)0x20000348 = 0x19000; + *(uint64_t*)0x200003d8 = 1; + *(uint64_t*)0x200003e0 = 0; + *(uint64_t*)0x200003e8 = 0; + *(uint32_t*)0x200003f0 = 0; + syscall(SYS_recvmsg, r[0], 0x200003c0ul, 0x40ul); + break; + case 5: + syscall(SYS_shutdown, r[0], 1ul); + break; + } +} +int main(void) +{ + syscall(SYS_mmap, 0x20000000ul, 0x1000000ul, 7ul, 0x1012ul, -1, 0ul); + loop(); + return 0; +} +EOF + +set -e +mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint +[ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart +mdconfig -a -t swap -s 5g -u $mdstart +newfs $newfs_flags -n md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint +set +e + +mkdir $mntpoint/work +mycc -o $mntpoint/work/syzkaller49 -Wall -Wextra -O0 /tmp/syzkaller49.c -lpthread || exit 1 + +start=`date +%s` +while [ $((`date +%s` - start)) -lt 120 ]; do + (cd $mntpoint/work; ./syzkaller49) +done + +for i in `jot 6`; do + mount | grep -q "on $mntpoint " || break + umount $mntpoint && break || sleep 10 + [ $i -eq 6 ] && + { echo FATAL; fstat -mf $mntpoint; exit 1; } +done +mdconfig -d -u $mdstart + +rm -rf /tmp/syzkaller49.c +exit 0 diff --git a/tools/test/stress2/misc/unionfs13.sh b/tools/test/stress2/misc/unionfs13.sh new file mode 100755 index 000000000000..69690d91e7d3 --- /dev/null +++ b/tools/test/stress2/misc/unionfs13.sh @@ -0,0 +1,72 @@ +#!/bin/sh + +# +# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# +# Copyright (c) 2022 Peter Holm +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# + +# Simple test to demonstrate EMLINK issue. + +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 +. ../default.cfg + +md1=$mdstart +md2=$((md1 + 1)) +mp1=/mnt$md1 +mp2=/mnt$md2 +mkdir -p $mp1 $mp2 +set -e +for i in $mp1 $mp2; do + mount | grep -q "on $i " && umount -f $i +done +for i in $md1 $md2; do + mdconfig -l | grep -q md$i && mdconfig -d -u $i +done + +mdconfig -a -t swap -s 2g -u $md1 +mdconfig -a -t swap -s 2g -u $md2 +newfs $newfs_flags -n md$md1 > /dev/null +newfs $newfs_flags -n md$md2 > /dev/null +mount /dev/md$md1 $mp1 +mount /dev/md$md2 $mp2 +df -i $mp1 $mp2 +echo +mount -t unionfs -o noatime $mp1 $mp2 +set +e + +df -i $mp2 +for i in `jot 100`; do + jot 1000 | xargs -P0 -I% mkdir $mp2/a% || { s=1; break; } + jot 1000 | xargs -P0 -I% rmdir $mp2/a% +done +[ $s ] && echo "Failed in loop #$i" +df -i $mp2 | tail -1 + +umount $mp2 # The unionfs mount +umount $mp2 +umount $mp1 +mdconfig -d -u $md2 +mdconfig -d -u $md1 +exit $s