From owner-svn-src-user@FreeBSD.ORG Sun Jun 16 06:56:18 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 3B5D02E3; Sun, 16 Jun 2013 06:56:18 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 143AE1C94; Sun, 16 Jun 2013 06:56:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5G6uHEg009648; Sun, 16 Jun 2013 06:56:17 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5G6uH08009647; Sun, 16 Jun 2013 06:56:17 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <201306160656.r5G6uH08009647@svn.freebsd.org> From: Peter Holm Date: Sun, 16 Jun 2013 06:56:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r251800 - 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: Sun, 16 Jun 2013 06:56:18 -0000 Author: pho Date: Sun Jun 16 06:56:17 2013 New Revision: 251800 URL: http://svnweb.freebsd.org/changeset/base/251800 Log: Added umtx(2) regression test for problem fixed with r251684. Added: user/pho/stress2/misc/rwlock_ronly.sh (contents, props changed) Added: user/pho/stress2/misc/rwlock_ronly.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/rwlock_ronly.sh Sun Jun 16 06:56:17 2013 (r251800) @@ -0,0 +1,82 @@ +#!/bin/sh + +# +# Copyright (c) 2013 Peter Holm +# 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$ +# + +# Test scenario by kib@ +# Demonstrate process looping in kernel mode. +# Fixed in r251684. + +dir=/tmp +odir=`pwd` +cd $dir +sed '1,/^EOF/d' < $odir/$0 > $dir/rwlock_ronly.c +cc -o rwlock_ronly -Wall -Wextra rwlock_ronly.c || exit 1 +rm -f rwlock_ronly.c +cd $odir + +/tmp/rwlock_ronly || echo OK + +rm -f /tmp/rwlock_ronly +exit + +EOF +/* $Id: rwlock_ronly.c,v 1.2 2013/06/10 04:44:08 kostik Exp kostik $ */ + +#include +#include +#include +#include +#include +#include + +int +main(void) +{ + char *p; + struct urwlock *rw; + int error; + + p = mmap(NULL, getpagesize(), PROT_READ | PROT_WRITE, + MAP_SHARED | MAP_ANON, -1, 0); + if (p == (char *)MAP_FAILED) + err(1, "mmap"); + + rw = (struct urwlock *)p; + rw->rw_state = URWLOCK_READ_WAITERS; + + error = mprotect(p, getpagesize(), PROT_READ); + if (error == -1) + err(1, "mprotect"); + + error = _umtx_op(p, UMTX_OP_RW_RDLOCK, 0, NULL, NULL); + if (error != 0) + err(1, "rdlock"); + + return (0); +}