From owner-svn-src-user@FreeBSD.ORG Sun Feb 1 14:41:11 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5663585D; Sun, 1 Feb 2015 14:41:11 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 37091C60; Sun, 1 Feb 2015 14:41:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t11EfBhg017264; Sun, 1 Feb 2015 14:41:11 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t11EfB8j017259; Sun, 1 Feb 2015 14:41:11 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201502011441.t11EfB8j017259@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Sun, 1 Feb 2015 14:41:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r278029 - 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.18-1 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: Sun, 01 Feb 2015 14:41:11 -0000 Author: pho Date: Sun Feb 1 14:41:10 2015 New Revision: 278029 URL: https://svnweb.freebsd.org/changeset/base/278029 Log: Added a PTHREAD_PRIO_INHERIT regression test. Submitted by: Eric van Gyzen Sponsored by: EMC / Isilon storage division Added: user/pho/stress2/misc/kern_umtx_inf_loop.sh (contents, props changed) Added: user/pho/stress2/misc/kern_umtx_inf_loop.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/kern_umtx_inf_loop.sh Sun Feb 1 14:41:10 2015 (r278029) @@ -0,0 +1,150 @@ +#!/bin/sh + +# $FreeBSD$ + +# The program is a test case by Eric which demonstrates the +# bug, unkillable spinning thread, owning a spinlock. + +# "panic: spin lock held too long" seen. +# Fixed in r277970. + +. ../default.cfg + +here=`pwd` +cd /tmp +sed '1,/^EOF/d' < $here/$0 > kern_umtx_inf_loop.c +cc -o kern_umtx_inf_loop -Wall -Wextra -O0 -g kern_umtx_inf_loop.c \ + -lpthread || exit 1 +rm -f kern_umtx_inf_loop.c + +/tmp/kern_umtx_inf_loop + +rm -f /tmp/kern_umtx_inf_loop +exit 0 +EOF +/*- + * Copyright (c) 2015 Eric van Gyzen + * 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. + */ + +#include +#include + +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +pthread_mutex_t the_mutex = PTHREAD_MUTEX_INITIALIZER; + +pthread_t contender; + +static void * +contender_func(void *arg) +{ + int error; + + (void) arg; + + error = pthread_mutex_lock(&the_mutex); + if (error) errc(1, error, "pthread_mutex_lock contender"); + + fprintf(stderr, "contender lock succeeded\n"); + + error = pthread_mutex_unlock(&the_mutex); + if (error) errc(1, error, "pthread_mutex_unlock contender"); + + fprintf(stderr, "contender unlock succeeded; exiting\n"); + + return (NULL); +} + +static void * +signaler_func(void *arg __unused) +{ + int error; + + // Wait for the main thread to sleep. + usleep(100000); + + error = pthread_kill(contender, SIGHUP); + if (error) errc(1, error, "pthread_kill"); + + // Wait for the contender to lock umtx_lock + // in umtx_repropagate_priority. + usleep(100000); + + error = pthread_mutex_lock(&the_mutex); + if (error) errc(1, error, "pthread_mutex_lock signaler"); + + return (NULL); +} + +int +main(void) +{ + int error; + + pthread_mutexattr_t mattr; + + error = pthread_mutexattr_init(&mattr); + if (error) errc(1, error, "pthread_mutexattr_init"); + + error = pthread_mutexattr_setprotocol(&mattr, PTHREAD_PRIO_INHERIT); + if (error) errc(1, error, "pthread_mutexattr_setprotocol"); + + error = pthread_mutex_init(&the_mutex, &mattr); + if (error) errc(1, error, "pthread_mutex_init"); + + error = pthread_mutexattr_destroy(&mattr); + if (error) errc(1, error, "pthread_mutexattr_destroy"); + + //error = pthread_mutex_lock(&the_mutex); + //if (error) errc(1, error, "pthread_mutex_lock"); + + // Hack lock. + *(int *)the_mutex = pthread_getthreadid_np(); + + error = pthread_create(&contender, NULL, contender_func, NULL); + if (error) errc(1, error, "pthread_create"); + + // Wait for the contender to sleep. + usleep(100000); + + pthread_t signaler; + error = pthread_create(&signaler, NULL, signaler_func, NULL); + if (error) errc(1, error, "pthread_create"); + + error = pthread_mutex_lock(&the_mutex); + if (error) errc(1, error, "pthread_mutex_lock recurse"); + + return (0); +} +