From owner-svn-src-user@FreeBSD.ORG Sun Nov 24 00:15:57 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EDF59472; Sun, 24 Nov 2013 00:15:57 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DD4B8237C; Sun, 24 Nov 2013 00:15:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAO0FvtP029246; Sun, 24 Nov 2013 00:15:57 GMT (envelope-from ray@svn.freebsd.org) Received: (from ray@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAO0FvcM029245; Sun, 24 Nov 2013 00:15:57 GMT (envelope-from ray@svn.freebsd.org) Message-Id: <201311240015.rAO0FvcM029245@svn.freebsd.org> From: Aleksandr Rybalko Date: Sun, 24 Nov 2013 00:15:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258506 - user/ed/newcons/sys/dev/vt 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.16 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, 24 Nov 2013 00:15:58 -0000 Author: ray Date: Sun Nov 24 00:15:57 2013 New Revision: 258506 URL: http://svnweb.freebsd.org/changeset/base/258506 Log: Swap HOME/END for ScrollLocked mode. This fix confusion when End key move history to begin point. Sponsored by: The FreeBSD Foundation Modified: user/ed/newcons/sys/dev/vt/vt_core.c Modified: user/ed/newcons/sys/dev/vt/vt_core.c ============================================================================== --- user/ed/newcons/sys/dev/vt/vt_core.c Sat Nov 23 23:54:38 2013 (r258505) +++ user/ed/newcons/sys/dev/vt/vt_core.c Sun Nov 24 00:15:57 2013 (r258506) @@ -359,7 +359,7 @@ vt_scrollmode_kbdevent(struct vt_window break; } case FKEY | F(49): /* Home key. */ - vt_scroll(vw, 0, VHS_END); + vt_scroll(vw, 0, VHS_SET); break; case FKEY | F(50): /* Arrow up. */ vt_scroll(vw, -1, VHS_CUR); @@ -369,7 +369,7 @@ vt_scrollmode_kbdevent(struct vt_window vt_scroll(vw, -size.tp_row, VHS_CUR); break; case FKEY | F(57): /* End key. */ - vt_scroll(vw, 0, VHS_SET); + vt_scroll(vw, 0, VHS_END); break; case FKEY | F(58): /* Arrow down. */ vt_scroll(vw, 1, VHS_CUR); From owner-svn-src-user@FreeBSD.ORG Sun Nov 24 09:07:24 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E2D64345; Sun, 24 Nov 2013 09:07:23 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C47EA277E; Sun, 24 Nov 2013 09:07:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAO97NN9084072; Sun, 24 Nov 2013 09:07:23 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAO97NWg084071; Sun, 24 Nov 2013 09:07:23 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <201311240907.rAO97NWg084071@svn.freebsd.org> From: Peter Holm Date: Sun, 24 Nov 2013 09:07:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258508 - 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.16 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, 24 Nov 2013 09:07:24 -0000 Author: pho Date: Sun Nov 24 09:07:23 2013 New Revision: 258508 URL: http://svnweb.freebsd.org/changeset/base/258508 Log: Added a regression test. Sponsored by: EMC / Isilon storage division Added: user/pho/stress2/misc/procfs5.sh (contents, props changed) Added: user/pho/stress2/misc/procfs5.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/procfs5.sh Sun Nov 24 09:07:23 2013 (r258508) @@ -0,0 +1,84 @@ +#!/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$ +# + +# Issue involving signed overflow. +# Test scenario based on panic seen in +# http://people.freebsd.org/~pho/stress/log/kostik640.txt +# Fixed in r258365, r258397. + +# Scanario by kib@ + +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 + +mount | grep -q "/proc " || mount -t procfs procfs /proc + +here=`pwd` +cd /tmp +sed '1,/^EOF/d' < $here/$0 > procfs_lr.c +cc -o procfs_lr -Wall -Wextra -O2 procfs_lr.c || exit 1 +rm -f procfs_lr.c + +/tmp/procfs_lr 2>/dev/null + +rm -f /tmp/procfs_lr + +exit 0 +EOF +/* $Id: procfs_lr.c,v 1.1 2013/11/16 07:06:46 kostik Exp kostik $ */ + +#include +#include +#include +#include +#include +#include +#include + +int +main(void) +{ + static const char name[] = "/proc/curproc/map"; + const off_t uio_offset = 0x6f51f3a1185bced9; +#if defined(__LP64__) + const size_t uio_resid = 0x4c330b10965a61af; +#else + const size_t uio_resid = 0x965a61af; +#endif + char buf[1]; + int error, fd; + + fd = open(name, O_RDONLY); + if (fd == -1) + err(1, "open"); + error = pread(fd, buf, uio_resid, uio_offset); + if (error == -1) + fprintf(stderr, "pread: %s\n", strerror(errno)); + return (0); +} From owner-svn-src-user@FreeBSD.ORG Sun Nov 24 09:09:44 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 ESMTPS id 147B746E; Sun, 24 Nov 2013 09:09:44 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 04423278F; Sun, 24 Nov 2013 09:09:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAO99h3v084801; Sun, 24 Nov 2013 09:09:43 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAO99hcV084800; Sun, 24 Nov 2013 09:09:43 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <201311240909.rAO99hcV084800@svn.freebsd.org> From: Peter Holm Date: Sun, 24 Nov 2013 09:09:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258509 - 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.16 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, 24 Nov 2013 09:09:44 -0000 Author: pho Date: Sun Nov 24 09:09:43 2013 New Revision: 258509 URL: http://svnweb.freebsd.org/changeset/base/258509 Log: Added a regression test. Sponsored by: EMC / Isilon storage division Added: user/pho/stress2/misc/vfork.sh (contents, props changed) Added: user/pho/stress2/misc/vfork.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/vfork.sh Sun Nov 24 09:09:43 2013 (r258509) @@ -0,0 +1,125 @@ +#!/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 r246484. + +cat > vfork1.c <<- EOF +#include +#include +#include + +int +main(void) +{ + pid_t pid; + + fprintf(stderr, "%d\n", getpid()); + if ((pid = vfork()) == 0) { +#if 0 + if (ptrace(PT_TRACE_ME, 0, 0, 0) == -1) + err(1, "PT_TRACEME"); +#endif + sleep(30); + _exit(0); + } + if (pid == -1) + err(1, "vfork"); + + return (0); +} +EOF +cc -o vfork1 -Wall -Wextra -g vfork1.c +rm vfork1.c + +cat > vfork2.c <<- EOF +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +int +main(int argc, char **argv) +{ + pid_t pid, rpid; + struct rusage ru; + int status; + + if (argc != 2) + errx(1, "Usage: %s ", argv[0]); + pid = atoi(argv[1]); + + 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) { + err(1, "OK 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); + + return (0); +} +EOF +cc -o vfork2 -Wall -Wextra -g vfork2.c +rm vfork2.c + +./vfork1 & +sleep .2 +childpid=`ps -l | grep -v grep | grep vfork1 | + tail -1 | grep nanslp | awk '{print $2}'` +# Seen before fix: +# failed to set signal flags properly for ast() +./vfork2 $childpid + +rm -f vfork1 vfork2 From owner-svn-src-user@FreeBSD.ORG Sun Nov 24 09:15:22 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 ESMTPS id 3DF2358C; Sun, 24 Nov 2013 09:15:22 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1F04C27CD; Sun, 24 Nov 2013 09:15:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAO9FLC0088591; Sun, 24 Nov 2013 09:15:21 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAO9FL1e088590; Sun, 24 Nov 2013 09:15:21 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <201311240915.rAO9FL1e088590@svn.freebsd.org> From: Peter Holm Date: Sun, 24 Nov 2013 09:15:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258510 - 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.16 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, 24 Nov 2013 09:15:22 -0000 Author: pho Date: Sun Nov 24 09:15:21 2013 New Revision: 258510 URL: http://svnweb.freebsd.org/changeset/base/258510 Log: Cleaned up test scenario, run as user nobody and as a daemon like the test scenario syscall4.sh which this test is based on. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/pread.sh Modified: user/pho/stress2/misc/pread.sh ============================================================================== --- user/pho/stress2/misc/pread.sh Sun Nov 24 09:09:43 2013 (r258509) +++ user/pho/stress2/misc/pread.sh Sun Nov 24 09:15:21 2013 (r258510) @@ -53,12 +53,21 @@ echo "Testing tmpfs(5)" umount $mntpoint echo "Testing fdescfs(5)" -/tmp/pread /dev/fd +mount -t fdescfs null /dev/fd +for i in `jot 100`; do + /tmp/pread /dev/fd +done + +while mount | grep -q "on /dev/fd "; do + umount /dev/fd || sleep 1 +done echo "Testing procfs(5)" mount -t procfs procfs $mntpoint /tmp/pread $mntpoint -umount $mntpoint +while mount | grep -q "on $mntpoint "; do + umount $mntpoint || sleep 1 +done mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 1g -u $mdstart || exit 1 @@ -68,15 +77,30 @@ mount /dev/md${mdstart}$part $mntpoint cp -a /usr/include $mntpoint echo "Testing FFS" /tmp/pread $mntpoint -umount $mntpoint +while mount | grep -q "on $mntpoint "; do + umount $mntpoint || sleep 1 +done mount -t nullfs /bin $mntpoint echo "Testing nullfs(5)" /tmp/pread $mntpoint -umount $mntpoint +while mount | grep -q "on $mntpoint "; do + umount $mntpoint || sleep 1 +done + +echo "Testing procfs(5)" mount -t procfs procfs $mntpoint /tmp/pread $mntpoint -umount $mntpoint +while mount | grep -q "on $mntpoint "; do + umount $mntpoint || sleep 1 +done + +echo "Testing devfs(8)" +mount -t devfs devfs $mntpoint +/tmp/pread $mntpoint +while mount | grep -q "on $mntpoint "; do + umount $mntpoint || sleep 1 +done rm -f /tmp/pread exit 0 @@ -85,8 +109,10 @@ EOF #include #include #include +#include #include #include +#include #include #include #include @@ -111,7 +137,7 @@ test(char *path) signal(SIGSEGV, hand); signal(SIGABRT, hand); - ftsoptions = 0; + ftsoptions = FTS_PHYSICAL; args[0] = path; args[1] = 0; @@ -119,8 +145,11 @@ test(char *path) err(1, "fts_open"); while ((p = fts_read(fts)) != NULL) { - if ((fd = open(p->fts_path, O_RDONLY)) == -1) - warn("open(%s)", p->fts_path); + if ((fd = open(p->fts_path, O_RDONLY)) == -1) { + if (errno != EACCES && errno != ENXIO) + warn("open(%s)", p->fts_path); + continue; + } alarm(1); pread(fd, (void *)0xdeadc0de, 0x7ffffff, 0xffffffff); pread(fd, buf, 0x7ffffff, 0xffffffff); @@ -137,6 +166,19 @@ int main(int argc __unused, char **argv) { int i; + struct passwd *pw; + + if ((pw = getpwnam("nobody")) == NULL) + err(1, "no such user: nobody"); + + if (setgroups(1, &pw->pw_gid) || + setegid(pw->pw_gid) || setgid(pw->pw_gid) || + seteuid(pw->pw_uid) || setuid(pw->pw_uid)) + err(1, "Can't drop privileges to \"nobody\""); + endpwent(); + + if (daemon(0, 0) == -1) + err(1, "daemon()"); for (i = 0; i < 10; i++) { if (fork() == 0) From owner-svn-src-user@FreeBSD.ORG Sun Nov 24 09:17:50 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E0AF576D; Sun, 24 Nov 2013 09:17:49 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D0B7127E1; Sun, 24 Nov 2013 09:17:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAO9Hns9089357; Sun, 24 Nov 2013 09:17:49 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAO9Hn4i089356; Sun, 24 Nov 2013 09:17:49 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <201311240917.rAO9Hn4i089356@svn.freebsd.org> From: Peter Holm Date: Sun, 24 Nov 2013 09:17:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258511 - 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.16 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, 24 Nov 2013 09:17:50 -0000 Author: pho Date: Sun Nov 24 09:17:49 2013 New Revision: 258511 URL: http://svnweb.freebsd.org/changeset/base/258511 Log: Added test scenario for running tests on two different file systems in parallel. Sponsored by: EMC / Isilon storage division Added: user/pho/stress2/misc/pfl2.sh (contents, props changed) Added: user/pho/stress2/misc/pfl2.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/pfl2.sh Sun Nov 24 09:17:49 2013 (r258511) @@ -0,0 +1,96 @@ +#!/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$ +# + +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 + +# Test scenario for the change of a global SU lock to a per filesystem lock. +# "panic: softdep_write_inodeblock: indirect pointer #0 mismatch ..." seen. +# http://people.freebsd.org/~pho/stress/log/kirk063.txt + +. ../default.cfg + +mp1=$mntpoint +mp2=${mntpoint}2 +[ -d $mp2 ] || mkdir -p $mp2 +md1=$mdstart +md2=$((mdstart + 1)) + +opt=$([ $((`date '+%s'` % 2)) -eq 0 ] && echo "-j" || echo "-U") +mount | grep $mp1 | grep -q /dev/md && umount -f $mp1 +mdconfig -l | grep -q md$md1 && mdconfig -d -u $md1 +mdconfig -a -t swap -s 2g -u $md1 +bsdlabel -w md$md1 auto +newfs $opt md${md1}$part > /dev/null +mount /dev/md${md1}$part $mp1 +chmod 777 $mp1 + +mount | grep $mp2 | grep -q /dev/md && umount -f $mp2 +mdconfig -l | grep -q md$md2 && mdconfig -d -u $md2 +mdconfig -a -t swap -s 2g -u $md2 +bsdlabel -w md$md2 auto +newfs $opt md${md2}$part > /dev/null +mount /dev/md${md2}$part $mp2 +chmod 777 $mp2 + +export runRUNTIME=10m +export RUNDIR=$mp1/stressX +export CTRLDIR=$mp1/stressX.control +export LOAD=80 +export symlinkLOAD=80 +export rwLOAD=80 +export TESTPROGS=" +testcases/lockf2/lockf2 +testcases/symlink/symlink +testcases/openat/openat +testcases/rw/rw +testcases/fts/fts +testcases/link/link +testcases/lockf/lockf +testcases/creat/creat +testcases/mkdir/mkdir +testcases/rename/rename +testcases/mkfifo/mkfifo +" +su $testuser -c 'cd ..; ./testcases/run/run $TESTPROGS' > /dev/null 2>&1 & + +export TESTPROGS="$TESTPROGS testcases/swap/swap" +export RUNDIR=$mp2/stressX +export CTRLDIR=$mp2/stressX.control +su $testuser -c 'cd ..; ./testcases/run/run $TESTPROGS' > /dev/null 2>&1 & +wait; wait + +while mount | grep "$mp2 " | grep -q /dev/md; do + umount $mp2 || sleep 1 +done +mdconfig -d -u $md2 +while mount | grep "$mp1 " | grep -q /dev/md; do + umount $mp1 || sleep 1 +done +mdconfig -d -u $md1 From owner-svn-src-user@FreeBSD.ORG Sun Nov 24 09:20:25 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 ESMTPS id 664578F1; Sun, 24 Nov 2013 09:20:25 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 568C9281B; Sun, 24 Nov 2013 09:20:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAO9KPfA091549; Sun, 24 Nov 2013 09:20:25 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAO9KPIZ091548; Sun, 24 Nov 2013 09:20:25 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <201311240920.rAO9KPIZ091548@svn.freebsd.org> From: Peter Holm Date: Sun, 24 Nov 2013 09:20:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258512 - 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.16 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, 24 Nov 2013 09:20:25 -0000 Author: pho Date: Sun Nov 24 09:20:24 2013 New Revision: 258512 URL: http://svnweb.freebsd.org/changeset/base/258512 Log: Updated list of test to run and not to run. Do not use games/random to shuffle sequence of tests to run. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/all.sh Modified: user/pho/stress2/misc/all.sh ============================================================================== --- user/pho/stress2/misc/all.sh Sun Nov 24 09:17:49 2013 (r258511) +++ user/pho/stress2/misc/all.sh Sun Nov 24 09:20:24 2013 (r258512) @@ -39,24 +39,14 @@ # panic: 43 vncache entries remaining 20111220 # backingstore3.sh # g_vfs_done():md6a[WRITE(offset=...)]error = 28 20111230 -# datamove.sh Deadlock (ufs) 20111216 -# datamove2.sh Deadlock (ufs) 20111220 -# datamove3.sh Deadlock (ufs) 20111221 -# datamove4.sh Deadlock (tmpfs) 20120601 # dfull.sh umount stuck in "mount drain" 20111227 # ext2fs.sh Deadlock 20120510 # fuse2.sh Deadlock seen 20121129 # gjournal.sh kmem_malloc(131072): kmem_map too small 20120626 # gjournal2.sh # gjournal3.sh panic: Journal overflow 20130729 -# mkfifo.sh umount stuck in suspfs 20111224 -# mkfifo2c.sh panic: ufsdirhash_newblk: bad offset 20111225 -# mlockall3.sh Waiting fix 20130616 -# msync.sh Waiting fix 20130619 -# nbufkv.sh Deadlock seen 20130212 # newfs.sh Memory modified after free. ... used by inodedep 20111217 # newfs2.sh umount stuck in ufs 20111226 -# nfs8X.sh Deadlock 20120610 # nfs9.sh panic: lockmgr still held 20130503 # nfs10.sh Deadlock 20130401 # nfs11.sh Deadlock 20130429 @@ -66,28 +56,18 @@ # quota3.sh panic: softdep_deallocate_dependencies: unrecovered ... 20111222 # quota6.sh panic: softdep_deallocate_dependencies: unrecovered ... 20130206 # quota7.sh panic: dqflush: stray dquot 20120221 -# readdir.sh panic: ffs_read: uio->uio_resid < 0 20120228 -# rwlock_ronly.sh Waiting for fix 20130611 # shm_open.sh panic: kmem_malloc(4096): kmem_map too small 20130504 -# sigreturn.sh Waiting for fix 20130606 # snap3.sh mksnap_ffs stuck in snaprdb 20111226 # snap5.sh mksnap_ffs stuck in getblk 20111224 # snap6.sh panic: softdep_deallocate_dependencies: unrecovered ... 20130630 # snap8.sh panic: softdep_deallocate_dependencies: unrecovered ... 20120630 -# socketpair.sh Deadlock 20130511 # suj11.sh panic: ufsdirhash_newblk: bad offset 20120118 # suj18.sh panic: Bad tailq NEXT(0xc1e2a6088->tqh_last_s) != NULL 20120213 -# suj23.sh panic: Bad link elm 0xc9d00e00 next->prev != elm 20111216 -# suj26.sh Deadlock 20120213 -# suj27.sh Deadlock 20120213 # suj30.sh panic: flush_pagedep_deps: MKDIR_PARENT 20121020 -# tmpfs6.sh watchdogd fired. Test stuck in pgrbwt 20111219 -# trim3.sh watchdog timeout 20111225 # umountf3.sh KDB: enter: watchdog timeout 20111217 -# unionfs.sh insmntque: mp-safe fs and non-locked vp is not ... 20111217 +# unionfs.sh insmntque: non-locked vp: xx is not exclusive locked... 20130909 # unionfs2.sh insmntque: mp-safe fs and non-locked vp is not ... 20111219 # unionfs3.sh insmntque: mp-safe fs and non-locked vp is not ... 20111216 -# wire_no_page.sh Waiting fix 20130616 # Test not to run for other reasons: @@ -111,6 +91,8 @@ # suj27.sh # suj28.sh +# kevent8.sh Deadlock seen. 20131017 + # End of list # Suspects: @@ -118,7 +100,6 @@ # Memory modified after free. ... used by inodedep 20111224 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 -[ -x /usr/games/random ] || { echo "random(6) not installed"; exit 1; } args=`getopt acno $*` [ $? -ne 0 ] && echo "Usage $0 [-a] [-c] [-n] [tests]" && exit 1 @@ -149,7 +130,8 @@ find . -maxdepth 1 -name .all.last -mtim touch .all.last chmod 555 .all.last .all.log while true; do - exclude=`sed -n '/^# Start of list/,/^# End of list/p' < $0 | \ + exclude=`sed -n '/^# Start of list/,/^# End of list/p' < $0 | + cat - all.exclude 2>/dev/null | grep "\.sh" | awk '{print $2}'` list=`ls *.sh | egrep -v "all\.sh|cleanup\.sh"` [ $# -ne 0 ] && list=$* @@ -162,7 +144,7 @@ while true; do fi fi [ -n "$noshuffle" ] || - list=`echo $list | tr ' ' '\n' | random -w | tr '\n' ' '` + list=`echo $list | tr '\n' ' ' | ../tools/shuffle | tr ' ' '\n'` lst="" for i in $list; do From owner-svn-src-user@FreeBSD.ORG Sun Nov 24 09:24:54 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 ESMTPS id 7CE8DAED; Sun, 24 Nov 2013 09:24:54 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 52DEE2840; Sun, 24 Nov 2013 09:24:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAO9Os1T093220; Sun, 24 Nov 2013 09:24:54 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAO9OsHi093219; Sun, 24 Nov 2013 09:24:54 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <201311240924.rAO9OsHi093219@svn.freebsd.org> From: Peter Holm Date: Sun, 24 Nov 2013 09:24:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258513 - 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.16 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, 24 Nov 2013 09:24:54 -0000 Author: pho Date: Sun Nov 24 09:24:53 2013 New Revision: 258513 URL: http://svnweb.freebsd.org/changeset/base/258513 Log: No need to specify full path in test program, fixed cleanup. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/rename.sh Modified: user/pho/stress2/misc/rename.sh ============================================================================== --- user/pho/stress2/misc/rename.sh Sun Nov 24 09:20:24 2013 (r258512) +++ user/pho/stress2/misc/rename.sh Sun Nov 24 09:24:53 2013 (r258513) @@ -40,7 +40,6 @@ cd /tmp sed '1,/^EOF/d' < $here/$0 > rename.c cc -o rename -Wall rename.c rm -f rename.c -cd $here rm -rf /tmp/rename.dir.* for i in `jot 10`; do @@ -51,7 +50,7 @@ for i in `jot 10`; do wait done done -rm -rf /tmp/rename.dir.* +rm -rf /tmp/rename.dir.* /tmp/rename exit 0 EOF #include @@ -65,6 +64,8 @@ EOF #include #include +#define N 30000 + static char dir1[128]; static char dir2[128]; @@ -75,8 +76,8 @@ main(int argc, char **argv) struct stat sb; pid_t p; - sprintf(dir1, "/tmp/rename.dir.%d", getpid()); - sprintf(dir2, "/tmp/rename.dir.2.%d", getpid()); + sprintf(dir1, "rename.dir.%d", getpid()); + sprintf(dir2, "rename.dir.2.%d", getpid()); if (mkdir(dir1, 0700) == -1) err(1, "mkdir(%s)", dir1); @@ -87,7 +88,7 @@ main(int argc, char **argv) if (p == 0) { if (chdir("..") == -1) err(1, "chdir(%s)", ".."); - for (i = 0; i < 100000; i++) { + for (i = 0; i < N; i++) { if (rename(dir1, dir2) == -1) { warn("rename(%s, %s)", dir1, dir2); stat(dir1, &sb); @@ -105,15 +106,17 @@ main(int argc, char **argv) errx(1, "stat(%s) succeeded!", dir2); } } - exit(0); + _exit(0); } else { - for (i = 0; i < 100000; i++) { + for (i = 0; i < N; i++) { if (stat("..", &sb) == -1) err(1, "stat(..)"); } } if (waitpid(p, &status, 0) == -1) err(1, "waitpid()"); + if (chdir("..") == -1) + err(1, "chdir(%s)", ".."); if (rmdir(dir1) == -1) err(1, "rmdir(%s)", dir1); From owner-svn-src-user@FreeBSD.ORG Sun Nov 24 09:27:34 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 ESMTPS id 02767CBC; Sun, 24 Nov 2013 09:27:34 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CE93A284F; Sun, 24 Nov 2013 09:27:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAO9RXOQ093967; Sun, 24 Nov 2013 09:27:33 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAO9RXaN093966; Sun, 24 Nov 2013 09:27:33 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <201311240927.rAO9RXaN093966@svn.freebsd.org> From: Peter Holm Date: Sun, 24 Nov 2013 09:27:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258514 - 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.16 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, 24 Nov 2013 09:27:34 -0000 Author: pho Date: Sun Nov 24 09:27:33 2013 New Revision: 258514 URL: http://svnweb.freebsd.org/changeset/base/258514 Log: Added options to script for better control of tests. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/syscall5.sh Modified: user/pho/stress2/misc/syscall5.sh ============================================================================== --- user/pho/stress2/misc/syscall5.sh Sun Nov 24 09:24:53 2013 (r258513) +++ user/pho/stress2/misc/syscall5.sh Sun Nov 24 09:27:33 2013 (r258514) @@ -36,30 +36,59 @@ . ../default.cfg syscall=`grep SYS_MAXSYSCALL /usr/include/sys/syscall.h | awk '{print $NF}'` +syscall=$((syscall - 1)) +args=`getopt ars:t: $*` +[ $? -ne 0 ] && echo "Usage $0 [-a] [-r] [-s number] [-t seconds]" && exit 1 +set -- $args +for i; do + case "$i" in + -a) all=1 # Test all syscalls + shift + ;; + -r) [ -h .syscall5.last ] && + syscall=`ls -l .syscall5.last | awk '{print $NF}'` + syscall=$((syscall - 1)) + shift + ;; + -s) syscall=$2 + shift; shift + ;; + -t) sleeptime=$2 + export sleeptime=$((sleeptime / 10)) # used in syscall4.sh + shift; shift + ;; + --) + shift + break + ;; + esac +done -# syscalls with knows issues: +# syscalls with known issues: broken=" swapcontext +pdfork rfork -_umtx_op +pselect " -n=$syscall -n=$((n - 1)) - rm -f ./syscall5.log +n=$syscall start=`date '+%s'` while [ $n -gt 0 ]; do ps -lUnobody | grep syscall4 | awk '{print $2}' | xargs kill + ln -fs $n .syscall5.last name=`grep -w $n /usr/include/sys/syscall.h | awk '{print $2}' | sed 's/SYS_//'` + [ -z "$name" ] && name="unknown" echo "`date '+%T'` syscall $n ($name)" | tee /dev/tty >> ./syscall5.log + printf "`date '+%T'` syscall $n ($name)\r\n" > /dev/console sync; sleep 1 echo "$broken" | grep -qw "$name" || ./syscall4.sh $n || break n=$((n - 1)) - [ $# -eq 0 -a `date '+%s'` -gt $((start + 1800)) ] && break + [ -z "$all" -a `date '+%s'` -gt $((start + 1800)) ] && break done -rm -f ./syscall5.log +rm -f ./syscall5.log .syscall5-last From owner-svn-src-user@FreeBSD.ORG Sun Nov 24 09:29:40 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C80B7DB2; Sun, 24 Nov 2013 09:29:40 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9D67A285B; Sun, 24 Nov 2013 09:29:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAO9Teme094421; Sun, 24 Nov 2013 09:29:40 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAO9TeDj094418; Sun, 24 Nov 2013 09:29:40 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <201311240929.rAO9TeDj094418@svn.freebsd.org> From: Peter Holm Date: Sun, 24 Nov 2013 09:29:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258515 - 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.16 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, 24 Nov 2013 09:29:40 -0000 Author: pho Date: Sun Nov 24 09:29:40 2013 New Revision: 258515 URL: http://svnweb.freebsd.org/changeset/base/258515 Log: Make sure the test runs for the specified $sleeptime. Added magic values in order to check for overwrite of syscall number to test. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/syscall4.sh Modified: user/pho/stress2/misc/syscall4.sh ============================================================================== --- user/pho/stress2/misc/syscall4.sh Sun Nov 24 09:27:33 2013 (r258514) +++ user/pho/stress2/misc/syscall4.sh Sun Nov 24 09:29:40 2013 (r258515) @@ -35,6 +35,7 @@ . ../default.cfg +killall 2>&1 | grep -q q && q="-q" odir=`pwd` cd /tmp sed '1,/^EOF/d' < $odir/$0 > syscall4.c @@ -58,14 +59,25 @@ mount /dev/md${mdstart}$part $mntpoint chmod 777 $mntpoint sleeptime=${sleeptime:-12} -for i in `jot 10`; do - (cd $mntpoint; /tmp/syscall4 $* < /dev/null) & - [ $# -eq 1 ] && sleep $sleeptime || sleep 120 - killall -9 syscall4 > /dev/null 2>&1 +st=`date '+%s'` +while [ $((`date '+%s'` - st)) -lt $((10 * sleeptime)) ]; do + (cd $mntpoint; /tmp/syscall4 $* ) & + start=`date '+%s'` + while [ $((`date '+%s'` - start)) -lt $sleeptime ]; do + ps aux | grep -v grep | egrep -q "syscall4$" || break + sleep .5 + done + if ps aux | grep -v grep | egrep -q "syscall4$"; then + killall $q syscall4 + ps aux | grep -v grep | egrep -q "syscall4 " && + killall $q -9 syscall4 + fi wait ipcs | awk '/^(q|m|s)/ {print " -" $1, $2}' | xargs -L 1 ipcrm done - +killall $q -9 syscall4 +ps aux | grep -v grep | egrep "syscall4" | egrep -v "\.sh" && + killall $q -9 syscall4 for i in `jot 10`; do mount | grep -q md${mdstart}$part && \ @@ -117,13 +129,20 @@ static int ignore[] = { SYS_mac_syscall, SYS_sigtimedwait, SYS_sigwaitinfo, +#if __FreeBSD_version >= 900041 SYS_pdfork, +#endif + SYS_posix_openpt }; int fd[900], fds[2], socketpr[2]; +#ifndef nitems +#define nitems(x) (sizeof((x)) / sizeof((x)[0])) +#endif #define N (128 * 1024 / (int)sizeof(u_int32_t)) +#define MAGIC 1664 u_int32_t r[N]; -int syscallno; +int magic1, syscallno, magic2; static int random_int(int mi, int ma) @@ -245,6 +264,8 @@ calls(void *arg __unused) alarm(1); syscall(num, arg1, arg2, arg3, arg4, arg5, arg6, arg7); num = 0; + if (magic1 != MAGIC || magic2 != MAGIC) + _exit(1); } return (0); @@ -258,6 +279,7 @@ main(int argc, char **argv) time_t start; int j; + magic1 = magic2 = MAGIC; if ((pw = getpwnam("nobody")) == NULL) err(1, "no such user: nobody"); From owner-svn-src-user@FreeBSD.ORG Sun Nov 24 09:30:45 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 ESMTPS id 8E5CEE9C; Sun, 24 Nov 2013 09:30:45 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7F1842887; Sun, 24 Nov 2013 09:30:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAO9UjXE096687; Sun, 24 Nov 2013 09:30:45 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAO9Uj94096686; Sun, 24 Nov 2013 09:30:45 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <201311240930.rAO9Uj94096686@svn.freebsd.org> From: Peter Holm Date: Sun, 24 Nov 2013 09:30:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258516 - 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.16 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, 24 Nov 2013 09:30:45 -0000 Author: pho Date: Sun Nov 24 09:30:45 2013 New Revision: 258516 URL: http://svnweb.freebsd.org/changeset/base/258516 Log: Added "fixed in" comment. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/mmap4.sh Modified: user/pho/stress2/misc/mmap4.sh ============================================================================== --- user/pho/stress2/misc/mmap4.sh Sun Nov 24 09:29:40 2013 (r258515) +++ user/pho/stress2/misc/mmap4.sh Sun Nov 24 09:30:45 2013 (r258516) @@ -30,6 +30,7 @@ # Test overcommit of the file system capacity # Causes panic: 1 vncache entries remaining +# Fixed in r202529 # Scanario by kib@ From owner-svn-src-user@FreeBSD.ORG Sun Nov 24 09:32:05 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 42E32F89; Sun, 24 Nov 2013 09:32:05 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3378D2891; Sun, 24 Nov 2013 09:32:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAO9W5nt097192; Sun, 24 Nov 2013 09:32:05 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAO9W5VE097191; Sun, 24 Nov 2013 09:32:05 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <201311240932.rAO9W5VE097191@svn.freebsd.org> From: Peter Holm Date: Sun, 24 Nov 2013 09:32:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258517 - 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.16 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, 24 Nov 2013 09:32:05 -0000 Author: pho Date: Sun Nov 24 09:32:04 2013 New Revision: 258517 URL: http://svnweb.freebsd.org/changeset/base/258517 Log: Make (more) sure that the blast host is down and just very busy. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/udp.sh Modified: user/pho/stress2/misc/udp.sh ============================================================================== --- user/pho/stress2/misc/udp.sh Sun Nov 24 09:30:45 2013 (r258516) +++ user/pho/stress2/misc/udp.sh Sun Nov 24 09:32:04 2013 (r258517) @@ -35,7 +35,7 @@ . ../default.cfg -ping -c 1 -t 2 $BLASTHOST > /dev/null 2>&1 || +ping -c 5 -t 2 $BLASTHOST > /dev/null 2>&1 || { echo "Can not ping $BLASTHOST"; exit 0; } export runRUNTIME=10m From owner-svn-src-user@FreeBSD.ORG Sun Nov 24 09:49:54 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 76116613; Sun, 24 Nov 2013 09:49:54 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 668C0293F; Sun, 24 Nov 2013 09:49:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAO9nsM4003654; Sun, 24 Nov 2013 09:49:54 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAO9nsWV003653; Sun, 24 Nov 2013 09:49:54 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <201311240949.rAO9nsWV003653@svn.freebsd.org> From: Peter Holm Date: Sun, 24 Nov 2013 09:49:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258519 - 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.16 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, 24 Nov 2013 09:49:54 -0000 Author: pho Date: Sun Nov 24 09:49:53 2013 New Revision: 258519 URL: http://svnweb.freebsd.org/changeset/base/258519 Log: Fixed typo. Pointed out by: gjb@ Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/procfs5.sh Modified: user/pho/stress2/misc/procfs5.sh ============================================================================== --- user/pho/stress2/misc/procfs5.sh Sun Nov 24 09:43:55 2013 (r258518) +++ user/pho/stress2/misc/procfs5.sh Sun Nov 24 09:49:53 2013 (r258519) @@ -33,7 +33,7 @@ # http://people.freebsd.org/~pho/stress/log/kostik640.txt # Fixed in r258365, r258397. -# Scanario by kib@ +# Scenario by kib@ [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 From owner-svn-src-user@FreeBSD.ORG Sun Nov 24 09:55:24 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 ESMTPS id 1939B7A9; Sun, 24 Nov 2013 09:55:24 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 094B82991; Sun, 24 Nov 2013 09:55:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAO9tN2e006994; Sun, 24 Nov 2013 09:55:23 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAO9tNqJ006993; Sun, 24 Nov 2013 09:55:23 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <201311240955.rAO9tNqJ006993@svn.freebsd.org> From: Peter Holm Date: Sun, 24 Nov 2013 09:55:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258520 - 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.16 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, 24 Nov 2013 09:55:24 -0000 Author: pho Date: Sun Nov 24 09:55:23 2013 New Revision: 258520 URL: http://svnweb.freebsd.org/changeset/base/258520 Log: Added text of what to expect from this test. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/mmap3.sh Modified: user/pho/stress2/misc/mmap3.sh ============================================================================== --- user/pho/stress2/misc/mmap3.sh Sun Nov 24 09:49:53 2013 (r258519) +++ user/pho/stress2/misc/mmap3.sh Sun Nov 24 09:55:23 2013 (r258520) @@ -40,6 +40,7 @@ start=`date '+%s'` while [ `date '+%s'` -lt $((start + 5 * 60)) ]; do ./mmap3 done +echo "Expect Segmentation faults" start=`date '+%s'` while [ `date '+%s'` -lt $((start + 5 * 60)) ]; do ./mmap3 random From owner-svn-src-user@FreeBSD.ORG Sun Nov 24 09:56:22 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 00907890; Sun, 24 Nov 2013 09:56:21 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E52062995; Sun, 24 Nov 2013 09:56:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAO9uL0a007235; Sun, 24 Nov 2013 09:56:21 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAO9uL9m007234; Sun, 24 Nov 2013 09:56:21 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <201311240956.rAO9uL9m007234@svn.freebsd.org> From: Peter Holm Date: Sun, 24 Nov 2013 09:56:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258521 - 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.16 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, 24 Nov 2013 09:56:22 -0000 Author: pho Date: Sun Nov 24 09:56:21 2013 New Revision: 258521 URL: http://svnweb.freebsd.org/changeset/base/258521 Log: No need to run this test for 30 minutes. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/mkfifo.sh Modified: user/pho/stress2/misc/mkfifo.sh ============================================================================== --- user/pho/stress2/misc/mkfifo.sh Sun Nov 24 09:55:23 2013 (r258520) +++ user/pho/stress2/misc/mkfifo.sh Sun Nov 24 09:56:21 2013 (r258521) @@ -49,7 +49,7 @@ newfs -j md${mdstart}$part > /dev/null mount /dev/md${mdstart}$part $mntpoint chmod 777 $mntpoint -export runRUNTIME=30m +export runRUNTIME=20m export RUNDIR=$mntpoint/stressX export TESTPROGS=" From owner-svn-src-user@FreeBSD.ORG Sun Nov 24 09:59:48 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 41535987; Sun, 24 Nov 2013 09:59:48 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3164F29A0; Sun, 24 Nov 2013 09:59:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAO9xlHT008067; Sun, 24 Nov 2013 09:59:47 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAO9xlJV008066; Sun, 24 Nov 2013 09:59:47 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <201311240959.rAO9xlJV008066@svn.freebsd.org> From: Peter Holm Date: Sun, 24 Nov 2013 09:59:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258522 - 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.16 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, 24 Nov 2013 09:59:48 -0000 Author: pho Date: Sun Nov 24 09:59:47 2013 New Revision: 258522 URL: http://svnweb.freebsd.org/changeset/base/258522 Log: No need to use tunefs(8). Use file system check defined in default.cfg and trim run time. Modified: user/pho/stress2/misc/trim3.sh Modified: user/pho/stress2/misc/trim3.sh ============================================================================== --- user/pho/stress2/misc/trim3.sh Sun Nov 24 09:56:21 2013 (r258521) +++ user/pho/stress2/misc/trim3.sh Sun Nov 24 09:59:47 2013 (r258522) @@ -41,21 +41,18 @@ mdconfig -l | grep -q md$mdstart && mdc size="1g" [ $# -eq 0 ] && trim=-t n=0 -for flag in '' '-U' '-U'; do - n=$((n + 1)) +for flag in '' '-U' '-j'; do echo "mdconfig -a -t swap -s $size -u $mdstart" mdconfig -a -t swap -s $size -u $mdstart || exit 1 bsdlabel -w md$mdstart auto echo "newfs $trim $flag md${mdstart}$part" newfs $trim $flag md${mdstart}$part > /dev/null - [ $n -eq 3 ] && tunefs -? 2>&1 | grep -q "j enable" && \ - tunefs -j enable /dev/md${mdstart}$part mount /dev/md${mdstart}$part $mntpoint chmod 777 $mntpoint - export runRUNTIME=10m + export runRUNTIME=7m export RUNDIR=$mntpoint/stressX su $testuser -c 'cd ..; ./run.sh marcus.cfg' > /dev/null 2>&1 @@ -63,12 +60,6 @@ for flag in '' '-U' '-U'; do while mount | grep $mntpoint | grep -q /dev/md; do umount $mntpoint || sleep 1 done - dumpfs /dev/md${mdstart}$part > /tmp/dumpfs.1 - sleep 1 - fsck -t ufs -y /dev/md${mdstart}$part > /tmp/fsck.log 2>&1 - dumpfs /dev/md${mdstart}$part > /tmp/dumpfs.2 - - diff -c /tmp/dumpfs.1 /tmp/dumpfs.2 || cat /tmp/fsck.log + checkfs /dev/md${mdstart}$part mdconfig -d -u $mdstart done -rm -f /tmp/fsck.log /tmp/dumpfs.? From owner-svn-src-user@FreeBSD.ORG Sun Nov 24 10:00:40 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 ESMTPS id F059FA71; Sun, 24 Nov 2013 10:00:40 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E126229A7; Sun, 24 Nov 2013 10:00:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAOA0eX1008825; Sun, 24 Nov 2013 10:00:40 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAOA0elP008824; Sun, 24 Nov 2013 10:00:40 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <201311241000.rAOA0elP008824@svn.freebsd.org> From: Peter Holm Date: Sun, 24 Nov 2013 10:00:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258523 - 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.16 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, 24 Nov 2013 10:00:41 -0000 Author: pho Date: Sun Nov 24 10:00:40 2013 New Revision: 258523 URL: http://svnweb.freebsd.org/changeset/base/258523 Log: Trim run time. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/suj9.sh Modified: user/pho/stress2/misc/suj9.sh ============================================================================== --- user/pho/stress2/misc/suj9.sh Sun Nov 24 09:59:47 2013 (r258522) +++ user/pho/stress2/misc/suj9.sh Sun Nov 24 10:00:40 2013 (r258523) @@ -25,7 +25,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: projects/stress2/misc/suj.sh 210724 2010-08-01 10:33:03Z pho $ +# $FreeBSD$ # [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 @@ -41,14 +41,14 @@ mdconfig -l | grep -q md$mdstart && mdc mdconfig -a -t swap -s 128m -u $mdstart || exit 1 bsdlabel -w md$mdstart auto -for i in `jot 5`; do +for i in `jot 4`; do newfs -U md${mdstart}$part > /dev/null tunefs -j enable /dev/md${mdstart}$part mount /dev/md${mdstart}$part $mntpoint chmod 777 $mntpoint - export runRUNTIME=10m + export runRUNTIME=5m export RUNDIR=$mntpoint/stressX su $testuser -c 'cd ..; ./run.sh marcus.cfg' > /dev/null 2>&1 From owner-svn-src-user@FreeBSD.ORG Sun Nov 24 11:55:07 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A4D3E770; Sun, 24 Nov 2013 11:55:07 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9564A2DBA; Sun, 24 Nov 2013 11:55:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAOBt7rR061231; Sun, 24 Nov 2013 11:55:07 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAOBt7c6061230; Sun, 24 Nov 2013 11:55:07 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <201311241155.rAOBt7c6061230@svn.freebsd.org> From: Peter Holm Date: Sun, 24 Nov 2013 11:55:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258524 - 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.16 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, 24 Nov 2013 11:55:07 -0000 Author: pho Date: Sun Nov 24 11:55:07 2013 New Revision: 258524 URL: http://svnweb.freebsd.org/changeset/base/258524 Log: I seem to be incapable of spelling "scenario" right. Pointed out by: kib@ Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/mmap4.sh Modified: user/pho/stress2/misc/mmap4.sh ============================================================================== --- user/pho/stress2/misc/mmap4.sh Sun Nov 24 10:00:40 2013 (r258523) +++ user/pho/stress2/misc/mmap4.sh Sun Nov 24 11:55:07 2013 (r258524) @@ -32,7 +32,7 @@ # Causes panic: 1 vncache entries remaining # Fixed in r202529 -# Scanario by kib@ +# Scenario by kib@ [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 From owner-svn-src-user@FreeBSD.ORG Mon Nov 25 06:17:15 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 03D6C735; Mon, 25 Nov 2013 06:17:15 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E87102D39; Mon, 25 Nov 2013 06:17:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAP6HEI3005189; Mon, 25 Nov 2013 06:17:14 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAP6HEL7005186; Mon, 25 Nov 2013 06:17:14 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201311250617.rAP6HEL7005186@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Mon, 25 Nov 2013 06:17:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258539 - in user/ae/inet6/sys: net netinet6 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.16 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: Mon, 25 Nov 2013 06:17:15 -0000 Author: ae Date: Mon Nov 25 06:17:14 2013 New Revision: 258539 URL: http://svnweb.freebsd.org/changeset/base/258539 Log: Remove deembed_scopeid sysctl and related code. Modified: user/ae/inet6/sys/net/rtsock.c user/ae/inet6/sys/netinet6/scope6.c user/ae/inet6/sys/netinet6/scope6_var.h Modified: user/ae/inet6/sys/net/rtsock.c ============================================================================== --- user/ae/inet6/sys/net/rtsock.c Mon Nov 25 02:22:20 2013 (r258538) +++ user/ae/inet6/sys/net/rtsock.c Mon Nov 25 06:17:14 2013 (r258539) @@ -544,8 +544,10 @@ rtm_get_jailed(struct rt_addrinfo *info, saun->sin6.sin6_len = sizeof(struct sockaddr_in6); saun->sin6.sin6_family = AF_INET6; bcopy(&ia6, &saun->sin6.sin6_addr, sizeof(struct in6_addr)); - if (sa6_recoverscope(&saun->sin6) != 0) - return (ESRCH); + /* + saun->sin6.sin6_sin6_scope_id = in6_getscopezone(ifp, + in6_addrscope(&ia6)); + */ info->rti_info[RTAX_IFA] = (struct sockaddr *)&saun->sin6; break; } @@ -565,11 +567,6 @@ route_output(struct mbuf *m, struct sock struct rtentry *rt = NULL; struct radix_node_head *rnh; struct rt_addrinfo info; -#ifdef INET6 - struct sockaddr_storage ss; - struct sockaddr_in6 *sin6; - int i, rti_need_deembed = 0; -#endif int len, error = 0; struct ifnet *ifp = NULL; union sockaddr_union saun; @@ -600,11 +597,6 @@ route_output(struct mbuf *m, struct sock rtm->rtm_pid = curproc->p_pid; bzero(&info, sizeof(info)); info.rti_addrs = rtm->rtm_addrs; - /* - * rt_xaddrs() performs s6_addr[2] := sin6_scope_id for AF_INET6 - * link-local address because rtrequest requires addresses with - * embedded scope id. - */ if (rt_xaddrs((caddr_t)(rtm + 1), len + (caddr_t)rtm, &info)) { info.rti_info[RTAX_DST] = NULL; senderr(EINVAL); @@ -673,18 +665,11 @@ route_output(struct mbuf *m, struct sock if (info.rti_info[RTAX_GATEWAY]->sa_family == AF_LINK && (rtm->rtm_flags & RTF_LLDATA) != 0) { error = lla_rt_output(rtm, &info); -#ifdef INET6 - if (error == 0) - rti_need_deembed = (V_deembed_scopeid) ? 1 : 0; -#endif break; } error = rtrequest1_fib(RTM_ADD, &info, &saved_nrt, so->so_fibnum); if (error == 0 && saved_nrt) { -#ifdef INET6 - rti_need_deembed = (V_deembed_scopeid) ? 1 : 0; -#endif RT_LOCK(saved_nrt); rt_setmetrics(rtm->rtm_inits, &rtm->rtm_rmx, &saved_nrt->rt_rmx); @@ -701,10 +686,6 @@ route_output(struct mbuf *m, struct sock (info.rti_info[RTAX_GATEWAY]->sa_family == AF_LINK) && (rtm->rtm_flags & RTF_LLDATA) != 0) { error = lla_rt_output(rtm, &info); -#ifdef INET6 - if (error == 0) - rti_need_deembed = (V_deembed_scopeid) ? 1 : 0; -#endif break; } error = rtrequest1_fib(RTM_DELETE, &info, &saved_nrt, @@ -714,10 +695,6 @@ route_output(struct mbuf *m, struct sock rt = saved_nrt; goto report; } -#ifdef INET6 - /* rt_msg2() will not be used when RTM_DELETE fails. */ - rti_need_deembed = (V_deembed_scopeid) ? 1 : 0; -#endif break; case RTM_GET: @@ -966,22 +943,6 @@ flush: rp = sotorawcb(so); } if (rtm) { -#ifdef INET6 - if (rti_need_deembed) { - /* sin6_scope_id is recovered before sending rtm. */ - sin6 = (struct sockaddr_in6 *)&ss; - for (i = 0; i < RTAX_MAX; i++) { - if (info.rti_info[i] == NULL) - continue; - if (info.rti_info[i]->sa_family != AF_INET6) - continue; - bcopy(info.rti_info[i], sin6, sizeof(*sin6)); - if (sa6_recoverscope(sin6) == 0) - bcopy(sin6, info.rti_info[i], - sizeof(*sin6)); - } - } -#endif m_copyback(m, 0, rtm->rtm_msglen, (caddr_t)rtm); if (m->m_pkthdr.len < rtm->rtm_msglen) { m_freem(m); @@ -1075,11 +1036,6 @@ rt_xaddrs(caddr_t cp, caddr_t cplim, str return (0); /* should be EINVAL but for compat */ } /* accept it */ -#ifdef INET6 - if (sa->sa_family == AF_INET6) - sa6_embedscope((struct sockaddr_in6 *)sa, - V_ip6_use_defzone); -#endif rtinfo->rti_info[i] = sa; cp += SA_SIZE(sa); } @@ -1094,13 +1050,8 @@ rt_msg1(int type, struct rt_addrinfo *rt { struct rt_msghdr *rtm; struct mbuf *m; - int i; struct sockaddr *sa; -#ifdef INET6 - struct sockaddr_storage ss; - struct sockaddr_in6 *sin6; -#endif - int len, dlen; + int len, i; switch (type) { @@ -1143,17 +1094,8 @@ rt_msg1(int type, struct rt_addrinfo *rt if ((sa = rtinfo->rti_info[i]) == NULL) continue; rtinfo->rti_addrs |= (1 << i); - dlen = SA_SIZE(sa); -#ifdef INET6 - if (V_deembed_scopeid && sa->sa_family == AF_INET6) { - sin6 = (struct sockaddr_in6 *)&ss; - bcopy(sa, sin6, sizeof(*sin6)); - if (sa6_recoverscope(sin6) == 0) - sa = (struct sockaddr *)sin6; - } -#endif - m_copyback(m, len, dlen, (caddr_t)sa); - len += dlen; + m_copyback(m, len, SA_SIZE(sa), (caddr_t)sa); + len += SA_SIZE(sa); } if (m->m_pkthdr.len != len) { m_freem(m); @@ -1171,13 +1113,8 @@ rt_msg1(int type, struct rt_addrinfo *rt static int rt_msg2(int type, struct rt_addrinfo *rtinfo, caddr_t cp, struct walkarg *w) { - int i; - int len, dlen, second_time = 0; caddr_t cp0; -#ifdef INET6 - struct sockaddr_storage ss; - struct sockaddr_in6 *sin6; -#endif + int len, i, second_time = 0; rtinfo->rti_addrs = 0; again: @@ -1228,20 +1165,11 @@ again: if ((sa = rtinfo->rti_info[i]) == NULL) continue; rtinfo->rti_addrs |= (1 << i); - dlen = SA_SIZE(sa); if (cp) { -#ifdef INET6 - if (V_deembed_scopeid && sa->sa_family == AF_INET6) { - sin6 = (struct sockaddr_in6 *)&ss; - bcopy(sa, sin6, sizeof(*sin6)); - if (sa6_recoverscope(sin6) == 0) - sa = (struct sockaddr *)sin6; - } -#endif - bcopy((caddr_t)sa, cp, (unsigned)dlen); - cp += dlen; + bcopy((caddr_t)sa, cp, SA_SIZE(sa)); + cp += SA_SIZE(sa); } - len += dlen; + len += SA_SIZE(sa); } len = ALIGN(len); if (cp == NULL && w != NULL && !second_time) { Modified: user/ae/inet6/sys/netinet6/scope6.c ============================================================================== --- user/ae/inet6/sys/netinet6/scope6.c Mon Nov 25 02:22:20 2013 (r258538) +++ user/ae/inet6/sys/netinet6/scope6.c Mon Nov 25 06:17:14 2013 (r258539) @@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include @@ -57,11 +56,6 @@ VNET_DEFINE(int, ip6_use_defzone) = 1; #else VNET_DEFINE(int, ip6_use_defzone) = 0; #endif -VNET_DEFINE(int, deembed_scopeid) = 1; -SYSCTL_DECL(_net_inet6_ip6); -SYSCTL_VNET_INT(_net_inet6_ip6, OID_AUTO, deembed_scopeid, CTLFLAG_RW, - &VNET_NAME(deembed_scopeid), 0, - "Extract embedded zone ID and set it to sin6_scope_id in sockaddr_in6."); /* * The scope6_lock protects the global sid default stored in Modified: user/ae/inet6/sys/netinet6/scope6_var.h ============================================================================== --- user/ae/inet6/sys/netinet6/scope6_var.h Mon Nov 25 02:22:20 2013 (r258538) +++ user/ae/inet6/sys/netinet6/scope6_var.h Mon Nov 25 06:17:14 2013 (r258539) @@ -45,9 +45,6 @@ struct scope6_id { uint32_t s6id_list[IPV6_ADDR_SCOPES_COUNT]; }; -VNET_DECLARE(int, deembed_scopeid); -#define V_deembed_scopeid VNET(deembed_scopeid) - void scope6_init(void); struct scope6_id *scope6_ifattach(struct ifnet *); void scope6_ifdetach(struct scope6_id *); From owner-svn-src-user@FreeBSD.ORG Mon Nov 25 07:35:02 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 342AB8BC; Mon, 25 Nov 2013 07:35:02 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2498420C7; Mon, 25 Nov 2013 07:35:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAP7Z1Jw031475; Mon, 25 Nov 2013 07:35:01 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAP7Z1qv031474; Mon, 25 Nov 2013 07:35:01 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201311250735.rAP7Z1qv031474@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Mon, 25 Nov 2013 07:35:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258540 - user/ae/inet6/sys/netinet6 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.16 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: Mon, 25 Nov 2013 07:35:02 -0000 Author: ae Date: Mon Nov 25 07:35:01 2013 New Revision: 258540 URL: http://svnweb.freebsd.org/changeset/base/258540 Log: Initialize sin6_scope_id using mbuf's rcvif. Modified: user/ae/inet6/sys/netinet6/in6_pcb.c Modified: user/ae/inet6/sys/netinet6/in6_pcb.c ============================================================================== --- user/ae/inet6/sys/netinet6/in6_pcb.c Mon Nov 25 06:17:14 2013 (r258539) +++ user/ae/inet6/sys/netinet6/in6_pcb.c Mon Nov 25 07:35:01 2013 (r258540) @@ -1170,8 +1170,8 @@ init_sin6(struct sockaddr_in6 *sin6, str sin6->sin6_len = sizeof(*sin6); sin6->sin6_family = AF_INET6; sin6->sin6_addr = ip->ip6_src; - - (void)sa6_recoverscope(sin6); /* XXX: should catch errors... */ - + if (m->m_pkthdr.rcvif != NULL) + sin6->sin6_scope_id = in6_getscopezone(m->m_pkthdr.rcvif, + in6_addrscope(&sin6->sin6_addr)); return; } From owner-svn-src-user@FreeBSD.ORG Mon Nov 25 07:52:08 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 ESMTPS id 7A87926B; Mon, 25 Nov 2013 07:52:08 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6ABFD21ED; Mon, 25 Nov 2013 07:52:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAP7q8mG037836; Mon, 25 Nov 2013 07:52:08 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAP7q84i037835; Mon, 25 Nov 2013 07:52:08 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201311250752.rAP7q84i037835@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Mon, 25 Nov 2013 07:52:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258542 - user/ae/inet6/sys/netinet6 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.16 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: Mon, 25 Nov 2013 07:52:08 -0000 Author: ae Date: Mon Nov 25 07:52:07 2013 New Revision: 258542 URL: http://svnweb.freebsd.org/changeset/base/258542 Log: No need to call sa6_recoverscope(), destination address here should contain correct zone information. Modified: user/ae/inet6/sys/netinet6/ip6_input.c Modified: user/ae/inet6/sys/netinet6/ip6_input.c ============================================================================== --- user/ae/inet6/sys/netinet6/ip6_input.c Mon Nov 25 07:38:45 2013 (r258541) +++ user/ae/inet6/sys/netinet6/ip6_input.c Mon Nov 25 07:52:07 2013 (r258542) @@ -1402,9 +1402,6 @@ ip6_notify_pmtu(struct inpcb *in6p, stru bzero(&mtuctl, sizeof(mtuctl)); /* zero-clear for safety */ mtuctl.ip6m_mtu = *mtu; mtuctl.ip6m_addr = *dst; - if (sa6_recoverscope(&mtuctl.ip6m_addr)) - return; - if ((m_mtu = sbcreatecontrol((caddr_t)&mtuctl, sizeof(mtuctl), IPV6_PATHMTU, IPPROTO_IPV6)) == NULL) return; From owner-svn-src-user@FreeBSD.ORG Tue Nov 26 08:48:10 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 ESMTPS id 8F755262; Tue, 26 Nov 2013 08:48:10 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7FCBA2C63; Tue, 26 Nov 2013 08:48: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 rAQ8mAdA080467; Tue, 26 Nov 2013 08:48:10 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAQ8mAo7080465; Tue, 26 Nov 2013 08:48:10 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201311260848.rAQ8mAo7080465@svn.freebsd.org> From: Gleb Smirnoff Date: Tue, 26 Nov 2013 08:48:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258624 - user/glebius/course/08.io2 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.16 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: Tue, 26 Nov 2013 08:48:10 -0000 Author: glebius Date: Tue Nov 26 08:48:09 2013 New Revision: 258624 URL: http://svnweb.freebsd.org/changeset/base/258624 Log: Empty page for next lection. Added: user/glebius/course/08.io2/ user/glebius/course/08.io2/Makefile - copied unchanged from r258604, user/glebius/course/01.intro/Makefile user/glebius/course/08.io2/lection.tex Copied: user/glebius/course/08.io2/Makefile (from r258604, user/glebius/course/01.intro/Makefile) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/glebius/course/08.io2/Makefile Tue Nov 26 08:48:09 2013 (r258624, copy of r258604, user/glebius/course/01.intro/Makefile) @@ -0,0 +1,17 @@ +NAME?= lection + +TMP= $(NAME).aux $(NAME).log $(NAME).nav $(NAME).out $(NAME).snm \ + $(NAME).toc $(NAME).vrb + +.MAIN: $(NAME).pdf + +.SUFFIXES: .pdf .tex +.tex.pdf: + pdflatex -file-line-error -halt-on-error ${.IMPSRC} + +clean: + rm -f -- $(TMP) texput.log + +cleanall: + make clean + rm -f $(NAME).pdf Added: user/glebius/course/08.io2/lection.tex ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/glebius/course/08.io2/lection.tex Tue Nov 26 08:48:09 2013 (r258624) @@ -0,0 +1,28 @@ +\documentclass{beamer} + +\usepackage[utf8]{inputenc} +\usepackage[russian]{babel} +\usepackage{tikz} +\usepackage{adjustbox} +\usepackage{url} +\usepackage{array} +\usepackage{xcolor} +\usepackage{listings} +\usepackage{verbatim} +\usepackage{ifthen} + +\usetikzlibrary{positioning} +\usetikzlibrary{shapes} +\usetikzlibrary{decorations.pathmorphing} + +\input{../course.tex} + +\title{Input/Output system: GEOM} + +\begin{document} + +\begin{frame} +\titlepage +\end{frame} + +\end{document} From owner-svn-src-user@FreeBSD.ORG Tue Nov 26 10:47:38 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 ESMTPS id ACD84D35; Tue, 26 Nov 2013 10:47:38 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9CE0623B1; Tue, 26 Nov 2013 10:47:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAQAlcce021697; Tue, 26 Nov 2013 10:47:38 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAQAlchb021696; Tue, 26 Nov 2013 10:47:38 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201311261047.rAQAlchb021696@svn.freebsd.org> From: Gleb Smirnoff Date: Tue, 26 Nov 2013 10:47:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258639 - user/glebius/course/06.filedesc 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.16 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: Tue, 26 Nov 2013 10:47:38 -0000 Author: glebius Date: Tue Nov 26 10:47:38 2013 New Revision: 258639 URL: http://svnweb.freebsd.org/changeset/base/258639 Log: Typos. Modified: user/glebius/course/06.filedesc/lection.tex Modified: user/glebius/course/06.filedesc/lection.tex ============================================================================== --- user/glebius/course/06.filedesc/lection.tex Tue Nov 26 10:46:43 2013 (r258638) +++ user/glebius/course/06.filedesc/lection.tex Tue Nov 26 10:47:38 2013 (r258639) @@ -294,7 +294,7 @@ struct kevent { \end{frame} -\FootReferences{}{sys/sys/event.h, sys/sys/eventvar.h} +\FootReferences{}{sys/sys/event.h, sys/sys/eventvar.h, sys/kern/kern\_event.c} \begin{frame} \frametitle{Kernel view of kevent(2)} \begin{figure} @@ -340,6 +340,7 @@ struct kevent { \draw [->, dotted] (ea2) -| (node cs:name=knotev, angle=110); \draw [->, dotted] (ea6) -| (knote1s1); + \draw [->, dotted] (knote1s1) -- (knote1s2); \draw [->, dashed] (aa1) -| (node cs:name=knotev, angle=70); \draw [->, dashed] (aa2) -- +(+.5\paperwidth, 0) |- (knote1s1); From owner-svn-src-user@FreeBSD.ORG Tue Nov 26 10:48:08 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D59D9E1C; Tue, 26 Nov 2013 10:48:08 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C57BD23B8; Tue, 26 Nov 2013 10:48:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAQAm8mZ021808; Tue, 26 Nov 2013 10:48:08 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAQAm81D021807; Tue, 26 Nov 2013 10:48:08 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201311261048.rAQAm81D021807@svn.freebsd.org> From: Gleb Smirnoff Date: Tue, 26 Nov 2013 10:48:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258640 - user/glebius/course/07.io 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.16 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: Tue, 26 Nov 2013 10:48:09 -0000 Author: glebius Date: Tue Nov 26 10:48:08 2013 New Revision: 258640 URL: http://svnweb.freebsd.org/changeset/base/258640 Log: Uncommitted slides from previous lection. Modified: user/glebius/course/07.io/lection.tex Modified: user/glebius/course/07.io/lection.tex ============================================================================== --- user/glebius/course/07.io/lection.tex Tue Nov 26 10:47:38 2013 (r258639) +++ user/glebius/course/07.io/lection.tex Tue Nov 26 10:48:08 2013 (r258640) @@ -28,6 +28,11 @@ \begin{frame} \frametitle{read(2), readv(2), write(2), writev(2)} +\note { + - Run the strategy.d and display typical I/O backtrace, + then continue with slides. The trace will lead us through + the entire lection. +} \begin{itemize} \onslide <1-> { \item {Syscall handler fills in \emph{struct uio}.} @@ -220,4 +225,100 @@ struct vnode { \end{figure} \end{frame} + +\FootReferences{vnode(9), VFS(9)}{sys/tools/vnode\_if.awk, + sys/kern/vnode\_if.src} +\begin{frame}[fragile] +\frametitle{VFS(9) - object oriented approach to vnodes} +Code is generated from vnode\_if.src file by vnode\_if.awk script. +\begin{verbatim} +%% read vp L L L +vop_read { + IN struct vnode *vp; + INOUT struct uio *uio; + IN int ioflag; + IN struct ucred *cred; +}; +\end{verbatim} +\end{frame} + +\FootReferences{vnode(9), VFS(9)}{sys/tools/vnode\_if.awk, + sys/kern/vnode\_if.src} +\begin{frame} +\frametitle{VFS(9) - object oriented approach to vnodes} +\onslide <1-> { +Generated in vnode\_if.h: +\begin{itemize} + \item{struct vop\_read\_args} + \item{VOP\_READ\_APV() declaration} + \item{VOP\_READ() inlined function} +\end{itemize} +} +\onslide <2-> { +Generated in vnode\_if.c: +\begin{itemize} + \item{VOP\_READ\_APV() function} +\end{itemize} +} +\onslide <3> { +VOP\_READ\_APV(): +\begin{itemize} + \item{Does locking assertions} + \item\textbf{Cycles through vop->vop\_default until vop\_read is defined} + \item{Does tracing: ktr(9) and sdt(9)} + \item{Runs VFS\_PROLOGUE(vp->v\_mount)} + \item\textbf{Runs vop->vop\_read} + \item{Runs VFS\_EPILOGUE(vp->v\_mount)} + \item{Does locking assertions} + \item{Does tracing: ktr(9) and sdt(9)} +\end{itemize} +} +\end{frame} + + +\FootReferences{buf(9)}{sys/sys/buf.h, sys/kern/vfs\_bio.c} +\begin{frame}[fragile] +\frametitle{buffer I/O} +\begin{verbatim} +struct buf { + long b_bufsize; /* Allocated buffer size. */ + caddr_t b_data; /* Base pointer. */ + off_t b_offset; /* Offset in the file. */ + long b_resid; /* Remaining bytes for i/o. */ + int b_dirtyoff; /* Offset in buffer of dirty region. */ + int b_dirtyend; /* Offset of end of dirty region. */ + ... + daddr_t b_blkno; /* Underlying physical block number. */ + daddr_t b_lblkno; /* Logical block number. */ + ... + struct vm_page *b_pages[btoc(MAXPHYS)]; + int b_npages; + ... + struct bufobj *b_bufobj; +} +\end{verbatim} +\end{frame} + + +\FootReferences{buf(9)}{sys/sys/bufobj.h, sys/kern/vfs\_bio.c} +\begin{frame}[fragile] +\frametitle{buffer I/O} +\begin{verbatim} +struct bufobj { + struct vm_object *bo_object; /* Place to store VM object */ + struct buf_ops *bo_ops; /* Buffer operations */ + struct bufv bo_clean; /* Clean buffers */ + struct bufv bo_dirty; /* Dirty buffers */ + ... +}; + +TAILQ_HEAD(buflists, buf); +struct bufv { + struct buflists bv_hd; /* Sorted blocklist */ + struct pctrie bv_root; /* Buf trie */ + int bv_cnt; /* Number of buffers */ +}; +\end{verbatim} +\end{frame} + \end{document} From owner-svn-src-user@FreeBSD.ORG Wed Nov 27 04:31:03 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 ESMTPS id 3F2DF3FA; Wed, 27 Nov 2013 04:31:03 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 20217259C; Wed, 27 Nov 2013 04:31:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAR4V2k7097019; Wed, 27 Nov 2013 04:31:02 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAR4V2j7097015; Wed, 27 Nov 2013 04:31:02 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201311270431.rAR4V2j7097015@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Wed, 27 Nov 2013 04:31:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258670 - user/ae/inet6/sys/netipsec 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.16 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: Wed, 27 Nov 2013 04:31:03 -0000 Author: ae Date: Wed Nov 27 04:31:01 2013 New Revision: 258670 URL: http://svnweb.freebsd.org/changeset/base/258670 Log: A try to clean up ipsec code from the embedded scope ids. Modified: user/ae/inet6/sys/netipsec/ipsec.c user/ae/inet6/sys/netipsec/ipsec_output.c user/ae/inet6/sys/netipsec/xform_ah.c user/ae/inet6/sys/netipsec/xform_ipip.c Modified: user/ae/inet6/sys/netipsec/ipsec.c ============================================================================== --- user/ae/inet6/sys/netipsec/ipsec.c Wed Nov 27 03:05:24 2013 (r258669) +++ user/ae/inet6/sys/netipsec/ipsec.c Wed Nov 27 04:31:01 2013 (r258670) @@ -72,6 +72,7 @@ #include #ifdef INET6 #include +#include #endif #include #ifdef INET6 @@ -793,8 +794,9 @@ ipsec6_setspidx_ipaddr(struct mbuf *m, s sin6->sin6_len = sizeof(struct sockaddr_in6); bcopy(&ip6->ip6_src, &sin6->sin6_addr, sizeof(ip6->ip6_src)); if (IN6_IS_SCOPE_LINKLOCAL(&ip6->ip6_src)) { - sin6->sin6_addr.s6_addr16[1] = 0; - sin6->sin6_scope_id = ntohs(ip6->ip6_src.s6_addr16[1]); + if (m->m_pkthdr.rcvif != NULL) /* XXX */ + sin6->sin6_scope_id = in6_getscopezone( + m->m_pkthdr.rcvif, IPV6_ADDR_SCOPE_LINKLOCAL); } spidx->prefs = sizeof(struct in6_addr) << 3; @@ -804,8 +806,9 @@ ipsec6_setspidx_ipaddr(struct mbuf *m, s sin6->sin6_len = sizeof(struct sockaddr_in6); bcopy(&ip6->ip6_dst, &sin6->sin6_addr, sizeof(ip6->ip6_dst)); if (IN6_IS_SCOPE_LINKLOCAL(&ip6->ip6_dst)) { - sin6->sin6_addr.s6_addr16[1] = 0; - sin6->sin6_scope_id = ntohs(ip6->ip6_dst.s6_addr16[1]); + if (m->m_pkthdr.rcvif != NULL) /* XXX */ + sin6->sin6_scope_id = in6_getscopezone( + m->m_pkthdr.rcvif, IPV6_ADDR_SCOPE_LINKLOCAL); } spidx->prefd = sizeof(struct in6_addr) << 3; Modified: user/ae/inet6/sys/netipsec/ipsec_output.c ============================================================================== --- user/ae/inet6/sys/netipsec/ipsec_output.c Wed Nov 27 03:05:24 2013 (r258669) +++ user/ae/inet6/sys/netipsec/ipsec_output.c Wed Nov 27 04:31:01 2013 (r258670) @@ -62,6 +62,7 @@ #include #ifdef INET6 #include +#include #endif #include #ifdef INET6 @@ -328,11 +329,12 @@ again: sin6->sin6_family = AF_INET6; sin6->sin6_port = IPSEC_PORT_ANY; sin6->sin6_addr = ip6->ip6_src; - if (IN6_IS_SCOPE_LINKLOCAL(&ip6->ip6_src)) { + if (IN6_IS_SCOPE_LINKLOCAL(&ip6->ip6_src) && + m->m_pkthdr.rcvif != NULL) { /* fix scope id for comparing SPD */ - sin6->sin6_addr.s6_addr16[1] = 0; - sin6->sin6_scope_id = - ntohs(ip6->ip6_src.s6_addr16[1]); + sin6->sin6_scope_id = in6_getscopezone( + m->m_pkthdr.rcvif, + IPV6_ADDR_SCOPE_LINKLOCAL); } } if (saidx->dst.sin6.sin6_len == 0) { @@ -341,11 +343,12 @@ again: sin6->sin6_family = AF_INET6; sin6->sin6_port = IPSEC_PORT_ANY; sin6->sin6_addr = ip6->ip6_dst; - if (IN6_IS_SCOPE_LINKLOCAL(&ip6->ip6_dst)) { + if (IN6_IS_SCOPE_LINKLOCAL(&ip6->ip6_dst) && + m->m_pkthdr.rcvif != NULL) { /* fix scope id for comparing SPD */ - sin6->sin6_addr.s6_addr16[1] = 0; - sin6->sin6_scope_id = - ntohs(ip6->ip6_dst.s6_addr16[1]); + sin6->sin6_scope_id = in6_getscopezone( + m->m_pkthdr.rcvif, + IPV6_ADDR_SCOPE_LINKLOCAL); } } } @@ -745,12 +748,6 @@ ipsec6_encapsulate(struct mbuf *m, struc ip6 = mtod(m, struct ip6_hdr *); bcopy((caddr_t)ip6, (caddr_t)oip6, sizeof(struct ip6_hdr)); - /* Fake link-local scope-class addresses */ - if (IN6_IS_SCOPE_LINKLOCAL(&oip6->ip6_src)) - oip6->ip6_src.s6_addr16[1] = 0; - if (IN6_IS_SCOPE_LINKLOCAL(&oip6->ip6_dst)) - oip6->ip6_dst.s6_addr16[1] = 0; - /* construct new IPv6 header. see RFC 2401 5.1.2.2 */ /* ECN consideration. */ ip6_ecn_ingress(V_ip6_ipsec_ecn, &ip6->ip6_flow, &oip6->ip6_flow); Modified: user/ae/inet6/sys/netipsec/xform_ah.c ============================================================================== --- user/ae/inet6/sys/netipsec/xform_ah.c Wed Nov 27 03:05:24 2013 (r258669) +++ user/ae/inet6/sys/netipsec/xform_ah.c Wed Nov 27 04:31:01 2013 (r258670) @@ -433,12 +433,6 @@ ah_massage_headers(struct mbuf **m0, int ip6.ip6_vfc &= ~IPV6_VERSION_MASK; ip6.ip6_vfc |= IPV6_VERSION; - /* Scoped address handling. */ - if (IN6_IS_SCOPE_LINKLOCAL(&ip6.ip6_src)) - ip6.ip6_src.s6_addr16[1] = 0; - if (IN6_IS_SCOPE_LINKLOCAL(&ip6.ip6_dst)) - ip6.ip6_dst.s6_addr16[1] = 0; - /* Done with IPv6 header. */ m_copyback(m, 0, sizeof(struct ip6_hdr), (caddr_t) &ip6); Modified: user/ae/inet6/sys/netipsec/xform_ipip.c ============================================================================== --- user/ae/inet6/sys/netipsec/xform_ipip.c Wed Nov 27 03:05:24 2013 (r258669) +++ user/ae/inet6/sys/netipsec/xform_ipip.c Wed Nov 27 04:31:01 2013 (r258670) @@ -536,11 +536,6 @@ ipip_output( /* scoped address handling */ ip6 = mtod(m, struct ip6_hdr *); - if (IN6_IS_SCOPE_LINKLOCAL(&ip6->ip6_src)) - ip6->ip6_src.s6_addr16[1] = 0; - if (IN6_IS_SCOPE_LINKLOCAL(&ip6->ip6_dst)) - ip6->ip6_dst.s6_addr16[1] = 0; - M_PREPEND(m, sizeof(struct ip6_hdr), M_NOWAIT); if (m == 0) { DPRINTF(("%s: M_PREPEND failed\n", __func__)); From owner-svn-src-user@FreeBSD.ORG Wed Nov 27 04:34:44 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D70F9573; Wed, 27 Nov 2013 04:34:44 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C6F1325EA; Wed, 27 Nov 2013 04:34:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAR4YiWn097480; Wed, 27 Nov 2013 04:34:44 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAR4YiJs097479; Wed, 27 Nov 2013 04:34:44 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201311270434.rAR4YiJs097479@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Wed, 27 Nov 2013 04:34:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258671 - user/ae/inet6/sys/netipsec 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.16 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: Wed, 27 Nov 2013 04:34:44 -0000 Author: ae Date: Wed Nov 27 04:34:44 2013 New Revision: 258671 URL: http://svnweb.freebsd.org/changeset/base/258671 Log: Remove now unused variable. Modified: user/ae/inet6/sys/netipsec/xform_ipip.c Modified: user/ae/inet6/sys/netipsec/xform_ipip.c ============================================================================== --- user/ae/inet6/sys/netipsec/xform_ipip.c Wed Nov 27 04:31:01 2013 (r258670) +++ user/ae/inet6/sys/netipsec/xform_ipip.c Wed Nov 27 04:34:44 2013 (r258671) @@ -426,7 +426,7 @@ ipip_output( struct ip *ipo; #endif /* INET */ #ifdef INET6 - struct ip6_hdr *ip6, *ip6o; + struct ip6_hdr *ip6o; #endif /* INET6 */ sav = isr->sav; @@ -534,8 +534,6 @@ ipip_output( goto bad; } - /* scoped address handling */ - ip6 = mtod(m, struct ip6_hdr *); M_PREPEND(m, sizeof(struct ip6_hdr), M_NOWAIT); if (m == 0) { DPRINTF(("%s: M_PREPEND failed\n", __func__)); From owner-svn-src-user@FreeBSD.ORG Wed Nov 27 06:54:30 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DAC0427E; Wed, 27 Nov 2013 06:54:29 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C9B0F2B59; Wed, 27 Nov 2013 06:54:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAR6sTQS044416; Wed, 27 Nov 2013 06:54:29 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAR6sTig044413; Wed, 27 Nov 2013 06:54:29 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201311270654.rAR6sTig044413@svn.freebsd.org> From: Gleb Smirnoff Date: Wed, 27 Nov 2013 06:54:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258674 - user/glebius/course/08.io2 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.16 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: Wed, 27 Nov 2013 06:54:30 -0000 Author: glebius Date: Wed Nov 27 06:54:29 2013 New Revision: 258674 URL: http://svnweb.freebsd.org/changeset/base/258674 Log: Some words on block I/O and geom(4). Added: user/glebius/course/08.io2/kern.geom.conf.dot user/glebius/course/08.io2/kern.geom.conf.png (contents, props changed) user/glebius/course/08.io2/kern.geom.conf.xml (contents, props changed) Modified: user/glebius/course/08.io2/lection.tex Added: user/glebius/course/08.io2/kern.geom.conf.dot ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/glebius/course/08.io2/kern.geom.conf.dot Wed Nov 27 06:54:29 2013 (r258674) @@ -0,0 +1,191 @@ +digraph geom { +z0xfffff800045c0900 [shape=box,label="VFS\nffs.ada2p1\nr#3"]; +z0xfffff8000452d800 [label="r1w1e1"]; +z0xfffff8000452d800 -> z0xfffff800045bea00; +z0xfffff800045c0900 -> z0xfffff8000452d800; +z0xfffff800045f6800 [shape=box,label="VFS\nffs.ada1p4\nr#3"]; +z0xfffff80004507900 [label="r1w1e1"]; +z0xfffff80004507900 -> z0xfffff80004520800; +z0xfffff800045f6800 -> z0xfffff80004507900; +z0xfffff80004927200 [shape=box,label="VFS\nffs.ada1p3\nr#3"]; +z0xfffff80004582c80 [label="r1w1e1"]; +z0xfffff80004582c80 -> z0xfffff80004520a00; +z0xfffff80004927200 -> z0xfffff80004582c80; +z0xfffff800045f6100 [shape=box,label="VFS\nffs.ada1p5\nr#3"]; +z0xfffff800045ae500 [label="r1w1e1"]; +z0xfffff800045ae500 -> z0xfffff80004520600; +z0xfffff800045f6100 -> z0xfffff800045ae500; +z0xfffff800045f6600 [shape=box,label="SWAP\nswap\nr#3"]; +z0xfffff800045ae080 [label="r1w1e0"]; +z0xfffff800045ae080 -> z0xfffff80004520c00; +z0xfffff800045f6600 -> z0xfffff800045ae080; +z0xfffff8010ed01a00 [shape=box,label="DISK\nda1\nr#1"]; +z0xfffff8010ed99700 [shape=hexagon,label="da1\nr0w0e0\nerr#0"]; +z0xfffff8010ed99700 -> z0xfffff8010ed01a00; +z0xfffff8010ecf8700 [shape=box,label="DISK\nda0\nr#1"]; +z0xfffff8010ec89200 [shape=hexagon,label="da0\nr0w0e0\nerr#0"]; +z0xfffff8010ec89200 -> z0xfffff8010ecf8700; +z0xfffff800043dad00 [shape=box,label="DISK\ncd0\nr#1"]; +z0xfffff800043dac00 [shape=hexagon,label="cd0\nr0w0e0\nerr#0"]; +z0xfffff800043dac00 -> z0xfffff800043dad00; +z0xfffff80004520400 [shape=box,label="DISK\nada2\nr#1"]; +z0xfffff80004520000 [shape=hexagon,label="ada2\nr1w1e2\nerr#0"]; +z0xfffff80004520000 -> z0xfffff80004520400; +z0xfffff80004522900 [shape=box,label="DISK\nada1\nr#1"]; +z0xfffff80004522800 [shape=hexagon,label="ada1\nr4w4e7\nerr#0"]; +z0xfffff80004522800 -> z0xfffff80004522900; +z0xfffff80004522c00 [shape=box,label="DISK\nada0\nr#1"]; +z0xfffff80004522b00 [shape=hexagon,label="ada0\nr0w0e0\nerr#0"]; +z0xfffff80004522b00 -> z0xfffff80004522c00; +z0xfffff8010ec8a600 [shape=box,label="DEV\nmsdosfs/NO_NAME\nr#4"]; +z0xfffff8010e08a580 [label="r0w0e0"]; +z0xfffff8010e08a580 -> z0xfffff8010ecf8c00; +z0xfffff8010ec8a600 -> z0xfffff8010e08a580; +z0xfffff8010ee04c00 [shape=box,label="DEV\nda1\nr#2"]; +z0xfffff800859a9e00 [label="r0w0e0"]; +z0xfffff800859a9e00 -> z0xfffff8010ed99700; +z0xfffff8010ee04c00 -> z0xfffff800859a9e00; +z0xfffff8010ef0bb00 [shape=box,label="DEV\nda0s1\nr#3"]; +z0xfffff800853c1080 [label="r0w0e0"]; +z0xfffff800853c1080 -> z0xfffff8010ef14500; +z0xfffff8010ef0bb00 -> z0xfffff800853c1080; +z0xfffff8010ec82c00 [shape=box,label="DEV\nda0\nr#2"]; +z0xfffff8010ef1e580 [label="r0w0e0"]; +z0xfffff8010ef1e580 -> z0xfffff8010ec89200; +z0xfffff8010ec82c00 -> z0xfffff8010ef1e580; +z0xfffff800045bed00 [shape=box,label="DEV\nada2p1\nr#3"]; +z0xfffff800045dc580 [label="r0w0e0"]; +z0xfffff800045dc580 -> z0xfffff800045bea00; +z0xfffff800045bed00 -> z0xfffff800045dc580; +z0xfffff800045c1800 [shape=box,label="DEV\ngptid/d4d0af71-4f14-11e3-a99e-002215734f17\nr#4"]; +z0xfffff8000452d080 [label="r0w0e0"]; +z0xfffff8000452d080 -> z0xfffff800045c1500; +z0xfffff800045c1800 -> z0xfffff8000452d080; +z0xfffff800043da700 [shape=box,label="DEV\ndiskid/DISK-5MS02EWGs2\nr#4"]; +z0xfffff8000452d180 [label="r0w0e0"]; +z0xfffff8000452d180 -> z0xfffff800043da600; +z0xfffff800043da700 -> z0xfffff8000452d180; +z0xfffff8000457e500 [shape=box,label="DEV\ndiskid/DISK-5MS02EWGs1\nr#4"]; +z0xfffff8000452d280 [label="r0w0e0"]; +z0xfffff8000452d280 -> z0xfffff800043da800; +z0xfffff8000457e500 -> z0xfffff8000452d280; +z0xfffff800043dab00 [shape=box,label="DEV\nntfs/System%20Reserved\nr#4"]; +z0xfffff8000452d380 [label="r0w0e0"]; +z0xfffff8000452d380 -> z0xfffff8000457e600; +z0xfffff800043dab00 -> z0xfffff8000452d380; +z0xfffff800043dae00 [shape=box,label="DEV\ncd0\nr#2"]; +z0xfffff8000452d480 [label="r0w0e0"]; +z0xfffff8000452d480 -> z0xfffff800043dac00; +z0xfffff800043dae00 -> z0xfffff8000452d480; +z0xfffff80004520100 [shape=box,label="DEV\nada2\nr#2"]; +z0xfffff8000452d600 [label="r0w0e0"]; +z0xfffff8000452d600 -> z0xfffff80004520000; +z0xfffff80004520100 -> z0xfffff8000452d600; +z0xfffff80004520700 [shape=box,label="DEV\nada1p5\nr#3"]; +z0xfffff8000452da80 [label="r0w0e0"]; +z0xfffff8000452da80 -> z0xfffff80004520600; +z0xfffff80004520700 -> z0xfffff8000452da80; +z0xfffff80004520900 [shape=box,label="DEV\nada1p4\nr#3"]; +z0xfffff8000452dc00 [label="r0w0e0"]; +z0xfffff8000452dc00 -> z0xfffff80004520800; +z0xfffff80004520900 -> z0xfffff8000452dc00; +z0xfffff80004520b00 [shape=box,label="DEV\nada1p3\nr#3"]; +z0xfffff8000452dd00 [label="r0w0e0"]; +z0xfffff8000452dd00 -> z0xfffff80004520a00; +z0xfffff80004520b00 -> z0xfffff8000452dd00; +z0xfffff80004520d00 [shape=box,label="DEV\nada1p2\nr#3"]; +z0xfffff8000452de00 [label="r0w0e0"]; +z0xfffff8000452de00 -> z0xfffff80004520c00; +z0xfffff80004520d00 -> z0xfffff8000452de00; +z0xfffff80004521500 [shape=box,label="DEV\nada1p1\nr#3"]; +z0xfffff8000452de80 [label="r0w0e0"]; +z0xfffff8000452de80 -> z0xfffff80004520e00; +z0xfffff80004521500 -> z0xfffff8000452de80; +z0xfffff80004521900 [shape=box,label="DEV\ndiskid/DISK-5MS02EWG\nr#3"]; +z0xfffff800045ae700 [label="r0w0e0"]; +z0xfffff800045ae700 -> z0xfffff80004521600; +z0xfffff80004521900 -> z0xfffff800045ae700; +z0xfffff80004521b00 [shape=box,label="DEV\nada0s2\nr#3"]; +z0xfffff8000458a680 [label="r0w0e0"]; +z0xfffff8000458a680 -> z0xfffff80004521a00; +z0xfffff80004521b00 -> z0xfffff8000458a680; +z0xfffff80004521d00 [shape=box,label="DEV\nada0s1\nr#3"]; +z0xfffff8000452f100 [label="r0w0e0"]; +z0xfffff8000452f100 -> z0xfffff80004521c00; +z0xfffff80004521d00 -> z0xfffff8000452f100; +z0xfffff80004522a00 [shape=box,label="DEV\nada1\nr#2"]; +z0xfffff8000452f580 [label="r0w0e0"]; +z0xfffff8000452f580 -> z0xfffff80004522800; +z0xfffff80004522a00 -> z0xfffff8000452f580; +z0xfffff80004522e00 [shape=box,label="DEV\nada0\nr#2"]; +z0xfffff8000441f900 [label="r0w0e0"]; +z0xfffff8000441f900 -> z0xfffff80004522b00; +z0xfffff80004522e00 -> z0xfffff8000441f900; +z0xfffff80085fc4800 [shape=box,label="PART\nda0\nr#2"]; +z0xfffff8010ef1e980 [label="r0w0e0"]; +z0xfffff8010ef1e980 -> z0xfffff8010ec89200; +z0xfffff80085fc4800 -> z0xfffff8010ef1e980; +z0xfffff8010ef14500 [shape=hexagon,label="da0s1\nr0w0e0\nerr#0"]; +z0xfffff8010ef14500 -> z0xfffff80085fc4800; +z0xfffff800045bec00 [shape=box,label="PART\nada2\nr#2"]; +z0xfffff8000452d580 [label="r1w1e2"]; +z0xfffff8000452d580 -> z0xfffff80004520000; +z0xfffff800045bec00 -> z0xfffff8000452d580; +z0xfffff800045bea00 [shape=hexagon,label="ada2p1\nr1w1e1\nerr#0"]; +z0xfffff800045bea00 -> z0xfffff800045bec00; +z0xfffff800043da900 [shape=box,label="PART\ndiskid/DISK-5MS02EWG\nr#3"]; +z0xfffff8000452e080 [label="r0w0e0"]; +z0xfffff8000452e080 -> z0xfffff80004521600; +z0xfffff800043da900 -> z0xfffff8000452e080; +z0xfffff800043da600 [shape=hexagon,label="diskid/DISK-5MS02EWGs2\nr0w0e0\nerr#0"]; +z0xfffff800043da600 -> z0xfffff800043da900; +z0xfffff800043da800 [shape=hexagon,label="diskid/DISK-5MS02EWGs1\nr0w0e0\nerr#0"]; +z0xfffff800043da800 -> z0xfffff800043da900; +z0xfffff80004521800 [shape=box,label="PART\nada1\nr#2"]; +z0xfffff8000452f480 [label="r4w4e7"]; +z0xfffff8000452f480 -> z0xfffff80004522800; +z0xfffff80004521800 -> z0xfffff8000452f480; +z0xfffff80004520600 [shape=hexagon,label="ada1p5\nr1w1e1\nerr#0"]; +z0xfffff80004520600 -> z0xfffff80004521800; +z0xfffff80004520800 [shape=hexagon,label="ada1p4\nr1w1e1\nerr#0"]; +z0xfffff80004520800 -> z0xfffff80004521800; +z0xfffff80004520a00 [shape=hexagon,label="ada1p3\nr1w1e1\nerr#0"]; +z0xfffff80004520a00 -> z0xfffff80004521800; +z0xfffff80004520c00 [shape=hexagon,label="ada1p2\nr1w1e0\nerr#0"]; +z0xfffff80004520c00 -> z0xfffff80004521800; +z0xfffff80004520e00 [shape=hexagon,label="ada1p1\nr0w0e0\nerr#0"]; +z0xfffff80004520e00 -> z0xfffff80004521800; +z0xfffff80004522600 [shape=box,label="PART\nada0\nr#2"]; +z0xfffff8000441f880 [label="r0w0e0"]; +z0xfffff8000441f880 -> z0xfffff80004522b00; +z0xfffff80004522600 -> z0xfffff8000441f880; +z0xfffff80004521a00 [shape=hexagon,label="ada0s2\nr0w0e0\nerr#0"]; +z0xfffff80004521a00 -> z0xfffff80004522600; +z0xfffff80004521c00 [shape=hexagon,label="ada0s1\nr0w0e0\nerr#0"]; +z0xfffff80004521c00 -> z0xfffff80004522600; +z0xfffff80004ff6c00 [shape=box,label="LABEL\nda0s1\nr#3"]; +z0xfffff8010e0b3a00 [label="r0w0e0"]; +z0xfffff8010e0b3a00 -> z0xfffff8010ef14500; +z0xfffff80004ff6c00 -> z0xfffff8010e0b3a00; +z0xfffff8010ecf8c00 [shape=hexagon,label="msdosfs/NO_NAME\nr0w0e0\nerr#0"]; +z0xfffff8010ecf8c00 -> z0xfffff80004ff6c00; +z0xfffff800045c1600 [shape=box,label="LABEL\nada1p1\nr#3"]; +z0xfffff8000452dd80 [label="r0w0e0"]; +z0xfffff8000452dd80 -> z0xfffff80004520e00; +z0xfffff800045c1600 -> z0xfffff8000452dd80; +z0xfffff800045c1500 [shape=hexagon,label="gptid/d4d0af71-4f14-11e3-a99e-002215734f17\nr0w0e0\nerr#0"]; +z0xfffff800045c1500 -> z0xfffff800045c1600; +z0xfffff8000457e700 [shape=box,label="LABEL\nada0s1\nr#3"]; +z0xfffff8000452f000 [label="r0w0e0"]; +z0xfffff8000452f000 -> z0xfffff80004521c00; +z0xfffff8000457e700 -> z0xfffff8000452f000; +z0xfffff8000457e600 [shape=hexagon,label="ntfs/System%20Reserved\nr0w0e0\nerr#0"]; +z0xfffff8000457e600 -> z0xfffff8000457e700; +z0xfffff80004521700 [shape=box,label="LABEL\nada0\nr#2"]; +z0xfffff8000452f500 [label="r0w0e0"]; +z0xfffff8000452f500 -> z0xfffff80004522b00; +z0xfffff80004521700 -> z0xfffff8000452f500; +z0xfffff80004521600 [shape=hexagon,label="diskid/DISK-5MS02EWG\nr0w0e0\nerr#0"]; +z0xfffff80004521600 -> z0xfffff80004521700; +} + Added: user/glebius/course/08.io2/kern.geom.conf.png ============================================================================== Binary file. No diff available. Added: user/glebius/course/08.io2/kern.geom.conf.xml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/glebius/course/08.io2/kern.geom.conf.xml Wed Nov 27 06:54:29 2013 (r258674) @@ -0,0 +1,860 @@ + + + FD + + + VFS + + + ffs.ada2p1 + 3 + + + + r1w1e1 + + + + + ffs.ada1p4 + 3 + + + + r1w1e1 + + + + + ffs.ada1p3 + 3 + + + + r1w1e1 + + + + + ffs.ada1p5 + 3 + + + + r1w1e1 + + + + + SWAP + + + swap + 3 + + + + r1w1e0 + + + + + DISK + + + da1 + 1 + + + + + r0w0e0 + da1 + 62914560 + 512 + 0 + 0 + + 64 + 32 + + MEDIATEK FLASH DISK + + + + + + da0 + 1 + + + + + r0w0e0 + da0 + 15931539456 + 512 + 0 + 0 + + 255 + 63 + + MEDIATEK FLASH DISK + + + + + + cd0 + 1 + + + + + r0w0e0 + cd0 + 0 + 2048 + 0 + 0 + + 0 + 0 + + TEAC DV-W518GM + + + + + + ada2 + 1 + + + + + r1w1e2 + ada2 + 1000204886016 + 512 + 0 + 0 + + 16 + 63 + 9QJ10GCN + 5000c5000d425c24 + ST31000340NS + + + + + + ada1 + 1 + + + + + r4w4e7 + ada1 + 80026361856 + 512 + 0 + 0 + + 16 + 63 + 5JV9KQLH + ST380013AS + + + + + + ada0 + 1 + + + + + r0w0e0 + ada0 + 120034123776 + 512 + 0 + 0 + + 16 + 63 + 5MS02EWG + ST3120827AS + + + + + + DEV + + + msdosfs/NO_NAME + 4 + + + + r0w0e0 + + + + + da1 + 2 + + + + r0w0e0 + + + + + da0s1 + 3 + + + + r0w0e0 + + + + + da0 + 2 + + + + r0w0e0 + + + + + ada2p1 + 3 + + + + r0w0e0 + + + + + gptid/d4d0af71-4f14-11e3-a99e-002215734f17 + 4 + + + + r0w0e0 + + + + + diskid/DISK-5MS02EWGs2 + 4 + + + + r0w0e0 + + + + + diskid/DISK-5MS02EWGs1 + 4 + + + + r0w0e0 + + + + + ntfs/System%20Reserved + 4 + + + + r0w0e0 + + + + + cd0 + 2 + + + + r0w0e0 + + + + + ada2 + 2 + + + + r0w0e0 + + + + + ada1p5 + 3 + + + + r0w0e0 + + + + + ada1p4 + 3 + + + + r0w0e0 + + + + + ada1p3 + 3 + + + + r0w0e0 + + + + + ada1p2 + 3 + + + + r0w0e0 + + + + + ada1p1 + 3 + + + + r0w0e0 + + + + + diskid/DISK-5MS02EWG + 3 + + + + r0w0e0 + + + + + ada0s2 + 3 + + + + r0w0e0 + + + + + ada0s1 + 3 + + + + r0w0e0 + + + + + ada1 + 2 + + + + r0w0e0 + + + + + ada0 + 2 + + + + r0w0e0 + + + + + PART + + + da0 + 2 + + MBR + 4 + 63 + 31116287 + 63 + 255 + OK + false + + + + + r0w0e0 + + + + + + r0w0e0 + da0s1 + 15927345152 + 512 + 0 + 4194304 + + 8192 + 31116287 + 1 + !12 + 4194304 + 15927345152 + 12 + + + + + + ada2 + 2 + + GPT + 128 + 34 + 1953525134 + 63 + 16 + OK + false + + + + + r1w1e2 + + + + + + r1w1e1 + ada2p1 + 1000204851712 + 512 + 0 + 17408 + + 34 + 1953525134 + 1 + freebsd-ufs + 17408 + 1000204851712 + + 516e7cb6-6ecf-11d6-8ff8-00022d09712b + aeb923e7-5b68-11de-9b01-002215734f17 + + + + + + diskid/DISK-5MS02EWG + 3 + + MBR + 4 + 63 + 234441647 + 63 + 16 + OK + false + + + + + r0w0e0 + + + + + + r0w0e0 + diskid/DISK-5MS02EWGs2 + 119664541696 + 512 + 0 + 368050176 + + 718848 + 234438655 + 2 + ntfs + 368050176 + 119664541696 + 7 + + + + + r0w0e0 + diskid/DISK-5MS02EWGs1 + 367001600 + 512 + 0 + 1048576 + + 2048 + 718847 + 1 + ntfs + 1048576 + 367001600 + 7 + active + + + + + + ada1 + 2 + + GPT + 128 + 34 + 156301454 + 63 + 16 + OK + false + + + + + r4w4e7 + + + + + + r1w1e1 + ada1p5 + 2147436544 + 512 + 0 + 64512 + + 126 + 4194337 + 5 + freebsd-ufs + 64512 + 2147436544 + + bootme + 516e7cb6-6ecf-11d6-8ff8-00022d09712b + dde64000-4f14-11e3-a99e-002215734f17 + + + + + r1w1e1 + ada1p4 + 69288909312 + 512 + 0 + 2147501056 + + 20971554 + 156301454 + 4 + freebsd-ufs + 10737435648 + 69288909312 + + 516e7cb6-6ecf-11d6-8ff8-00022d09712b + f2debecc-4e91-11e3-9a26-002215734f17 + + + + + r1w1e1 + ada1p3 + 4294967296 + 512 + 0 + 2147501056 + + 12582946 + 20971553 + 3 + freebsd-ufs + 6442468352 + 4294967296 + + 516e7cb6-6ecf-11d6-8ff8-00022d09712b + ebe8528e-4e91-11e3-9a26-002215734f17 + + + + + r1w1e0 + ada1p2 + 4294967296 + 512 + 0 + 2147501056 + + 4194338 + 12582945 + 2 + freebsd-swap + 2147501056 + 4294967296 + + 516e7cb5-6ecf-11d6-8ff8-00022d09712b + de5224ef-4e91-11e3-9a26-002215734f17 + + + + + r0w0e0 + ada1p1 + 47104 + 512 + 0 + 17408 + + 34 + 125 + 1 + freebsd-boot + 17408 + 47104 + + 83bd6b9d-7f41-11dc-be0b-001560b84f0f + d4d0af71-4f14-11e3-a99e-002215734f17 + + + + + + ada0 + 2 + + MBR + 4 + 63 + 234441647 + 63 + 16 + OK + false + + + + + r0w0e0 + + + + + + r0w0e0 + ada0s2 + 119664541696 + 512 + 0 + 368050176 + + 718848 + 234438655 + 2 + ntfs + 368050176 + 119664541696 + 7 + + + + + r0w0e0 + ada0s1 + 367001600 + 512 + 0 + 1048576 + + 2048 + 718847 + 1 + ntfs + 1048576 + 367001600 + 7 + active + + + + + + LABEL + + + da0s1 + 3 + + + + + + r0w0e0 + + + + + + r0w0e0 + msdosfs/NO_NAME + 15927345152 + 512 + 0 + 4194304 + + 0 + 15927345152 + 31108096 + 0 + 0 + + + + + + ada1p1 + 3 + + + + + + r0w0e0 + + + + + + r0w0e0 + gptid/d4d0af71-4f14-11e3-a99e-002215734f17 + 47104 + 512 + 0 + 17408 + + 0 + 47104 + 92 + 0 + 0 + + + + + + ada0s1 + 3 + + *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@FreeBSD.ORG Wed Nov 27 12:27:52 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 ESMTPS id 39AB2D7C; Wed, 27 Nov 2013 12:27:52 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2983E2CAF; Wed, 27 Nov 2013 12:27:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rARCRqRY056397; Wed, 27 Nov 2013 12:27:52 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rARCRqSv056396; Wed, 27 Nov 2013 12:27:52 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201311271227.rARCRqSv056396@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Wed, 27 Nov 2013 12:27:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258680 - user/ae/inet6/sys/netinet6 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.16 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: Wed, 27 Nov 2013 12:27:52 -0000 Author: ae Date: Wed Nov 27 12:27:51 2013 New Revision: 258680 URL: http://svnweb.freebsd.org/changeset/base/258680 Log: Fix a typo. Reported by: melifaro Modified: user/ae/inet6/sys/netinet6/in6_pcb.c Modified: user/ae/inet6/sys/netinet6/in6_pcb.c ============================================================================== --- user/ae/inet6/sys/netinet6/in6_pcb.c Wed Nov 27 12:17:05 2013 (r258679) +++ user/ae/inet6/sys/netinet6/in6_pcb.c Wed Nov 27 12:27:51 2013 (r258680) @@ -161,7 +161,7 @@ in6_pcbbind(struct inpcb *inp, struct so ifa = in6ifa_ifwithaddr(&sin6->sin6_addr, sin6->sin6_scope_id); - if (ifa != NULL && + if (ifa == NULL && (inp->inp_flags & INP_BINDANY) == 0) { return (EADDRNOTAVAIL); } From owner-svn-src-user@FreeBSD.ORG Wed Nov 27 13:46: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 ESMTPS id B3AB0632; Wed, 27 Nov 2013 13:46: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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A3B71213C; Wed, 27 Nov 2013 13:46:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rARDkB1G083136; Wed, 27 Nov 2013 13:46:11 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rARDkB0R083135; Wed, 27 Nov 2013 13:46:11 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201311271346.rARDkB0R083135@svn.freebsd.org> From: Gleb Smirnoff Date: Wed, 27 Nov 2013 13:46:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258681 - user/glebius/course/08.io2 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.16 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: Wed, 27 Nov 2013 13:46:11 -0000 Author: glebius Date: Wed Nov 27 13:46:11 2013 New Revision: 258681 URL: http://svnweb.freebsd.org/changeset/base/258681 Log: More on geom. Modified: user/glebius/course/08.io2/lection.tex Modified: user/glebius/course/08.io2/lection.tex ============================================================================== --- user/glebius/course/08.io2/lection.tex Wed Nov 27 12:27:51 2013 (r258680) +++ user/glebius/course/08.io2/lection.tex Wed Nov 27 13:46:11 2013 (r258681) @@ -137,7 +137,7 @@ both threads return. \item{access(), spoiled()} } \onslide <2-> { - \item{strategy(struct bio *) + \item{start(struct bio *) \begin{itemize} \item{BIO\_READ} \item{BIO\_WRITE} @@ -249,10 +249,10 @@ Who said that mirror can be built only o text width = 20ex, node distance = 3mm } ] \only <1> { - \node [name=top] { mirror\\ mediasize = 200 Gb }; + \node [name=top] { mirror\\ mediasize = 100 Gb }; } \only <2-> { - \node [name=top] { stripe\\ mediasize = 100 Gb }; + \node [name=top] { stripe\\ mediasize = 200 Gb }; } \onslide <1-2> { \node [name=ada0, below left=of top.south] @@ -342,7 +342,7 @@ Who said that mirror can be built only o text width = 10ex, node distance = 3mm } ] \node [name=top, text width = 40ex] - { mirror\\ rank = max(rank of consumers) = 2 }; + { mirror\\ rank = max(rank of consumers) + 1 = 2 }; \node [name=ada0, below left=of top.south] { ada0\\ rank = 1 }; \node [name=ada1, below right=of top.south] @@ -362,7 +362,178 @@ Who said that mirror can be built only o \textbf{configuration} - manual request for a given class to instantiate itself, with certain parameters. } +\onslide <2-> { + \item { + \textbf{tasting} + \begin{itemize} + \item { Whenever a new class is loaded, it \emph{tastes} all + geoms, and if finds appropriate ones, instantiates itself. } +\onslide <3-> { + \item { Whenever a new geom is instantiated, all available classes + \emph{taste} its provider, and if any finds it appropriate, + instantiates itself. } +} + \end{itemize} + } +} +\onslide <4-> { + \item { + \textbf{orphanization} - removal of a provider. + \begin{itemize} +\onslide <5-> { + \item { Passing I/O requests below this provider is stopped. } +} +\onslide <6-> { + \item { Orphanization announce recursively goes to all above consumers. } +} +\onslide <7-> { + \item { Geom makes decision on autoremoval. } +} + \end{itemize} + } +} +\onslide <8-> { + \item { + \textbf{spoiling} - orphanization due to metadata change. + } +} +\end{itemize} +\end{frame} + + +\FootReferences{geom(9)}{sys/geom/geom\_subr.c} +\begin{frame} +\frametitle{GEOM in threads} +\begin{itemize} +\onslide <1-> { + \item { + \textbf{g\_event} thread + \begin{itemize} + \item { configuration } + \item { tasting } + \item { orphanisation } + \item { spoiling } + \end{itemize} + } +} +\onslide <2-> { + \item { \textbf{g\_down} thread - I/O submission } + \item { \textbf{g\_up} thread - I/O completion } +} +\onslide <3-> { + \item { GEOM direct dispatch } + \begin{itemize} + \item { syscall thread goes into GEOM instead of g\_down } + \item { interrupt thread goes up into GEOM instead of g\_up } + \end{itemize} +} \end{itemize} \end{frame} + +\FootReferences{}{sys/sys/bio.h, sys/geom/geom\_io.c} +\begin{frame}[fragile] +\frametitle{passing I/O through GEOM} +\small\begin{verbatim} +struct bio { + uint8_t bio_cmd; /* I/O operation. */ + uint8_t bio_flags; /* General flags. */ + + off_t bio_offset; /* Offset into file. */ + off_t bio_length; /* Like bio_bcount */ + + caddr_t bio_data; /* Memory, superblocks, indirect etc. */ + struct vm_page **bio_ma; /* Or unmapped. */ + int bio_ma_n; /* Number of pages in bio_ma. */ + + struct bio *bio_parent; /* Pointer to parent */ + u_int bio_children; /* Number of spawned bios */ + u_int bio_inbed; /* Children safely home by now */ + + void (*bio_done)(struct bio *); +} +\end{verbatim} +\end{frame} + + +\FootReferences{}{sys/sys/bio.h, sys/geom/geom\_subr.c} +\begin{frame}[fragile] +\frametitle{passing I/O through GEOM} +Typical g\_class\_start() operation: +\small\begin{verbatim} +void +g_class_start(struct bio* bio) { + struct bio *mybio; + + mybio = g_clone_bio(bio); + /* setup mybio */ + /* choose consumer */ + g_io_request(mybio, consumer); +} +\end{verbatim} +\end{frame} + + +\FootReferences{}{sys/sys/bio.h, sys/geom/geom\_subr.c} +\begin{frame}[fragile] +\frametitle{passing I/O through GEOM} +Standard bio\_done method g\_std\_done: +\small\begin{verbatim} +void +g_std_done(struct bio *bp) +{ + struct bio *bp2; + + bp2 = bp->bio_parent; + if (bp2->bio_error == 0) + bp2->bio_error = bp->bio_error; + bp2->bio_completed += bp->bio_completed; + g_destroy_bio(bp); + bp2->bio_inbed++; + if (bp2->bio_children == bp2->bio_inbed) + g_io_deliver(bp2, bp2->bio_error); +} +\end{verbatim} +\end{frame} + + +\FootReferences{}{sys/geom/geom.h, sys/geom/nop/geom\_nop.c} +\begin{frame}[fragile] +\frametitle{a minimal GEOM class} +\small\begin{verbatim} +struct g_class { + const char *name; + u_int version; + g_taste_t *taste; + g_config_t *config; + g_ctl_destroy_geom_t *destroy_geom; + ... +} +\end{verbatim} +\end{frame} + + +\FootReferences{}{sys/geom/geom.h, sys/geom/nop/geom\_nop.c} +\begin{frame}[fragile] +\frametitle{a minimal GEOM class} +\small\begin{verbatim} +struct g_geom { + char *name; + struct g_class *class; + LIST_HEAD(,g_consumer) consumer; + LIST_HEAD(,g_provider) provider; + int rank; + g_start_t *start; + g_spoiled_t *spoiled; + g_attrchanged_t *attrchanged; + g_dumpconf_t *dumpconf; + g_access_t *access; + g_orphan_t *orphan; + g_ioctl_t *ioctl; + g_provgone_t *providergone; + g_resize_t *resize; +} +\end{verbatim} +\end{frame} + \end{document} From owner-svn-src-user@FreeBSD.ORG Thu Nov 28 05:44:47 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0329493B; Thu, 28 Nov 2013 05:44:47 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D7FC015CA; Thu, 28 Nov 2013 05:44:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAS5ikxs090367; Thu, 28 Nov 2013 05:44:46 GMT (envelope-from lwhsu@svn.freebsd.org) Received: (from lwhsu@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAS5ijj9090352; Thu, 28 Nov 2013 05:44:45 GMT (envelope-from lwhsu@svn.freebsd.org) Message-Id: <201311280544.rAS5ijj9090352@svn.freebsd.org> From: Li-Wen Hsu Date: Thu, 28 Nov 2013 05:44:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258701 - in user/glebius/course: . 01.intro 02.entering_kernel 03.processes&threads 04.synchronisation 05.memory 06.filedesc 07.io 08.io2 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.16 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, 28 Nov 2013 05:44:47 -0000 Author: lwhsu (ports committer) Date: Thu Nov 28 05:44:44 2013 New Revision: 258701 URL: http://svnweb.freebsd.org/changeset/base/258701 Log: - Use for-loop to reduce duplicated code - Use dependency instead of directly invoking make on other target Approved by: glebius Modified: user/glebius/course/01.intro/Makefile user/glebius/course/02.entering_kernel/Makefile user/glebius/course/03.processes&threads/Makefile user/glebius/course/04.synchronisation/Makefile user/glebius/course/05.memory/Makefile user/glebius/course/06.filedesc/Makefile user/glebius/course/07.io/Makefile user/glebius/course/08.io2/Makefile user/glebius/course/Makefile Modified: user/glebius/course/01.intro/Makefile ============================================================================== --- user/glebius/course/01.intro/Makefile Wed Nov 27 23:26:54 2013 (r258700) +++ user/glebius/course/01.intro/Makefile Thu Nov 28 05:44:44 2013 (r258701) @@ -12,6 +12,5 @@ TMP= $(NAME).aux $(NAME).log $(NAME).nav clean: rm -f -- $(TMP) texput.log -cleanall: - make clean +cleanall: clean rm -f $(NAME).pdf Modified: user/glebius/course/02.entering_kernel/Makefile ============================================================================== --- user/glebius/course/02.entering_kernel/Makefile Wed Nov 27 23:26:54 2013 (r258700) +++ user/glebius/course/02.entering_kernel/Makefile Thu Nov 28 05:44:44 2013 (r258701) @@ -12,6 +12,5 @@ TMP= $(NAME).aux $(NAME).log $(NAME).nav clean: rm -f -- $(TMP) texput.log -cleanall: - make clean +cleanall: clean rm -f $(NAME).pdf Modified: user/glebius/course/03.processes&threads/Makefile ============================================================================== --- user/glebius/course/03.processes&threads/Makefile Wed Nov 27 23:26:54 2013 (r258700) +++ user/glebius/course/03.processes&threads/Makefile Thu Nov 28 05:44:44 2013 (r258701) @@ -12,6 +12,5 @@ TMP= $(NAME).aux $(NAME).log $(NAME).nav clean: rm -f -- $(TMP) texput.log -cleanall: - make clean +cleanall: clean rm -f $(NAME).pdf Modified: user/glebius/course/04.synchronisation/Makefile ============================================================================== --- user/glebius/course/04.synchronisation/Makefile Wed Nov 27 23:26:54 2013 (r258700) +++ user/glebius/course/04.synchronisation/Makefile Thu Nov 28 05:44:44 2013 (r258701) @@ -12,6 +12,5 @@ TMP= $(NAME).aux $(NAME).log $(NAME).nav clean: rm -f -- $(TMP) texput.log -cleanall: - make clean +cleanall: clean rm -f $(NAME).pdf Modified: user/glebius/course/05.memory/Makefile ============================================================================== --- user/glebius/course/05.memory/Makefile Wed Nov 27 23:26:54 2013 (r258700) +++ user/glebius/course/05.memory/Makefile Thu Nov 28 05:44:44 2013 (r258701) @@ -12,6 +12,5 @@ TMP= $(NAME).aux $(NAME).log $(NAME).nav clean: rm -f -- $(TMP) texput.log -cleanall: - make clean +cleanall: clean rm -f $(NAME).pdf Modified: user/glebius/course/06.filedesc/Makefile ============================================================================== --- user/glebius/course/06.filedesc/Makefile Wed Nov 27 23:26:54 2013 (r258700) +++ user/glebius/course/06.filedesc/Makefile Thu Nov 28 05:44:44 2013 (r258701) @@ -12,6 +12,5 @@ TMP= $(NAME).aux $(NAME).log $(NAME).nav clean: rm -f -- $(TMP) texput.log -cleanall: - make clean +cleanall: clean rm -f $(NAME).pdf Modified: user/glebius/course/07.io/Makefile ============================================================================== --- user/glebius/course/07.io/Makefile Wed Nov 27 23:26:54 2013 (r258700) +++ user/glebius/course/07.io/Makefile Thu Nov 28 05:44:44 2013 (r258701) @@ -12,6 +12,5 @@ TMP= $(NAME).aux $(NAME).log $(NAME).nav clean: rm -f -- $(TMP) texput.log -cleanall: - make clean +cleanall: clean rm -f $(NAME).pdf Modified: user/glebius/course/08.io2/Makefile ============================================================================== --- user/glebius/course/08.io2/Makefile Wed Nov 27 23:26:54 2013 (r258700) +++ user/glebius/course/08.io2/Makefile Thu Nov 28 05:44:44 2013 (r258701) @@ -12,6 +12,5 @@ TMP= $(NAME).aux $(NAME).log $(NAME).nav clean: rm -f -- $(TMP) texput.log -cleanall: - make clean +cleanall: clean rm -f $(NAME).pdf Modified: user/glebius/course/Makefile ============================================================================== --- user/glebius/course/Makefile Wed Nov 27 23:26:54 2013 (r258700) +++ user/glebius/course/Makefile Thu Nov 28 05:44:44 2013 (r258701) @@ -1,35 +1,37 @@ -ALL: build +LECTURES= 01.intro \ + 02.entering_kernel \ + 03.processes\&threads \ + 04.synchronisation \ + 05.memory \ + 06.filedesc \ + 07.io \ + 08.io2 + +.MAIN: build build: @echo "Building individual chapters..." - cd 01.intro; make - cd 02.entering_kernel; make - cd 03.processes\&threads; make - cd 04.synchronisation; make - cd 05.memory; make + @for l in ${LECTURES}; do \ + cd $${l}; make; cd -; \ + done course: @echo "Creating combined pdf..." - pdfjoin 01.intro/lection.pdf \ - 02.entering_kernel/lection.pdf \ - 03.processes\&threads/lection.pdf \ - 04.synchronisation/lection.pdf \ - 05.memory/lection.pdf \ - -o course.pdf + @PDFS=""; \ + for l in ${LECTURES}; do \ + PDFS="$${PDFS} $${l}/lection.pdf"; \ + done; \ + pdfjoin $${PDFS} -o course.pdf clean: @echo "Cleanup temp files..." - cd 01.intro; make clean - cd 02.entering_kernel; make clean - cd 03.processes\&threads; make clean - cd 04.synchronisation; make clean - cd 05.memory; make clean + @for l in ${LECTURES}; do \ + cd $${l}; make ${.TARGET}; cd -; \ + done cleanall: @echo "Cleanup all files..." - cd 01.intro; make cleanall - cd 02.entering_kernel; make cleanall - cd 03.processes\&threads; make cleanall - cd 04.synchronisation; make cleanall - cd 05.memory; make cleanall + @for l in ${LECTURES}; do \ + cd $${l}; make ${.TARGET}; cd -; \ + done rm -f course.pdf From owner-svn-src-user@FreeBSD.ORG Thu Nov 28 07:09:59 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 88EAE439; Thu, 28 Nov 2013 07:09:59 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5C1991989; Thu, 28 Nov 2013 07:09:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAS79xES018042; Thu, 28 Nov 2013 07:09:59 GMT (envelope-from lwhsu@svn.freebsd.org) Received: (from lwhsu@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAS79xn4018041; Thu, 28 Nov 2013 07:09:59 GMT (envelope-from lwhsu@svn.freebsd.org) Message-Id: <201311280709.rAS79xn4018041@svn.freebsd.org> From: Li-Wen Hsu Date: Thu, 28 Nov 2013 07:09:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258703 - user/glebius/course/01.intro/img 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.16 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, 28 Nov 2013 07:09:59 -0000 Author: lwhsu (ports committer) Date: Thu Nov 28 07:09:58 2013 New Revision: 258703 URL: http://svnweb.freebsd.org/changeset/base/258703 Log: Yahoo has changed to a new logo Approved by: glebius Modified: user/glebius/course/01.intro/img/yahoo.png Modified: user/glebius/course/01.intro/img/yahoo.png ============================================================================== Binary file (source and/or target). No diff available. From owner-svn-src-user@FreeBSD.ORG Thu Nov 28 13:15:05 2013 Return-Path: Delivered-To: svn-src-user@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4F8DBE01; Thu, 28 Nov 2013 13:15:05 +0000 (UTC) Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140]) by mx1.freebsd.org (Postfix) with ESMTP id 400F31D63; Thu, 28 Nov 2013 13:15:03 +0000 (UTC) Received: from porto.starpoint.kiev.ua (porto-e.starpoint.kiev.ua [212.40.38.100]) by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id PAA24292; Thu, 28 Nov 2013 15:15:02 +0200 (EET) (envelope-from avg@FreeBSD.org) Received: from localhost ([127.0.0.1]) by porto.starpoint.kiev.ua with esmtp (Exim 4.34 (FreeBSD)) id 1Vm1Qr-0009wQ-NK; Thu, 28 Nov 2013 15:15:01 +0200 Message-ID: <529741CE.7040805@FreeBSD.org> Date: Thu, 28 Nov 2013 15:14:54 +0200 From: Andriy Gapon User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:24.0) Gecko/20100101 Thunderbird/24.1.0 MIME-Version: 1.0 To: Aleksandr Rybalko , src-committers@FreeBSD.org, svn-src-user@FreeBSD.org Subject: Re: svn commit: r257451 - in user/ed/newcons/sys/dev/drm2: . i915 radeon References: <201310311439.r9VEd5fh025537@svn.freebsd.org> In-Reply-To: <201310311439.r9VEd5fh025537@svn.freebsd.org> X-Enigmail-Version: 1.6 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.16 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, 28 Nov 2013 13:15:05 -0000 on 31/10/2013 16:39 Aleksandr Rybalko said the following: > Author: ray > Date: Thu Oct 31 14:39:04 2013 > New Revision: 257451 > URL: http://svnweb.freebsd.org/changeset/base/257451 > > Log: > Change drm2 to attach fbd as device. > Radeon driver not ready yet. > > Sponsored by: The FreeBSD Foundation > > Modified: > user/ed/newcons/sys/dev/drm2/drm_fb_helper.c > user/ed/newcons/sys/dev/drm2/i915/i915_drv.c > user/ed/newcons/sys/dev/drm2/radeon/radeon_drv.c > > Modified: user/ed/newcons/sys/dev/drm2/i915/i915_drv.c > ============================================================================== > --- user/ed/newcons/sys/dev/drm2/i915/i915_drv.c Thu Oct 31 14:11:14 2013 (r257450) > +++ user/ed/newcons/sys/dev/drm2/i915/i915_drv.c Thu Oct 31 14:39:04 2013 (r257451) > @@ -400,6 +421,10 @@ static device_method_t i915_methods[] = > DEVMETHOD(device_suspend, i915_suspend), > DEVMETHOD(device_resume, i915_resume), > DEVMETHOD(device_detach, drm_detach), > + > + /* Framebuffer service methods */ > + DEVMETHOD(fb_getinfo, i915_fb_helper_getinfo), > + > DEVMETHOD_END > }; > > > Modified: user/ed/newcons/sys/dev/drm2/radeon/radeon_drv.c > ============================================================================== > --- user/ed/newcons/sys/dev/drm2/radeon/radeon_drv.c Thu Oct 31 14:11:14 2013 (r257450) > +++ user/ed/newcons/sys/dev/drm2/radeon/radeon_drv.c Thu Oct 31 14:39:04 2013 (r257451) > @@ -495,6 +518,10 @@ static device_method_t radeon_methods[] > DEVMETHOD(device_suspend, radeon_suspend), > DEVMETHOD(device_resume, radeon_resume), > DEVMETHOD(device_detach, drm_detach), > + > + /* Framebuffer service methods */ > + DEVMETHOD(fb_getinfo, radeon_fb_helper_getinfo), > + > DEVMETHOD_END > }; It seems that this change these modules can not be loaded when a kernel is compiled with syscons rather than vt (newcons). The problem is that fb_getinfo_desc is undefined in that case. It is supposed to come from fb_if.m -> fb_if.c -> fb_if.o. Is this intentional? -- Andriy Gapon From owner-svn-src-user@FreeBSD.ORG Thu Nov 28 13:38:22 2013 Return-Path: Delivered-To: svn-src-user@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8149533D; Thu, 28 Nov 2013 13:38:22 +0000 (UTC) Received: from smtp.dlink.ua (smtp.dlink.ua [193.138.187.146]) by mx1.freebsd.org (Postfix) with ESMTP id 3772B1E79; Thu, 28 Nov 2013 13:38:21 +0000 (UTC) Received: from terran (unknown [192.168.99.1]) (Authenticated sender: ray) by smtp.dlink.ua (Postfix) with ESMTPA id 2C1C6C4930; Thu, 28 Nov 2013 15:38:15 +0200 (EET) Date: Thu, 28 Nov 2013 15:38:20 +0200 From: Aleksandr Rybalko To: Andriy Gapon Subject: Re: svn commit: r257451 - in user/ed/newcons/sys/dev/drm2: . i915 radeon Message-Id: <20131128153820.f611e65cb7214f478a9ebfe5@freebsd.org> In-Reply-To: <529741CE.7040805@FreeBSD.org> References: <201310311439.r9VEd5fh025537@svn.freebsd.org> <529741CE.7040805@FreeBSD.org> X-Mailer: Sylpheed 3.2.0 (GTK+ 2.24.6; amd64-portbld-freebsd9.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: Aleksandr Rybalko , src-committers@FreeBSD.org, svn-src-user@FreeBSD.org X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.16 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, 28 Nov 2013 13:38:22 -0000 On Thu, 28 Nov 2013 15:14:54 +0200 Andriy Gapon wrote: > on 31/10/2013 16:39 Aleksandr Rybalko said the following: > > Author: ray > > Date: Thu Oct 31 14:39:04 2013 > > New Revision: 257451 > > URL: http://svnweb.freebsd.org/changeset/base/257451 > > > > Log: > > Change drm2 to attach fbd as device. > > Radeon driver not ready yet. > > > > Sponsored by: The FreeBSD Foundation > > > > Modified: > > user/ed/newcons/sys/dev/drm2/drm_fb_helper.c > > user/ed/newcons/sys/dev/drm2/i915/i915_drv.c > > user/ed/newcons/sys/dev/drm2/radeon/radeon_drv.c > > > > > Modified: user/ed/newcons/sys/dev/drm2/i915/i915_drv.c > > ============================================================================== > > --- user/ed/newcons/sys/dev/drm2/i915/i915_drv.c Thu Oct 31 14:11:14 2013 (r257450) > > +++ user/ed/newcons/sys/dev/drm2/i915/i915_drv.c Thu Oct 31 14:39:04 2013 (r257451) > > > @@ -400,6 +421,10 @@ static device_method_t i915_methods[] = > > DEVMETHOD(device_suspend, i915_suspend), > > DEVMETHOD(device_resume, i915_resume), > > DEVMETHOD(device_detach, drm_detach), > > + > > + /* Framebuffer service methods */ > > + DEVMETHOD(fb_getinfo, i915_fb_helper_getinfo), > > + > > DEVMETHOD_END > > }; > > > > > > Modified: user/ed/newcons/sys/dev/drm2/radeon/radeon_drv.c > > ============================================================================== > > --- user/ed/newcons/sys/dev/drm2/radeon/radeon_drv.c Thu Oct 31 14:11:14 2013 (r257450) > > +++ user/ed/newcons/sys/dev/drm2/radeon/radeon_drv.c Thu Oct 31 14:39:04 2013 (r257451) > > > @@ -495,6 +518,10 @@ static device_method_t radeon_methods[] > > DEVMETHOD(device_suspend, radeon_suspend), > > DEVMETHOD(device_resume, radeon_resume), > > DEVMETHOD(device_detach, drm_detach), > > + > > + /* Framebuffer service methods */ > > + DEVMETHOD(fb_getinfo, radeon_fb_helper_getinfo), > > + > > DEVMETHOD_END > > }; > > > It seems that this change these modules can not be loaded when a kernel is > compiled with syscons rather than vt (newcons). > The problem is that fb_getinfo_desc is undefined in that case. It is supposed > to come from fb_if.m -> fb_if.c -> fb_if.o. > > Is this intentional? Yeah, currently fbd is not standalone module, it is depended on VT(9) (a.k.a. newcons) presence. From another point, syscons can't use (at least now) DRM's fb_helper. If syscons present, newcons will not be able to attach, since he will need to replace handler of /dev/ttyvX files, which is impossible as I know (at least now). > > -- > Andriy Gapon -- Aleksandr Rybalko From owner-svn-src-user@FreeBSD.ORG Thu Nov 28 14:20:19 2013 Return-Path: Delivered-To: svn-src-user@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 82F34AF3; Thu, 28 Nov 2013 14:20:19 +0000 (UTC) Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140]) by mx1.freebsd.org (Postfix) with ESMTP id 6FD0010A3; Thu, 28 Nov 2013 14:20:17 +0000 (UTC) Received: from porto.starpoint.kiev.ua (porto-e.starpoint.kiev.ua [212.40.38.100]) by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id QAA25100; Thu, 28 Nov 2013 16:20:16 +0200 (EET) (envelope-from avg@FreeBSD.org) Received: from localhost ([127.0.0.1]) by porto.starpoint.kiev.ua with esmtp (Exim 4.34 (FreeBSD)) id 1Vm2Rz-000A0t-VE; Thu, 28 Nov 2013 16:20:15 +0200 Message-ID: <529750FB.8050209@FreeBSD.org> Date: Thu, 28 Nov 2013 16:19:39 +0200 From: Andriy Gapon User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:24.0) Gecko/20100101 Thunderbird/24.1.0 MIME-Version: 1.0 To: Aleksandr Rybalko Subject: Re: svn commit: r257451 - in user/ed/newcons/sys/dev/drm2: . i915 radeon References: <201310311439.r9VEd5fh025537@svn.freebsd.org> <529741CE.7040805@FreeBSD.org> <20131128153820.f611e65cb7214f478a9ebfe5@freebsd.org> In-Reply-To: <20131128153820.f611e65cb7214f478a9ebfe5@freebsd.org> X-Enigmail-Version: 1.6 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: src-committers@FreeBSD.org, svn-src-user@FreeBSD.org X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.16 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, 28 Nov 2013 14:20:19 -0000 on 28/11/2013 15:38 Aleksandr Rybalko said the following: > Yeah, currently fbd is not standalone module, it is depended on VT(9) > (a.k.a. newcons) presence. From another point, syscons can't use (at > least now) DRM's fb_helper. > If syscons present, newcons will not be able to attach, since he will > need to replace handler of /dev/ttyvX files, which is impossible as I > know (at least now). Still, the drivers should be usable even with syscons? -- Andriy Gapon From owner-svn-src-user@FreeBSD.ORG Fri Nov 29 04:18:37 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 ESMTPS id 6984CD0A; Fri, 29 Nov 2013 04:18:37 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 561FA1B7D; Fri, 29 Nov 2013 04:18:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAT4IbcA062379; Fri, 29 Nov 2013 04:18:37 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAT4IbvH062378; Fri, 29 Nov 2013 04:18:37 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201311290418.rAT4IbvH062378@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Fri, 29 Nov 2013 04:18:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258729 - user/ae/inet6/sys/net 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.16 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: Fri, 29 Nov 2013 04:18:37 -0000 Author: ae Date: Fri Nov 29 04:18:36 2013 New Revision: 258729 URL: http://svnweb.freebsd.org/changeset/base/258729 Log: Some software use embedded form of zone ids. Remove ids from the address and initialize sin6_scope_id. Use sa6_recoverscope function for this. Modified: user/ae/inet6/sys/net/rtsock.c Modified: user/ae/inet6/sys/net/rtsock.c ============================================================================== --- user/ae/inet6/sys/net/rtsock.c Fri Nov 29 04:09:25 2013 (r258728) +++ user/ae/inet6/sys/net/rtsock.c Fri Nov 29 04:18:36 2013 (r258729) @@ -1036,6 +1036,15 @@ rt_xaddrs(caddr_t cp, caddr_t cplim, str return (0); /* should be EINVAL but for compat */ } /* accept it */ +#ifdef INET6 + /* + * XXX: some software use embedded scope ids. + * We remove id from address and initialize sin6_scope_id + * instead. + */ + if (sa->sa_family == AF_INET6) + sa6_recoverscope((struct sockaddr_in6 *)sa); +#endif rtinfo->rti_info[i] = sa; cp += SA_SIZE(sa); } From owner-svn-src-user@FreeBSD.ORG Fri Nov 29 04:29:02 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 ESMTPS id 85556F79; Fri, 29 Nov 2013 04:29:02 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 722251BF7; Fri, 29 Nov 2013 04:29:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAT4T2GV065769; Fri, 29 Nov 2013 04:29:02 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAT4T2Ev065768; Fri, 29 Nov 2013 04:29:02 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201311290429.rAT4T2Ev065768@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Fri, 29 Nov 2013 04:29:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258730 - user/ae/inet6/sys/net 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.16 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: Fri, 29 Nov 2013 04:29:02 -0000 Author: ae Date: Fri Nov 29 04:29:01 2013 New Revision: 258730 URL: http://svnweb.freebsd.org/changeset/base/258730 Log: When we are trying to find ifaddr for the specific network, and this network has link-local scope, use its sin6_scope_id to determine corresponding ifnet. Then just take its first link-local address. This helps to go away from the embedded form of LLA. Modified: user/ae/inet6/sys/net/if.c Modified: user/ae/inet6/sys/net/if.c ============================================================================== --- user/ae/inet6/sys/net/if.c Fri Nov 29 04:18:36 2013 (r258729) +++ user/ae/inet6/sys/net/if.c Fri Nov 29 04:29:01 2013 (r258730) @@ -84,6 +84,7 @@ #ifdef INET6 #include #include +#include #endif /* INET6 */ #endif /* INET || INET6 */ @@ -1703,7 +1704,20 @@ ifa_ifwithnet(struct sockaddr *addr, int if (sdl->sdl_index && sdl->sdl_index <= V_if_index) return (ifaddr_byindex(sdl->sdl_index)); } +#ifdef INET6 + if (af == AF_INET6) { + struct sockaddr_in6 *sin6; + sin6 = (struct sockaddr_in6 *)addr; + if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr) && + sin6->sin6_scope_id != 0) { + ifp = in6_getlinkifnet(sin6->sin6_scope_id); + if (ifp != NULL) + return ((struct ifaddr *) + in6ifa_ifpforlinklocal(ifp, 0)); + } + } +#endif /* * Scan though each interface, looking for ones that have addresses * in this address family. Maintain a reference on ifa_maybe once From owner-svn-src-user@FreeBSD.ORG Sat Nov 30 22:46:44 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4294F60E; Sat, 30 Nov 2013 22:46:44 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2E30F1F09; Sat, 30 Nov 2013 22:46:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAUMkixo047313; Sat, 30 Nov 2013 22:46:44 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAUMkhGY047311; Sat, 30 Nov 2013 22:46:43 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201311302246.rAUMkhGY047311@svn.freebsd.org> From: Nathan Whitehorn Date: Sat, 30 Nov 2013 22:46:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258781 - in user/ed/newcons/sys/dev/vt: . hw/fb 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.16 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: Sat, 30 Nov 2013 22:46:44 -0000 Author: nwhitehorn Date: Sat Nov 30 22:46:43 2013 New Revision: 258781 URL: http://svnweb.freebsd.org/changeset/base/258781 Log: Work around false positive errors from GCC. Modified: user/ed/newcons/sys/dev/vt/hw/fb/vt_fb.c user/ed/newcons/sys/dev/vt/vt_core.c Modified: user/ed/newcons/sys/dev/vt/hw/fb/vt_fb.c ============================================================================== --- user/ed/newcons/sys/dev/vt/hw/fb/vt_fb.c Sat Nov 30 22:17:27 2013 (r258780) +++ user/ed/newcons/sys/dev/vt/hw/fb/vt_fb.c Sat Nov 30 22:46:43 2013 (r258781) @@ -107,6 +107,7 @@ vt_fb_bitbltchr(struct vt_device *vd, co bpp = FBTYPE_GET_BYTESPP(info); fgc = info->fb_cmap[fg]; bgc = info->fb_cmap[bg]; + b = m = 0; if (bpl == 0) bpl = (width + 7) >> 3; /* Bytes per sorce line. */ Modified: user/ed/newcons/sys/dev/vt/vt_core.c ============================================================================== --- user/ed/newcons/sys/dev/vt/vt_core.c Sat Nov 30 22:17:27 2013 (r258780) +++ user/ed/newcons/sys/dev/vt/vt_core.c Sat Nov 30 22:46:43 2013 (r258781) @@ -1109,6 +1109,7 @@ vt_mouse_event(int type, int x, int y, i vd = main_vd; vw = vd->vd_curwindow; vf = vw->vw_font; + mark = 0; if (vw->vw_flags & VWF_MOUSE_HIDE) return; /* Mouse disabled. */ From owner-svn-src-user@FreeBSD.ORG Sat Nov 30 22:49:27 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5F9AC78E; Sat, 30 Nov 2013 22:49:27 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4C9E01F17; Sat, 30 Nov 2013 22:49:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAUMnRm9047662; Sat, 30 Nov 2013 22:49:27 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAUMnRk8047661; Sat, 30 Nov 2013 22:49:27 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201311302249.rAUMnRk8047661@svn.freebsd.org> From: Nathan Whitehorn Date: Sat, 30 Nov 2013 22:49:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258782 - user/ed/newcons/sys/dev/vt/hw/ofwfb 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.16 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: Sat, 30 Nov 2013 22:49:27 -0000 Author: nwhitehorn Date: Sat Nov 30 22:49:26 2013 New Revision: 258782 URL: http://svnweb.freebsd.org/changeset/base/258782 Log: Fix build. Modified: user/ed/newcons/sys/dev/vt/hw/ofwfb/ofwfb.c Modified: user/ed/newcons/sys/dev/vt/hw/ofwfb/ofwfb.c ============================================================================== --- user/ed/newcons/sys/dev/vt/hw/ofwfb/ofwfb.c Sat Nov 30 22:46:43 2013 (r258781) +++ user/ed/newcons/sys/dev/vt/hw/ofwfb/ofwfb.c Sat Nov 30 22:49:26 2013 (r258782) @@ -110,10 +110,11 @@ ofwfb_bitbltchr(struct vt_device *vd, co fgc = sc->sc_colormap[fg]; bgc = sc->sc_colormap[bg]; + b = m = 0; /* Don't try to put off screen pixels */ - if (((left + width) > info->fb_width) || ((top + height) > - info->fb_height)) + if (((left + width) > vd->vd_width) || ((top + height) > + vd->vd_height)) return; line = (sc->sc_stride * top) + left * sc->sc_depth/8;