From owner-svn-src-user@FreeBSD.ORG Thu Oct 17 19:24:11 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 10297245; Thu, 17 Oct 2013 19:24:11 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id F1CF72BB9; Thu, 17 Oct 2013 19:24:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9HJOA3u088164; Thu, 17 Oct 2013 19:24:10 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9HJOAdF088162; Thu, 17 Oct 2013 19:24:10 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <201310171924.r9HJOAdF088162@svn.freebsd.org> From: Peter Holm Date: Thu, 17 Oct 2013 19:24:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r256696 - user/pho/stress2/misc X-SVN-Group: user 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.14 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: Thu, 17 Oct 2013 19:24:11 -0000 Author: pho Date: Thu Oct 17 19:24:10 2013 New Revision: 256696 URL: http://svnweb.freebsd.org/changeset/base/256696 Log: Added two ptrace(2) regression tests. Sponsored by: EMC / Isilon storage division Added: user/pho/stress2/misc/ptrace.sh (contents, props changed) user/pho/stress2/misc/ptrace2.sh (contents, props changed) Added: user/pho/stress2/misc/ptrace.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/ptrace.sh Thu Oct 17 19:24:10 2013 (r256696) @@ -0,0 +1,106 @@ +#!/bin/sh + +# +# Copyright (c) 2013 EMC Corp. +# All rights reserved. +# +# 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. +# +# $FreeBSD$ +# + +# wait4(2) / ptrace(2) regression test. + +here=`pwd` +cd /tmp +sed '1,/^EOF/d' < $here/$0 > ptrace.c +cc -o ptrace -Wall -Wextra -g ptrace.c || exit 1 +rm -f ptrace.c +cd $here + +/tmp/ptrace + +rm -f /tmp/ptrace +exit + +EOF +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +void +test(void) +{ + pid_t pid, rpid; + struct rusage ru; + int status; + + if ((pid = fork()) == 0) { + usleep(2000); + _exit(64); + } + if (pid == -1) + err(1, "fork()"); + if (ptrace(PT_ATTACH, pid, NULL, 0) == -1) + err(1, "ptrace(%d) attach", pid); + if (wait(NULL) == -1) + err(1, "wait"); + bzero(&ru, sizeof(ru)); + usleep(2000); + if ((rpid = wait4(-1, &status, WNOHANG, &ru)) == -1) { + if (errno == ECHILD) + warn("FAIL"); + else + err(1, "wait4"); + } + if (rpid == 0) { +// fprintf(stderr, "No rusage info.\n"); + if (ptrace(PT_DETACH, pid, NULL, 0) == -1) + err(1, "ptrace(%d) detach", pid); + if (wait(&status) == -1) + err(1, "wait"); + } else { + fprintf(stderr, "FAIL Got unexpected rusage.\n"); + if (ru.ru_utime.tv_sec != 0) + fprintf(stderr, "FAIL tv_sec\n"); + } + if (status != 0x4000) + fprintf(stderr, "FAIL Child exit status 0x%x\n", status); + + _exit(0); +} + +int +main(void) +{ + test(); + + return (0); +} Added: user/pho/stress2/misc/ptrace2.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/ptrace2.sh Thu Oct 17 19:24:10 2013 (r256696) @@ -0,0 +1,142 @@ +#!/bin/sh + +# +# Copyright (c) 2013 EMC Corp. +# All rights reserved. +# +# 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. +# +# $FreeBSD$ +# + +# Regression test for kern/142757, race condition in traced process signal +# handling. Fixed in r202692. + +# Test scenario by Tijl Coosemans, tijl@ + +cd /tmp + +cat > race1.c < +#include +#include +#include +#include +#include + +int +main(void) +{ + pid_t pid; + int i, status; + + alarm(120); + /* fork dummy child process */ + pid = fork(); + if (pid == 0) { + /* child does nothing */ + for (;;) { + sleep(1); + } + } else { + /* parent */ + sleep(1); + for (i = 0; i < 100000; i++) { + /* loop: attach, wait, detach */ + printf("attach "); + fflush(stdout); + ptrace(PT_ATTACH, pid, (caddr_t) 0, 0); + + printf("wait "); + fflush(stdout); + wait4(pid, &status, 0, NULL); + + printf("detach "); + fflush(stdout); + ptrace(PT_DETACH, pid, (caddr_t) 1, 0); + + printf("ok\n"); + fflush(stdout); + } + } + + return (0); +} +EOF + +cat > race2.c < +#include +#include +#include +#include +#include + +int +main(void) +{ + pid_t pid; + int i, status; + + alarm(120); + /* fork dummy child process */ + pid = fork(); + if (pid == 0) { + /* child does nothing */ + for (;;) { + sleep(1); + } + } else { + /* parent */ + sleep(1); + ptrace(PT_ATTACH, pid, (caddr_t) 0, 0); + wait4(pid, &status, 0, NULL); + for (i = 0; i < 100000; i++) { + /* loop: continue, kill, wait */ + printf("continue "); + fflush(stdout); + ptrace(PT_CONTINUE, pid, (caddr_t) 1, 0); + + printf("kill "); + fflush(stdout); + kill(pid, SIGINT); + + printf("wait "); + fflush(stdout); + wait4(pid, &status, 0, NULL); + + printf("ok\n"); + fflush(stdout); + } + } + + return (0); +} +EOF + +cc -o race1 -Wall -Wextra race1.c +cc -o race2 -Wall -Wextra race2.c + +./race1 > /dev/null || echo "FAIL #1" +./race2 > /dev/null || echo "FAIL #2" + +rm -f race1.c race1 race2.c race2