From owner-svn-src-user@FreeBSD.ORG Sun Apr 12 05:09:07 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6AD6A947; Sun, 12 Apr 2015 05:09: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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3CE2E96F; Sun, 12 Apr 2015 05:09:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3C596hb058489; Sun, 12 Apr 2015 05:09:06 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3C596kd058488; Sun, 12 Apr 2015 05:09:06 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504120509.t3C596kd058488@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 12 Apr 2015 05:09:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281447 - user/ngie/more-tests/tests/sys X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Apr 2015 05:09:07 -0000 Author: ngie Date: Sun Apr 12 05:09:05 2015 New Revision: 281447 URL: https://svnweb.freebsd.org/changeset/base/281447 Log: Default to WARNS=6 Added: user/ngie/more-tests/tests/sys/Makefile.inc (contents, props changed) Added: user/ngie/more-tests/tests/sys/Makefile.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests/tests/sys/Makefile.inc Sun Apr 12 05:09:05 2015 (r281447) @@ -0,0 +1,3 @@ +# $FreeBSD$ + +WARNS?= 6 From owner-svn-src-user@FreeBSD.ORG Sun Apr 12 05:25:13 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3E79BCD3; Sun, 12 Apr 2015 05:25:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 290EEB6E; Sun, 12 Apr 2015 05:25:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3C5PDR6067456; Sun, 12 Apr 2015 05:25:13 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3C5PBAa067450; Sun, 12 Apr 2015 05:25:11 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504120525.t3C5PBAa067450@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 12 Apr 2015 05:25:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281448 - in user/ngie/more-tests: etc/mtree tests/sys tests/sys/mmap tools/regression/mmap X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Apr 2015 05:25:13 -0000 Author: ngie Date: Sun Apr 12 05:25:11 2015 New Revision: 281448 URL: https://svnweb.freebsd.org/changeset/base/281448 Log: Integrate tools/regression/mmap into the FreeBSD test suite as tests/sys/mmap Added: user/ngie/more-tests/tests/sys/mmap/ - copied from r281446, user/ngie/more-tests/tools/regression/mmap/ Deleted: user/ngie/more-tests/tools/regression/mmap/ Modified: user/ngie/more-tests/etc/mtree/BSD.tests.dist user/ngie/more-tests/tests/sys/Makefile user/ngie/more-tests/tests/sys/mmap/Makefile user/ngie/more-tests/tests/sys/mmap/mmap.c Modified: user/ngie/more-tests/etc/mtree/BSD.tests.dist ============================================================================== --- user/ngie/more-tests/etc/mtree/BSD.tests.dist Sun Apr 12 05:09:05 2015 (r281447) +++ user/ngie/more-tests/etc/mtree/BSD.tests.dist Sun Apr 12 05:25:11 2015 (r281448) @@ -360,6 +360,8 @@ .. kqueue .. + mmmap + .. mqueue .. netinet Modified: user/ngie/more-tests/tests/sys/Makefile ============================================================================== --- user/ngie/more-tests/tests/sys/Makefile Sun Apr 12 05:09:05 2015 (r281447) +++ user/ngie/more-tests/tests/sys/Makefile Sun Apr 12 05:25:11 2015 (r281448) @@ -8,6 +8,7 @@ TESTS_SUBDIRS+= file TESTS_SUBDIRS+= kern TESTS_SUBDIRS+= kqueue TESTS_SUBDIRS+= mqueue +TESTS_SUBDIRS+= mmap TESTS_SUBDIRS+= netinet TESTS_SUBDIRS+= opencrypto TESTS_SUBDIRS+= posixshm Modified: user/ngie/more-tests/tests/sys/mmap/Makefile ============================================================================== --- user/ngie/more-tests/tools/regression/mmap/Makefile Sun Apr 12 01:14:43 2015 (r281446) +++ user/ngie/more-tests/tests/sys/mmap/Makefile Sun Apr 12 05:25:11 2015 (r281448) @@ -1,6 +1,7 @@ # $FreeBSD$ -PROG= mmap -MAN= +TESTSDIR= ${TESTSBASE}/sys/mmap -.include +TAP_TESTS_C+= mmap + +.include Modified: user/ngie/more-tests/tests/sys/mmap/mmap.c ============================================================================== --- user/ngie/more-tests/tools/regression/mmap/mmap.c Sun Apr 12 01:14:43 2015 (r281446) +++ user/ngie/more-tests/tests/sys/mmap/mmap.c Sun Apr 12 05:25:11 2015 (r281448) @@ -31,10 +31,11 @@ #include #include +#include #include -#include +#include -const struct tests { +static const struct { void *addr; int ok[2]; /* Depending on security.bsd.map_at_zero {0, !=0}. */ } tests[] = { @@ -49,6 +50,8 @@ const struct tests { { (void *)(0x1000 * PAGE_SIZE), { 1, 1 } }, }; +#define MAP_AT_ZERO "security.bsd.map_at_zero" + int main(void) { @@ -60,37 +63,43 @@ main(void) /* Get the current sysctl value of security.bsd.map_at_zero. */ len = sizeof(mib) / sizeof(*mib); - if (sysctlnametomib("security.bsd.map_at_zero", mib, &len) == -1) - err(1, "sysctlnametomib(security.bsd.map_at_zero)"); + if (sysctlnametomib(MAP_AT_ZERO, mib, &len) == -1) { + printf("1..0 # SKIP: sysctlnametomib(\"%s\") failed: %s\n", + MAP_AT_ZERO, strerror(errno)); + return (0); + } len = sizeof(map_at_zero); - if (sysctl(mib, 3, &map_at_zero, &len, NULL, 0) == -1) - err(1, "sysctl(security.bsd.map_at_zero)"); + if (sysctl(mib, 3, &map_at_zero, &len, NULL, 0) == -1) { + printf("1..0 # SKIP: sysctl for %s failed: %s\n", MAP_AT_ZERO, + strerror(errno)); + return (0); + } /* Normalize to 0 or 1 for array access. */ map_at_zero = !!map_at_zero; - for (i=0; i < (sizeof(tests) / sizeof(*tests)); i++) { + printf("1..%zu\n", nitems(tests)); + for (i = 0; i < (int)nitems(tests); i++) { p = mmap((void *)tests[i].addr, PAGE_SIZE, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANON | MAP_FIXED, -1, 0); if (p == MAP_FAILED) { if (tests[i].ok[map_at_zero] != 0) error++; - warnx("%s: mmap(%p, ...) failed.", - (tests[i].ok[map_at_zero] == 0) ? "OK " : "ERR", - tests[i].addr); + printf("%sok %d # mmap(%p, ...) failed\n", + tests[i].ok[map_at_zero] == 0 ? "" : "not ", + i + 1, + tests[i].addr); } else { if (tests[i].ok[map_at_zero] != 1) error++; - warnx("%s: mmap(%p, ...) succeeded: p=%p", - (tests[i].ok[map_at_zero] == 1) ? "OK " : "ERR", + printf("%sok %d # mmap(%p, ...) succeeded: p=%p\n", + tests[i].ok[map_at_zero] == 1 ? "" : "not ", + i + 1, tests[i].addr, p); } } - if (error) - err(1, "---\nERROR: %d unexpected results.", error); - return (error != 0); } From owner-svn-src-user@FreeBSD.ORG Sun Apr 12 06:00:14 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9EB4B237; Sun, 12 Apr 2015 06:00:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 70FD2E2C; Sun, 12 Apr 2015 06:00:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3C60EQE084100; Sun, 12 Apr 2015 06:00:14 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3C60EwE084099; Sun, 12 Apr 2015 06:00:14 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504120600.t3C60EwE084099@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 12 Apr 2015 06:00:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281449 - user/ngie/more-tests/tools/regression/file X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Apr 2015 06:00:14 -0000 Author: ngie Date: Sun Apr 12 06:00:13 2015 New Revision: 281449 URL: https://svnweb.freebsd.org/changeset/base/281449 Log: Garbage collect directory Deleted: user/ngie/more-tests/tools/regression/file/ From owner-svn-src-user@FreeBSD.ORG Sun Apr 12 06:18:27 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1EA2D4F3; Sun, 12 Apr 2015 06:18: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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 01107FC4; Sun, 12 Apr 2015 06:18:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3C6IQ9x091301; Sun, 12 Apr 2015 06:18:26 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3C6IOu2091290; Sun, 12 Apr 2015 06:18:24 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504120618.t3C6IOu2091290@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 12 Apr 2015 06:18:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281450 - in user/ngie/more-tests: etc/mtree tests/sys tests/sys/fifo tests/sys/fifo/fifo_create tests/sys/fifo/fifo_io tests/sys/fifo/fifo_misc tests/sys/fifo/fifo_open tools/regressio... X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Apr 2015 06:18:27 -0000 Author: ngie Date: Sun Apr 12 06:18:24 2015 New Revision: 281450 URL: https://svnweb.freebsd.org/changeset/base/281450 Log: Integrate tools/regression/fifo into the FreeBSD test suite as tests/sys/fifo Added: user/ngie/more-tests/tests/sys/fifo/ - copied from r281446, user/ngie/more-tests/tools/regression/fifo/ user/ngie/more-tests/tests/sys/fifo/fifo_create.c - copied, changed from r281446, user/ngie/more-tests/tools/regression/fifo/fifo_create/fifo_create.c user/ngie/more-tests/tests/sys/fifo/fifo_io.c - copied, changed from r281446, user/ngie/more-tests/tools/regression/fifo/fifo_io/fifo_io.c user/ngie/more-tests/tests/sys/fifo/fifo_misc.c - copied, changed from r281446, user/ngie/more-tests/tools/regression/fifo/fifo_misc/fifo_misc.c user/ngie/more-tests/tests/sys/fifo/fifo_open.c - copied, changed from r281446, user/ngie/more-tests/tools/regression/fifo/fifo_open/fifo_open.c Deleted: user/ngie/more-tests/tests/sys/fifo/fifo_create/ user/ngie/more-tests/tests/sys/fifo/fifo_io/ user/ngie/more-tests/tests/sys/fifo/fifo_misc/ user/ngie/more-tests/tests/sys/fifo/fifo_open/ user/ngie/more-tests/tools/regression/fifo/ Modified: user/ngie/more-tests/etc/mtree/BSD.tests.dist user/ngie/more-tests/tests/sys/Makefile Modified: user/ngie/more-tests/etc/mtree/BSD.tests.dist ============================================================================== --- user/ngie/more-tests/etc/mtree/BSD.tests.dist Sun Apr 12 06:00:13 2015 (r281449) +++ user/ngie/more-tests/etc/mtree/BSD.tests.dist Sun Apr 12 06:18:24 2015 (r281450) @@ -354,6 +354,8 @@ .. .. sys + fifo + .. file .. kern Modified: user/ngie/more-tests/tests/sys/Makefile ============================================================================== --- user/ngie/more-tests/tests/sys/Makefile Sun Apr 12 06:00:13 2015 (r281449) +++ user/ngie/more-tests/tests/sys/Makefile Sun Apr 12 06:18:24 2015 (r281450) @@ -4,6 +4,7 @@ TESTSDIR= ${TESTSBASE}/sys +TESTS_SUBDIRS+= fifo TESTS_SUBDIRS+= file TESTS_SUBDIRS+= kern TESTS_SUBDIRS+= kqueue Copied and modified: user/ngie/more-tests/tests/sys/fifo/fifo_create.c (from r281446, user/ngie/more-tests/tools/regression/fifo/fifo_create/fifo_create.c) ============================================================================== --- user/ngie/more-tests/tools/regression/fifo/fifo_create/fifo_create.c Sun Apr 12 01:14:43 2015 (r281446, copy source) +++ user/ngie/more-tests/tests/sys/fifo/fifo_create.c Sun Apr 12 06:18:24 2015 (r281450) @@ -75,7 +75,7 @@ * All activity occurs within a temporary directory created early in the * test. */ -char temp_dir[PATH_MAX]; +static char temp_dir[PATH_MAX]; static void __unused atexit_temp_dir(void) @@ -94,7 +94,7 @@ fifo_create_test(int use_mkfifo) { struct stat old_dirsb, dirsb, fifosb; const char *testname; - char path[PATH_MAX]; + char path[] = "testfifo"; int error; if (use_mkfifo) @@ -106,14 +106,12 @@ fifo_create_test(int use_mkfifo) * Sleep to make sure that the time stamp on the directory will be * updated. */ - if (stat(temp_dir, &old_dirsb) < 0) + if (stat(".", &old_dirsb) < 0) err(-1, "basic_create_test: %s: stat: %s", testname, temp_dir); sleep(2); - snprintf(path, PATH_MAX, "%s/testfifo", temp_dir); - if (use_mkfifo) { if (mkfifo(path, 0600) < 0) err(-1, "basic_create_test: %s: %s", testname, path); @@ -149,7 +147,7 @@ fifo_create_test(int use_mkfifo) err(-1, "basic_create_test: dup %s unexpected error", testname); - if (stat(temp_dir, &dirsb) < 0) { + if (stat(".", &dirsb) < 0) { error = errno; (void)unlink(path); errno = error; @@ -205,7 +203,7 @@ fifo_permission_test(int use_mkfifo) { const struct permission_test *ptp; mode_t __unused old_umask; - char path[PATH_MAX]; + char path[] = "testfifo"; const char *testname; struct stat sb; int error, i; @@ -215,7 +213,6 @@ fifo_permission_test(int use_mkfifo) else testname = "mknod"; - snprintf(path, PATH_MAX, "%s/testfifo", temp_dir); old_umask = umask(0022); for (i = 0; i < permission_test_count; i++) { ptp = &permission_test[i]; @@ -256,14 +253,14 @@ fifo_permission_test(int use_mkfifo) } int -main(int argc, char *argv[]) +main(void) { int i; if (geteuid() != 0) errx(-1, "must be run as root"); - strcpy(temp_dir, "/tmp/fifo_create.XXXXXXXXXXX"); + strcpy(temp_dir, "fifo_create.XXXXXXXXXXX"); if (mkdtemp(temp_dir) == NULL) err(-1, "mkdtemp"); atexit(atexit_temp_dir); Copied and modified: user/ngie/more-tests/tests/sys/fifo/fifo_io.c (from r281446, user/ngie/more-tests/tools/regression/fifo/fifo_io/fifo_io.c) ============================================================================== --- user/ngie/more-tests/tools/regression/fifo/fifo_io/fifo_io.c Sun Apr 12 01:14:43 2015 (r281446, copy source) +++ user/ngie/more-tests/tests/sys/fifo/fifo_io.c Sun Apr 12 06:18:24 2015 (r281450) @@ -88,7 +88,7 @@ * All activity occurs within a temporary directory created early in the * test. */ -char temp_dir[PATH_MAX]; +static char temp_dir[PATH_MAX]; static void __unused atexit_temp_dir(void) @@ -130,8 +130,7 @@ cleanfifo3(const char *fifoname, int fd1 * so using non-blocking opens in order to avoid deadlocking the process. */ static int -openfifo(const char *fifoname, const char *testname, int *reader_fdp, - int *writer_fdp) +openfifo(const char *fifoname, int *reader_fdp, int *writer_fdp) { int error, fd1, fd2; @@ -155,7 +154,7 @@ openfifo(const char *fifoname, const cha * Open one file descriptor for the fifo, supporting both read and write. */ static int -openfifo_rw(const char *fifoname, const char *testname, int *fdp) +openfifo_rw(const char *fifoname, int *fdp) { int fd; @@ -249,7 +248,7 @@ test_simpleio(void) ssize_t len; makefifo("testfifo", __func__); - if (openfifo("testfifo", "test_simpleio", &reader_fd, &writer_fd) + if (openfifo("testfifo", &reader_fd, &writer_fd) < 0) { warn("test_simpleio: openfifo: testfifo"); cleanfifo2("testfifo", -1, -1); @@ -296,12 +295,12 @@ test_simpleio(void) cleanfifo2("testfifo", reader_fd, writer_fd); } -static int alarm_fired; +static volatile int alarm_fired; /* * Non-destructive SIGALRM handler. */ static void -sigalarm(int signum) +sigalarm(int signum __unused) { alarm_fired = 1; @@ -408,7 +407,7 @@ test_blocking_read_empty(void) u_char ch; makefifo("testfifo", __func__); - if (openfifo("testfifo", __func__, &reader_fd, &writer_fd) + if (openfifo("testfifo", &reader_fd, &writer_fd) < 0) { warn("test_blocking_read_empty: openfifo: testfifo"); cleanfifo2("testfifo", -1, -1); @@ -477,8 +476,7 @@ test_blocking_one_byte(void) u_char ch; makefifo("testfifo", __func__); - if (openfifo("testfifo", __func__, &reader_fd, &writer_fd) - < 0) { + if (openfifo("testfifo", &reader_fd, &writer_fd) < 0) { warn("test_blocking: openfifo: testfifo"); cleanfifo2("testfifo", -1, -1); exit(-1); @@ -544,8 +542,7 @@ test_nonblocking_one_byte(void) u_char ch; makefifo("testfifo", __func__); - if (openfifo("testfifo", __func__, &reader_fd, &writer_fd) - < 0) { + if (openfifo("testfifo", &reader_fd, &writer_fd) < 0) { warn("test_nonblocking: openfifo: testfifo"); cleanfifo2("testfifo", -1, -1); exit(-1); @@ -609,8 +606,7 @@ test_blocking_partial_write(void) ssize_t len; makefifo("testfifo", __func__); - if (openfifo("testfifo", __func__, &reader_fd, &writer_fd) - < 0) { + if (openfifo("testfifo", &reader_fd, &writer_fd) < 0) { warn("test_blocking_partial_write: openfifo: testfifo"); cleanfifo2("testfifo", -1, -1); exit(-1); @@ -668,8 +664,7 @@ test_nonblocking_partial_write(void) ssize_t len; makefifo("testfifo", __func__); - if (openfifo("testfifo", __func__, &reader_fd, &writer_fd) - < 0) { + if (openfifo("testfifo", &reader_fd, &writer_fd) < 0) { warn("test_blocking_partial_write: openfifo: testfifo"); cleanfifo2("testfifo", -1, -1); exit(-1); @@ -736,8 +731,7 @@ test_coalesce_big_read(void) ssize_t len; makefifo("testfifo", __func__); - if (openfifo("testfifo", __func__, &reader_fd, &writer_fd) - < 0) { + if (openfifo("testfifo", &reader_fd, &writer_fd) < 0) { warn("test_coalesce_big_read: openfifo: testfifo"); cleanfifo2("testfifo", -1, -1); exit(-1); @@ -808,8 +802,7 @@ test_coalesce_big_write(void) ssize_t len; makefifo("testfifo", __func__); - if (openfifo("testfifo", __func__, &reader_fd, &writer_fd) - < 0) { + if (openfifo("testfifo", &reader_fd, &writer_fd) < 0) { warn("test_coalesce_big_write: openfifo: testfifo"); cleanfifo2("testfifo", -1, -1); exit(-1); @@ -1078,7 +1071,7 @@ test_events_outofbox(void) int kqueue_fd, reader_fd, writer_fd; makefifo("testfifo", __func__); - if (openfifo("testfifo", __func__, &reader_fd, &writer_fd) < 0) { + if (openfifo("testfifo", &reader_fd, &writer_fd) < 0) { warn("test_events_outofbox: openfifo: testfifo"); cleanfifo2("testfifo", -1, -1); exit(-1); @@ -1134,8 +1127,7 @@ test_events_write_read_byte(void) u_char ch; makefifo("testfifo", __func__); - if (openfifo("testfifo", __func__, &reader_fd, &writer_fd) - < 0) { + if (openfifo("testfifo", &reader_fd, &writer_fd) < 0) { warn("test_events_write_read_byte: openfifo: testfifo"); cleanfifo2("testfifo", -1, -1); exit(-1); @@ -1227,8 +1219,7 @@ test_events_partial_write(void) ssize_t len; makefifo("testfifo", __func__); - if (openfifo("testfifo", __func__, &reader_fd, &writer_fd) - < 0) { + if (openfifo("testfifo", &reader_fd, &writer_fd) < 0) { warn("test_events_partial_write: openfifo: testfifo"); cleanfifo2("testfifo", -1, -1); exit(-1); @@ -1313,8 +1304,7 @@ test_events_rdwr(void) char ch; makefifo("testfifo", __func__); - if (openfifo_rw("testfifo", __func__, &fd) - < 0) { + if (openfifo_rw("testfifo", &fd) < 0) { warn("%s: openfifo_rw: testfifo", __func__); cleanfifo2("testfifo", -1, -1); exit(-1); @@ -1381,10 +1371,10 @@ test_events_rdwr(void) } int -main(int argc, char *argv[]) +main(void) { - strcpy(temp_dir, "/tmp/fifo_io.XXXXXXXXXXX"); + strcpy(temp_dir, "fifo_io.XXXXXXXXXXX"); if (mkdtemp(temp_dir) == NULL) err(-1, "mkdtemp"); atexit(atexit_temp_dir); Copied and modified: user/ngie/more-tests/tests/sys/fifo/fifo_misc.c (from r281446, user/ngie/more-tests/tools/regression/fifo/fifo_misc/fifo_misc.c) ============================================================================== --- user/ngie/more-tests/tools/regression/fifo/fifo_misc/fifo_misc.c Sun Apr 12 01:14:43 2015 (r281446, copy source) +++ user/ngie/more-tests/tests/sys/fifo/fifo_misc.c Sun Apr 12 06:18:24 2015 (r281450) @@ -50,7 +50,7 @@ * All activity occurs within a temporary directory created early in the * test. */ -char temp_dir[PATH_MAX]; +static char temp_dir[PATH_MAX]; static void __unused atexit_temp_dir(void) @@ -79,8 +79,7 @@ cleanfifo(const char *fifoname, int fd1, } static int -openfifo(const char *fifoname, const char *testname, int *reader_fdp, - int *writer_fdp) +openfifo(const char *fifoname, int *reader_fdp, int *writer_fdp) { int error, fd1, fd2; @@ -110,7 +109,7 @@ test_lseek(void) makefifo("testfifo", __func__); - if (openfifo("testfifo", __func__, &reader_fd, &writer_fd) < 0) { + if (openfifo("testfifo", &reader_fd, &writer_fd) < 0) { warn("%s: openfifo", __func__); cleanfifo("testfifo", -1, -1); exit(-1); @@ -185,7 +184,7 @@ test_ioctl(void) makefifo("testfifo", __func__); - if (openfifo("testfifo", __func__, &reader_fd, &writer_fd) < 0) { + if (openfifo("testfifo", &reader_fd, &writer_fd) < 0) { warn("%s: openfifo", __func__); cleanfifo("testfifo", -1, -1); exit(-1); @@ -237,7 +236,7 @@ test_chmodchown(void) makefifo("testfifo", __func__); - if (openfifo("testfifo", __func__, &reader_fd, &writer_fd) < 0) { + if (openfifo("testfifo", &reader_fd, &writer_fd) < 0) { warn("%s: openfifo", __func__); cleanfifo("testfifo", -1, -1); exit(-1); @@ -316,10 +315,10 @@ test_chmodchown(void) } int -main(int argc, char *argv[]) +main(void) { - strcpy(temp_dir, "/tmp/fifo_misc.XXXXXXXXXXX"); + strcpy(temp_dir, "fifo_misc.XXXXXXXXXXX"); if (mkdtemp(temp_dir) == NULL) err(-1, "mkdtemp"); atexit(atexit_temp_dir); Copied and modified: user/ngie/more-tests/tests/sys/fifo/fifo_open.c (from r281446, user/ngie/more-tests/tools/regression/fifo/fifo_open/fifo_open.c) ============================================================================== --- user/ngie/more-tests/tools/regression/fifo/fifo_open/fifo_open.c Sun Apr 12 01:14:43 2015 (r281446, copy source) +++ user/ngie/more-tests/tests/sys/fifo/fifo_open.c Sun Apr 12 06:18:24 2015 (r281450) @@ -87,7 +87,7 @@ * All activity occurs within a temporary directory created early in the * test. */ -char temp_dir[PATH_MAX]; +static char temp_dir[PATH_MAX]; static void __unused atexit_temp_dir(void) @@ -453,13 +453,13 @@ test_non_blocking_writer(void) } int -main(int argc, char *argv[]) +main(void) { if (geteuid() != 0) errx(-1, "must be run as root"); - strcpy(temp_dir, "/tmp/fifo_open.XXXXXXXXXXX"); + strcpy(temp_dir, "fifo_open.XXXXXXXXXXX"); if (mkdtemp(temp_dir) == NULL) err(-1, "mkdtemp"); if (chdir(temp_dir) < 0) From owner-svn-src-user@FreeBSD.ORG Sun Apr 12 08:19:06 2015 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E1BB8626; Sun, 12 Apr 2015 08:19:06 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B3F1EE53; Sun, 12 Apr 2015 08:19:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3C8J6i0048418; Sun, 12 Apr 2015 08:19:06 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3C8J5Np048412; Sun, 12 Apr 2015 08:19:05 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504120819.t3C8J5Np048412@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 12 Apr 2015 08:19:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281460 - in user/ngie/more-tests/lib: libc librt libthr msun X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Apr 2015 08:19:07 -0000 Author: ngie Date: Sun Apr 12 08:19:04 2015 New Revision: 281460 URL: https://svnweb.freebsd.org/changeset/base/281460 Log: Build/install lib, librt, libthr, and msun on all architectures Deleted: user/ngie/more-tests/lib/libc/Makefile.amd64 user/ngie/more-tests/lib/libc/Makefile.i386 user/ngie/more-tests/lib/librt/Makefile.amd64 user/ngie/more-tests/lib/librt/Makefile.i386 user/ngie/more-tests/lib/libthr/Makefile.amd64 user/ngie/more-tests/lib/libthr/Makefile.i386 user/ngie/more-tests/lib/msun/Makefile.amd64 user/ngie/more-tests/lib/msun/Makefile.i386 Modified: user/ngie/more-tests/lib/libc/Makefile user/ngie/more-tests/lib/librt/Makefile user/ngie/more-tests/lib/libthr/Makefile user/ngie/more-tests/lib/msun/Makefile Modified: user/ngie/more-tests/lib/libc/Makefile ============================================================================== --- user/ngie/more-tests/lib/libc/Makefile Sun Apr 12 08:10:18 2015 (r281459) +++ user/ngie/more-tests/lib/libc/Makefile Sun Apr 12 08:19:04 2015 (r281460) @@ -161,7 +161,9 @@ libkern.${LIBC_ARCH}:: ${KMSRCS} CFLAGS+=-DSYSCALL_COMPAT .endif -.include +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif .include Modified: user/ngie/more-tests/lib/librt/Makefile ============================================================================== --- user/ngie/more-tests/lib/librt/Makefile Sun Apr 12 08:10:18 2015 (r281459) +++ user/ngie/more-tests/lib/librt/Makefile Sun Apr 12 08:19:04 2015 (r281460) @@ -19,6 +19,8 @@ PRECIOUSLIB= VERSION_MAP= ${.CURDIR}/Version.map -.include +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif .include Modified: user/ngie/more-tests/lib/libthr/Makefile ============================================================================== --- user/ngie/more-tests/lib/libthr/Makefile Sun Apr 12 08:10:18 2015 (r281459) +++ user/ngie/more-tests/lib/libthr/Makefile Sun Apr 12 08:19:04 2015 (r281460) @@ -65,6 +65,8 @@ SYMLINKS+=lib${LIB}_p.a ${LIBDIR}/libpth CFLAGS+=-DSYSCALL_COMPAT .endif -.include +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif .include Modified: user/ngie/more-tests/lib/msun/Makefile ============================================================================== --- user/ngie/more-tests/lib/msun/Makefile Sun Apr 12 08:10:18 2015 (r281459) +++ user/ngie/more-tests/lib/msun/Makefile Sun Apr 12 08:19:04 2015 (r281460) @@ -221,6 +221,8 @@ MLINKS+=trunc.3 truncf.3 trunc.3 truncl. .include -.include +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif .include From owner-svn-src-user@FreeBSD.ORG Sun Apr 12 12:29:40 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 295CEB5E; Sun, 12 Apr 2015 12: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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 127A9B6F; Sun, 12 Apr 2015 12:29:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3CCTdwD068414; Sun, 12 Apr 2015 12:29:39 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3CCTZUg068396; Sun, 12 Apr 2015 12:29:35 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504121229.t3CCTZUg068396@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 12 Apr 2015 12:29:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281464 - in user/ngie/more-tests: etc/mtree tests/sys/kern tests/sys/kern/execve tests/sys/kern/execve/tests tools/regression/execve X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Apr 2015 12:29:40 -0000 Author: ngie Date: Sun Apr 12 12:29:34 2015 New Revision: 281464 URL: https://svnweb.freebsd.org/changeset/base/281464 Log: Integrate tools/regression/execve into the FreeBSD test suite as tests/sys/kern/execve Added: user/ngie/more-tests/tests/sys/kern/execve/ - copied from r281446, user/ngie/more-tests/tools/regression/execve/ user/ngie/more-tests/tests/sys/kern/execve/bad_interp_len - copied unchanged from r281446, user/ngie/more-tests/tools/regression/execve/tests/badinterplen user/ngie/more-tests/tests/sys/kern/execve/devnullscript - copied unchanged from r281446, user/ngie/more-tests/tools/regression/execve/tests/devnullscript user/ngie/more-tests/tests/sys/kern/execve/execve_helper.c - copied, changed from r281446, user/ngie/more-tests/tools/regression/execve/doexec.c user/ngie/more-tests/tests/sys/kern/execve/execve_test.sh - copied, changed from r281446, user/ngie/more-tests/tools/regression/execve/execve.t user/ngie/more-tests/tests/sys/kern/execve/good_aout.c - copied, changed from r281446, user/ngie/more-tests/tools/regression/execve/tests/goodaout.c user/ngie/more-tests/tests/sys/kern/execve/good_script - copied, changed from r281446, user/ngie/more-tests/tools/regression/execve/tests/goodscript user/ngie/more-tests/tests/sys/kern/execve/non_exist_shell - copied unchanged from r281446, user/ngie/more-tests/tools/regression/execve/tests/nonexistshell user/ngie/more-tests/tests/sys/kern/execve/scriptarg - copied unchanged from r281446, user/ngie/more-tests/tools/regression/execve/tests/scriptarg user/ngie/more-tests/tests/sys/kern/execve/scriptarg-nospace - copied unchanged from r281446, user/ngie/more-tests/tools/regression/execve/tests/scriptarg-nospace Deleted: user/ngie/more-tests/tests/sys/kern/execve/doexec.c user/ngie/more-tests/tests/sys/kern/execve/execve.t user/ngie/more-tests/tests/sys/kern/execve/tests/ user/ngie/more-tests/tools/regression/execve/ Modified: user/ngie/more-tests/etc/mtree/BSD.tests.dist user/ngie/more-tests/tests/sys/kern/Makefile user/ngie/more-tests/tests/sys/kern/execve/Makefile Modified: user/ngie/more-tests/etc/mtree/BSD.tests.dist ============================================================================== --- user/ngie/more-tests/etc/mtree/BSD.tests.dist Sun Apr 12 11:23:59 2015 (r281463) +++ user/ngie/more-tests/etc/mtree/BSD.tests.dist Sun Apr 12 12:29:34 2015 (r281464) @@ -359,6 +359,8 @@ file .. kern + execve + .. .. kqueue .. Modified: user/ngie/more-tests/tests/sys/kern/Makefile ============================================================================== --- user/ngie/more-tests/tests/sys/kern/Makefile Sun Apr 12 11:23:59 2015 (r281463) +++ user/ngie/more-tests/tests/sys/kern/Makefile Sun Apr 12 12:29:34 2015 (r281464) @@ -10,4 +10,6 @@ LDADD.unix_seqpacket_test+= -lpthread WARNS?= 5 +TESTS_SUBDIRS+= execve + .include Modified: user/ngie/more-tests/tests/sys/kern/execve/Makefile ============================================================================== --- user/ngie/more-tests/tools/regression/execve/Makefile Sun Apr 12 01:14:43 2015 (r281446) +++ user/ngie/more-tests/tests/sys/kern/execve/Makefile Sun Apr 12 12:29:34 2015 (r281464) @@ -1,70 +1,37 @@ -# $FreeBSD$ +TESTSDIR= ${TESTSBASE}/sys/kern/execve -PROG= doexec -MAN= - -RP= ./${PROG} -TD= ${.CURDIR}/tests - -TESTSCRIPTS= nonexistshell devnullscript badinterplen goodscript \ - scriptarg scriptarg-nospace -CLEANFILES= goodaout truncaout sparseaout empty ${TESTSCRIPTS} - -all: ${PROG} goodaout ${TESTSCRIPTS} - -.for x in ${TESTSCRIPTS} -${x}: ${TD}/${x} - ${CP} ${TD}/${x} . - chmod +x ${x} -.endfor +BINDIR= ${TESTSDIR} -regress: test-empty test-nonexist test-nonexistshell \ - test-devnullscript test-badinterplen test-goodscript \ - test-scriptarg test-scriptarg-nospace test-goodaout \ - test-truncaout test-sparseaout - -test-empty: ${PROG} - rm -f empty - touch empty - chmod +x empty - ${RP} empty | grep 'Exec format error' - -test-nonexist: ${PROG} - ${RP} ${TD}/nonexistent | grep 'No such file or directory' - -test-nonexistshell: ${PROG} nonexistshell - ${RP} nonexistshell | grep 'No such file or directory' - -test-devnullscript: ${PROG} devnullscript - ${RP} devnullscript | grep 'Permission denied' +MAN= -test-badinterplen: ${PROG} badinterplen - ${RP} badinterplen | grep 'No such file or directory' +ATF_TESTS_SH+= execve_test -test-goodscript: ${PROG} goodscript - ${RP} goodscript | grep 'succeeded' +PROGS+= good_aout +PROGS+= execve_helper -test-scriptarg: ${PROG} scriptarg - ${RP} scriptarg 2>&1 | grep '+ echo succeeded' +LDFLAGS.goodaout+= -static -test-scriptarg-nospace: ${PROG} scriptarg-nospace - ${RP} scriptarg-nospace 2>&1 | grep '+ echo succeeded' +CLEANFILES+= empty +CLEANFILES+= sparse_aout +CLEANFILES+= trunc_aout -goodaout: ${TD}/goodaout.c - ${CC} -static -o ${.TARGET} ${TD}/goodaout.c +SCRIPTS+= bad_interp_len +SCRIPTS+= dev_null_script +SCRIPTS+= empty +SCRIPTS+= good_script +SCRIPTS+= non_exist_shell +SCRIPTS+= script_arg +SCRIPTS+= script_arg_nospace +SCRIPTS+= sparse_aout +SCRIPTS+= trunc_aout -test-goodaout: ${PROG} goodaout - ${RP} goodaout | grep 'succeeded' +empty: + @touch $@ -test-truncaout: ${PROG} goodaout - truncate -s 16 truncaout - chmod a+x truncaout - ${RP} truncaout | grep 'Exec format error' +sparse_aout: + @truncate -s 20480 $@ -test-sparseaout: ${PROG} - /bin/rm -rf sparseaout - truncate -s 20480 sparseaout - chmod a+x sparseaout - ${RP} sparseaout | grep 'Exec format error' +trunc_aout: + @truncate -s 16 $@ -.include +.include Copied: user/ngie/more-tests/tests/sys/kern/execve/bad_interp_len (from r281446, user/ngie/more-tests/tools/regression/execve/tests/badinterplen) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests/tests/sys/kern/execve/bad_interp_len Sun Apr 12 12:29:34 2015 (r281464, copy of r281446, user/ngie/more-tests/tools/regression/execve/tests/badinterplen) @@ -0,0 +1,4 @@ +#! 456789012345678 0123456789012345 789012345678 012345678901234 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 12345678 90 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 +# $FreeBSD$ + +echo succeeded Copied: user/ngie/more-tests/tests/sys/kern/execve/devnullscript (from r281446, user/ngie/more-tests/tools/regression/execve/tests/devnullscript) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests/tests/sys/kern/execve/devnullscript Sun Apr 12 12:29:34 2015 (r281464, copy of r281446, user/ngie/more-tests/tools/regression/execve/tests/devnullscript) @@ -0,0 +1,4 @@ +#! /dev/null +# $FreeBSD$ + +echo succeeded Copied and modified: user/ngie/more-tests/tests/sys/kern/execve/execve_helper.c (from r281446, user/ngie/more-tests/tools/regression/execve/doexec.c) ============================================================================== --- user/ngie/more-tests/tools/regression/execve/doexec.c Sun Apr 12 01:14:43 2015 (r281446, copy source) +++ user/ngie/more-tests/tests/sys/kern/execve/execve_helper.c Sun Apr 12 12:29:34 2015 (r281464) @@ -34,25 +34,21 @@ * $FreeBSD$ */ +#include #include #include #include -#include #include int -main(argc, argv) - int argc; - char *argv[]; +main(int argc, char **argv) { + if (argc != 2) { fprintf(stderr, "usage: %s \n", argv[0]); exit(2); } - unsetenv("LANG"); /* we compare C error strings */ - if (execve(argv[1], &argv[1], NULL) == -1) { - printf("%s\n", strerror(errno)); - exit(1); - } + execve(argv[1], &argv[1], NULL); + err(1, ""); } Copied and modified: user/ngie/more-tests/tests/sys/kern/execve/execve_test.sh (from r281446, user/ngie/more-tests/tools/regression/execve/execve.t) ============================================================================== --- user/ngie/more-tests/tools/regression/execve/execve.t Sun Apr 12 01:14:43 2015 (r281446, copy source) +++ user/ngie/more-tests/tests/sys/kern/execve/execve_test.sh Sun Apr 12 12:29:34 2015 (r281464) @@ -1,27 +1,115 @@ -#!/bin/sh -# $FreeBSD$ -cd `dirname $0` -cmd="./`basename $0 .t`" +bad_interp_len_head() +{ + atf_set "descr" "Bad interpreter length" +} +bad_interp_len_body() +{ + atf_check -s exit:1 -e 'match:No such file or directory' -o empty \ + -x "cd $(atf_get_srcdir) && ./execve_helper bad_interp_len" +} + +empty_head() +{ + atf_set "descr" "Empty file" +} +empty_body() +{ + atf_check -s exit:1 -e 'match:Exec format error' -o empty \ + -x "cd $(atf_get_srcdir) && ./execve_helper empty" +} + +good_aout_head() +{ + atf_set "descr" "Good a.out" +} +good_aout_body() +{ + atf_check -s exit:0 -e empty -o 'match:succeeded' \ + -x "cd $(atf_get_srcdir) && ./execve_helper ./good_aout" +} + +good_script_head() +{ + atf_set "descr" "Good script" +} +good_script_body() +{ + atf_check -s exit:0 -e empty -o 'match:succeeded' \ + -x "cd $(atf_get_srcdir) && ./execve_helper good_script" +} + +non_exist_head() +{ + atf_set "descr" "Non-existent file" +} +non_exist_body() +{ + atf_check -s exit:1 -e 'match:No such file or directory' -o empty \ + -x "cd $(atf_get_srcdir) && ./execve_helper non_exist" +} + +non_exist_shell_head() +{ + atf_set "descr" "Non-existent shell" +} +non_exist_shell_body() +{ + atf_check -s exit:1 -e 'match:No such file or directory' -o empty \ + -x "cd $(atf_get_srcdir) && ./execve_helper non_exist_shell" +} + +script_arg_head() +{ + atf_set "descr" "-x in the shebang" +} +script_arg_body() +{ + atf_check -s exit:0 -e 'match:\+ echo succeeded' -o 'match:succeeded' \ + -x "cd $(atf_get_srcdir) && ./execve_helper script_arg" +} + +script_arg_nospace_head() +{ + atf_set "descr" '-x in the shebang; no space between #! and /bin/sh' +} +script_arg_nospace_body() +{ + atf_check -s exit:0 -e 'match:\+ echo succeeded' -o 'match:succeeded' \ + -x "cd $(atf_get_srcdir) && ./execve_helper script_arg_nospace" +} + +sparse_aout_head() +{ + atf_set "descr" 'Sparse file' +} +sparse_aout_body() +{ + atf_check -s exit:1 -e 'match:Exec format error' -o empty \ + -x "cd $(atf_get_srcdir) && ./execve_helper sparse_aout" +} + +trunc_aout_head() +{ + atf_set "descr" 'Truncated file' +} +trunc_aout_body() +{ + atf_check -s exit:1 -e 'match:Exec format error' -o empty \ + -x "cd $(atf_get_srcdir) && ./execve_helper trunc_aout" +} + +atf_init_test_cases() +{ + atf_add_test_case bad_interp_len + atf_add_test_case empty + atf_add_test_case good_aout + atf_add_test_case good_script + atf_add_test_case non_exist + atf_add_test_case non_exist_shell + atf_add_test_case script_arg + atf_add_test_case script_arg_nospace + atf_add_test_case sparse_aout + atf_add_test_case trunc_aout -make >/dev/null 2>&1 - -tests="test-empty test-nonexist test-nonexistshell \ - test-devnullscript test-badinterplen test-goodscript \ - test-scriptarg test-scriptarg-nospace test-goodaout \ - test-truncaout test-sparseaout" - -n=0 - -echo "1..11" - -for atest in ${tests} -do - n=`expr ${n} + 1` - if make ${atest} - then - echo "ok ${n} - ${atest}" - else - echo "not ok ${n} - ${atest}" - fi -done +} Copied and modified: user/ngie/more-tests/tests/sys/kern/execve/good_aout.c (from r281446, user/ngie/more-tests/tools/regression/execve/tests/goodaout.c) ============================================================================== --- user/ngie/more-tests/tools/regression/execve/tests/goodaout.c Sun Apr 12 01:14:43 2015 (r281446, copy source) +++ user/ngie/more-tests/tests/sys/kern/execve/good_aout.c Sun Apr 12 12:29:34 2015 (r281464) @@ -38,9 +38,7 @@ #include int -main(argc, argv) - int argc; - char *argv[]; +main(void) { printf("succeeded\n"); exit(0); Copied and modified: user/ngie/more-tests/tests/sys/kern/execve/good_script (from r281446, user/ngie/more-tests/tools/regression/execve/tests/goodscript) ============================================================================== --- user/ngie/more-tests/tools/regression/execve/tests/goodscript Sun Apr 12 01:14:43 2015 (r281446, copy source) +++ user/ngie/more-tests/tests/sys/kern/execve/good_script Sun Apr 12 12:29:34 2015 (r281464) @@ -1,4 +1,4 @@ -#! /bin/csh +#!/bin/sh # $FreeBSD$ echo succeeded Copied: user/ngie/more-tests/tests/sys/kern/execve/non_exist_shell (from r281446, user/ngie/more-tests/tools/regression/execve/tests/nonexistshell) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests/tests/sys/kern/execve/non_exist_shell Sun Apr 12 12:29:34 2015 (r281464, copy of r281446, user/ngie/more-tests/tools/regression/execve/tests/nonexistshell) @@ -0,0 +1,4 @@ +#! /foo/bar/baz +# $FreeBSD$ + +echo foo Copied: user/ngie/more-tests/tests/sys/kern/execve/scriptarg (from r281446, user/ngie/more-tests/tools/regression/execve/tests/scriptarg) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests/tests/sys/kern/execve/scriptarg Sun Apr 12 12:29:34 2015 (r281464, copy of r281446, user/ngie/more-tests/tools/regression/execve/tests/scriptarg) @@ -0,0 +1,4 @@ +#! /bin/sh -x +# $FreeBSD$ + +echo succeeded Copied: user/ngie/more-tests/tests/sys/kern/execve/scriptarg-nospace (from r281446, user/ngie/more-tests/tools/regression/execve/tests/scriptarg-nospace) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests/tests/sys/kern/execve/scriptarg-nospace Sun Apr 12 12:29:34 2015 (r281464, copy of r281446, user/ngie/more-tests/tools/regression/execve/tests/scriptarg-nospace) @@ -0,0 +1,4 @@ +#!/bin/sh -x +# $FreeBSD$ + +echo succeeded From owner-svn-src-user@FreeBSD.ORG Sun Apr 12 12:31:20 2015 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 25083C5A; Sun, 12 Apr 2015 12:31:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 103FAB7B; Sun, 12 Apr 2015 12:31:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3CCVJTV072184; Sun, 12 Apr 2015 12:31:19 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3CCVJGP072183; Sun, 12 Apr 2015 12:31:19 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504121231.t3CCVJGP072183@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 12 Apr 2015 12:31:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281465 - user/ngie/more-tests/tests/sys/kern/execve X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Apr 2015 12:31:20 -0000 Author: ngie Date: Sun Apr 12 12:31:19 2015 New Revision: 281465 URL: https://svnweb.freebsd.org/changeset/base/281465 Log: Add $FreeBSD$ RCS tag Modified: user/ngie/more-tests/tests/sys/kern/execve/Makefile Modified: user/ngie/more-tests/tests/sys/kern/execve/Makefile ============================================================================== --- user/ngie/more-tests/tests/sys/kern/execve/Makefile Sun Apr 12 12:29:34 2015 (r281464) +++ user/ngie/more-tests/tests/sys/kern/execve/Makefile Sun Apr 12 12:31:19 2015 (r281465) @@ -1,3 +1,5 @@ +# $FreeBSD$ + TESTSDIR= ${TESTSBASE}/sys/kern/execve BINDIR= ${TESTSDIR} From owner-svn-src-user@FreeBSD.ORG Sun Apr 12 22:44:48 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 66700E95; Sun, 12 Apr 2015 22:44: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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 37B111E6; Sun, 12 Apr 2015 22:44:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3CMim5t062592; Sun, 12 Apr 2015 22:44:48 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3CMil3A062591; Sun, 12 Apr 2015 22:44:47 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504122244.t3CMil3A062591@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 12 Apr 2015 22:44:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281476 - user/ngie/more-tests/share/mk X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Apr 2015 22:44:48 -0000 Author: ngie Date: Sun Apr 12 22:44:47 2015 New Revision: 281476 URL: https://svnweb.freebsd.org/changeset/base/281476 Log: Put kyuafile-check in beforetest so the target isn't evaluated when iterating through subdirs (like bin/), thus causing the build to fail Modified: user/ngie/more-tests/share/mk/suite.test.mk Modified: user/ngie/more-tests/share/mk/suite.test.mk ============================================================================== --- user/ngie/more-tests/share/mk/suite.test.mk Sun Apr 12 22:40:27 2015 (r281475) +++ user/ngie/more-tests/share/mk/suite.test.mk Sun Apr 12 22:44:47 2015 (r281476) @@ -85,7 +85,26 @@ KYUA?= ${KYUA_PREFIX}/bin/kyua _kyuafile= ${DESTDIR}${TESTSDIR}/Kyuafile -kyuafile-check: +realtest: .PHONY +.if exists(${KYUA}) +# Definition of the "make test" target and supporting variables. +# +# This target, by necessity, can only work for native builds (i.e. a FreeBSD +# host building a release for the same system). The target runs Kyua, which is +# not in the toolchain, and the tests execute code built for the target host. +# +# Due to the dependencies of the binaries built by the source tree and how they +# are used by tests, it is highly possible for a execution of "make test" to +# report bogus results unless the new binaries are put in place. +realtest: + @${KYUA} test -k ${_kyuafile} +.endif + +beforetest: .PHONY +.if !defined(TESTSDIR) + @echo "*** No TESTSDIR defined; nothing to do." + @false +.endif .if ${KYUAFILE:tl} != "no" @if [ ! -f ${_kyuafile} ]; then \ echo "*** Please run make install and make test for" \ @@ -104,24 +123,3 @@ kyuafile-check: false; \ fi .endif - -.if exists(${KYUA}) -# Definition of the "make test" target and supporting variables. -# -# This target, by necessity, can only work for native builds (i.e. a FreeBSD -# host building a release for the same system). The target runs Kyua, which is -# not in the toolchain, and the tests execute code built for the target host. -# -# Due to the dependencies of the binaries built by the source tree and how they -# are used by tests, it is highly possible for a execution of "make test" to -# report bogus results unless the new binaries are put in place. -realtest: .PHONY - ${KYUA} test -k ${_kyuafile} -.endif - -beforetest: .PHONY -beforetest: kyuafile-check -.if !defined(TESTSDIR) - @echo "*** No TESTSDIR defined; nothing to do." - @false -.endif From owner-svn-src-user@FreeBSD.ORG Sun Apr 12 22:54:13 2015 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 81483FFA; Sun, 12 Apr 2015 22:54:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 68BD22FA; Sun, 12 Apr 2015 22:54:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3CMsDem067305; Sun, 12 Apr 2015 22:54:13 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3CMs51W067272; Sun, 12 Apr 2015 22:54:05 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504122254.t3CMs51W067272@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 12 Apr 2015 22:54:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281477 - in user/ngie/more-tests: lib/libc/sys sys/arm/amlogic/aml8726 sys/arm/conf sys/arm/freescale/vybrid sys/arm/qemu sys/arm/samsung/exynos sys/arm/samsung/s3c2xx0 sys/boot/efi/lo... X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Apr 2015 22:54:13 -0000 Author: ngie Date: Sun Apr 12 22:54:04 2015 New Revision: 281477 URL: https://svnweb.freebsd.org/changeset/base/281477 Log: MFhead @ r281476 Added: user/ngie/more-tests/sys/arm/conf/VIRT - copied unchanged from r281476, head/sys/arm/conf/VIRT user/ngie/more-tests/sys/arm/qemu/ - copied from r281476, head/sys/arm/qemu/ user/ngie/more-tests/sys/dev/psci/ - copied from r281476, head/sys/dev/psci/ Modified: user/ngie/more-tests/lib/libc/sys/mount.2 user/ngie/more-tests/sys/arm/amlogic/aml8726/aml8726_clkmsr.c user/ngie/more-tests/sys/arm/amlogic/aml8726/aml8726_i2c.c user/ngie/more-tests/sys/arm/amlogic/aml8726/aml8726_identsoc.c user/ngie/more-tests/sys/arm/amlogic/aml8726/aml8726_machdep.c user/ngie/more-tests/sys/arm/amlogic/aml8726/aml8726_mmc.c user/ngie/more-tests/sys/arm/amlogic/aml8726/aml8726_soc.h user/ngie/more-tests/sys/arm/amlogic/aml8726/aml8726_timer.c user/ngie/more-tests/sys/arm/amlogic/aml8726/aml8726_wdt.c user/ngie/more-tests/sys/arm/amlogic/aml8726/uart_dev_aml8726.c user/ngie/more-tests/sys/arm/freescale/vybrid/vf_uart.c user/ngie/more-tests/sys/arm/samsung/exynos/exynos_uart.c user/ngie/more-tests/sys/arm/samsung/s3c2xx0/uart_dev_s3c2410.c user/ngie/more-tests/sys/boot/efi/loader/Makefile user/ngie/more-tests/sys/boot/efi/loader/arch/amd64/Makefile.inc user/ngie/more-tests/sys/boot/efi/loader/arch/arm/Makefile.inc user/ngie/more-tests/sys/boot/efi/loader/arch/arm/ldscript.arm user/ngie/more-tests/sys/boot/efi/loader/arch/i386/Makefile.inc user/ngie/more-tests/sys/boot/fdt/dts/arm/odroidc1.dts user/ngie/more-tests/sys/boot/fdt/dts/arm/vsatv102-m6.dts user/ngie/more-tests/sys/compat/svr4/svr4_stream.c user/ngie/more-tests/sys/conf/files.arm user/ngie/more-tests/sys/dev/acpica/acpivar.h user/ngie/more-tests/sys/dev/atkbdc/psm.c user/ngie/more-tests/sys/dev/streams/streams.c user/ngie/more-tests/sys/dev/uart/uart_bus.h user/ngie/more-tests/sys/dev/uart/uart_bus_fdt.c user/ngie/more-tests/sys/dev/uart/uart_core.c user/ngie/more-tests/sys/dev/uart/uart_cpu.h user/ngie/more-tests/sys/dev/uart/uart_cpu_fdt.c user/ngie/more-tests/sys/dev/uart/uart_dev_imx.c user/ngie/more-tests/sys/dev/uart/uart_dev_lpc.c user/ngie/more-tests/sys/dev/uart/uart_dev_msm.c user/ngie/more-tests/sys/dev/uart/uart_dev_ns8250.c user/ngie/more-tests/sys/dev/uart/uart_dev_pl011.c user/ngie/more-tests/sys/dev/uart/uart_dev_quicc.c user/ngie/more-tests/sys/dev/uart/uart_dev_sab82532.c user/ngie/more-tests/sys/dev/uart/uart_dev_ti8250.c user/ngie/more-tests/sys/dev/uart/uart_dev_z8530.c user/ngie/more-tests/sys/kern/kern_descrip.c user/ngie/more-tests/sys/kern/kern_fork.c user/ngie/more-tests/sys/kern/sys_pipe.c user/ngie/more-tests/sys/kern/tty_pts.c user/ngie/more-tests/sys/kern/uipc_mqueue.c user/ngie/more-tests/sys/kern/uipc_sem.c user/ngie/more-tests/sys/kern/uipc_shm.c user/ngie/more-tests/sys/kern/uipc_syscalls.c user/ngie/more-tests/sys/mips/adm5120/uart_dev_adm5120.c user/ngie/more-tests/sys/mips/atheros/uart_dev_ar933x.c user/ngie/more-tests/sys/mips/cavium/uart_dev_oct16550.c user/ngie/more-tests/sys/mips/conf/CARAMBOLA2.hints user/ngie/more-tests/sys/mips/rt305x/uart_dev_rt305x.c user/ngie/more-tests/sys/netinet/sctp_syscalls.c user/ngie/more-tests/sys/ofed/include/linux/file.h user/ngie/more-tests/sys/sparc64/pci/sbbc.c user/ngie/more-tests/sys/sys/cdefs.h user/ngie/more-tests/sys/sys/filedesc.h user/ngie/more-tests/sys/sys/module.h user/ngie/more-tests/sys/sys/mouse.h user/ngie/more-tests/sys/sys/socketvar.h user/ngie/more-tests/sys/vm/uma_core.c user/ngie/more-tests/sys/vm/uma_int.h user/ngie/more-tests/sys/vm/vm_reserv.c user/ngie/more-tests/sys/x86/acpica/OsdEnvironment.c user/ngie/more-tests/usr.bin/iscsictl/Makefile user/ngie/more-tests/usr.bin/iscsictl/iscsictl.c user/ngie/more-tests/usr.bin/iscsictl/parse.y user/ngie/more-tests/usr.bin/iscsictl/periphs.c user/ngie/more-tests/usr.sbin/bluetooth/hccontrol/hccontrol.c user/ngie/more-tests/usr.sbin/bluetooth/hccontrol/util.c Directory Properties: user/ngie/more-tests/ (props changed) user/ngie/more-tests/lib/libc/ (props changed) user/ngie/more-tests/sys/ (props changed) user/ngie/more-tests/sys/boot/ (props changed) user/ngie/more-tests/sys/conf/ (props changed) Modified: user/ngie/more-tests/lib/libc/sys/mount.2 ============================================================================== --- user/ngie/more-tests/lib/libc/sys/mount.2 Sun Apr 12 22:44:47 2015 (r281476) +++ user/ngie/more-tests/lib/libc/sys/mount.2 Sun Apr 12 22:54:04 2015 (r281477) @@ -28,7 +28,7 @@ .\" @(#)mount.2 8.3 (Berkeley) 5/24/95 .\" $FreeBSD$ .\" -.Dd January 26, 2010 +.Dd April 13, 2015 .Dt MOUNT 2 .Os .Sh NAME @@ -351,11 +351,6 @@ The argument points outside the process's allocated address space. .El -.Pp -A -.Em ufs -mount can also fail if the maximum number of file systems are currently -mounted. .Sh SEE ALSO .Xr lsvfs 1 , .Xr mksnap_ffs 8 , Modified: user/ngie/more-tests/sys/arm/amlogic/aml8726/aml8726_clkmsr.c ============================================================================== --- user/ngie/more-tests/sys/arm/amlogic/aml8726/aml8726_clkmsr.c Sun Apr 12 22:44:47 2015 (r281476) +++ user/ngie/more-tests/sys/arm/amlogic/aml8726/aml8726_clkmsr.c Sun Apr 12 22:54:04 2015 (r281477) @@ -56,6 +56,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include @@ -147,6 +148,30 @@ aml8726_clkmsr_clock_frequency(struct am return value; } +static void +aml8726_clkmsr_fixup_clk81(struct aml8726_clkmsr_softc *sc, int freq) +{ + pcell_t prop; + ssize_t len; + phandle_t clk_node; + phandle_t node; + + node = ofw_bus_get_node(sc->dev); + + len = OF_getencprop(node, "clocks", &prop, sizeof(prop)); + if ((len / sizeof(prop)) != 1 || prop == 0 || + (clk_node = OF_node_from_xref(prop)) == 0) + return; + + len = OF_getencprop(clk_node, "clock-frequency", &prop, sizeof(prop)); + if ((len / sizeof(prop)) != 1 || prop != 0) + return; + + freq = cpu_to_fdt32(freq); + + OF_setprop(clk_node, "clock-frequency", (void *)&freq, sizeof(freq)); +} + static int aml8726_clkmsr_probe(device_t dev) { @@ -178,6 +203,8 @@ aml8726_clkmsr_attach(device_t dev) freq = aml8726_clkmsr_clock_frequency(sc, AML_CLKMSR_CLK81); device_printf(sc->dev, "bus clock %u MHz\n", freq); + aml8726_clkmsr_fixup_clk81(sc, freq * 1000000); + return (0); } @@ -209,8 +236,8 @@ static driver_t aml8726_clkmsr_driver = static devclass_t aml8726_clkmsr_devclass; -DRIVER_MODULE(clkmsr, simplebus, aml8726_clkmsr_driver, - aml8726_clkmsr_devclass, 0, 0); +EARLY_DRIVER_MODULE(clkmsr, simplebus, aml8726_clkmsr_driver, + aml8726_clkmsr_devclass, 0, 0, BUS_PASS_CPU + BUS_PASS_ORDER_EARLY); int aml8726_clkmsr_bus_frequency() @@ -222,6 +249,9 @@ aml8726_clkmsr_bus_frequency() u_long start, size; int freq; + KASSERT(aml8726_soc_hw_rev != AML_SOC_HW_REV_UNKNOWN, + ("aml8726_soc_hw_rev isn't initialized")); + /* * Try to access the clkmsr node directly i.e. through /aliases/. */ Modified: user/ngie/more-tests/sys/arm/amlogic/aml8726/aml8726_i2c.c ============================================================================== --- user/ngie/more-tests/sys/arm/amlogic/aml8726/aml8726_i2c.c Sun Apr 12 22:44:47 2015 (r281476) +++ user/ngie/more-tests/sys/arm/amlogic/aml8726/aml8726_i2c.c Sun Apr 12 22:54:04 2015 (r281477) @@ -93,7 +93,7 @@ aml8726_iic_probe(device_t dev) if (!ofw_bus_status_okay(dev)) return (ENXIO); - if (!ofw_bus_is_compatible(dev, "amlogic,aml8726-i2c")) + if (!ofw_bus_is_compatible(dev, "amlogic,meson6-i2c")) return (ENXIO); device_set_desc(dev, "Amlogic aml8726 I2C"); Modified: user/ngie/more-tests/sys/arm/amlogic/aml8726/aml8726_identsoc.c ============================================================================== --- user/ngie/more-tests/sys/arm/amlogic/aml8726/aml8726_identsoc.c Sun Apr 12 22:44:47 2015 (r281476) +++ user/ngie/more-tests/sys/arm/amlogic/aml8726/aml8726_identsoc.c Sun Apr 12 22:54:04 2015 (r281477) @@ -59,8 +59,8 @@ __FBSDID("$FreeBSD$"); #include -uint32_t aml8726_soc_hw_rev = 0xffffffff; -uint32_t aml8726_soc_metal_rev = 0xffffffff; +uint32_t aml8726_soc_hw_rev = AML_SOC_HW_REV_UNKNOWN; +uint32_t aml8726_soc_metal_rev = AML_SOC_METAL_REV_UNKNOWN; static const struct { uint32_t hw_rev; @@ -86,11 +86,10 @@ static const struct { { 0xff, NULL } }; -static void -aml8726_identify_soc(void *dummy) +void +aml8726_identify_soc() { int err; - int i; struct resource res; memset(&res, 0, sizeof(res)); @@ -108,6 +107,12 @@ aml8726_identify_soc(void *dummy) aml8726_soc_metal_rev = bus_read_4(&res, AML_SOC_METAL_REV_REG); bus_space_unmap(res.r_bustag, res.r_bushandle, 0x100000); +} + +static void +aml8726_identify_announce_soc(void *dummy) +{ + int i; for (i = 0; aml8726_soc_desc[i].desc; i++) if (aml8726_soc_desc[i].hw_rev == aml8726_soc_hw_rev) @@ -133,5 +138,5 @@ aml8726_identify_soc(void *dummy) printf("\n"); } -SYSINIT(aml8726_identify_soc, SI_SUB_CPU, SI_ORDER_SECOND, - aml8726_identify_soc, NULL); +SYSINIT(aml8726_identify_announce_soc, SI_SUB_CPU, SI_ORDER_SECOND, + aml8726_identify_announce_soc, NULL); Modified: user/ngie/more-tests/sys/arm/amlogic/aml8726/aml8726_machdep.c ============================================================================== --- user/ngie/more-tests/sys/arm/amlogic/aml8726/aml8726_machdep.c Sun Apr 12 22:44:47 2015 (r281476) +++ user/ngie/more-tests/sys/arm/amlogic/aml8726/aml8726_machdep.c Sun Apr 12 22:54:04 2015 (r281477) @@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$"); #include +#include #include #if defined(SOCDEV_PA) && defined(SOCDEV_VA) @@ -55,12 +56,12 @@ vm_offset_t aml8726_aobus_kva_base; static void aml8726_fixup_busfreq() { - phandle_t node, child; + phandle_t node; pcell_t freq, prop; ssize_t len; /* - * Set the bus-frequency for any top level SoC simple-bus which + * Set the bus-frequency for the SoC simple-bus if it * needs updating (meaning the current frequency is zero). */ @@ -74,16 +75,6 @@ aml8726_fixup_busfreq() len = OF_getencprop(node, "bus-frequency", &prop, sizeof(prop)); if ((len / sizeof(prop)) == 1 && prop == 0) OF_setprop(node, "bus-frequency", (void *)&freq, sizeof(freq)); - - for (child = OF_child(node); child != 0; child = OF_peer(child)) { - if (fdt_is_compatible_strict(child, "simple-bus")) { - len = OF_getencprop(child, "bus-frequency", - &prop, sizeof(prop)); - if ((len / sizeof(prop)) == 1 && prop == 0) - OF_setprop(child, "bus-frequency", - (void *)&freq, sizeof(freq)); - } - } } vm_offset_t @@ -116,6 +107,13 @@ platform_gpio_init(void) (vm_offset_t)arm_devmap_ptov(0xc8100000, 0x100000); /* + * The hardware mux used by clkmsr is unique to the SoC (though + * currently clk81 is at a fixed location, however that might + * change in the future). + */ + aml8726_identify_soc(); + + /* * This FDT fixup should arguably be called through fdt_fixup_table, * however currently there's no mechanism to specify a fixup which * should always be invoked. @@ -179,13 +177,13 @@ fdt_pic_decode_ic(phandle_t node, pcell_ * multi core chips also have a GIC. */ #ifdef SMP - if (!fdt_is_compatible_strict(node, "arm,gic")) + if (!fdt_is_compatible_strict(node, "arm,cortex-a9-gic")) #else if (!fdt_is_compatible_strict(node, "amlogic,aml8726-pic")) #endif return (ENXIO); - *interrupt = fdt32_to_cpu(intr[0]); + *interrupt = fdt32_to_cpu(intr[1]); *trig = INTR_TRIGGER_EDGE; *pol = INTR_POLARITY_HIGH; Modified: user/ngie/more-tests/sys/arm/amlogic/aml8726/aml8726_mmc.c ============================================================================== --- user/ngie/more-tests/sys/arm/amlogic/aml8726/aml8726_mmc.c Sun Apr 12 22:44:47 2015 (r281476) +++ user/ngie/more-tests/sys/arm/amlogic/aml8726/aml8726_mmc.c Sun Apr 12 22:54:04 2015 (r281477) @@ -107,6 +107,25 @@ static struct resource_spec aml8726_mmc_ #define PWR_OFF_FLAG(pol) ((pol) == 0 ? GPIO_PIN_HIGH : \ GPIO_PIN_LOW) +static unsigned int +aml8726_mmc_clk(phandle_t node) +{ + pcell_t prop; + ssize_t len; + phandle_t clk_node; + + len = OF_getencprop(node, "clocks", &prop, sizeof(prop)); + if ((len / sizeof(prop)) != 1 || prop == 0 || + (clk_node = OF_node_from_xref(prop)) == 0) + return (0); + + len = OF_getencprop(clk_node, "clock-frequency", &prop, sizeof(prop)); + if ((len / sizeof(prop)) != 1 || prop == 0) + return (0); + + return ((unsigned int)prop); +} + static void aml8726_mmc_mapmem(void *arg, bus_dma_segment_t *segs, int nseg, int error) { @@ -502,15 +521,13 @@ aml8726_mmc_attach(device_t dev) node = ofw_bus_get_node(dev); - len = OF_getencprop(OF_parent(node), "bus-frequency", - prop, sizeof(prop)); - if ((len / sizeof(prop[0])) != 1 || prop[0] == 0) { - device_printf(dev, "missing bus-frequency attribute in FDT\n"); + sc->ref_freq = aml8726_mmc_clk(node); + + if (sc->ref_freq == 0) { + device_printf(dev, "missing clocks attribute in FDT\n"); return (ENXIO); } - sc->ref_freq = prop[0]; - /* * The pins must be specified as part of the device in order * to know which port to used. Modified: user/ngie/more-tests/sys/arm/amlogic/aml8726/aml8726_soc.h ============================================================================== --- user/ngie/more-tests/sys/arm/amlogic/aml8726/aml8726_soc.h Sun Apr 12 22:44:47 2015 (r281476) +++ user/ngie/more-tests/sys/arm/amlogic/aml8726/aml8726_soc.h Sun Apr 12 22:54:04 2015 (r281477) @@ -32,8 +32,11 @@ #define AML_SOC_AOBUS_BASE_ADDR 0xc8100000 #define AML_SOC_CBUS_BASE_ADDR 0xc1100000 +void aml8726_identify_soc(void); + /* cbus */ #define AML_SOC_HW_REV_REG 0x7d4c +#define AML_SOC_HW_REV_UNKNOWN 0xffffffff #define AML_SOC_HW_REV_M3 0x15 #define AML_SOC_HW_REV_M6 0x16 #define AML_SOC_HW_REV_M6TV 0x17 @@ -42,6 +45,7 @@ #define AML_SOC_HW_REV_M8B 0x1b #define AML_SOC_METAL_REV_REG 0x81a8 +#define AML_SOC_METAL_REV_UNKNOWN 0xffffffff #define AML_SOC_M8_METAL_REV_A 0x11111111 #define AML_SOC_M8_METAL_REV_M2_A 0x11111112 #define AML_SOC_M8_METAL_REV_B 0x11111113 Modified: user/ngie/more-tests/sys/arm/amlogic/aml8726/aml8726_timer.c ============================================================================== --- user/ngie/more-tests/sys/arm/amlogic/aml8726/aml8726_timer.c Sun Apr 12 22:44:47 2015 (r281476) +++ user/ngie/more-tests/sys/arm/amlogic/aml8726/aml8726_timer.c Sun Apr 12 22:54:04 2015 (r281477) @@ -226,7 +226,7 @@ aml8726_timer_probe(device_t dev) if (!ofw_bus_status_okay(dev)) return (ENXIO); - if (!ofw_bus_is_compatible(dev, "amlogic,aml8726-timer")) + if (!ofw_bus_is_compatible(dev, "amlogic,meson6-timer")) return (ENXIO); device_set_desc(dev, "Amlogic aml8726 timer"); Modified: user/ngie/more-tests/sys/arm/amlogic/aml8726/aml8726_wdt.c ============================================================================== --- user/ngie/more-tests/sys/arm/amlogic/aml8726/aml8726_wdt.c Sun Apr 12 22:44:47 2015 (r281476) +++ user/ngie/more-tests/sys/arm/amlogic/aml8726/aml8726_wdt.c Sun Apr 12 22:54:04 2015 (r281477) @@ -167,7 +167,7 @@ aml8726_wdt_probe(device_t dev) if (!ofw_bus_status_okay(dev)) return (ENXIO); - if (!ofw_bus_is_compatible(dev, "amlogic,aml8726-wdt")) + if (!ofw_bus_is_compatible(dev, "amlogic,meson6-wdt")) return (ENXIO); device_set_desc(dev, "Amlogic aml8726 WDT"); Modified: user/ngie/more-tests/sys/arm/amlogic/aml8726/uart_dev_aml8726.c ============================================================================== --- user/ngie/more-tests/sys/arm/amlogic/aml8726/uart_dev_aml8726.c Sun Apr 12 22:44:47 2015 (r281476) +++ user/ngie/more-tests/sys/arm/amlogic/aml8726/uart_dev_aml8726.c Sun Apr 12 22:54:04 2015 (r281477) @@ -48,6 +48,10 @@ __FBSDID("$FreeBSD$"); #include #include +#include +#include +#include + #include #include #include @@ -262,6 +266,25 @@ struct uart_ops aml8726_uart_ops = { .getc = aml8726_uart_getc, }; +static unsigned int +aml8726_uart_bus_clk(phandle_t node) +{ + pcell_t prop; + ssize_t len; + phandle_t clk_node; + + len = OF_getencprop(node, "clocks", &prop, sizeof(prop)); + if ((len / sizeof(prop)) != 1 || prop == 0 || + (clk_node = OF_node_from_xref(prop)) == 0) + return (0); + + len = OF_getencprop(clk_node, "clock-frequency", &prop, sizeof(prop)); + if ((len / sizeof(prop)) != 1 || prop == 0) + return (0); + + return ((unsigned int)prop); +} + static int aml8726_uart_bus_probe(struct uart_softc *sc) { @@ -330,8 +353,10 @@ aml8726_uart_bus_attach(struct uart_soft bas = &sc->sc_bas; + bas->rclk = aml8726_uart_bus_clk(ofw_bus_get_node(sc->sc_dev)); + if (bas->rclk == 0) { - device_printf(sc->sc_dev, "missing clock attribute in FDT\n"); + device_printf(sc->sc_dev, "missing clocks attribute in FDT\n"); return (ENXIO); } @@ -699,11 +724,12 @@ struct uart_class uart_aml8726_class = { sizeof(struct uart_softc), .uc_ops = &aml8726_uart_ops, .uc_range = 24, - .uc_rclk = 0 + .uc_rclk = 0, + .uc_rshift = 0 }; static struct ofw_compat_data compat_data[] = { - { "amlogic,aml8726-uart", (uintptr_t)&uart_aml8726_class }, + { "amlogic,meson-uart", (uintptr_t)&uart_aml8726_class }, { NULL, (uintptr_t)NULL } }; UART_FDT_CLASS_AND_DEVICE(compat_data); Copied: user/ngie/more-tests/sys/arm/conf/VIRT (from r281476, head/sys/arm/conf/VIRT) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests/sys/arm/conf/VIRT Sun Apr 12 22:54:04 2015 (r281477, copy of r281476, head/sys/arm/conf/VIRT) @@ -0,0 +1,97 @@ +# +# VIRT -- Custom configuration for the qemu virt platform +# +# For more information on this file, please read the config(5) manual page, +# and/or the handbook section on Kernel Configuration Files: +# +# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# +# The handbook is also available locally in /usr/share/doc/handbook +# if you've installed the doc distribution, otherwise always see the +# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# latest information. +# +# An exhaustive list of options and more detailed explanations of the +# device lines is also present in the ../../conf/NOTES and NOTES files. +# If you are in doubt as to the purpose or necessity of a line, check first +# in NOTES. +# +# $FreeBSD$ + +ident VIRT + +include "../qemu/std.virt" + +options HZ=100 +options SCHED_4BSD # 4BSD scheduler +options PREEMPTION # Enable kernel thread preemption +options INET # InterNETworking +options INET6 # IPv6 communications protocols +options SCTP # Stream Control Transmission Protocol +options FFS # Berkeley Fast Filesystem +options SOFTUPDATES # Enable FFS soft updates support +options UFS_ACL # Support for access control lists +options UFS_DIRHASH # Improve performance on big directories +options UFS_GJOURNAL # Enable gjournal-based UFS journaling +options QUOTA # Enable disk quotas for UFS +options NFSCL # Network Filesystem Client +options NFSLOCKD # Network Lock Manager +options NFS_ROOT # NFS usable as /, requires NFSCL +options MSDOSFS # MSDOS Filesystem +options CD9660 # ISO 9660 Filesystem +options PROCFS # Process filesystem (requires PSEUDOFS) +options PSEUDOFS # Pseudo-filesystem framework +options TMPFS # Efficient memory filesystem +options GEOM_PART_GPT # GUID Partition Tables +options GEOM_PART_BSD # BSD partition scheme +options GEOM_PART_MBR # MBR partition scheme +options GEOM_LABEL # Provides labelization +options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!] +options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI +options KTRACE # ktrace(1) support +options SYSVSHM # SYSV-style shared memory +options SYSVMSG # SYSV-style message queues +options SYSVSEM # SYSV-style semaphores +options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions +options KBD_INSTALL_CDEV # install a CDEV entry in /dev +options PLATFORM +options FREEBSD_BOOT_LOADER # Process metadata passed from loader(8) +options VFP # Enable floating point hardware support +options ARM_NEW_PMAP # Enable the new v6 pmap + +# Debugging for use in -current +makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols +options BREAK_TO_DEBUGGER +options ALT_BREAK_TO_DEBUGGER +#options VERBOSE_SYSINIT # Enable verbose sysinit messages +options KDB # Enable kernel debugger support +# For minimum debugger support (stable branch) use: +#options KDB_TRACE # Print a stack trace for a panic +# For full debugger support use this instead: +options DDB # Enable the kernel debugger +options INVARIANTS # Enable calls of extra sanity checking +options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS +#options WITNESS # Enable checks to detect deadlocks and cycles +#options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed +#options DIAGNOSTIC + +device bpf +device loop +device ether +device uart +device pty +device snp +device pl011 +device psci + +device virtio +device virtio_mmio +device virtio_blk +device vtnet + +device md +device random # Entropy device + +# Flattened Device Tree +options FDT # Configure using FDT/DTB data + Modified: user/ngie/more-tests/sys/arm/freescale/vybrid/vf_uart.c ============================================================================== --- user/ngie/more-tests/sys/arm/freescale/vybrid/vf_uart.c Sun Apr 12 22:44:47 2015 (r281476) +++ user/ngie/more-tests/sys/arm/freescale/vybrid/vf_uart.c Sun Apr 12 22:54:04 2015 (r281477) @@ -276,7 +276,8 @@ static struct uart_class uart_vybrid_cla sizeof(struct vf_uart_softc), .uc_ops = &uart_vybrid_ops, .uc_range = 0x100, - .uc_rclk = 24000000 /* TODO: get value from CCM */ + .uc_rclk = 24000000, /* TODO: get value from CCM */ + .uc_rshift = 0 }; static struct ofw_compat_data compat_data[] = { Modified: user/ngie/more-tests/sys/arm/samsung/exynos/exynos_uart.c ============================================================================== --- user/ngie/more-tests/sys/arm/samsung/exynos/exynos_uart.c Sun Apr 12 22:44:47 2015 (r281476) +++ user/ngie/more-tests/sys/arm/samsung/exynos/exynos_uart.c Sun Apr 12 22:54:04 2015 (r281477) @@ -380,6 +380,7 @@ static struct uart_class uart_exynos4210 .uc_ops = &uart_exynos4210_ops, .uc_range = 8, .uc_rclk = 0, + .uc_rshift = 0 }; static struct ofw_compat_data compat_data[] = { Modified: user/ngie/more-tests/sys/arm/samsung/s3c2xx0/uart_dev_s3c2410.c ============================================================================== --- user/ngie/more-tests/sys/arm/samsung/s3c2xx0/uart_dev_s3c2410.c Sun Apr 12 22:44:47 2015 (r281476) +++ user/ngie/more-tests/sys/arm/samsung/s3c2xx0/uart_dev_s3c2410.c Sun Apr 12 22:54:04 2015 (r281477) @@ -402,4 +402,5 @@ struct uart_class uart_s3c2410_class = { .uc_ops = &uart_s3c2410_ops, .uc_range = 8, .uc_rclk = 0, + .uc_rshift = 0 }; Modified: user/ngie/more-tests/sys/boot/efi/loader/Makefile ============================================================================== --- user/ngie/more-tests/sys/boot/efi/loader/Makefile Sun Apr 12 22:44:47 2015 (r281476) +++ user/ngie/more-tests/sys/boot/efi/loader/Makefile Sun Apr 12 22:54:04 2015 (r281477) @@ -20,6 +20,7 @@ SRCS= autoload.c \ copy.c \ devicename.c \ main.c \ + reloc.c \ smbios.c \ vers.c @@ -28,7 +29,6 @@ SRCS= autoload.c \ .PATH: ${.CURDIR}/../../i386/libi386 .include "${.CURDIR}/arch/${MACHINE_CPUARCH}/Makefile.inc" -CFLAGS+= -fPIC CFLAGS+= -I${.CURDIR} CFLAGS+= -I${.CURDIR}/arch/${MACHINE_CPUARCH} CFLAGS+= -I${.CURDIR}/../include @@ -71,7 +71,7 @@ FILES= loader.efi FILESMODE_loader.efi= ${BINMODE} LDSCRIPT= ${.CURDIR}/arch/${MACHINE_CPUARCH}/ldscript.${MACHINE_CPUARCH} -LDFLAGS= -Wl,-T${LDSCRIPT} -Wl,-Bsymbolic -shared -Wl,-znocombreloc +LDFLAGS+= -Wl,-T${LDSCRIPT} -Wl,-Bsymbolic -shared CLEANFILES= vers.c loader.efi Modified: user/ngie/more-tests/sys/boot/efi/loader/arch/amd64/Makefile.inc ============================================================================== --- user/ngie/more-tests/sys/boot/efi/loader/arch/amd64/Makefile.inc Sun Apr 12 22:44:47 2015 (r281476) +++ user/ngie/more-tests/sys/boot/efi/loader/arch/amd64/Makefile.inc Sun Apr 12 22:54:04 2015 (r281477) @@ -3,9 +3,11 @@ SRCS+= amd64_tramp.S \ start.S \ framebuffer.c \ - elf64_freebsd.c \ - reloc.c + elf64_freebsd.c .PATH: ${.CURDIR}/../../i386/libi386 SRCS+= nullconsole.c \ comconsole.c + +CFLAGS+= -fPIC +LDFLAGS+= -Wl,-znocombreloc Modified: user/ngie/more-tests/sys/boot/efi/loader/arch/arm/Makefile.inc ============================================================================== --- user/ngie/more-tests/sys/boot/efi/loader/arch/arm/Makefile.inc Sun Apr 12 22:44:47 2015 (r281476) +++ user/ngie/more-tests/sys/boot/efi/loader/arch/arm/Makefile.inc Sun Apr 12 22:54:04 2015 (r281477) @@ -1,5 +1,6 @@ # $FreeBSD$ SRCS+= exec.c \ - start.S \ - reloc.c + start.S + +LOADER_FDT_SUPPORT=yes Modified: user/ngie/more-tests/sys/boot/efi/loader/arch/arm/ldscript.arm ============================================================================== --- user/ngie/more-tests/sys/boot/efi/loader/arch/arm/ldscript.arm Sun Apr 12 22:44:47 2015 (r281476) +++ user/ngie/more-tests/sys/boot/efi/loader/arch/arm/ldscript.arm Sun Apr 12 22:54:04 2015 (r281477) @@ -8,10 +8,8 @@ SECTIONS /* Read-only sections, merged into text segment: */ . = 0; ImageBase = .; - .peheader : { - *(.peheader) - } .text : { + *(.peheader) *(.text .stub .text.* .gnu.linkonce.t.*) /* .gnu.warning sections are handled specially by elf32.em. */ *(.gnu.warning) @@ -22,65 +20,43 @@ SECTIONS . = ALIGN(4096); .data : { - *(.data) + *(.data *.data.*) *(.gnu.linkonce.d*) *(.rodata) *(.rodata.*) CONSTRUCTORS + + PROVIDE (__bss_start = .); + *(.sbss) + *(.scommon) + *(.dynsbss) + *(.dynbss) + *(.bss) + *(COMMON) + PROVIDE (__bss_end = .); } - .data1 : { *(.data1) } - .got1 : { *(.got1) } - .dynamic : { *(.dynamic) } - /* Put .ctors and .dtors next to the .got2 section, so that the pointers - get relocated with -mrelocatable. Also put in the .fixup pointers. - The current compiler no longer needs this, but keep it around for 2.7.2 */ - PROVIDE (_GOT2_START_ = .); - .got2 : { *(.got2) } - PROVIDE (__CTOR_LIST__ = .); - .ctors : { *(.ctors) } - PROVIDE (__CTOR_END__ = .); - PROVIDE (__DTOR_LIST__ = .); - .dtors : { *(.dtors) } - PROVIDE (__DTOR_END__ = .); - PROVIDE (_FIXUP_START_ = .); - .fixup : { *(.fixup) } - PROVIDE (_FIXUP_END_ = .); - PROVIDE (_GOT2_END_ = .); - PROVIDE (_GOT_START_ = .); - .got : { *(.got) } - .got.plt : { *(.got.plt) } - PROVIDE (_GOT_END_ = .); /* We want the small data sections together, so single-instruction offsets can access them all, and initialized data all before uninitialized, so we can shorten the on-disk segment size. */ - .sdata : { *(.sdata) } - _edata = .; - PROVIDE (edata = .); + .sdata : { + *(.got.plt .got) + *(.sdata*.sdata.* .gnu.linkonce.s.*) + } set_Xcommand_set : { __start_set_Xcommand_set = .; *(set_Xcommand_set) __stop_set_Xcommand_set = .; } __gp = .; - PROVIDE (__bss_start = .); - .sbss : - { - *(.sbss) - *(.scommon) - *(.dynsbss) - } - .bss : - { - *(.dynbss) - *(.bss) - *(COMMON) - } - PROVIDE (__bss_end = .); .plt : { *(.plt) } .dynamic : { *(.dynamic) } .reloc : { *(.reloc) } - .hash : { *(.hash) } .dynsym : { *(.dynsym) } .dynstr : { *(.dynstr) } + .rel.dyn : { + *(.rel.*) + *(.relset_*) + } _edata = .; + .hash : { *(.hash) } } Modified: user/ngie/more-tests/sys/boot/efi/loader/arch/i386/Makefile.inc ============================================================================== --- user/ngie/more-tests/sys/boot/efi/loader/arch/i386/Makefile.inc Sun Apr 12 22:44:47 2015 (r281476) +++ user/ngie/more-tests/sys/boot/efi/loader/arch/i386/Makefile.inc Sun Apr 12 22:54:04 2015 (r281477) @@ -3,9 +3,11 @@ SRCS+= start.S \ efimd.c \ elf32_freebsd.c \ - exec.c \ - reloc.c + exec.c .PATH: ${.CURDIR}/../../i386/libi386 SRCS+= nullconsole.c \ comconsole.c + +CFLAGS+= -fPIC +LDFLAGS+= -Wl,-znocombreloc Modified: user/ngie/more-tests/sys/boot/fdt/dts/arm/odroidc1.dts ============================================================================== --- user/ngie/more-tests/sys/boot/fdt/dts/arm/odroidc1.dts Sun Apr 12 22:44:47 2015 (r281476) +++ user/ngie/more-tests/sys/boot/fdt/dts/arm/odroidc1.dts Sun Apr 12 22:54:04 2015 (r281477) @@ -39,6 +39,8 @@ /memreserve/ 0x7900000 0x00600000; /* 6MB frame buffer */ +#include "meson8b.dtsi" + / { model = "hardkernel,odroid-c1"; compatible = "hardkernel,odroid-c1", "amlogic,s805"; @@ -46,41 +48,10 @@ #address-cells = <1>; #size-cells = <1>; - interrupt-parent = <&gic>; - aliases { soc = &soc; screen = &screen; - uart0 = &uart0; - }; - - cpus { - #address-cells = <1>; - #size-cells = <0>; - - cpu@0 { - device_type = "cpu"; - compatible = "arm,cortex-a5"; - reg = <0x0>; - }; - - cpu@1 { - device_type = "cpu"; - compatible = "arm,cortex-a5"; - reg = <0x1>; - }; - - cpu@2 { - device_type = "cpu"; - compatible = "arm,cortex-a5"; - reg = <0x2>; - }; - - cpu@3 { - device_type = "cpu"; - compatible = "arm,cortex-a5"; - reg = <0x3>; - }; + uart0 = &uart_AO; }; memory { @@ -88,60 +59,37 @@ reg = <0x0 0x40000000>; /* 1GB RAM */ }; - soc: soc@c0000000 { + soc: soc { device_type = "soc"; - compatible = "simple-bus"; bus-frequency = <0>; - #address-cells = <1>; - #size-cells = <1>; - - ranges = <0x0 0xc0000000 0x1a100000>; - - gic: gic@4301000 { - device_type = "interrupt-controller"; - compatible = "arm,gic"; - reg = <0x4301000 0x1000>, // distributer registers - <0x4300100 0x0100>; // CPU if registers - - interrupt-controller; - #interrupt-cells = <1>; - }; - - scu: scu@4300000 { + scu: scu@c4300000 { compatible = "arm,cortex-a5-scu"; - reg = <0x4300000 0x1000>; + reg = <0xc4300000 0x1000>; }; - cpuconfig: cpuconfig@1901ff80 { + cpuconfig: cpuconfig@d901ff80 { compatible = "amlogic,aml8726-cpuconfig"; - reg = <0x1901ff80 16>; + reg = <0xd901ff80 16>; }; - pl310@4200000 { - compatible = "arm,pl310"; - reg = <0x4200000 0x1000>; - interrupts = <61>; - interrupt-parent = <&gic>; - }; - - ccm@1104140 { + ccm@c1104140 { compatible = "amlogic,aml8726-ccm"; - reg = <0x1104140 20>; /* cbus 0x1050 */ + reg = <0xc1104140 20>; /* cbus 0x1050 */ functions = "ethernet", "i2c", "rng", "sdio", "sdxc", "uart-a", "uart-b", "uart-c", "usb-a", "usb-b"; }; - pinctrl@11080b0 { + pinctrl@c11080b0 { compatible = "amlogic,aml8726-pinctrl"; - reg = <0x11080b0 40>, /* mux */ - <0x11080e8 24>, /* pu/pd */ - <0x1108120 24>, /* pull enable */ - <0x8100014 4>, /* ao mux */ - <0x810002c 4>, /* ao pu/pd */ - <0x810002c 4>; /* ao pull enable */ + reg = <0xc11080b0 40>, /* mux */ + <0xc11080e8 24>, /* pu/pd */ + <0xc1108120 24>, /* pull enable */ + <0xc8100014 4>, /* ao mux */ + <0xc810002c 4>, /* ao pu/pd */ + <0xc810002c 4>; /* ao pull enable */ /* * Currently only pin muxing that deviates @@ -242,24 +190,10 @@ }; }; - watchdog@1109900 { - compatible = "amlogic,aml8726-wdt"; - reg = <0x1109900 8>; /* cbus 0x2640 */ - interrupts = <0>; - interrupt-parent = <&gic>; - }; - - timer@1109940 { - compatible = "amlogic,aml8726-timer"; - reg = <0x1109940 24>; /* cbus 0x2650 */ - interrupts = <10 11 6 29>; - interrupt-parent = <&gic>; - }; - - rtc@8100740 { + rtc@c8100740 { compatible = "amlogic,aml8726-rtc"; - reg = <0x8100740 20>; /* aobus 0x1d0 */ - interrupts = <72>; + reg = <0xc8100740 20>; /* aobus 0x1d0 */ + interrupts = <0 72 1>; interrupt-parent = <&gic>; init-always = "false"; @@ -267,62 +201,55 @@ gpo-init = <0x500000>; }; - clkmsr: clkmsr@1108758 { + clkmsr: clkmsr@c1108758 { compatible = "amlogic,aml8726-clkmsr"; - reg = <0x1108758 16>; /* cbus 0x21d6 */ - }; + reg = <0xc1108758 16>; /* cbus 0x21d6 */ - uart0: uart@81004c0 { - /* uart-ao */ - device_type = "serial"; - compatible = "amlogic,aml8726-uart"; - clock-frequency = <0>; - current-speed = <115200>; - reg = <0x81004c0 20>; /* aobus 0x130 */ - interrupts = <90>; - interrupt-parent = <&gic>; + clocks = <&clk81>; }; - gpioao: gpio@8100024 { + gpioao: gpio@c8100024 { /* gpio unit 7 */ compatible = "amlogic,aml8726-gpio"; - reg = <0x8100024 4>, /* oen aobus 0x9 */ - <0x8100024 4>, /* out */ - <0x8100028 4>; /* in */ + reg = <0xc8100024 4>, /* oen aobus 0x9 */ + <0xc8100024 4>, /* out */ + <0xc8100028 4>; /* in */ gpio-controller; #gpio-cells = <1>; pin-count = <14>; }; - gpio3: gpio@1108054 { + gpio3: gpio@c1108054 { compatible = "amlogic,aml8726-gpio"; - reg = <0x1108054 4>, /* oen cbus 0x2015 */ - <0x1108058 4>, /* out */ - <0x110805c 4>; /* in */ + reg = <0xc1108054 4>, /* oen cbus 0x2015 */ + <0xc1108058 4>, /* out */ + <0xc110805c 4>; /* in */ gpio-controller; #gpio-cells = <1>; pin-count = <32>; }; - gpio5: gpio@110806c { + gpio5: gpio@c110806c { compatible = "amlogic,aml8726-gpio"; - reg = <0x110806c 4>, /* oen cbus 0x201b */ - <0x1108070 4>, /* out */ - <0x1108074 4>; /* in */ + reg = <0xc110806c 4>, /* oen cbus 0x201b */ + <0xc1108070 4>, /* out */ + <0xc1108074 4>; /* in */ gpio-controller; #gpio-cells = <1>; pin-count = <32>; }; - mmc@1108c20 { + mmc@c1108c20 { compatible = "amlogic,aml8726-mmc"; - reg = <0x1108c20 32>; /* cbus 0x2308 */ - interrupts = <28>; + reg = <0xc1108c20 32>; /* cbus 0x2308 */ + interrupts = <0 28 1>; interrupt-parent = <&gic>; + clocks = <&clk81>; + pinctrl-names = "default"; pinctrl-0 = <&pins_sdio_b>; @@ -342,11 +269,11 @@ ins-detect = <&gpio5 29 0>; /* card_6 */ }; - sdxc@1108e00 { + sdxc@c1108e00 { compatible = "amlogic,aml8726-sdxc-m8"; clock-frequency = <1275000000>; - reg = <0x1108e00 60>; /* cbus 0x2380 */ - interrupts = <78>; + reg = <0xc1108e00 60>; /* cbus 0x2380 */ + interrupts = <0 78 1>; interrupt-parent = <&gic>; pinctrl-names = "default"; @@ -357,82 +284,33 @@ mmc-rst = <&gpio3 9 0>; /* boot_9 emmc-rst */ }; - rng@1108100 { + rng@c1108100 { compatible = "amlogic,aml8726-rng"; - reg = <0x1108100 8>; /* cbus 0x2040 */ + reg = <0xc1108100 8>; /* cbus 0x2040 */ }; - i2c@1108500 { - /* i2c-a */ - compatible = "amlogic,aml8726-i2c"; - reg = <0x1108500 32>; /* cbus 0x2140 */ - interrupts = <21>; - interrupt-parent = <&gic>; - }; - - i2c@11087c0 { - /* i2c-b */ - compatible = "amlogic,aml8726-i2c"; - reg = <0x11087c0 32>; /* cbus 0x21f0 */ - interrupts = <128>; - interrupt-parent = <&gic>; - }; - - uart@11084c0 { - /* uart-a */ - device_type = "serial"; - compatible = "amlogic,aml8726-uart"; - clock-frequency = <0>; - current-speed = <115200>; - reg = <0x11084c0 20>; /* cbus 0x2130 */ - interrupts = <26>; - interrupt-parent = <&gic>; - }; - - uart@11084dc { - /* uart-b */ - device_type = "serial"; - compatible = "amlogic,aml8726-uart"; - clock-frequency = <0>; - current-speed = <115200>; - reg = <0x11084dc 20>; /* cbus 0x2137 */ - interrupts = <75>; - interrupt-parent = <&gic>; - }; - - uart@1108700 { - /* uart-c */ - device_type = "serial"; - compatible = "amlogic,aml8726-uart"; - clock-frequency = <0>; - current-speed = <115200>; - reg = <0x1108700 20>; /* cbus 0x21c0 */ - interrupts = <93>; - interrupt-parent = <&gic>; - }; - - usb-phy@1108800 { + usb-phy@c1108800 { /* usb-a phy */ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@FreeBSD.ORG Mon Apr 13 03:15:07 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7D72246A; Mon, 13 Apr 2015 03:15: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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 69369F96; Mon, 13 Apr 2015 03:15:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3D3F7KT090605; Mon, 13 Apr 2015 03:15:07 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3D3F7Mn090604; Mon, 13 Apr 2015 03:15:07 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504130315.t3D3F7Mn090604@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Mon, 13 Apr 2015 03:15:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281484 - user/ngie/more-tests/share/mk X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Apr 2015 03:15:07 -0000 Author: ngie Date: Mon Apr 13 03:15:06 2015 New Revision: 281484 URL: https://svnweb.freebsd.org/changeset/base/281484 Log: Remove the Kyuafile check; it needs some additional work in order to pass buildworld Modified: user/ngie/more-tests/share/mk/suite.test.mk Modified: user/ngie/more-tests/share/mk/suite.test.mk ============================================================================== --- user/ngie/more-tests/share/mk/suite.test.mk Mon Apr 13 01:55:42 2015 (r281483) +++ user/ngie/more-tests/share/mk/suite.test.mk Mon Apr 13 03:15:06 2015 (r281484) @@ -105,21 +105,3 @@ beforetest: .PHONY @echo "*** No TESTSDIR defined; nothing to do." @false .endif -.if ${KYUAFILE:tl} != "no" - @if [ ! -f ${_kyuafile} ]; then \ - echo "*** Please run make install and make test for" \ - "end-to-end testing"; \ - false; \ - fi - @if [ "${KYUAFILE:tl}" = yes ]; then \ - ext=; \ - else \ - ext=.auto; \ - fi; \ - if [ ${_kyuafile} -ot Kyuafile$$ext ]; then \ - echo "*** ${_kyuafile} is older than " \ - "${.OBJDIR}/Kyuafile$$ext"; \ - echo "*** Please run make install before running make test"; \ - false; \ - fi -.endif From owner-svn-src-user@FreeBSD.ORG Mon Apr 13 04:48:14 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C05C6CE; Mon, 13 Apr 2015 04:48:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id ABD5DA2D; Mon, 13 Apr 2015 04:48:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3D4mEeR033195; Mon, 13 Apr 2015 04:48:14 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3D4mEZc033193; Mon, 13 Apr 2015 04:48:14 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504130448.t3D4mEZc033193@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Mon, 13 Apr 2015 04:48:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281485 - in user/ngie/more-tests/tests/sys: fifo file X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Apr 2015 04:48:14 -0000 Author: ngie Date: Mon Apr 13 04:48:13 2015 New Revision: 281485 URL: https://svnweb.freebsd.org/changeset/base/281485 Log: Add missing Makefiles for fifo and file Added: user/ngie/more-tests/tests/sys/fifo/Makefile (contents, props changed) user/ngie/more-tests/tests/sys/file/Makefile (contents, props changed) Added: user/ngie/more-tests/tests/sys/fifo/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests/tests/sys/fifo/Makefile Mon Apr 13 04:48:13 2015 (r281485) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +TESTSDIR= ${TESTSBASE}/sys/fifo + +PLAIN_TESTS_C+= fifo_create +PLAIN_TESTS_C+= fifo_io +PLAIN_TESTS_C+= fifo_misc +PLAIN_TESTS_C+= fifo_open + +TEST_METADATA.fifo_create+= required_user="root" +TEST_METADATA.fifo_open+= required_user="root" + +.include Added: user/ngie/more-tests/tests/sys/file/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests/tests/sys/file/Makefile Mon Apr 13 04:48:13 2015 (r281485) @@ -0,0 +1,25 @@ +# $FreeBSD$ + +TESTSDIR= ${TESTSBASE}/sys/file + +BINDIR= ${TESTSDIR} + +TAP_TESTS_C+= closefrom_test +TAP_TESTS_C+= dup_test +TAP_TESTS_C+= fcntlflags_test +TAP_TESTS_SH+= flock_test +PLAIN_TESTS_C+= ftruncate_test +PLAIN_TESTS_C+= newfileops_on_fork_test + +PROGS+= flock_helper + +DPADD.closefrom_test= ${LIBUTIL} +LDADD.closefrom_test= -lutil + +DPADD.flock_helper= ${LIBPTHREAD} +LDADD.flock_helper= -lpthread + +DPADD.newfileops_on_fork_test= ${LIBPTHREAD} +LDADD.newfileops_on_fork_test= -lpthread + +.include From owner-svn-src-user@FreeBSD.ORG Mon Apr 13 09:40:27 2015 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 30E2B94A; Mon, 13 Apr 2015 09:40: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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1D715C8D; Mon, 13 Apr 2015 09:40:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3D9eQtX079745; Mon, 13 Apr 2015 09:40:26 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3D9eQLD079742; Mon, 13 Apr 2015 09:40:26 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504130940.t3D9eQLD079742@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Mon, 13 Apr 2015 09:40:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281489 - user/ngie/more-tests/tests/sys/kern/execve X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Apr 2015 09:40:27 -0000 Author: ngie Date: Mon Apr 13 09:40:25 2015 New Revision: 281489 URL: https://svnweb.freebsd.org/changeset/base/281489 Log: Install the proper files Added: user/ngie/more-tests/tests/sys/kern/execve/dev_null_script user/ngie/more-tests/tests/sys/kern/execve/script_arg user/ngie/more-tests/tests/sys/kern/execve/script_arg_nospace Deleted: user/ngie/more-tests/tests/sys/kern/execve/devnullscript user/ngie/more-tests/tests/sys/kern/execve/scriptarg user/ngie/more-tests/tests/sys/kern/execve/scriptarg-nospace Added: user/ngie/more-tests/tests/sys/kern/execve/dev_null_script ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests/tests/sys/kern/execve/dev_null_script Mon Apr 13 09:40:25 2015 (r281489) @@ -0,0 +1,4 @@ +#! /dev/null +# $FreeBSD$ + +echo succeeded Added: user/ngie/more-tests/tests/sys/kern/execve/script_arg ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests/tests/sys/kern/execve/script_arg Mon Apr 13 09:40:25 2015 (r281489) @@ -0,0 +1,4 @@ +#! /bin/sh -x +# $FreeBSD$ + +echo succeeded Added: user/ngie/more-tests/tests/sys/kern/execve/script_arg_nospace ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests/tests/sys/kern/execve/script_arg_nospace Mon Apr 13 09:40:25 2015 (r281489) @@ -0,0 +1,4 @@ +#!/bin/sh -x +# $FreeBSD$ + +echo succeeded From owner-svn-src-user@FreeBSD.ORG Mon Apr 13 09:40:58 2015 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D5422A36; Mon, 13 Apr 2015 09:40:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C159FC90; Mon, 13 Apr 2015 09:40:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3D9ew4N079884; Mon, 13 Apr 2015 09:40:58 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3D9ewoL079883; Mon, 13 Apr 2015 09:40:58 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504130940.t3D9ewoL079883@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Mon, 13 Apr 2015 09:40:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281490 - user/ngie/more-tests/tests/sys/mqueue X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Apr 2015 09:40:58 -0000 Author: ngie Date: Mon Apr 13 09:40:57 2015 New Revision: 281490 URL: https://svnweb.freebsd.org/changeset/base/281490 Log: Add mqueue_test.sh Added: user/ngie/more-tests/tests/sys/mqueue/mqueue_test.sh (contents, props changed) Added: user/ngie/more-tests/tests/sys/mqueue/mqueue_test.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests/tests/sys/mqueue/mqueue_test.sh Mon Apr 13 09:40:57 2015 (r281490) @@ -0,0 +1,54 @@ + +mqtest1_head() +{ + : +} +mqtest1_body() +{ + atf_check -s exit:0 -x $(atf_get_srcdir)/mqtest1 +} + +mqtest2_head() +{ + : +} +mqtest2_body() +{ + atf_check -s exit:0 -x $(atf_get_srcdir)/mqtest2 +} + +mqtest3_head() +{ + : +} +mqtest3_body() +{ + atf_check -s exit:0 -x $(atf_get_srcdir)/mqtest3 +} + +mqtest4_head() +{ + : +} +mqtest4_body() +{ + atf_check -s exit:0 -x $(atf_get_srcdir)/mqtest4 +} + +mqtest5_head() +{ + : +} +mqtest5_body() +{ + atf_check -s exit:0 -x $(atf_get_srcdir)/mqtest5 +} + +atf_init_test_cases() +{ + atf_add_test_case mqtest1 + atf_add_test_case mqtest2 + atf_add_test_case mqtest3 + atf_add_test_case mqtest4 + atf_add_test_case mqtest5 +} From owner-svn-src-user@FreeBSD.ORG Mon Apr 13 10:30:33 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1BBD26D4; Mon, 13 Apr 2015 10:30:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 067EC250; Mon, 13 Apr 2015 10:30:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3DAUWbl007335; Mon, 13 Apr 2015 10:30:32 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3DAUVhK007331; Mon, 13 Apr 2015 10:30:31 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504131030.t3DAUVhK007331@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Mon, 13 Apr 2015 10:30:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281491 - in user/ngie/more-tests/etc: rc.d rc.d/tests tests tests/rc.d X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Apr 2015 10:30:33 -0000 Author: ngie Date: Mon Apr 13 10:30:30 2015 New Revision: 281491 URL: https://svnweb.freebsd.org/changeset/base/281491 Log: Move etc/tests/rc.d to etc/rc.d/tests to match the desired directory layout Added: user/ngie/more-tests/etc/rc.d/tests/ user/ngie/more-tests/etc/rc.d/tests/Makefile - copied unchanged from r281476, user/ngie/more-tests/etc/tests/rc.d/Makefile user/ngie/more-tests/etc/rc.d/tests/routing_test.sh - copied unchanged from r281476, user/ngie/more-tests/etc/tests/rc.d/routing_test.sh Deleted: user/ngie/more-tests/etc/tests/rc.d/Makefile user/ngie/more-tests/etc/tests/rc.d/routing_test.sh Modified: user/ngie/more-tests/etc/rc.d/Makefile user/ngie/more-tests/etc/tests/Makefile Modified: user/ngie/more-tests/etc/rc.d/Makefile ============================================================================== --- user/ngie/more-tests/etc/rc.d/Makefile Mon Apr 13 09:40:57 2015 (r281490) +++ user/ngie/more-tests/etc/rc.d/Makefile Mon Apr 13 10:30:30 2015 (r281491) @@ -263,6 +263,10 @@ FILES+= routed FILES+= sendmail .endif +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .if ${MK_TIMED} != "no" FILES+= timed .endif Copied: user/ngie/more-tests/etc/rc.d/tests/Makefile (from r281476, user/ngie/more-tests/etc/tests/rc.d/Makefile) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests/etc/rc.d/tests/Makefile Mon Apr 13 10:30:30 2015 (r281491, copy of r281476, user/ngie/more-tests/etc/tests/rc.d/Makefile) @@ -0,0 +1,7 @@ +# $FreeBSD$ + +TESTSDIR= ${TESTSBASE}/etc/rc.d + +ATF_TESTS_SH+= routing_test + +.include Copied: user/ngie/more-tests/etc/rc.d/tests/routing_test.sh (from r281476, user/ngie/more-tests/etc/tests/rc.d/routing_test.sh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests/etc/rc.d/tests/routing_test.sh Mon Apr 13 10:30:30 2015 (r281491, copy of r281476, user/ngie/more-tests/etc/tests/rc.d/routing_test.sh) @@ -0,0 +1,138 @@ +# +# Copyright (c) 2014 Spectra Logic Corporation +# 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, +# without modification. +# 2. Redistributions in binary form must reproduce at minimum a disclaimer +# substantially similar to the "NO WARRANTY" disclaimer below +# ("Disclaimer") and any redistribution must be conditioned upon +# including a substantially similar Disclaimer requirement for further +# binary redistribution. +# +# NO WARRANTY +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES. +# +# Authors: Alan Somers (Spectra Logic Corporation) +# +# $FreeBSD$ + +atf_test_case static_ipv6_loopback_route_for_each_fib cleanup +static_ipv6_loopback_route_for_each_fib_head() +{ + atf_set "descr" "Every FIB should have a static IPv6 loopback route" + atf_set "require.user" "root" + atf_set "require.config" "fibs" + atf_set "require.progs" "sysrc" +} +static_ipv6_loopback_route_for_each_fib_body() +{ + # Configure the TAP interface to use an RFC5737 nonrouteable address + # and a non-default fib + ADDR="192.0.2.2" + SUBNET="192.0.2.0" + MASK="24" + + # Check system configuration + if [ 0 != `sysctl -n net.add_addr_allfibs` ]; then + atf_skip "This test requires net.add_addr_allfibs=0" + fi + + get_fibs 1 + get_tap + + # Configure a TAP interface in /etc/rc.conf. Register the sysrc + # variable for cleanup. + echo "ifconfig_${TAP}" >> "sysrc_vars_to_cleanup" + sysrc ifconfig_${TAP}="${ADDR}/${MASK} fib ${FIB0}" + + # Start the interface + service netif start ${TAP} + # Check for an IPv6 loopback route + setfib ${FIB0} netstat -rn -f inet6 | grep -q "^::1.*lo0$" + if [ 0 -eq $? ]; then + atf_pass + else + setfib ${FIB0} netstat -rn -f inet6 + atf_fail "Did not find an IPv6 loopback route" + fi +} +static_ipv6_loopback_route_for_each_fib_cleanup() +{ + cleanup_sysrc + cleanup_tap +} + +atf_init_test_cases() +{ + atf_add_test_case static_ipv6_loopback_route_for_each_fib +} + +# Looks up one or more fibs from the configuration data and validates them. +# Returns the results in the env varilables FIB0, FIB1, etc. +# parameter numfibs The number of fibs to lookup +get_fibs() +{ + NUMFIBS=$1 + net_fibs=`sysctl -n net.fibs` + i=0 + while [ $i -lt "$NUMFIBS" ]; do + fib=`atf_config_get "fibs" | \ + awk -v i=$(( i + 1 )) '{print $i}'` + echo "fib is ${fib}" + eval FIB${i}=${fib} + if [ "$fib" -ge "$net_fibs" ]; then + msg="The ${i}th configured fib is ${fub}, which is " + msg="$msg not less than net.fibs (${net_fibs})" + atf_skip "$msg" + fi + i=$(( $i + 1 )) + done +} + + +# Creates a new tap(4) interface, registers it for cleanup, and returns the +# name via the environment variable TAP +get_tap() +{ + local TAPN=0 + while ! ifconfig tap${TAPN} create > /dev/null 2>&1; do + if [ "$TAPN" -ge 8 ]; then + atf_skip "Could not create a tap(4) interface" + else + TAPN=$(($TAPN + 1)) + fi + done + local TAPD=tap${TAPN} + # Record the TAP device so we can clean it up later + echo ${TAPD} >> "tap_devices_to_cleanup" + TAP=${TAPD} +} + +cleanup_sysrc() +{ + for var in `cat "sysrc_vars_to_cleanup"`; do + sysrc -x $var + done +} + +cleanup_tap() +{ + for TAPD in `cat "tap_devices_to_cleanup"`; do + ifconfig ${TAPD} destroy + done +} Modified: user/ngie/more-tests/etc/tests/Makefile ============================================================================== --- user/ngie/more-tests/etc/tests/Makefile Mon Apr 13 09:40:57 2015 (r281490) +++ user/ngie/more-tests/etc/tests/Makefile Mon Apr 13 10:30:30 2015 (r281491) @@ -7,6 +7,4 @@ TESTSDIR= ${TESTSBASE}/etc .PATH: ${.CURDIR:H:H}/tests KYUAFILE= yes -TESTS_SUBDIRS+= rc.d - .include From owner-svn-src-user@FreeBSD.ORG Mon Apr 13 10:32:56 2015 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B6B6985F; Mon, 13 Apr 2015 10:32:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A1F5F26C; Mon, 13 Apr 2015 10:32:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3DAWuhi011097; Mon, 13 Apr 2015 10:32:56 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3DAWs51011091; Mon, 13 Apr 2015 10:32:54 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504131032.t3DAWs51011091@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Mon, 13 Apr 2015 10:32:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281492 - in user/ngie/more-tests: . share/mk X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Apr 2015 10:32:56 -0000 Author: ngie Date: Mon Apr 13 10:32:53 2015 New Revision: 281492 URL: https://svnweb.freebsd.org/changeset/base/281492 Log: Revive regress target and kill off test target instead bin/test being present causes the unfortunate issue of make test being run on the bin/ subdir, which subsequently causes things to fall apart when running make buildworld make regress is the legacy target, so use it instead While here, in order to deal with recursion issues and executing make regress both at subdirectories (which could yield the wrong results depending on how things are installed) Modified: user/ngie/more-tests/Makefile user/ngie/more-tests/share/mk/atf.test.mk user/ngie/more-tests/share/mk/bsd.README user/ngie/more-tests/share/mk/bsd.sys.mk user/ngie/more-tests/share/mk/bsd.test.mk user/ngie/more-tests/share/mk/suite.test.mk Modified: user/ngie/more-tests/Makefile ============================================================================== --- user/ngie/more-tests/Makefile Mon Apr 13 10:30:30 2015 (r281491) +++ user/ngie/more-tests/Makefile Mon Apr 13 10:32:53 2015 (r281492) @@ -109,7 +109,7 @@ TGTS= all all-man buildenv buildenvvars installkernel.debug packagekernel packageworld \ reinstallkernel reinstallkernel.debug \ installworld kernel-toolchain libraries lint maninstall \ - obj objlink rerelease showconfig tags test toolchain update \ + obj objlink regress rerelease showconfig tags toolchain update \ _worldtmp _legacy _bootstrap-tools _cleanobj _obj \ _build-tools _cross-tools _includes _libraries _depend \ build32 builddtb distribute32 install32 xdev xdev-build xdev-install \ Modified: user/ngie/more-tests/share/mk/atf.test.mk ============================================================================== --- user/ngie/more-tests/share/mk/atf.test.mk Mon Apr 13 10:30:30 2015 (r281491) +++ user/ngie/more-tests/share/mk/atf.test.mk Mon Apr 13 10:32:53 2015 (r281492) @@ -43,7 +43,7 @@ ATFFILE?= auto # Path to the prefix of the installed ATF tools, if any. # # If atf-run and atf-report are installed from ports, we automatically define a -# realtest target below to run the tests using these tools. The tools are +# realregress target below to run the tests using these tools. The tools are # searched for in the hierarchy specified by this variable. ATF_PREFIX?= /usr/local @@ -164,7 +164,7 @@ ATF_RUN?= ${ATF_PREFIX}/bin/atf-run _TESTS_FIFO= ${.OBJDIR}/atf-run.fifo _TESTS_LOG= ${.OBJDIR}/atf-run.log CLEANFILES+= ${_TESTS_FIFO} ${_TESTS_LOG} -realtest: .PHONY +realregress: .PHONY @set -e; \ if [ -z "${TESTSDIR}" ]; then \ echo "*** No TESTSDIR defined; nothing to do."; \ Modified: user/ngie/more-tests/share/mk/bsd.README ============================================================================== --- user/ngie/more-tests/share/mk/bsd.README Mon Apr 13 10:30:30 2015 (r281491) +++ user/ngie/more-tests/share/mk/bsd.README Mon Apr 13 10:32:53 2015 (r281492) @@ -401,14 +401,14 @@ It has seven targets: install target is executed. lint: run lint on the source files. - tags: - create a tags file for the source files. - test: - runs the test programs from the object directory; if the + regress: + runs the test programs from the installed directory; if the Makefile does not itself define the target test, the - targets beforetest and aftertest may also be used to - cause actions immediately before and after the test + targets beforeregress and afterregress may also be used to + cause actions immediately before and after the regress target is executed. + tags: + create a tags file for the source files. It sets/uses the following variables, among many others: Modified: user/ngie/more-tests/share/mk/bsd.sys.mk ============================================================================== --- user/ngie/more-tests/share/mk/bsd.sys.mk Mon Apr 13 10:30:30 2015 (r281491) +++ user/ngie/more-tests/share/mk/bsd.sys.mk Mon Apr 13 10:32:53 2015 (r281492) @@ -170,8 +170,8 @@ PHONY_NOTMAIN = afterdepend afterinstall depend dependall distclean distribute exe \ html includes install installfiles installincludes lint \ obj objlink objs objwarn realall realdepend \ - realinstall subdir-all subdir-depend subdir-install \ - tags test whereobj + realinstall regress subdir-all subdir-depend subdir-install \ + tags whereobj .PHONY: ${PHONY_NOTMAIN} .NOTMAIN: ${PHONY_NOTMAIN} Modified: user/ngie/more-tests/share/mk/bsd.test.mk ============================================================================== --- user/ngie/more-tests/share/mk/bsd.test.mk Mon Apr 13 10:30:30 2015 (r281491) +++ user/ngie/more-tests/share/mk/bsd.test.mk Mon Apr 13 10:32:53 2015 (r281492) @@ -77,14 +77,14 @@ PROGS_TARGETS+= install .include .endif -.if !target(realtest) -realtest: .PHONY +.if !target(realregress) +realregress: .PHONY @echo "$@ not defined; skipping" .endif -beforetest realtest aftertest test: .PHONY -.ORDER: beforetest realtest aftertest -test: beforetest realtest aftertest +beforeregress realregress afterregress regress: .PHONY +.ORDER: beforeregress realregress afterregress +regress: beforeregress realregress afterregress .if !empty(SUBDIR) .include Modified: user/ngie/more-tests/share/mk/suite.test.mk ============================================================================== --- user/ngie/more-tests/share/mk/suite.test.mk Mon Apr 13 10:30:30 2015 (r281491) +++ user/ngie/more-tests/share/mk/suite.test.mk Mon Apr 13 10:32:53 2015 (r281492) @@ -44,7 +44,7 @@ KYUAFILE?= auto # Path to the prefix of the installed Kyua CLI, if any. # -# If kyua is installed from ports, we automatically define a realtest target +# If kyua is installed from ports, we automatically define a realregress target # below to run the tests using this tool. The tools are searched for in the # hierarchy specified by this variable. KYUA_PREFIX?= /usr/local @@ -85,7 +85,7 @@ KYUA?= ${KYUA_PREFIX}/bin/kyua _kyuafile= ${DESTDIR}${TESTSDIR}/Kyuafile -realtest: .PHONY +realregress: .PHONY .if exists(${KYUA}) # Definition of the "make test" target and supporting variables. # @@ -96,11 +96,11 @@ realtest: .PHONY # Due to the dependencies of the binaries built by the source tree and how they # are used by tests, it is highly possible for a execution of "make test" to # report bogus results unless the new binaries are put in place. -realtest: +realregress: @${KYUA} test -k ${_kyuafile} .endif -beforetest: .PHONY +beforeregress: .PHONY .if !defined(TESTSDIR) @echo "*** No TESTSDIR defined; nothing to do." @false From owner-svn-src-user@FreeBSD.ORG Mon Apr 13 10:34:37 2015 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DC80F955; Mon, 13 Apr 2015 10:34:37 +0000 (UTC) Received: from mail-pd0-x22a.google.com (mail-pd0-x22a.google.com [IPv6:2607:f8b0:400e:c02::22a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A2FBA276; Mon, 13 Apr 2015 10:34:37 +0000 (UTC) Received: by pddn5 with SMTP id n5so102913611pdd.2; Mon, 13 Apr 2015 03:34:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:mime-version:subject:from:in-reply-to:date:cc :message-id:references:to; bh=7rv558c6ihSDDRoAXC8Nqark6wNZ+C+PpGXroTURixc=; b=h8yCc//Osx8mkia8YuAp7zgcxn4OMcW/N1LDv32rESsShPlcCMWA57OmbuOgQMm5Fn 4jMlpwVhrVls0c0cmUI9J059qOCky8VwwQEeAcNifwQBQ3c1Tua0O51IHzNhudLvHn4Q tsoezdBmB5VItdP8DBqvlyPFh+rE1RWW/MSCUicwcClSUo2Bya49zJZk31lb3X2MXOMC ROdbvDK9s9Wd0oTkSkhOkVm11Tnq0oGIQWwiUqx80sbPUZImC1u2Q5qNgOdycEr3phU2 4KjsAXOPhPEFxVU5dhgENxHFRZ98WtxoKKGbmtO37OAa0Rq65wwqy8fkWAviUlUPrYv7 Vgkw== X-Received: by 10.70.37.144 with SMTP id y16mr25345169pdj.86.1428921277097; Mon, 13 Apr 2015 03:34:37 -0700 (PDT) Received: from ?IPv6:2601:8:ab80:7d6:95d9:58db:99b9:a8df? ([2601:8:ab80:7d6:95d9:58db:99b9:a8df]) by mx.google.com with ESMTPSA id nj5sm6869861pdb.35.2015.04.13.03.34.35 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 13 Apr 2015 03:34:36 -0700 (PDT) Content-Type: multipart/signed; boundary="Apple-Mail=_632F7AD2-8A76-4DE9-A7D0-BF51A45B667E"; protocol="application/pgp-signature"; micalg=pgp-sha512 Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) Subject: Re: svn commit: r281492 - in user/ngie/more-tests: . share/mk From: Garrett Cooper In-Reply-To: <201504131032.t3DAWs51011091@svn.freebsd.org> Date: Mon, 13 Apr 2015 03:34:34 -0700 Message-Id: <9A8ED5ED-6806-41DE-986C-E540E9B4B18D@gmail.com> References: <201504131032.t3DAWs51011091@svn.freebsd.org> To: Garrett Cooper X-Mailer: Apple Mail (2.1878.6) Cc: src-committers@freebsd.org, svn-src-user@freebsd.org X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Apr 2015 10:34:38 -0000 --Apple-Mail=_632F7AD2-8A76-4DE9-A7D0-BF51A45B667E Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=windows-1252 On Apr 13, 2015, at 3:32, Garrett Cooper wrote: > Author: ngie > Date: Mon Apr 13 10:32:53 2015 > New Revision: 281492 > URL: https://svnweb.freebsd.org/changeset/base/281492 >=20 > Log: =85 > While here, in order to deal with recursion issues and executing make = regress > both at subdirectories (which could yield the wrong results depending = on how > things are installed) This was an incomplete thought that I forgot to delete from my commit = message; please ignore. --Apple-Mail=_632F7AD2-8A76-4DE9-A7D0-BF51A45B667E Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQEcBAEBCgAGBQJVK5u6AAoJEMZr5QU6S73eWtkIALCfDI2mzT7u6nnFNRxsvGmS Dyv1p98luWZUq08pVZnvQLEl8sU35HJ/Cyg67Z1p59CyG3I294J10LJhYkT5ZYYw wEBh7ypQFNCo48DVvVYsqPtN+QSHy6k4O1pOxshBfOW1VLRqmrBdW5ovlTARLGHC VfzTdZDJ8TsrJXj5EkMSQLONyvdKXyJqE+0y8OccIWZvu3f6bf5vgvAhqQmym1VY zAAoysk4DzempfQGaKjRQiNJS9DnulOdQZU2YbG5OWjmibjod5udlPXF/43gKK5n aCAD1QLMC5rt3NqnrWVTZnEPX/7HTW7QV1NRj/Tmkj6RYYfYoMqy/U2W0id0GXE= =DkyB -----END PGP SIGNATURE----- --Apple-Mail=_632F7AD2-8A76-4DE9-A7D0-BF51A45B667E-- From owner-svn-src-user@FreeBSD.ORG Mon Apr 13 16:43:07 2015 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CF015F17; Mon, 13 Apr 2015 16:43: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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BB2063B9; Mon, 13 Apr 2015 16:43:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3DGh74U088683; Mon, 13 Apr 2015 16:43:07 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3DGh7QF088682; Mon, 13 Apr 2015 16:43:07 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504131643.t3DGh7QF088682@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Mon, 13 Apr 2015 16:43:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281498 - user/ngie/more-tests/tests/sys/file X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Apr 2015 16:43:07 -0000 Author: ngie Date: Mon Apr 13 16:43:06 2015 New Revision: 281498 URL: https://svnweb.freebsd.org/changeset/base/281498 Log: Fix WARNS= 6 by removing garbage collecting unused argc/argv Modified: user/ngie/more-tests/tests/sys/file/ftruncate_test.c Modified: user/ngie/more-tests/tests/sys/file/ftruncate_test.c ============================================================================== --- user/ngie/more-tests/tests/sys/file/ftruncate_test.c Mon Apr 13 16:41:33 2015 (r281497) +++ user/ngie/more-tests/tests/sys/file/ftruncate_test.c Mon Apr 13 16:43:06 2015 (r281498) @@ -57,7 +57,7 @@ static off_t lengths[] = {0, 1, 2, 3, 4, static int lengths_count = sizeof(lengths) / sizeof(off_t); int -main(int argc, char *argv[]) +main(void) { int error, fd, fds[2], i, read_only_fd; char path[PATH_MAX]; From owner-svn-src-user@FreeBSD.ORG Mon Apr 13 21:33:54 2015 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3D28D2AC; Mon, 13 Apr 2015 21:33: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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 237B6C3F; Mon, 13 Apr 2015 21:33:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3DLXsFj031225; Mon, 13 Apr 2015 21:33:54 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3DLXoGZ031207; Mon, 13 Apr 2015 21:33:50 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504132133.t3DLXoGZ031207@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Mon, 13 Apr 2015 21:33:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281504 - in user/ngie/more-tests: . share/mk sys/arm/arm sys/arm64/arm64 sys/arm64/conf sys/arm64/include sys/boot/efi/boot1 sys/boot/efi/loader sys/conf sys/contrib/x86emu sys/dev/fdt... 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.20 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, 13 Apr 2015 21:33:54 -0000 Author: ngie Date: Mon Apr 13 21:33:49 2015 New Revision: 281504 URL: https://svnweb.freebsd.org/changeset/base/281504 Log: MFhead @ r281503 Added: user/ngie/more-tests/sys/arm64/arm64/ - copied from r281503, head/sys/arm64/arm64/ user/ngie/more-tests/sys/arm64/conf/ - copied from r281503, head/sys/arm64/conf/ user/ngie/more-tests/sys/arm64/include/_bus.h - copied unchanged from r281503, head/sys/arm64/include/_bus.h user/ngie/more-tests/sys/arm64/include/armreg.h - copied unchanged from r281503, head/sys/arm64/include/armreg.h user/ngie/more-tests/sys/arm64/include/bus.h - copied unchanged from r281503, head/sys/arm64/include/bus.h user/ngie/more-tests/sys/arm64/include/bus_dma.h - copied unchanged from r281503, head/sys/arm64/include/bus_dma.h user/ngie/more-tests/sys/arm64/include/clock.h - copied unchanged from r281503, head/sys/arm64/include/clock.h user/ngie/more-tests/sys/arm64/include/counter.h - copied unchanged from r281503, head/sys/arm64/include/counter.h user/ngie/more-tests/sys/arm64/include/db_machdep.h - copied unchanged from r281503, head/sys/arm64/include/db_machdep.h user/ngie/more-tests/sys/arm64/include/debug_monitor.h - copied unchanged from r281503, head/sys/arm64/include/debug_monitor.h user/ngie/more-tests/sys/arm64/include/devmap.h - copied unchanged from r281503, head/sys/arm64/include/devmap.h user/ngie/more-tests/sys/arm64/include/dump.h - copied unchanged from r281503, head/sys/arm64/include/dump.h user/ngie/more-tests/sys/arm64/include/hypervisor.h - copied unchanged from r281503, head/sys/arm64/include/hypervisor.h user/ngie/more-tests/sys/arm64/include/in_cksum.h - copied unchanged from r281503, head/sys/arm64/include/in_cksum.h user/ngie/more-tests/sys/arm64/include/intr.h - copied unchanged from r281503, head/sys/arm64/include/intr.h user/ngie/more-tests/sys/arm64/include/kdb.h - copied unchanged from r281503, head/sys/arm64/include/kdb.h user/ngie/more-tests/sys/arm64/include/machdep.h - copied unchanged from r281503, head/sys/arm64/include/machdep.h user/ngie/more-tests/sys/arm64/include/md_var.h - copied unchanged from r281503, head/sys/arm64/include/md_var.h user/ngie/more-tests/sys/arm64/include/memdev.h - copied unchanged from r281503, head/sys/arm64/include/memdev.h user/ngie/more-tests/sys/arm64/include/metadata.h - copied unchanged from r281503, head/sys/arm64/include/metadata.h user/ngie/more-tests/sys/arm64/include/ofw_machdep.h - copied unchanged from r281503, head/sys/arm64/include/ofw_machdep.h user/ngie/more-tests/sys/arm64/include/resource.h - copied unchanged from r281503, head/sys/arm64/include/resource.h user/ngie/more-tests/sys/arm64/include/sf_buf.h - copied unchanged from r281503, head/sys/arm64/include/sf_buf.h user/ngie/more-tests/sys/arm64/include/smp.h - copied unchanged from r281503, head/sys/arm64/include/smp.h user/ngie/more-tests/sys/arm64/include/stack.h - copied unchanged from r281503, head/sys/arm64/include/stack.h user/ngie/more-tests/sys/arm64/include/trap.h - copied unchanged from r281503, head/sys/arm64/include/trap.h user/ngie/more-tests/sys/arm64/include/vfp.h - copied unchanged from r281503, head/sys/arm64/include/vfp.h user/ngie/more-tests/sys/conf/Makefile.arm64 - copied unchanged from r281503, head/sys/conf/Makefile.arm64 user/ngie/more-tests/sys/conf/files.arm64 - copied unchanged from r281503, head/sys/conf/files.arm64 user/ngie/more-tests/sys/conf/ldscript.arm64 - copied unchanged from r281503, head/sys/conf/ldscript.arm64 user/ngie/more-tests/sys/conf/options.arm64 - copied unchanged from r281503, head/sys/conf/options.arm64 user/ngie/more-tests/sys/dev/fdt/fdt_arm64.c - copied unchanged from r281503, head/sys/dev/fdt/fdt_arm64.c user/ngie/more-tests/sys/dev/psci/psci_arm64.S - copied unchanged from r281503, head/sys/dev/psci/psci_arm64.S Modified: user/ngie/more-tests/README user/ngie/more-tests/share/mk/bsd.progs.mk user/ngie/more-tests/sys/arm/arm/devmap.c user/ngie/more-tests/sys/arm64/include/cpufunc.h user/ngie/more-tests/sys/arm64/include/pmap.h user/ngie/more-tests/sys/boot/efi/boot1/Makefile user/ngie/more-tests/sys/boot/efi/loader/Makefile user/ngie/more-tests/sys/conf/options.i386 user/ngie/more-tests/sys/contrib/x86emu/x86emu.c user/ngie/more-tests/sys/dev/usb/controller/ehci_pci.c user/ngie/more-tests/sys/dev/usb/controller/uhci_pci.c user/ngie/more-tests/sys/dev/usb/controller/xhci_pci.c user/ngie/more-tests/sys/i386/i386/bios.c user/ngie/more-tests/sys/i386/i386/initcpu.c user/ngie/more-tests/sys/i386/i386/locore.s user/ngie/more-tests/sys/i386/i386/machdep.c user/ngie/more-tests/sys/i386/i386/minidump_machdep.c user/ngie/more-tests/sys/i386/i386/mpboot.s user/ngie/more-tests/sys/i386/i386/pmap.c user/ngie/more-tests/sys/i386/i386/swtch.s user/ngie/more-tests/sys/i386/i386/trap.c user/ngie/more-tests/sys/i386/i386/vm86bios.s user/ngie/more-tests/sys/i386/i386/vm_machdep.c user/ngie/more-tests/sys/i386/include/param.h user/ngie/more-tests/sys/i386/include/pmap.h user/ngie/more-tests/sys/i386/include/vmparam.h user/ngie/more-tests/sys/netinet6/nd6.c user/ngie/more-tests/sys/sys/kerneldump.h user/ngie/more-tests/sys/x86/acpica/acpi_wakeup.c user/ngie/more-tests/usr.bin/gzip/gzip.1 user/ngie/more-tests/usr.bin/gzip/gzip.c user/ngie/more-tests/usr.bin/ipcs/Makefile user/ngie/more-tests/usr.bin/ipcs/ipc.c user/ngie/more-tests/usr.bin/ipcs/ipc.h user/ngie/more-tests/usr.bin/ipcs/ipcs.c Directory Properties: user/ngie/more-tests/ (props changed) user/ngie/more-tests/share/ (props changed) user/ngie/more-tests/sys/ (props changed) user/ngie/more-tests/sys/boot/ (props changed) user/ngie/more-tests/sys/conf/ (props changed) user/ngie/more-tests/sys/contrib/x86emu/ (props changed) Modified: user/ngie/more-tests/README ============================================================================== --- user/ngie/more-tests/README Mon Apr 13 21:29:40 2015 (r281503) +++ user/ngie/more-tests/README Mon Apr 13 21:33:49 2015 (r281504) @@ -34,9 +34,7 @@ The sample kernel configuration files re sub-directory (assuming that you've installed the kernel sources), the file named GENERIC being the one used to build your initial installation kernel. The file NOTES contains entries and documentation for all possible -devices, not just those commonly used. It is the successor of the ancient -LINT file, but in contrast to LINT, it is not buildable as a kernel but a -pure reference and documentation file. +devices, not just those commonly used. Source Roadmap: @@ -77,6 +75,9 @@ share Shared resources. sys Kernel sources. +tests Regression tests which can be run by Kyua. See tests/README + for additional information. + tools Utilities for regression testing and miscellaneous tasks. usr.bin User commands. Modified: user/ngie/more-tests/share/mk/bsd.progs.mk ============================================================================== --- user/ngie/more-tests/share/mk/bsd.progs.mk Mon Apr 13 21:29:40 2015 (r281503) +++ user/ngie/more-tests/share/mk/bsd.progs.mk Mon Apr 13 21:33:49 2015 (r281504) @@ -96,14 +96,14 @@ x.$p= PROG_CXX=$p $p ${p}_p: .PHONY .MAKE (cd ${.CURDIR} && ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS= \ - SUBDIR= SCRIPTS= PROG=$p \ + SUBDIR= PROG=$p \ DEPENDFILE=.depend.$p .MAKE.DEPENDFILE=.depend.$p \ ${x.$p}) .for t in ${PROGS_TARGETS:O:u} $p.$t: .PHONY .MAKE (cd ${.CURDIR} && ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS= \ - SUBDIR= SCRIPTS= PROG=$p \ + SUBDIR= PROG=$p \ DEPENDFILE=.depend.$p .MAKE.DEPENDFILE=.depend.$p \ ${x.$p} ${@:E}) .endfor Modified: user/ngie/more-tests/sys/arm/arm/devmap.c ============================================================================== --- user/ngie/more-tests/sys/arm/arm/devmap.c Mon Apr 13 21:29:40 2015 (r281503) +++ user/ngie/more-tests/sys/arm/arm/devmap.c Mon Apr 13 21:33:49 2015 (r281504) @@ -29,6 +29,8 @@ __FBSDID("$FreeBSD$"); /* * Routines for mapping device memory. + * + * This is used on both arm and arm64. */ #include "opt_ddb.h" @@ -40,10 +42,18 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include static const struct arm_devmap_entry *devmap_table; static boolean_t devmap_bootstrap_done = false; +#if defined(__aarch64__) +#define MAX_VADDR VM_MAX_KERNEL_ADDRESS +#define PTE_DEVICE VM_MEMATTR_DEVICE +#elif defined(__arm__) +#define MAX_VADDR ARM_VECTORS_HIGH +#endif + /* * The allocated-kva (akva) devmap table and metadata. Platforms can call * arm_devmap_add_entry() to add static device mappings to this table using @@ -53,7 +63,11 @@ static boolean_t devmap_bootstrap_done = #define AKVA_DEVMAP_MAX_ENTRIES 32 static struct arm_devmap_entry akva_devmap_entries[AKVA_DEVMAP_MAX_ENTRIES]; static u_int akva_devmap_idx; -static vm_offset_t akva_devmap_vaddr = ARM_VECTORS_HIGH; +static vm_offset_t akva_devmap_vaddr = MAX_VADDR; + +#ifdef __aarch64__ +extern int early_boot; +#endif /* * Print the contents of the static mapping table using the provided printf-like @@ -99,7 +113,7 @@ arm_devmap_lastaddr() if (akva_devmap_idx > 0) return (akva_devmap_vaddr); - lowaddr = ARM_VECTORS_HIGH; + lowaddr = MAX_VADDR; for (pd = devmap_table; pd != NULL && pd->pd_size != 0; ++pd) { if (lowaddr > pd->pd_va) lowaddr = pd->pd_va; @@ -136,9 +150,12 @@ arm_devmap_add_entry(vm_paddr_t pa, vm_s * align the virtual address to the next-lower 1MB boundary so that we * end up with a nice efficient section mapping. */ +#ifdef __arm__ if ((pa & 0x000fffff) == 0 && (sz & 0x000fffff) == 0) { akva_devmap_vaddr = trunc_1mpage(akva_devmap_vaddr - sz); - } else { + } else +#endif + { akva_devmap_vaddr = trunc_page(akva_devmap_vaddr - sz); } m = &akva_devmap_entries[akva_devmap_idx++]; @@ -186,8 +203,12 @@ arm_devmap_bootstrap(vm_offset_t l1pt, c return; for (pd = devmap_table; pd->pd_size != 0; ++pd) { +#if defined(__arm__) pmap_map_chunk(l1pt, pd->pd_va, pd->pd_pa, pd->pd_size, pd->pd_prot,pd->pd_cache); +#elif defined(__aarch64__) + pmap_kenter_device(pd->pd_va, pd->pd_size, pd->pd_pa); +#endif } } @@ -252,17 +273,25 @@ pmap_mapdev(vm_offset_t pa, vm_size_t si /* First look in the static mapping table. */ if ((rva = arm_devmap_ptov(pa, size)) != NULL) return (rva); - + offset = pa & PAGE_MASK; pa = trunc_page(pa); size = round_page(size + offset); - - va = kva_alloc(size); + +#ifdef __aarch64__ + if (early_boot) { + akva_devmap_vaddr = trunc_page(akva_devmap_vaddr - size); + va = akva_devmap_vaddr; + KASSERT(va >= VM_MAX_KERNEL_ADDRESS - L2_SIZE, + ("Too many early devmap mappings")); + } else +#endif + va = kva_alloc(size); if (!va) panic("pmap_mapdev: Couldn't alloc kernel virtual memory"); pmap_kenter_device(va, size, pa); - + return ((void *)(va + offset)); } Copied: user/ngie/more-tests/sys/arm64/include/_bus.h (from r281503, head/sys/arm64/include/_bus.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests/sys/arm64/include/_bus.h Mon Apr 13 21:33:49 2015 (r281504, copy of r281503, head/sys/arm64/include/_bus.h) @@ -0,0 +1,46 @@ +/*- + * Copyright (c) 2005 M. Warner Losh. + * 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, + * without modification, immediately at the beginning of the file. + * 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$ + */ + +#ifndef _MACHINE__BUS_H_ +#define _MACHINE__BUS_H_ + +/* + * Addresses (in bus space). + */ +typedef u_long bus_addr_t; +typedef u_long bus_size_t; + +/* + * Access methods for bus space. + */ +typedef u_long bus_space_handle_t; +typedef struct bus_space *bus_space_tag_t; + +#endif /* !_MACHINE__BUS_H_ */ Copied: user/ngie/more-tests/sys/arm64/include/armreg.h (from r281503, head/sys/arm64/include/armreg.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests/sys/arm64/include/armreg.h Mon Apr 13 21:33:49 2015 (r281504, copy of r281503, head/sys/arm64/include/armreg.h) @@ -0,0 +1,194 @@ +/*- + * Copyright (c) 2013, 2014 Andrew Turner + * Copyright (c) 2015 The FreeBSD Foundation + * All rights reserved. + * + * This software was developed by Andrew Turner under + * sponsorship from the FreeBSD Foundation. + * + * 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$ + */ + +#ifndef _MACHINE_ARMREG_H_ +#define _MACHINE_ARMREG_H_ + +#define READ_SPECIALREG(reg) \ +({ uint64_t val; \ + __asm __volatile("mrs %0, " __STRING(reg) : "=&r" (val)); \ + val; \ +}) +#define WRITE_SPECIALREG(reg, val) \ + __asm __volatile("msr " __STRING(reg) ", %0" : : "r"((uint64_t)val)) + +/* CPACR_EL1 */ +#define CPACR_FPEN_MASK (0x3 << 20) +#define CPACR_FPEN_TRAP_ALL1 (0x0 << 20) /* Traps from EL0 and EL1 */ +#define CPACR_FPEN_TRAP_EL0 (0x1 << 20) /* Traps from EL0 */ +#define CPACR_FPEN_TRAP_ALL2 (0x2 << 20) /* Traps from EL0 and EL1 */ +#define CPACR_FPEN_TRAP_NONE (0x3 << 20) /* No traps */ +#define CPACR_TTA (0x1 << 28) + +/* CTR_EL0 - Cache Type Register */ +#define CTR_DLINE_SHIFT 16 +#define CTR_DLINE_MASK (0xf << CTR_DLINE_SHIFT) +#define CTR_DLINE_SIZE(reg) (((reg) & CTR_DLINE_MASK) >> CTR_DLINE_SHIFT) +#define CTR_ILINE_SHIFT 0 +#define CTR_ILINE_MASK (0xf << CTR_ILINE_SHIFT) +#define CTR_ILINE_SIZE(reg) (((reg) & CTR_ILINE_MASK) >> CTR_ILINE_SHIFT) + +/* ESR_ELx */ +#define ESR_ELx_ISS_MASK 0x00ffffff +#define ISS_INSN_FnV (0x01 << 10) +#define ISS_INSN_EA (0x01 << 9) +#define ISS_INSN_S1PTW (0x01 << 7) +#define ISS_INSN_IFSC_MASK (0x1f << 0) +#define ISS_DATA_ISV (0x01 << 24) +#define ISS_DATA_SAS_MASK (0x03 << 22) +#define ISS_DATA_SSE (0x01 << 21) +#define ISS_DATA_SRT_MASK (0x1f << 16) +#define ISS_DATA_SF (0x01 << 15) +#define ISS_DATA_AR (0x01 << 14) +#define ISS_DATA_FnV (0x01 << 10) +#define ISS_DATa_EA (0x01 << 9) +#define ISS_DATa_CM (0x01 << 8) +#define ISS_INSN_S1PTW (0x01 << 7) +#define ISS_DATa_WnR (0x01 << 6) +#define ISS_DATA_DFSC_MASK (0x1f << 0) +#define ESR_ELx_IL (0x01 << 25) +#define ESR_ELx_EC_SHIFT 26 +#define ESR_ELx_EC_MASK (0x3f << 26) +#define ESR_ELx_EXCEPTION(esr) (((esr) & ESR_ELx_EC_MASK) >> ESR_ELx_EC_SHIFT) +#define EXCP_UNKNOWN 0x00 /* Unkwn exception */ +#define EXCP_FP_SIMD 0x07 /* VFP/SIMD trap */ +#define EXCP_ILL_STATE 0x0e /* Illegal execution state */ +#define EXCP_SVC 0x15 /* SVC trap */ +#define EXCP_MSR 0x18 /* MSR/MRS trap */ +#define EXCP_INSN_ABORT_L 0x20 /* Instruction abort, from lower EL */ +#define EXCP_INSN_ABORT 0x21 /* Instruction abort, from same EL */ +#define EXCP_PC_ALIGN 0x22 /* PC alignment fault */ +#define EXCP_DATA_ABORT_L 0x24 /* Data abort, from lower EL */ +#define EXCP_DATA_ABORT 0x25 /* Data abort, from same EL */ +#define EXCP_SP_ALIGN 0x26 /* SP slignment fault */ +#define EXCP_TRAP_FP 0x2c /* Trapped FP exception */ +#define EXCP_SERROR 0x2f /* SError interrupt */ +#define EXCP_SOFTSTP_EL1 0x33 /* Software Step, from same EL */ +#define EXCP_WATCHPT_EL1 0x35 /* Watchpoint, from same EL */ +#define EXCP_BRK 0x3c /* Breakpoint */ + +/* ID_AA64PFR0_EL1 */ +#define ID_AA64PFR0_EL0_MASK (0xf << 0) +#define ID_AA64PFR0_EL1_MASK (0xf << 4) +#define ID_AA64PFR0_EL2_MASK (0xf << 8) +#define ID_AA64PFR0_EL3_MASK (0xf << 12) +#define ID_AA64PFR0_FP_MASK (0xf << 16) +#define ID_AA64PFR0_FP_IMPL (0x0 << 16) /* Floating-point implemented */ +#define ID_AA64PFR0_FP_NONE (0xf << 16) /* Floating-point not implemented */ +#define ID_AA64PFR0_ADV_SIMD_MASK (0xf << 20) +#define ID_AA64PFR0_GIC_MASK (0xf << 24) + +/* MAIR_EL1 - Memory Attribute Indirection Register */ +#define MAIR_ATTR_MASK(idx) (0xff << ((n)* 8)) +#define MAIR_ATTR(attr, idx) ((attr) << ((idx) * 8)) + +/* SCTLR_EL1 - System Control Register */ +#define SCTLR_RES0 0xc8222400 /* Reserved, write 0 */ +#define SCTLR_RES1 0x30d00800 /* Reserved, write 1 */ + +#define SCTLR_M 0x00000001 +#define SCTLR_A 0x00000002 +#define SCTLR_C 0x00000004 +#define SCTLR_SA 0x00000008 +#define SCTLR_SA0 0x00000010 +#define SCTLR_CP15BEN 0x00000020 +#define SCTLR_THEE 0x00000040 +#define SCTLR_ITD 0x00000080 +#define SCTLR_SED 0x00000100 +#define SCTLR_UMA 0x00000200 +#define SCTLR_I 0x00001000 +#define SCTLR_DZE 0x00004000 +#define SCTLR_UCT 0x00008000 +#define SCTLR_nTWI 0x00010000 +#define SCTLR_nTWE 0x00040000 +#define SCTLR_WXN 0x00080000 +#define SCTLR_EOE 0x01000000 +#define SCTLR_EE 0x02000000 +#define SCTLR_UCI 0x04000000 + +/* SPSR_EL1 */ +/* + * When the exception is taken in AArch64: + * M[4] is 0 for AArch64 mode + * M[3:2] is the exception level + * M[1] is unused + * M[0] is the SP select: + * 0: always SP0 + * 1: current ELs SP + */ +#define PSR_M_EL0t 0x00000000 +#define PSR_M_EL1t 0x00000004 +#define PSR_M_EL1h 0x00000005 +#define PSR_M_EL2t 0x00000008 +#define PSR_M_EL2h 0x00000009 +#define PSR_M_MASK 0x0000001f + +#define PSR_F 0x00000040 +#define PSR_I 0x00000080 +#define PSR_A 0x00000100 +#define PSR_D 0x00000200 +#define PSR_IL 0x00100000 +#define PSR_SS 0x00200000 +#define PSR_V 0x10000000 +#define PSR_C 0x20000000 +#define PSR_Z 0x40000000 +#define PSR_N 0x80000000 + +/* TCR_EL1 - Translation Control Register */ +#define TCR_ASID_16 (1 << 36) + +#define TCR_IPS_SHIFT 32 +#define TCR_IPS_32BIT (0 << TCR_IPS_SHIFT) +#define TCR_IPS_36BIT (1 << TCR_IPS_SHIFT) +#define TCR_IPS_40BIT (2 << TCR_IPS_SHIFT) +#define TCR_IPS_42BIT (3 << TCR_IPS_SHIFT) +#define TCR_IPS_44BIT (4 << TCR_IPS_SHIFT) +#define TCR_IPS_48BIT (5 << TCR_IPS_SHIFT) + +#define TCR_TG1_SHIFT 30 +#define TCR_TG1_16K (1 << TCR_TG1_SHIFT) +#define TCR_TG1_4K (2 << TCR_TG1_SHIFT) +#define TCR_TG1_64K (3 << TCR_TG1_SHIFT) + +#define TCR_T1SZ_SHIFT 16 +#define TCR_T0SZ_SHIFT 0 +#define TCR_TxSZ(x) (((x) << TCR_T1SZ_SHIFT) | ((x) << TCR_T0SZ_SHIFT)) + +/* Saved Program Status Register */ +#define DBG_SPSR_SS (0x1 << 21) + +/* Monitor Debug System Control Register */ +#define DBG_MDSCR_SS (0x1 << 0) +#define DBG_MDSCR_KDE (0x1 << 13) +#define DBG_MDSCR_MDE (0x1 << 15) + +#endif /* !_MACHINE_ARMREG_H_ */ Copied: user/ngie/more-tests/sys/arm64/include/bus.h (from r281503, head/sys/arm64/include/bus.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests/sys/arm64/include/bus.h Mon Apr 13 21:33:49 2015 (r281504, copy of r281503, head/sys/arm64/include/bus.h) @@ -0,0 +1,469 @@ +/* $NetBSD: bus.h,v 1.11 2003/07/28 17:35:54 thorpej Exp $ */ + +/*- + * Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility, + * NASA Ames Research Center. + * + * 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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. + */ + +/*- + * Copyright (c) 1996 Charles M. Hannum. All rights reserved. + * Copyright (c) 1996 Christopher G. Demetriou. 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. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by Christopher G. Demetriou + * for the NetBSD Project. + * 4. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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. + * + * From: sys/arm/include/bus.h + * + * $FreeBSD$ + */ + +#ifndef _MACHINE_BUS_H_ +#define _MACHINE_BUS_H_ + +#include + +#define BUS_SPACE_ALIGNED_POINTER(p, t) ALIGNED_POINTER(p, t) + +#define BUS_SPACE_MAXADDR_24BIT 0xFFFFFFUL +#define BUS_SPACE_MAXADDR_32BIT 0xFFFFFFFFUL +#define BUS_SPACE_MAXSIZE_24BIT 0xFFFFFFUL +#define BUS_SPACE_MAXSIZE_32BIT 0xFFFFFFFFUL + +#define BUS_SPACE_MAXADDR 0xFFFFFFFFFFFFFFFFUL +#define BUS_SPACE_MAXSIZE 0xFFFFFFFFFFFFFFFFUL + +#define BUS_SPACE_MAP_CACHEABLE 0x01 +#define BUS_SPACE_MAP_LINEAR 0x02 +#define BUS_SPACE_MAP_PREFETCHABLE 0x04 + +#define BUS_SPACE_UNRESTRICTED (~0) + +#define BUS_SPACE_BARRIER_READ 0x01 +#define BUS_SPACE_BARRIER_WRITE 0x02 + + +struct bus_space { + /* cookie */ + void *bs_cookie; + + /* mapping/unmapping */ + int (*bs_map) (void *, bus_addr_t, bus_size_t, + int, bus_space_handle_t *); + void (*bs_unmap) (void *, bus_space_handle_t, bus_size_t); + int (*bs_subregion) (void *, bus_space_handle_t, + bus_size_t, bus_size_t, bus_space_handle_t *); + + /* allocation/deallocation */ + int (*bs_alloc) (void *, bus_addr_t, bus_addr_t, + bus_size_t, bus_size_t, bus_size_t, int, + bus_addr_t *, bus_space_handle_t *); + void (*bs_free) (void *, bus_space_handle_t, + bus_size_t); + + /* get kernel virtual address */ + /* barrier */ + void (*bs_barrier) (void *, bus_space_handle_t, + bus_size_t, bus_size_t, int); + + /* read single */ + u_int8_t (*bs_r_1) (void *, bus_space_handle_t, bus_size_t); + u_int16_t (*bs_r_2) (void *, bus_space_handle_t, bus_size_t); + u_int32_t (*bs_r_4) (void *, bus_space_handle_t, bus_size_t); + u_int64_t (*bs_r_8) (void *, bus_space_handle_t, bus_size_t); + + /* read multiple */ + void (*bs_rm_1) (void *, bus_space_handle_t, bus_size_t, + u_int8_t *, bus_size_t); + void (*bs_rm_2) (void *, bus_space_handle_t, bus_size_t, + u_int16_t *, bus_size_t); + void (*bs_rm_4) (void *, bus_space_handle_t, + bus_size_t, u_int32_t *, bus_size_t); + void (*bs_rm_8) (void *, bus_space_handle_t, + bus_size_t, u_int64_t *, bus_size_t); + + /* read region */ + void (*bs_rr_1) (void *, bus_space_handle_t, + bus_size_t, u_int8_t *, bus_size_t); + void (*bs_rr_2) (void *, bus_space_handle_t, + bus_size_t, u_int16_t *, bus_size_t); + void (*bs_rr_4) (void *, bus_space_handle_t, + bus_size_t, u_int32_t *, bus_size_t); + void (*bs_rr_8) (void *, bus_space_handle_t, + bus_size_t, u_int64_t *, bus_size_t); + + /* write single */ + void (*bs_w_1) (void *, bus_space_handle_t, + bus_size_t, u_int8_t); + void (*bs_w_2) (void *, bus_space_handle_t, + bus_size_t, u_int16_t); + void (*bs_w_4) (void *, bus_space_handle_t, + bus_size_t, u_int32_t); + void (*bs_w_8) (void *, bus_space_handle_t, + bus_size_t, u_int64_t); + + /* write multiple */ + void (*bs_wm_1) (void *, bus_space_handle_t, + bus_size_t, const u_int8_t *, bus_size_t); + void (*bs_wm_2) (void *, bus_space_handle_t, + bus_size_t, const u_int16_t *, bus_size_t); + void (*bs_wm_4) (void *, bus_space_handle_t, + bus_size_t, const u_int32_t *, bus_size_t); + void (*bs_wm_8) (void *, bus_space_handle_t, + bus_size_t, const u_int64_t *, bus_size_t); + + /* write region */ + void (*bs_wr_1) (void *, bus_space_handle_t, + bus_size_t, const u_int8_t *, bus_size_t); + void (*bs_wr_2) (void *, bus_space_handle_t, + bus_size_t, const u_int16_t *, bus_size_t); + void (*bs_wr_4) (void *, bus_space_handle_t, + bus_size_t, const u_int32_t *, bus_size_t); + void (*bs_wr_8) (void *, bus_space_handle_t, + bus_size_t, const u_int64_t *, bus_size_t); + + /* set multiple */ + void (*bs_sm_1) (void *, bus_space_handle_t, + bus_size_t, u_int8_t, bus_size_t); + void (*bs_sm_2) (void *, bus_space_handle_t, + bus_size_t, u_int16_t, bus_size_t); + void (*bs_sm_4) (void *, bus_space_handle_t, + bus_size_t, u_int32_t, bus_size_t); + void (*bs_sm_8) (void *, bus_space_handle_t, + bus_size_t, u_int64_t, bus_size_t); + + /* set region */ + void (*bs_sr_1) (void *, bus_space_handle_t, + bus_size_t, u_int8_t, bus_size_t); + void (*bs_sr_2) (void *, bus_space_handle_t, + bus_size_t, u_int16_t, bus_size_t); + void (*bs_sr_4) (void *, bus_space_handle_t, + bus_size_t, u_int32_t, bus_size_t); + void (*bs_sr_8) (void *, bus_space_handle_t, + bus_size_t, u_int64_t, bus_size_t); + + /* copy */ + void (*bs_c_1) (void *, bus_space_handle_t, bus_size_t, + bus_space_handle_t, bus_size_t, bus_size_t); + void (*bs_c_2) (void *, bus_space_handle_t, bus_size_t, + bus_space_handle_t, bus_size_t, bus_size_t); + void (*bs_c_4) (void *, bus_space_handle_t, bus_size_t, + bus_space_handle_t, bus_size_t, bus_size_t); + void (*bs_c_8) (void *, bus_space_handle_t, bus_size_t, + bus_space_handle_t, bus_size_t, bus_size_t); + + /* read single stream */ + u_int8_t (*bs_r_1_s) (void *, bus_space_handle_t, bus_size_t); + u_int16_t (*bs_r_2_s) (void *, bus_space_handle_t, bus_size_t); + u_int32_t (*bs_r_4_s) (void *, bus_space_handle_t, bus_size_t); + u_int64_t (*bs_r_8_s) (void *, bus_space_handle_t, bus_size_t); + + /* read multiple stream */ + void (*bs_rm_1_s) (void *, bus_space_handle_t, bus_size_t, + u_int8_t *, bus_size_t); + void (*bs_rm_2_s) (void *, bus_space_handle_t, bus_size_t, + u_int16_t *, bus_size_t); + void (*bs_rm_4_s) (void *, bus_space_handle_t, + bus_size_t, u_int32_t *, bus_size_t); + void (*bs_rm_8_s) (void *, bus_space_handle_t, + bus_size_t, u_int64_t *, bus_size_t); + + /* read region stream */ + void (*bs_rr_1_s) (void *, bus_space_handle_t, + bus_size_t, u_int8_t *, bus_size_t); + void (*bs_rr_2_s) (void *, bus_space_handle_t, + bus_size_t, u_int16_t *, bus_size_t); + void (*bs_rr_4_s) (void *, bus_space_handle_t, + bus_size_t, u_int32_t *, bus_size_t); + void (*bs_rr_8_s) (void *, bus_space_handle_t, + bus_size_t, u_int64_t *, bus_size_t); + + /* write single stream */ + void (*bs_w_1_s) (void *, bus_space_handle_t, + bus_size_t, u_int8_t); + void (*bs_w_2_s) (void *, bus_space_handle_t, + bus_size_t, u_int16_t); + void (*bs_w_4_s) (void *, bus_space_handle_t, + bus_size_t, u_int32_t); + void (*bs_w_8_s) (void *, bus_space_handle_t, + bus_size_t, u_int64_t); + + /* write multiple stream */ + void (*bs_wm_1_s) (void *, bus_space_handle_t, + bus_size_t, const u_int8_t *, bus_size_t); + void (*bs_wm_2_s) (void *, bus_space_handle_t, + bus_size_t, const u_int16_t *, bus_size_t); + void (*bs_wm_4_s) (void *, bus_space_handle_t, + bus_size_t, const u_int32_t *, bus_size_t); + void (*bs_wm_8_s) (void *, bus_space_handle_t, + bus_size_t, const u_int64_t *, bus_size_t); + + /* write region stream */ + void (*bs_wr_1_s) (void *, bus_space_handle_t, + bus_size_t, const u_int8_t *, bus_size_t); + void (*bs_wr_2_s) (void *, bus_space_handle_t, + bus_size_t, const u_int16_t *, bus_size_t); + void (*bs_wr_4_s) (void *, bus_space_handle_t, + bus_size_t, const u_int32_t *, bus_size_t); + void (*bs_wr_8_s) (void *, bus_space_handle_t, + bus_size_t, const u_int64_t *, bus_size_t); +}; + + +/* + * Utility macros; INTERNAL USE ONLY. + */ +#define __bs_c(a,b) __CONCAT(a,b) +#define __bs_opname(op,size) __bs_c(__bs_c(__bs_c(bs_,op),_),size) + +#define __bs_rs(sz, t, h, o) \ + (*(t)->__bs_opname(r,sz))((t)->bs_cookie, h, o) +#define __bs_ws(sz, t, h, o, v) \ + (*(t)->__bs_opname(w,sz))((t)->bs_cookie, h, o, v) +#define __bs_nonsingle(type, sz, t, h, o, a, c) \ + (*(t)->__bs_opname(type,sz))((t)->bs_cookie, h, o, a, c) +#define __bs_set(type, sz, t, h, o, v, c) \ + (*(t)->__bs_opname(type,sz))((t)->bs_cookie, h, o, v, c) +#define __bs_copy(sz, t, h1, o1, h2, o2, cnt) \ + (*(t)->__bs_opname(c,sz))((t)->bs_cookie, h1, o1, h2, o2, cnt) + +#define __bs_opname_s(op,size) __bs_c(__bs_c(__bs_c(__bs_c(bs_,op),_),size),_s) +#define __bs_rs_s(sz, t, h, o) \ + (*(t)->__bs_opname_s(r,sz))((t)->bs_cookie, h, o) +#define __bs_ws_s(sz, t, h, o, v) \ + (*(t)->__bs_opname_s(w,sz))((t)->bs_cookie, h, o, v) +#define __bs_nonsingle_s(type, sz, t, h, o, a, c) \ + (*(t)->__bs_opname_s(type,sz))((t)->bs_cookie, h, o, a, c) + + +/* + * Mapping and unmapping operations. + */ +#define bus_space_map(t, a, s, c, hp) \ + (*(t)->bs_map)((t)->bs_cookie, (a), (s), (c), (hp)) +#define bus_space_unmap(t, h, s) \ + (*(t)->bs_unmap)((t)->bs_cookie, (h), (s)) +#define bus_space_subregion(t, h, o, s, hp) \ + (*(t)->bs_subregion)((t)->bs_cookie, (h), (o), (s), (hp)) + + +/* + * Allocation and deallocation operations. + */ +#define bus_space_alloc(t, rs, re, s, a, b, c, ap, hp) \ + (*(t)->bs_alloc)((t)->bs_cookie, (rs), (re), (s), (a), (b), \ + (c), (ap), (hp)) +#define bus_space_free(t, h, s) \ + (*(t)->bs_free)((t)->bs_cookie, (h), (s)) + +/* + * Bus barrier operations. + */ +#define bus_space_barrier(t, h, o, l, f) \ + (*(t)->bs_barrier)((t)->bs_cookie, (h), (o), (l), (f)) + + + +/* + * Bus read (single) operations. + */ +#define bus_space_read_1(t, h, o) __bs_rs(1,(t),(h),(o)) +#define bus_space_read_2(t, h, o) __bs_rs(2,(t),(h),(o)) +#define bus_space_read_4(t, h, o) __bs_rs(4,(t),(h),(o)) +#define bus_space_read_8(t, h, o) __bs_rs(8,(t),(h),(o)) + +#define bus_space_read_stream_1(t, h, o) __bs_rs_s(1,(t), (h), (o)) +#define bus_space_read_stream_2(t, h, o) __bs_rs_s(2,(t), (h), (o)) +#define bus_space_read_stream_4(t, h, o) __bs_rs_s(4,(t), (h), (o)) +#define bus_space_read_stream_8(t, h, o) __bs_rs_s(8,8,(t),(h),(o)) + +/* + * Bus read multiple operations. + */ +#define bus_space_read_multi_1(t, h, o, a, c) \ + __bs_nonsingle(rm,1,(t),(h),(o),(a),(c)) +#define bus_space_read_multi_2(t, h, o, a, c) \ + __bs_nonsingle(rm,2,(t),(h),(o),(a),(c)) +#define bus_space_read_multi_4(t, h, o, a, c) \ + __bs_nonsingle(rm,4,(t),(h),(o),(a),(c)) +#define bus_space_read_multi_8(t, h, o, a, c) \ + __bs_nonsingle(rm,8,(t),(h),(o),(a),(c)) + +#define bus_space_read_multi_stream_1(t, h, o, a, c) \ + __bs_nonsingle_s(rm,1,(t),(h),(o),(a),(c)) +#define bus_space_read_multi_stream_2(t, h, o, a, c) \ + __bs_nonsingle_s(rm,2,(t),(h),(o),(a),(c)) +#define bus_space_read_multi_stream_4(t, h, o, a, c) \ + __bs_nonsingle_s(rm,4,(t),(h),(o),(a),(c)) +#define bus_space_read_multi_stream_8(t, h, o, a, c) \ + __bs_nonsingle_s(rm,8,(t),(h),(o),(a),(c)) + + +/* + * Bus read region operations. + */ +#define bus_space_read_region_1(t, h, o, a, c) \ + __bs_nonsingle(rr,1,(t),(h),(o),(a),(c)) +#define bus_space_read_region_2(t, h, o, a, c) \ + __bs_nonsingle(rr,2,(t),(h),(o),(a),(c)) +#define bus_space_read_region_4(t, h, o, a, c) \ + __bs_nonsingle(rr,4,(t),(h),(o),(a),(c)) +#define bus_space_read_region_8(t, h, o, a, c) \ + __bs_nonsingle(rr,8,(t),(h),(o),(a),(c)) + +#define bus_space_read_region_stream_1(t, h, o, a, c) \ + __bs_nonsingle_s(rr,1,(t),(h),(o),(a),(c)) +#define bus_space_read_region_stream_2(t, h, o, a, c) \ + __bs_nonsingle_s(rr,2,(t),(h),(o),(a),(c)) +#define bus_space_read_region_stream_4(t, h, o, a, c) \ + __bs_nonsingle_s(rr,4,(t),(h),(o),(a),(c)) +#define bus_space_read_region_stream_8(t, h, o, a, c) \ + __bs_nonsingle_s(rr,8,(t),(h),(o),(a),(c)) + + +/* + * Bus write (single) operations. + */ +#define bus_space_write_1(t, h, o, v) __bs_ws(1,(t),(h),(o),(v)) +#define bus_space_write_2(t, h, o, v) __bs_ws(2,(t),(h),(o),(v)) +#define bus_space_write_4(t, h, o, v) __bs_ws(4,(t),(h),(o),(v)) +#define bus_space_write_8(t, h, o, v) __bs_ws(8,(t),(h),(o),(v)) + +#define bus_space_write_stream_1(t, h, o, v) __bs_ws_s(1,(t),(h),(o),(v)) +#define bus_space_write_stream_2(t, h, o, v) __bs_ws_s(2,(t),(h),(o),(v)) +#define bus_space_write_stream_4(t, h, o, v) __bs_ws_s(4,(t),(h),(o),(v)) +#define bus_space_write_stream_8(t, h, o, v) __bs_ws_s(8,(t),(h),(o),(v)) + + +/* + * Bus write multiple operations. + */ +#define bus_space_write_multi_1(t, h, o, a, c) \ + __bs_nonsingle(wm,1,(t),(h),(o),(a),(c)) +#define bus_space_write_multi_2(t, h, o, a, c) \ + __bs_nonsingle(wm,2,(t),(h),(o),(a),(c)) +#define bus_space_write_multi_4(t, h, o, a, c) \ + __bs_nonsingle(wm,4,(t),(h),(o),(a),(c)) +#define bus_space_write_multi_8(t, h, o, a, c) \ + __bs_nonsingle(wm,8,(t),(h),(o),(a),(c)) + +#define bus_space_write_multi_stream_1(t, h, o, a, c) \ + __bs_nonsingle_s(wm,1,(t),(h),(o),(a),(c)) +#define bus_space_write_multi_stream_2(t, h, o, a, c) \ + __bs_nonsingle_s(wm,2,(t),(h),(o),(a),(c)) +#define bus_space_write_multi_stream_4(t, h, o, a, c) \ + __bs_nonsingle_s(wm,4,(t),(h),(o),(a),(c)) +#define bus_space_write_multi_stream_8(t, h, o, a, c) \ + __bs_nonsingle_s(wm,8,(t),(h),(o),(a),(c)) + + +/* + * Bus write region operations. + */ +#define bus_space_write_region_1(t, h, o, a, c) \ + __bs_nonsingle(wr,1,(t),(h),(o),(a),(c)) +#define bus_space_write_region_2(t, h, o, a, c) \ + __bs_nonsingle(wr,2,(t),(h),(o),(a),(c)) +#define bus_space_write_region_4(t, h, o, a, c) \ + __bs_nonsingle(wr,4,(t),(h),(o),(a),(c)) +#define bus_space_write_region_8(t, h, o, a, c) \ + __bs_nonsingle(wr,8,(t),(h),(o),(a),(c)) + +#define bus_space_write_region_stream_1(t, h, o, a, c) \ + __bs_nonsingle_s(wr,1,(t),(h),(o),(a),(c)) +#define bus_space_write_region_stream_2(t, h, o, a, c) \ + __bs_nonsingle_s(wr,2,(t),(h),(o),(a),(c)) +#define bus_space_write_region_stream_4(t, h, o, a, c) \ + __bs_nonsingle_s(wr,4,(t),(h),(o),(a),(c)) +#define bus_space_write_region_stream_8(t, h, o, a, c) \ + __bs_nonsingle_s(wr,8,(t),(h),(o),(a),(c)) + + +/* + * Set multiple operations. + */ +#define bus_space_set_multi_1(t, h, o, v, c) \ + __bs_set(sm,1,(t),(h),(o),(v),(c)) +#define bus_space_set_multi_2(t, h, o, v, c) \ + __bs_set(sm,2,(t),(h),(o),(v),(c)) +#define bus_space_set_multi_4(t, h, o, v, c) \ + __bs_set(sm,4,(t),(h),(o),(v),(c)) +#define bus_space_set_multi_8(t, h, o, v, c) \ + __bs_set(sm,8,(t),(h),(o),(v),(c)) + + +/* + * Set region operations. + */ +#define bus_space_set_region_1(t, h, o, v, c) \ + __bs_set(sr,1,(t),(h),(o),(v),(c)) +#define bus_space_set_region_2(t, h, o, v, c) \ + __bs_set(sr,2,(t),(h),(o),(v),(c)) +#define bus_space_set_region_4(t, h, o, v, c) \ + __bs_set(sr,4,(t),(h),(o),(v),(c)) +#define bus_space_set_region_8(t, h, o, v, c) \ + __bs_set(sr,8,(t),(h),(o),(v),(c)) + + +/* + * Copy operations. + */ +#define bus_space_copy_region_1(t, h1, o1, h2, o2, c) \ + __bs_copy(1, t, h1, o1, h2, o2, c) +#define bus_space_copy_region_2(t, h1, o1, h2, o2, c) \ + __bs_copy(2, t, h1, o1, h2, o2, c) +#define bus_space_copy_region_4(t, h1, o1, h2, o2, c) \ + __bs_copy(4, t, h1, o1, h2, o2, c) +#define bus_space_copy_region_8(t, h1, o1, h2, o2, c) \ + __bs_copy(8, t, h1, o1, h2, o2, c) + +#include + +#endif /* _MACHINE_BUS_H_ */ Copied: user/ngie/more-tests/sys/arm64/include/bus_dma.h (from r281503, head/sys/arm64/include/bus_dma.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests/sys/arm64/include/bus_dma.h Mon Apr 13 21:33:49 2015 (r281504, copy of r281503, head/sys/arm64/include/bus_dma.h) @@ -0,0 +1,8 @@ +/* $FreeBSD$ */ + +#ifndef _MACHINE_BUS_DMA_H_ +#define _MACHINE_BUS_DMA_H_ + +#include + +#endif /* !_MACHINE_BUS_DMA_H_ */ Copied: user/ngie/more-tests/sys/arm64/include/clock.h (from r281503, head/sys/arm64/include/clock.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests/sys/arm64/include/clock.h Mon Apr 13 21:33:49 2015 (r281504, copy of r281503, head/sys/arm64/include/clock.h) @@ -0,0 +1 @@ +/* $FreeBSD$ */ Copied: user/ngie/more-tests/sys/arm64/include/counter.h (from r281503, head/sys/arm64/include/counter.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests/sys/arm64/include/counter.h Mon Apr 13 21:33:49 2015 (r281504, copy of r281503, head/sys/arm64/include/counter.h) @@ -0,0 +1,93 @@ +/*- + * Copyright (c) 2012 Konstantin Belousov + * 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$ + */ + +#ifndef _MACHINE_COUNTER_H_ +#define _MACHINE_COUNTER_H_ + +#include +#ifdef INVARIANTS +#include +#endif + +#define counter_enter() critical_enter() +#define counter_exit() critical_exit() + +#ifdef IN_SUBR_COUNTER_C +static inline uint64_t +counter_u64_read_one(uint64_t *p, int cpu) +{ + + return (*(uint64_t *)((char *)p + sizeof(struct pcpu) * cpu)); +} + +static inline uint64_t +counter_u64_fetch_inline(uint64_t *p) +{ + uint64_t r; + int i; + + r = 0; + for (i = 0; i < mp_ncpus; i++) + r += counter_u64_read_one((uint64_t *)p, i); + + return (r); +} + +/* XXXKIB might interrupt increment */ +static void +counter_u64_zero_one_cpu(void *arg) +{ + + *((uint64_t *)((char *)arg + sizeof(struct pcpu) * + PCPU_GET(cpuid))) = 0; +} + +static inline void +counter_u64_zero_inline(counter_u64_t c) +{ + + smp_rendezvous(smp_no_rendevous_barrier, counter_u64_zero_one_cpu, + smp_no_rendevous_barrier, c); +} +#endif + +#define counter_u64_add_protected(c, inc) do { \ + CRITICAL_ASSERT(curthread); \ + *(uint64_t *)zpcpu_get(c) += (inc); \ +} while (0) + +static inline void +counter_u64_add(counter_u64_t c, int64_t inc) +{ + + counter_enter(); + counter_u64_add_protected(c, inc); + counter_exit(); +} + +#endif /* ! _MACHINE_COUNTER_H_ */ Modified: user/ngie/more-tests/sys/arm64/include/cpufunc.h ============================================================================== --- user/ngie/more-tests/sys/arm64/include/cpufunc.h Mon Apr 13 21:29:40 2015 (r281503) +++ user/ngie/more-tests/sys/arm64/include/cpufunc.h Mon Apr 13 21:33:49 2015 (r281504) @@ -109,6 +109,7 @@ get_mpidr(void) } #define cpu_nullop() arm64_nullop() +#define cpufunc_nullop() arm64_nullop() #define cpu_setttb(a) arm64_setttb(a) #define cpu_tlb_flushID() arm64_tlb_flushID() Copied: user/ngie/more-tests/sys/arm64/include/db_machdep.h (from r281503, head/sys/arm64/include/db_machdep.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests/sys/arm64/include/db_machdep.h Mon Apr 13 21:33:49 2015 (r281504, copy of r281503, head/sys/arm64/include/db_machdep.h) @@ -0,0 +1,126 @@ +/*- + * Copyright (c) 2014 Andrew Turner + * Copyright (c) 2014-2015 The FreeBSD Foundation + * All rights reserved. + * + * This software was developed by Semihalf under + * sponsorship from the FreeBSD Foundation. *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@FreeBSD.ORG Mon Apr 13 22:50:45 2015 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DE6202CA; Mon, 13 Apr 2015 22:50: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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C744F7A3; Mon, 13 Apr 2015 22:50:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3DMojKX065985; Mon, 13 Apr 2015 22:50:45 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3DMojSq065983; Mon, 13 Apr 2015 22:50:45 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201504132250.t3DMojSq065983@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Mon, 13 Apr 2015 22:50:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281508 - in user/cperciva/freebsd-update-build/patches: 10.0-RELEASE 10.1-RELEASE 8.4-RELEASE 9.3-RELEASE 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.20 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, 13 Apr 2015 22:50:46 -0000 Author: delphij Date: Mon Apr 13 22:50:44 2015 New Revision: 281508 URL: https://svnweb.freebsd.org/changeset/base/281508 Log: Add recent patches. Added: user/cperciva/freebsd-update-build/patches/10.0-RELEASE/18-EN-15:02.openssl user/cperciva/freebsd-update-build/patches/10.0-RELEASE/18-EN-15:03.freebsd-update user/cperciva/freebsd-update-build/patches/10.0-RELEASE/18-SA-15:04.igmp user/cperciva/freebsd-update-build/patches/10.1-RELEASE/6-EN-15:01.vt user/cperciva/freebsd-update-build/patches/10.1-RELEASE/6-EN-15:02.openssl user/cperciva/freebsd-update-build/patches/10.1-RELEASE/6-EN-15:03.freebsd-update user/cperciva/freebsd-update-build/patches/10.1-RELEASE/6-SA-15:04.igmp user/cperciva/freebsd-update-build/patches/10.1-RELEASE/7-SA-15:06.openssl user/cperciva/freebsd-update-build/patches/10.1-RELEASE/8-SA-15:06.openssl user/cperciva/freebsd-update-build/patches/10.1-RELEASE/9-SA-15:04.igmp user/cperciva/freebsd-update-build/patches/10.1-RELEASE/9-SA-15:07.ntp user/cperciva/freebsd-update-build/patches/10.1-RELEASE/9-SA-15:08.bsdinstall user/cperciva/freebsd-update-build/patches/10.1-RELEASE/9-SA-15:09.ipv6 user/cperciva/freebsd-update-build/patches/8.4-RELEASE/24-EN-15:02.openssl user/cperciva/freebsd-update-build/patches/8.4-RELEASE/24-EN-15:03.freebsd-update user/cperciva/freebsd-update-build/patches/8.4-RELEASE/24-SA-15:04.igmp user/cperciva/freebsd-update-build/patches/8.4-RELEASE/24-SA-15:05.bind user/cperciva/freebsd-update-build/patches/8.4-RELEASE/25-SA-15:06.openssl user/cperciva/freebsd-update-build/patches/8.4-RELEASE/26-SA-15:06.openssl user/cperciva/freebsd-update-build/patches/8.4-RELEASE/27-SA-15:04.igmp user/cperciva/freebsd-update-build/patches/8.4-RELEASE/27-SA-15:07.ntp user/cperciva/freebsd-update-build/patches/8.4-RELEASE/27-SA-15:09.ipv6 user/cperciva/freebsd-update-build/patches/9.3-RELEASE/10-EN-15:01.vt user/cperciva/freebsd-update-build/patches/9.3-RELEASE/10-EN-15:02.openssl user/cperciva/freebsd-update-build/patches/9.3-RELEASE/10-EN-15:03.freebsd-update user/cperciva/freebsd-update-build/patches/9.3-RELEASE/10-SA-15:04.igmp user/cperciva/freebsd-update-build/patches/9.3-RELEASE/10-SA-15:05.bind user/cperciva/freebsd-update-build/patches/9.3-RELEASE/11-SA-15:06.openssl user/cperciva/freebsd-update-build/patches/9.3-RELEASE/12-SA-15:06.openssl user/cperciva/freebsd-update-build/patches/9.3-RELEASE/13-SA-15:04.igmp user/cperciva/freebsd-update-build/patches/9.3-RELEASE/13-SA-15:07.ntp user/cperciva/freebsd-update-build/patches/9.3-RELEASE/13-SA-15:09.ipv6 Added: user/cperciva/freebsd-update-build/patches/10.0-RELEASE/18-EN-15:02.openssl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/cperciva/freebsd-update-build/patches/10.0-RELEASE/18-EN-15:02.openssl Mon Apr 13 22:50:44 2015 (r281508) @@ -0,0 +1,58313 @@ +Index: crypto/openssl/ACKNOWLEDGMENTS +=================================================================== +--- crypto/openssl/ACKNOWLEDGMENTS (revision 279126) ++++ crypto/openssl/ACKNOWLEDGMENTS (working copy) +@@ -10,13 +10,18 @@ OpenSSL project. + We would like to identify and thank the following such sponsors for their past + or current significant support of the OpenSSL project: + ++Major support: ++ ++ Qualys http://www.qualys.com/ ++ + Very significant support: + +- OpenGear: www.opengear.com ++ OpenGear: http://www.opengear.com/ + + Significant support: + +- PSW Group: www.psw.net ++ PSW Group: http://www.psw.net/ ++ Acano Ltd. http://acano.com/ + + Please note that we ask permission to identify sponsors and that some sponsors + we consider eligible for inclusion here have requested to remain anonymous. +Index: crypto/openssl/CHANGES +=================================================================== +--- crypto/openssl/CHANGES (revision 279126) ++++ crypto/openssl/CHANGES (working copy) +@@ -2,9 +2,376 @@ + OpenSSL CHANGES + _______________ + ++ Changes between 1.0.1k and 1.0.1l [15 Jan 2015] ++ ++ *) Build fixes for the Windows and OpenVMS platforms ++ [Matt Caswell and Richard Levitte] ++ ++ Changes between 1.0.1j and 1.0.1k [8 Jan 2015] ++ ++ *) Fix DTLS segmentation fault in dtls1_get_record. A carefully crafted DTLS ++ message can cause a segmentation fault in OpenSSL due to a NULL pointer ++ dereference. This could lead to a Denial Of Service attack. Thanks to ++ Markus Stenberg of Cisco Systems, Inc. for reporting this issue. ++ (CVE-2014-3571) ++ [Steve Henson] ++ ++ *) Fix DTLS memory leak in dtls1_buffer_record. A memory leak can occur in the ++ dtls1_buffer_record function under certain conditions. In particular this ++ could occur if an attacker sent repeated DTLS records with the same ++ sequence number but for the next epoch. The memory leak could be exploited ++ by an attacker in a Denial of Service attack through memory exhaustion. ++ Thanks to Chris Mueller for reporting this issue. ++ (CVE-2015-0206) ++ [Matt Caswell] ++ ++ *) Fix issue where no-ssl3 configuration sets method to NULL. When openssl is ++ built with the no-ssl3 option and a SSL v3 ClientHello is received the ssl ++ method would be set to NULL which could later result in a NULL pointer ++ dereference. Thanks to Frank Schmirler for reporting this issue. ++ (CVE-2014-3569) ++ [Kurt Roeckx] ++ ++ *) Abort handshake if server key exchange message is omitted for ephemeral ++ ECDH ciphersuites. ++ ++ Thanks to Karthikeyan Bhargavan of the PROSECCO team at INRIA for ++ reporting this issue. ++ (CVE-2014-3572) ++ [Steve Henson] ++ ++ *) Remove non-export ephemeral RSA code on client and server. This code ++ violated the TLS standard by allowing the use of temporary RSA keys in ++ non-export ciphersuites and could be used by a server to effectively ++ downgrade the RSA key length used to a value smaller than the server ++ certificate. Thanks for Karthikeyan Bhargavan of the PROSECCO team at ++ INRIA or reporting this issue. ++ (CVE-2015-0204) ++ [Steve Henson] ++ ++ *) Fixed issue where DH client certificates are accepted without verification. ++ An OpenSSL server will accept a DH certificate for client authentication ++ without the certificate verify message. This effectively allows a client to ++ authenticate without the use of a private key. This only affects servers ++ which trust a client certificate authority which issues certificates ++ containing DH keys: these are extremely rare and hardly ever encountered. ++ Thanks for Karthikeyan Bhargavan of the PROSECCO team at INRIA or reporting ++ this issue. ++ (CVE-2015-0205) ++ [Steve Henson] ++ ++ *) Ensure that the session ID context of an SSL is updated when its ++ SSL_CTX is updated via SSL_set_SSL_CTX. ++ ++ The session ID context is typically set from the parent SSL_CTX, ++ and can vary with the CTX. ++ [Adam Langley] ++ ++ *) Fix various certificate fingerprint issues. ++ ++ By using non-DER or invalid encodings outside the signed portion of a ++ certificate the fingerprint can be changed without breaking the signature. ++ Although no details of the signed portion of the certificate can be changed ++ this can cause problems with some applications: e.g. those using the ++ certificate fingerprint for blacklists. ++ ++ 1. Reject signatures with non zero unused bits. ++ ++ If the BIT STRING containing the signature has non zero unused bits reject ++ the signature. All current signature algorithms require zero unused bits. ++ ++ 2. Check certificate algorithm consistency. ++ ++ Check the AlgorithmIdentifier inside TBS matches the one in the ++ certificate signature. NB: this will result in signature failure ++ errors for some broken certificates. ++ ++ Thanks to Konrad Kraszewski from Google for reporting this issue. ++ ++ 3. Check DSA/ECDSA signatures use DER. ++ ++ Reencode DSA/ECDSA signatures and compare with the original received ++ signature. Return an error if there is a mismatch. ++ ++ This will reject various cases including garbage after signature ++ (thanks to Antti Karjalainen and Tuomo Untinen from the Codenomicon CROSS ++ program for discovering this case) and use of BER or invalid ASN.1 INTEGERs ++ (negative or with leading zeroes). ++ ++ Further analysis was conducted and fixes were developed by Stephen Henson ++ of the OpenSSL core team. ++ ++ (CVE-2014-8275) ++ [Steve Henson] ++ ++ *) Correct Bignum squaring. Bignum squaring (BN_sqr) may produce incorrect ++ results on some platforms, including x86_64. This bug occurs at random ++ with a very low probability, and is not known to be exploitable in any ++ way, though its exact impact is difficult to determine. Thanks to Pieter ++ Wuille (Blockstream) who reported this issue and also suggested an initial ++ fix. Further analysis was conducted by the OpenSSL development team and ++ Adam Langley of Google. The final fix was developed by Andy Polyakov of ++ the OpenSSL core team. ++ (CVE-2014-3570) ++ [Andy Polyakov] ++ ++ *) Do not resume sessions on the server if the negotiated protocol ++ version does not match the session's version. Resuming with a different ++ version, while not strictly forbidden by the RFC, is of questionable ++ sanity and breaks all known clients. ++ [David Benjamin, Emilia Käsper] ++ ++ *) Tighten handling of the ChangeCipherSpec (CCS) message: reject ++ early CCS messages during renegotiation. (Note that because ++ renegotiation is encrypted, this early CCS was not exploitable.) ++ [Emilia Käsper] ++ ++ *) Tighten client-side session ticket handling during renegotiation: ++ ensure that the client only accepts a session ticket if the server sends ++ the extension anew in the ServerHello. Previously, a TLS client would ++ reuse the old extension state and thus accept a session ticket if one was ++ announced in the initial ServerHello. ++ ++ Similarly, ensure that the client requires a session ticket if one ++ was advertised in the ServerHello. Previously, a TLS client would ++ ignore a missing NewSessionTicket message. ++ [Emilia Käsper] ++ ++ Changes between 1.0.1i and 1.0.1j [15 Oct 2014] ++ ++ *) SRTP Memory Leak. ++ ++ A flaw in the DTLS SRTP extension parsing code allows an attacker, who ++ sends a carefully crafted handshake message, to cause OpenSSL to fail ++ to free up to 64k of memory causing a memory leak. This could be ++ exploited in a Denial Of Service attack. This issue affects OpenSSL ++ 1.0.1 server implementations for both SSL/TLS and DTLS regardless of ++ whether SRTP is used or configured. Implementations of OpenSSL that ++ have been compiled with OPENSSL_NO_SRTP defined are not affected. ++ ++ The fix was developed by the OpenSSL team. ++ (CVE-2014-3513) ++ [OpenSSL team] ++ ++ *) Session Ticket Memory Leak. ++ ++ When an OpenSSL SSL/TLS/DTLS server receives a session ticket the ++ integrity of that ticket is first verified. In the event of a session ++ ticket integrity check failing, OpenSSL will fail to free memory ++ causing a memory leak. By sending a large number of invalid session ++ tickets an attacker could exploit this issue in a Denial Of Service ++ attack. ++ (CVE-2014-3567) ++ [Steve Henson] ++ ++ *) Build option no-ssl3 is incomplete. ++ ++ When OpenSSL is configured with "no-ssl3" as a build option, servers ++ could accept and complete a SSL 3.0 handshake, and clients could be ++ configured to send them. ++ (CVE-2014-3568) ++ [Akamai and the OpenSSL team] ++ ++ *) Add support for TLS_FALLBACK_SCSV. ++ Client applications doing fallback retries should call ++ SSL_set_mode(s, SSL_MODE_SEND_FALLBACK_SCSV). ++ (CVE-2014-3566) ++ [Adam Langley, Bodo Moeller] ++ ++ *) Add additional DigestInfo checks. ++ ++ Reencode DigestInto in DER and check against the original when ++ verifying RSA signature: this will reject any improperly encoded ++ DigestInfo structures. ++ ++ Note: this is a precautionary measure and no attacks are currently known. ++ ++ [Steve Henson] ++ ++ Changes between 1.0.1h and 1.0.1i [6 Aug 2014] ++ ++ *) Fix SRP buffer overrun vulnerability. Invalid parameters passed to the ++ SRP code can be overrun an internal buffer. Add sanity check that ++ g, A, B < N to SRP code. ++ ++ Thanks to Sean Devlin and Watson Ladd of Cryptography Services, NCC ++ Group for discovering this issue. ++ (CVE-2014-3512) ++ [Steve Henson] ++ ++ *) A flaw in the OpenSSL SSL/TLS server code causes the server to negotiate ++ TLS 1.0 instead of higher protocol versions when the ClientHello message ++ is badly fragmented. This allows a man-in-the-middle attacker to force a ++ downgrade to TLS 1.0 even if both the server and the client support a ++ higher protocol version, by modifying the client's TLS records. ++ ++ Thanks to David Benjamin and Adam Langley (Google) for discovering and ++ researching this issue. ++ (CVE-2014-3511) ++ [David Benjamin] ++ ++ *) OpenSSL DTLS clients enabling anonymous (EC)DH ciphersuites are subject ++ to a denial of service attack. A malicious server can crash the client ++ with a null pointer dereference (read) by specifying an anonymous (EC)DH ++ ciphersuite and sending carefully crafted handshake messages. ++ ++ Thanks to Felix Gröbert (Google) for discovering and researching this ++ issue. ++ (CVE-2014-3510) ++ [Emilia Käsper] ++ ++ *) By sending carefully crafted DTLS packets an attacker could cause openssl ++ to leak memory. This can be exploited through a Denial of Service attack. ++ Thanks to Adam Langley for discovering and researching this issue. ++ (CVE-2014-3507) ++ [Adam Langley] ++ ++ *) An attacker can force openssl to consume large amounts of memory whilst ++ processing DTLS handshake messages. This can be exploited through a ++ Denial of Service attack. ++ Thanks to Adam Langley for discovering and researching this issue. ++ (CVE-2014-3506) ++ [Adam Langley] ++ ++ *) An attacker can force an error condition which causes openssl to crash ++ whilst processing DTLS packets due to memory being freed twice. This ++ can be exploited through a Denial of Service attack. ++ Thanks to Adam Langley and Wan-Teh Chang for discovering and researching ++ this issue. ++ (CVE-2014-3505) ++ [Adam Langley] ++ ++ *) If a multithreaded client connects to a malicious server using a resumed ++ session and the server sends an ec point format extension it could write ++ up to 255 bytes to freed memory. ++ ++ Thanks to Gabor Tyukasz (LogMeIn Inc) for discovering and researching this ++ issue. ++ (CVE-2014-3509) ++ [Gabor Tyukasz] ++ ++ *) A malicious server can crash an OpenSSL client with a null pointer ++ dereference (read) by specifying an SRP ciphersuite even though it was not ++ properly negotiated with the client. This can be exploited through a ++ Denial of Service attack. ++ ++ Thanks to Joonas Kuorilehto and Riku Hietamäki (Codenomicon) for ++ discovering and researching this issue. ++ (CVE-2014-5139) ++ [Steve Henson] ++ ++ *) A flaw in OBJ_obj2txt may cause pretty printing functions such as ++ X509_name_oneline, X509_name_print_ex et al. to leak some information ++ from the stack. Applications may be affected if they echo pretty printing ++ output to the attacker. ++ ++ Thanks to Ivan Fratric (Google) for discovering this issue. ++ (CVE-2014-3508) ++ [Emilia Käsper, and Steve Henson] ++ ++ *) Fix ec_GFp_simple_points_make_affine (thus, EC_POINTs_mul etc.) ++ for corner cases. (Certain input points at infinity could lead to ++ bogus results, with non-infinity inputs mapped to infinity too.) ++ [Bodo Moeller] ++ ++ Changes between 1.0.1g and 1.0.1h [5 Jun 2014] ++ ++ *) Fix for SSL/TLS MITM flaw. An attacker using a carefully crafted ++ handshake can force the use of weak keying material in OpenSSL ++ SSL/TLS clients and servers. ++ ++ Thanks to KIKUCHI Masashi (Lepidum Co. Ltd.) for discovering and ++ researching this issue. (CVE-2014-0224) ++ [KIKUCHI Masashi, Steve Henson] ++ ++ *) Fix DTLS recursion flaw. By sending an invalid DTLS handshake to an ++ OpenSSL DTLS client the code can be made to recurse eventually crashing ++ in a DoS attack. ++ ++ Thanks to Imre Rad (Search-Lab Ltd.) for discovering this issue. ++ (CVE-2014-0221) ++ [Imre Rad, Steve Henson] ++ ++ *) Fix DTLS invalid fragment vulnerability. A buffer overrun attack can ++ be triggered by sending invalid DTLS fragments to an OpenSSL DTLS ++ client or server. This is potentially exploitable to run arbitrary ++ code on a vulnerable client or server. ++ ++ Thanks to Jüri Aedla for reporting this issue. (CVE-2014-0195) ++ [Jüri Aedla, Steve Henson] ++ ++ *) Fix bug in TLS code where clients enable anonymous ECDH ciphersuites ++ are subject to a denial of service attack. ++ ++ Thanks to Felix Gröbert and Ivan Fratric at Google for discovering ++ this issue. (CVE-2014-3470) ++ [Felix Gröbert, Ivan Fratric, Steve Henson] ++ ++ *) Harmonize version and its documentation. -f flag is used to display ++ compilation flags. ++ [mancha ] ++ ++ *) Fix eckey_priv_encode so it immediately returns an error upon a failure ++ in i2d_ECPrivateKey. ++ [mancha ] ++ ++ *) Fix some double frees. These are not thought to be exploitable. ++ [mancha ] ++ ++ Changes between 1.0.1f and 1.0.1g [7 Apr 2014] ++ ++ *) A missing bounds check in the handling of the TLS heartbeat extension ++ can be used to reveal up to 64k of memory to a connected client or ++ server. ++ ++ Thanks for Neel Mehta of Google Security for discovering this bug and to ++ Adam Langley and Bodo Moeller for ++ preparing the fix (CVE-2014-0160) ++ [Adam Langley, Bodo Moeller] ++ ++ *) Fix for the attack described in the paper "Recovering OpenSSL ++ ECDSA Nonces Using the FLUSH+RELOAD Cache Side-channel Attack" ++ by Yuval Yarom and Naomi Benger. Details can be obtained from: ++ http://eprint.iacr.org/2014/140 ++ ++ Thanks to Yuval Yarom and Naomi Benger for discovering this ++ flaw and to Yuval Yarom for supplying a fix (CVE-2014-0076) ++ [Yuval Yarom and Naomi Benger] ++ ++ *) TLS pad extension: draft-agl-tls-padding-03 ++ ++ Workaround for the "TLS hang bug" (see FAQ and PR#2771): if the ++ TLS client Hello record length value would otherwise be > 255 and ++ less that 512 pad with a dummy extension containing zeroes so it ++ is at least 512 bytes long. ++ ++ [Adam Langley, Steve Henson] ++ ++ Changes between 1.0.1e and 1.0.1f [6 Jan 2014] ++ ++ *) Fix for TLS record tampering bug. A carefully crafted invalid ++ handshake could crash OpenSSL with a NULL pointer exception. ++ Thanks to Anton Johansson for reporting this issues. ++ (CVE-2013-4353) ++ ++ *) Keep original DTLS digest and encryption contexts in retransmission ++ structures so we can use the previous session parameters if they need ++ to be resent. (CVE-2013-6450) ++ [Steve Henson] ++ ++ *) Add option SSL_OP_SAFARI_ECDHE_ECDSA_BUG (part of SSL_OP_ALL) which ++ avoids preferring ECDHE-ECDSA ciphers when the client appears to be ++ Safari on OS X. Safari on OS X 10.8..10.8.3 advertises support for ++ several ECDHE-ECDSA ciphers, but fails to negotiate them. The bug ++ is fixed in OS X 10.8.4, but Apple have ruled out both hot fixing ++ 10.8..10.8.3 and forcing users to upgrade to 10.8.4 or newer. ++ [Rob Stradling, Adam Langley] ++ + Changes between 1.0.1d and 1.0.1e [11 Feb 2013] + +- *) ++ *) Correct fix for CVE-2013-0169. The original didn't work on AES-NI ++ supporting platforms or when small records were transferred. ++ [Andy Polyakov, Steve Henson] + + Changes between 1.0.1c and 1.0.1d [5 Feb 2013] + +@@ -404,6 +771,63 @@ + Add command line options to s_client/s_server. + [Steve Henson] + ++ Changes between 1.0.0j and 1.0.0k [5 Feb 2013] ++ ++ *) Make the decoding of SSLv3, TLS and DTLS CBC records constant time. ++ ++ This addresses the flaw in CBC record processing discovered by ++ Nadhem Alfardan and Kenny Paterson. Details of this attack can be found ++ at: http://www.isg.rhul.ac.uk/tls/ ++ ++ Thanks go to Nadhem Alfardan and Kenny Paterson of the Information ++ Security Group at Royal Holloway, University of London ++ (www.isg.rhul.ac.uk) for discovering this flaw and Adam Langley and ++ Emilia Käsper for the initial patch. ++ (CVE-2013-0169) ++ [Emilia Käsper, Adam Langley, Ben Laurie, Andy Polyakov, Steve Henson] ++ ++ *) Return an error when checking OCSP signatures when key is NULL. ++ This fixes a DoS attack. (CVE-2013-0166) ++ [Steve Henson] ++ ++ *) Call OCSP Stapling callback after ciphersuite has been chosen, so ++ the right response is stapled. Also change SSL_get_certificate() ++ so it returns the certificate actually sent. ++ See http://rt.openssl.org/Ticket/Display.html?id=2836. ++ (This is a backport) ++ [Rob Stradling ] ++ ++ *) Fix possible deadlock when decoding public keys. ++ [Steve Henson] ++ ++ Changes between 1.0.0i and 1.0.0j [10 May 2012] ++ ++ [NB: OpenSSL 1.0.0i and later 1.0.0 patch levels were released after ++ OpenSSL 1.0.1.] ++ ++ *) Sanity check record length before skipping explicit IV in DTLS ++ to fix DoS attack. ++ ++ Thanks to Codenomicon for discovering this issue using Fuzz-o-Matic ++ fuzzing as a service testing platform. ++ (CVE-2012-2333) ++ [Steve Henson] ++ ++ *) Initialise tkeylen properly when encrypting CMS messages. ++ Thanks to Solar Designer of Openwall for reporting this issue. ++ [Steve Henson] ++ ++ Changes between 1.0.0h and 1.0.0i [19 Apr 2012] ++ ++ *) Check for potentially exploitable overflows in asn1_d2i_read_bio ++ BUF_mem_grow and BUF_mem_grow_clean. Refuse attempts to shrink buffer ++ in CRYPTO_realloc_clean. ++ ++ Thanks to Tavis Ormandy, Google Security Team, for discovering this ++ issue and to Adam Langley for fixing it. ++ (CVE-2012-2110) ++ [Adam Langley (Google), Tavis Ormandy, Google Security Team] ++ + Changes between 1.0.0g and 1.0.0h [12 Mar 2012] + + *) Fix MMA (Bleichenbacher's attack on PKCS #1 v1.5 RSA padding) weakness +@@ -1394,6 +1818,86 @@ + *) Change 'Configure' script to enable Camellia by default. + [NTT] + ++ Changes between 0.9.8x and 0.9.8y [5 Feb 2013] ++ ++ *) Make the decoding of SSLv3, TLS and DTLS CBC records constant time. ++ ++ This addresses the flaw in CBC record processing discovered by ++ Nadhem Alfardan and Kenny Paterson. Details of this attack can be found ++ at: http://www.isg.rhul.ac.uk/tls/ ++ ++ Thanks go to Nadhem Alfardan and Kenny Paterson of the Information ++ Security Group at Royal Holloway, University of London ++ (www.isg.rhul.ac.uk) for discovering this flaw and Adam Langley and ++ Emilia Käsper for the initial patch. ++ (CVE-2013-0169) ++ [Emilia Käsper, Adam Langley, Ben Laurie, Andy Polyakov, Steve Henson] ++ ++ *) Return an error when checking OCSP signatures when key is NULL. ++ This fixes a DoS attack. (CVE-2013-0166) ++ [Steve Henson] ++ ++ *) Call OCSP Stapling callback after ciphersuite has been chosen, so ++ the right response is stapled. Also change SSL_get_certificate() ++ so it returns the certificate actually sent. ++ See http://rt.openssl.org/Ticket/Display.html?id=2836. ++ (This is a backport) ++ [Rob Stradling ] ++ ++ *) Fix possible deadlock when decoding public keys. ++ [Steve Henson] ++ ++ Changes between 0.9.8w and 0.9.8x [10 May 2012] ++ ++ *) Sanity check record length before skipping explicit IV in DTLS ++ to fix DoS attack. ++ ++ Thanks to Codenomicon for discovering this issue using Fuzz-o-Matic ++ fuzzing as a service testing platform. ++ (CVE-2012-2333) ++ [Steve Henson] ++ ++ *) Initialise tkeylen properly when encrypting CMS messages. ++ Thanks to Solar Designer of Openwall for reporting this issue. ++ [Steve Henson] ++ ++ Changes between 0.9.8v and 0.9.8w [23 Apr 2012] ++ ++ *) The fix for CVE-2012-2110 did not take into account that the ++ 'len' argument to BUF_MEM_grow and BUF_MEM_grow_clean is an ++ int in OpenSSL 0.9.8, making it still vulnerable. Fix by ++ rejecting negative len parameter. (CVE-2012-2131) ++ [Tomas Hoger ] ++ ++ Changes between 0.9.8u and 0.9.8v [19 Apr 2012] ++ ++ *) Check for potentially exploitable overflows in asn1_d2i_read_bio ++ BUF_mem_grow and BUF_mem_grow_clean. Refuse attempts to shrink buffer ++ in CRYPTO_realloc_clean. ++ ++ Thanks to Tavis Ormandy, Google Security Team, for discovering this ++ issue and to Adam Langley for fixing it. ++ (CVE-2012-2110) ++ [Adam Langley (Google), Tavis Ormandy, Google Security Team] ++ ++ Changes between 0.9.8t and 0.9.8u [12 Mar 2012] ++ ++ *) Fix MMA (Bleichenbacher's attack on PKCS #1 v1.5 RSA padding) weakness ++ in CMS and PKCS7 code. When RSA decryption fails use a random key for ++ content decryption and always return the same error. Note: this attack ++ needs on average 2^20 messages so it only affects automated senders. The ++ old behaviour can be reenabled in the CMS code by setting the ++ CMS_DEBUG_DECRYPT flag: this is useful for debugging and testing where ++ an MMA defence is not necessary. ++ Thanks to Ivan Nestlerode for discovering ++ this issue. (CVE-2012-0884) ++ [Steve Henson] ++ ++ *) Fix CVE-2011-4619: make sure we really are receiving a ++ client hello before rejecting multiple SGC restarts. Thanks to ++ Ivan Nestlerode for discovering this bug. ++ [Steve Henson] ++ + Changes between 0.9.8s and 0.9.8t [18 Jan 2012] + + *) Fix for DTLS DoS issue introduced by fix for CVE-2011-4109. +@@ -1401,7 +1905,7 @@ + Development, Cisco Systems, Inc. for discovering this bug and + preparing a fix. (CVE-2012-0050) + [Antonio Martin] +- ++ + Changes between 0.9.8r and 0.9.8s [4 Jan 2012] + + *) Nadhem Alfardan and Kenny Paterson have discovered an extension +Index: crypto/openssl/Configure +=================================================================== +--- crypto/openssl/Configure (revision 279126) ++++ crypto/openssl/Configure (working copy) +@@ -178,7 +178,7 @@ my %table=( + "debug-ben-no-opt", "gcc: -Wall -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG -Werror -DL_ENDIAN -DTERMIOS -Wall -g3::(unknown)::::::", + "debug-ben-strict", "gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DCONST_STRICT -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe::(unknown)::::::", + "debug-rse","cc:-DTERMIOS -DL_ENDIAN -pipe -O -g -ggdb3 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}", +-"debug-bodo", "gcc:$gcc_devteam_warn -DBN_DEBUG -DBN_DEBUG_RAND -DCONF_DEBUG -DBIO_PAIR_DEBUG -m64 -DL_ENDIAN -DTERMIO -g -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", ++"debug-bodo", "gcc:$gcc_devteam_warn -Wno-error=overlength-strings -DBN_DEBUG -DBN_DEBUG_RAND -DCONF_DEBUG -DBIO_PAIR_DEBUG -m64 -DL_ENDIAN -DTERMIO -g -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", + "debug-ulf", "gcc:-DTERMIOS -DL_ENDIAN -march=i486 -Wall -DBN_DEBUG -DBN_DEBUG_RAND -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -g -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations:::CYGWIN32:::${no_asm}:win32:cygwin-shared:::.dll", + "debug-steve64", "gcc:$gcc_devteam_warn -m64 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -DDEBUG_SAFESTACK -Wno-overlength-strings -g::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "debug-steve32", "gcc:$gcc_devteam_warn -m32 -DL_ENDIAN -DCONF_DEBUG -DDEBUG_SAFESTACK -g -pipe::-D_REENTRANT::-rdynamic -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC:-m32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +@@ -526,7 +526,7 @@ my %table=( + # 'perl Configure VC-WIN32' with '-DUNICODE -D_UNICODE' + "VC-WIN32","cl:-W3 -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32", + # Unified CE target +-"debug-VC-WIN32","cl:-W3 -WX -Gs0 -GF -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32", ++"debug-VC-WIN32","cl:-W3 -Gs0 -GF -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32", + "VC-CE","cl::::WINCE::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${no_asm}:win32", + + # Borland C++ 4.5 +@@ -720,6 +720,7 @@ my %disabled = ( # "what" => "comment" [or + "sctp" => "default", + "shared" => "default", + "store" => "experimental", ++ "unit-test" => "default", + "zlib" => "default", + "zlib-dynamic" => "default" + ); +@@ -727,7 +728,7 @@ my @experimental = (); + + # This is what $depflags will look like with the above defaults + # (we need this to see if we should advise the user to run "make depend"): +-my $default_depflags = " -DOPENSSL_NO_EC_NISTP_64_GCC_128 -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SCTP -DOPENSSL_NO_STORE"; ++my $default_depflags = " -DOPENSSL_NO_EC_NISTP_64_GCC_128 -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SCTP -DOPENSSL_NO_STORE -DOPENSSL_NO_UNIT_TEST"; + + # Explicit "no-..." options will be collected in %disabled along with the defaults. + # To remove something from %disabled, use "enable-foo" (unless it's experimental). +@@ -803,6 +804,11 @@ PROCESS_ARGS: + { + $disabled{"tls1"} = "option(tls)" + } ++ elsif ($1 eq "ssl3-method") ++ { ++ $disabled{"ssl3-method"} = "option(ssl)"; ++ $disabled{"ssl3"} = "option(ssl)"; ++ } + else + { + $disabled{$1} = "option"; +@@ -1766,6 +1772,9 @@ open(OUT,'>crypto/opensslconf.h.new') || die "unab + print OUT "/* opensslconf.h */\n"; + print OUT "/* WARNING: Generated automatically from opensslconf.h.in by Configure. */\n\n"; + ++print OUT "#ifdef __cplusplus\n"; ++print OUT "extern \"C\" {\n"; ++print OUT "#endif\n"; + print OUT "/* OpenSSL was configured with the following options: */\n"; + my $openssl_algorithm_defines_trans = $openssl_algorithm_defines; + $openssl_experimental_defines =~ s/^\s*#\s*define\s+OPENSSL_NO_(.*)/#ifndef OPENSSL_EXPERIMENTAL_$1\n# ifndef OPENSSL_NO_$1\n# define OPENSSL_NO_$1\n# endif\n#endif/mg; +@@ -1870,6 +1879,9 @@ while () + { print OUT $_; } + } + close(IN); ++print OUT "#ifdef __cplusplus\n"; ++print OUT "}\n"; ++print OUT "#endif\n"; + close(OUT); + rename("crypto/opensslconf.h","crypto/opensslconf.h.bak") || die "unable to rename crypto/opensslconf.h\n" if -e "crypto/opensslconf.h"; + rename("crypto/opensslconf.h.new","crypto/opensslconf.h") || die "unable to rename crypto/opensslconf.h.new\n"; +Index: crypto/openssl/FAQ +=================================================================== +--- crypto/openssl/FAQ (revision 279126) ++++ crypto/openssl/FAQ (working copy) +@@ -113,11 +113,6 @@ that came with the version of OpenSSL you are usin + documentation is included in each OpenSSL distribution under the docs + directory. + +-For information on parts of libcrypto that are not yet documented, you +-might want to read Ariel Glenn's documentation on SSLeay 0.9, OpenSSL's +-predecessor, at . Much +-of this still applies to OpenSSL. +- + There is some documentation about certificate extensions and PKCS#12 + in doc/openssl.txt + +@@ -768,6 +763,9 @@ openssl-security@openssl.org if you don't get a pr + acknowledging receipt then resend or mail it directly to one of the + more active team members (e.g. Steve). + ++Note that bugs only present in the openssl utility are not in general ++considered to be security issues. ++ + [PROG] ======================================================================== + + * Is OpenSSL thread-safe? +Index: crypto/openssl/Makefile +=================================================================== +--- crypto/openssl/Makefile (revision 279126) ++++ crypto/openssl/Makefile (working copy) +@@ -4,7 +4,7 @@ + ## Makefile for OpenSSL + ## + +-VERSION=1.0.1e ++VERSION=1.0.1l + MAJOR=1 + MINOR=0.1 + SHLIB_VERSION_NUMBER=1.0.0 +@@ -13,7 +13,7 @@ SHLIB_MAJOR=1 + SHLIB_MINOR=0.0 + SHLIB_EXT= + PLATFORM=dist +-OPTIONS= no-ec_nistp_64_gcc_128 no-gmp no-jpake no-krb5 no-md2 no-rc5 no-rfc3779 no-sctp no-shared no-store no-zlib no-zlib-dynamic static-engine ++OPTIONS= no-ec_nistp_64_gcc_128 no-gmp no-jpake no-krb5 no-md2 no-rc5 no-rfc3779 no-sctp no-shared no-store no-unit-test no-zlib no-zlib-dynamic static-engine + CONFIGURE_ARGS=dist + SHLIB_TARGET= + +@@ -61,7 +61,7 @@ OPENSSLDIR=/usr/local/ssl + + CC= cc + CFLAG= -O +-DEPFLAG= -DOPENSSL_NO_EC_NISTP_64_GCC_128 -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SCTP -DOPENSSL_NO_STORE ++DEPFLAG= -DOPENSSL_NO_EC_NISTP_64_GCC_128 -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SCTP -DOPENSSL_NO_STORE -DOPENSSL_NO_UNIT_TEST + PEX_LIBS= + EX_LIBS= + EXE_EXT= +@@ -304,7 +304,8 @@ libcrypto$(SHLIB_EXT): libcrypto.a fips_premain_ds + FIPSLD_CC="$(CC)"; CC=$(FIPSDIR)/bin/fipsld; \ + export CC FIPSLD_CC FIPSLD_LIBCRYPTO; \ + fi; \ +- $(MAKE) -e SHLIBDIRS=crypto build-shared; \ ++ $(MAKE) -e SHLIBDIRS=crypto CC="$${CC:-$(CC)}" build-shared && \ ++ (touch -c fips_premain_dso$(EXE_EXT) || :); \ + else \ + echo "There's no support for shared libraries on this platform" >&2; \ + exit 1; \ +Index: crypto/openssl/Makefile.org +=================================================================== +--- crypto/openssl/Makefile.org (revision 279126) ++++ crypto/openssl/Makefile.org (working copy) +@@ -302,7 +302,8 @@ libcrypto$(SHLIB_EXT): libcrypto.a fips_premain_ds + FIPSLD_CC="$(CC)"; CC=$(FIPSDIR)/bin/fipsld; \ + export CC FIPSLD_CC FIPSLD_LIBCRYPTO; \ + fi; \ +- $(MAKE) -e SHLIBDIRS=crypto build-shared; \ ++ $(MAKE) -e SHLIBDIRS=crypto CC="$${CC:-$(CC)}" build-shared && \ ++ (touch -c fips_premain_dso$(EXE_EXT) || :); \ + else \ + echo "There's no support for shared libraries on this platform" >&2; \ + exit 1; \ +Index: crypto/openssl/NEWS +=================================================================== +--- crypto/openssl/NEWS (revision 279126) ++++ crypto/openssl/NEWS (working copy) +@@ -5,11 +5,67 @@ + This file gives a brief overview of the major changes between each OpenSSL + release. For more details please read the CHANGES file. + +- Major changes between OpenSSL 1.0.1d and OpenSSL 1.0.1e: ++ Major changes between OpenSSL 1.0.1k and OpenSSL 1.0.1l [15 Jan 2015] + ++ o Build fixes for the Windows and OpenVMS platforms ++ ++ Major changes between OpenSSL 1.0.1j and OpenSSL 1.0.1k [8 Jan 2015] ++ ++ o Fix for CVE-2014-3571 ++ o Fix for CVE-2015-0206 ++ o Fix for CVE-2014-3569 ++ o Fix for CVE-2014-3572 ++ o Fix for CVE-2015-0204 ++ o Fix for CVE-2015-0205 ++ o Fix for CVE-2014-8275 ++ o Fix for CVE-2014-3570 ++ ++ Major changes between OpenSSL 1.0.1i and OpenSSL 1.0.1j [15 Oct 2014] ++ ++ o Fix for CVE-2014-3513 ++ o Fix for CVE-2014-3567 ++ o Mitigation for CVE-2014-3566 (SSL protocol vulnerability) ++ o Fix for CVE-2014-3568 ++ ++ Major changes between OpenSSL 1.0.1h and OpenSSL 1.0.1i [6 Aug 2014] ++ ++ o Fix for CVE-2014-3512 ++ o Fix for CVE-2014-3511 ++ o Fix for CVE-2014-3510 ++ o Fix for CVE-2014-3507 ++ o Fix for CVE-2014-3506 ++ o Fix for CVE-2014-3505 ++ o Fix for CVE-2014-3509 ++ o Fix for CVE-2014-5139 ++ o Fix for CVE-2014-3508 ++ ++ Major changes between OpenSSL 1.0.1g and OpenSSL 1.0.1h [5 Jun 2014] ++ ++ o Fix for CVE-2014-0224 ++ o Fix for CVE-2014-0221 ++ o Fix for CVE-2014-0198 ++ o Fix for CVE-2014-0195 ++ o Fix for CVE-2014-3470 ++ o Fix for CVE-2010-5298 ++ ++ Major changes between OpenSSL 1.0.1f and OpenSSL 1.0.1g [7 Apr 2014] ++ ++ o Fix for CVE-2014-0160 ++ o Add TLS padding extension workaround for broken servers. ++ o Fix for CVE-2014-0076 ++ ++ Major changes between OpenSSL 1.0.1e and OpenSSL 1.0.1f [6 Jan 2014] ++ ++ o Don't include gmt_unix_time in TLS server and client random values ++ o Fix for TLS record tampering bug CVE-2013-4353 ++ o Fix for TLS version checking bug CVE-2013-6449 ++ o Fix for DTLS retransmission bug CVE-2013-6450 ++ ++ Major changes between OpenSSL 1.0.1d and OpenSSL 1.0.1e [11 Feb 2013]: ++ + o Corrected fix for CVE-2013-0169 + +- Major changes between OpenSSL 1.0.1c and OpenSSL 1.0.1d: ++ Major changes between OpenSSL 1.0.1c and OpenSSL 1.0.1d [4 Feb 2013]: + + o Fix renegotiation in TLS 1.1, 1.2 by using the correct TLS version. + o Include the fips configuration module. +@@ -17,24 +73,24 @@ + o Fix for SSL/TLS/DTLS CBC plaintext recovery attack CVE-2013-0169 + o Fix for TLS AESNI record handling flaw CVE-2012-2686 + +- Major changes between OpenSSL 1.0.1b and OpenSSL 1.0.1c: ++ Major changes between OpenSSL 1.0.1b and OpenSSL 1.0.1c [10 May 2012]: + + o Fix TLS/DTLS record length checking bug CVE-2012-2333 + o Don't attempt to use non-FIPS composite ciphers in FIPS mode. + +- Major changes between OpenSSL 1.0.1a and OpenSSL 1.0.1b: ++ Major changes between OpenSSL 1.0.1a and OpenSSL 1.0.1b [26 Apr 2012]: + + o Fix compilation error on non-x86 platforms. + o Make FIPS capable OpenSSL ciphers work in non-FIPS mode. + o Fix SSL_OP_NO_TLSv1_1 clash with SSL_OP_ALL in OpenSSL 1.0.0 + +- Major changes between OpenSSL 1.0.1 and OpenSSL 1.0.1a: ++ Major changes between OpenSSL 1.0.1 and OpenSSL 1.0.1a [19 Apr 2012]: + + o Fix for ASN1 overflow bug CVE-2012-2110 + o Workarounds for some servers that hang on long client hellos. + o Fix SEGV in AES code. + +- Major changes between OpenSSL 1.0.0h and OpenSSL 1.0.1: ++ Major changes between OpenSSL 1.0.0h and OpenSSL 1.0.1 [14 Mar 2012]: + + o TLS/DTLS heartbeat support. + o SCTP support. +@@ -47,17 +103,30 @@ + o Preliminary FIPS capability for unvalidated 2.0 FIPS module. + o SRP support. + +- Major changes between OpenSSL 1.0.0g and OpenSSL 1.0.0h: ++ Major changes between OpenSSL 1.0.0j and OpenSSL 1.0.0k [5 Feb 2013]: + ++ o Fix for SSL/TLS/DTLS CBC plaintext recovery attack CVE-2013-0169 ++ o Fix OCSP bad key DoS attack CVE-2013-0166 ++ ++ Major changes between OpenSSL 1.0.0i and OpenSSL 1.0.0j [10 May 2012]: ++ ++ o Fix DTLS record length checking bug CVE-2012-2333 ++ ++ Major changes between OpenSSL 1.0.0h and OpenSSL 1.0.0i [19 Apr 2012]: ++ ++ o Fix for ASN1 overflow bug CVE-2012-2110 ++ ++ Major changes between OpenSSL 1.0.0g and OpenSSL 1.0.0h [12 Mar 2012]: ++ + o Fix for CMS/PKCS#7 MMA CVE-2012-0884 + o Corrected fix for CVE-2011-4619 + o Various DTLS fixes. + +- Major changes between OpenSSL 1.0.0f and OpenSSL 1.0.0g: ++ Major changes between OpenSSL 1.0.0f and OpenSSL 1.0.0g [18 Jan 2012]: + + o Fix for DTLS DoS issue CVE-2012-0050 + +- Major changes between OpenSSL 1.0.0e and OpenSSL 1.0.0f: ++ Major changes between OpenSSL 1.0.0e and OpenSSL 1.0.0f [4 Jan 2012]: + + o Fix for DTLS plaintext recovery attack CVE-2011-4108 + o Clear block padding bytes of SSL 3.0 records CVE-2011-4576 +@@ -65,7 +134,7 @@ + o Check parameters are not NULL in GOST ENGINE CVE-2012-0027 + o Check for malformed RFC3779 data CVE-2011-4577 + +- Major changes between OpenSSL 1.0.0d and OpenSSL 1.0.0e: ++ Major changes between OpenSSL 1.0.0d and OpenSSL 1.0.0e [6 Sep 2011]: + + o Fix for CRL vulnerability issue CVE-2011-3207 + o Fix for ECDH crashes CVE-2011-3210 +@@ -73,11 +142,11 @@ + o Support ECDH ciphersuites for certificates using SHA2 algorithms. + o Various DTLS fixes. + +- Major changes between OpenSSL 1.0.0c and OpenSSL 1.0.0d: ++ Major changes between OpenSSL 1.0.0c and OpenSSL 1.0.0d [8 Feb 2011]: + + o Fix for security issue CVE-2011-0014 + +- Major changes between OpenSSL 1.0.0b and OpenSSL 1.0.0c: ++ Major changes between OpenSSL 1.0.0b and OpenSSL 1.0.0c [2 Dec 2010]: + + o Fix for security issue CVE-2010-4180 + o Fix for CVE-2010-4252 +@@ -85,18 +154,18 @@ + o Fix various platform compilation issues. + o Corrected fix for security issue CVE-2010-3864. + +- Major changes between OpenSSL 1.0.0a and OpenSSL 1.0.0b: ++ Major changes between OpenSSL 1.0.0a and OpenSSL 1.0.0b [16 Nov 2010]: + + o Fix for security issue CVE-2010-3864. + o Fix for CVE-2010-2939 + o Fix WIN32 build system for GOST ENGINE. + +- Major changes between OpenSSL 1.0.0 and OpenSSL 1.0.0a: ++ Major changes between OpenSSL 1.0.0 and OpenSSL 1.0.0a [1 Jun 2010]: + + o Fix for security issue CVE-2010-1633. + o GOST MAC and CFB fixes. + +- Major changes between OpenSSL 0.9.8n and OpenSSL 1.0.0: ++ Major changes between OpenSSL 0.9.8n and OpenSSL 1.0.0 [29 Mar 2010]: + + o RFC3280 path validation: sufficient to process PKITS tests. + o Integrated support for PVK files and keyblobs. +@@ -119,20 +188,55 @@ + o Opaque PRF Input TLS extension support. + o Updated time routines to avoid OS limitations. + +- Major changes between OpenSSL 0.9.8q and OpenSSL 0.9.8r: ++ Major changes between OpenSSL 0.9.8x and OpenSSL 0.9.8y [5 Feb 2013]: + ++ o Fix for SSL/TLS/DTLS CBC plaintext recovery attack CVE-2013-0169 ++ o Fix OCSP bad key DoS attack CVE-2013-0166 ++ ++ Major changes between OpenSSL 0.9.8w and OpenSSL 0.9.8x [10 May 2012]: ++ ++ o Fix DTLS record length checking bug CVE-2012-2333 ++ ++ Major changes between OpenSSL 0.9.8v and OpenSSL 0.9.8w [23 Apr 2012]: ++ ++ o Fix for CVE-2012-2131 (corrected fix for 0.9.8 and CVE-2012-2110) ++ ++ Major changes between OpenSSL 0.9.8u and OpenSSL 0.9.8v [19 Apr 2012]: ++ ++ o Fix for ASN1 overflow bug CVE-2012-2110 ++ ++ Major changes between OpenSSL 0.9.8t and OpenSSL 0.9.8u [12 Mar 2012]: ++ ++ o Fix for CMS/PKCS#7 MMA CVE-2012-0884 ++ o Corrected fix for CVE-2011-4619 ++ o Various DTLS fixes. ++ ++ Major changes between OpenSSL 0.9.8s and OpenSSL 0.9.8t [18 Jan 2012]: ++ ++ o Fix for DTLS DoS issue CVE-2012-0050 ++ ++ Major changes between OpenSSL 0.9.8r and OpenSSL 0.9.8s [4 Jan 2012]: ++ ++ o Fix for DTLS plaintext recovery attack CVE-2011-4108 ++ o Fix policy check double free error CVE-2011-4109 ++ o Clear block padding bytes of SSL 3.0 records CVE-2011-4576 ++ o Only allow one SGC handshake restart for SSL/TLS CVE-2011-4619 ++ o Check for malformed RFC3779 data CVE-2011-4577 ++ ++ Major changes between OpenSSL 0.9.8q and OpenSSL 0.9.8r [8 Feb 2011]: ++ + o Fix for security issue CVE-2011-0014 + +- Major changes between OpenSSL 0.9.8p and OpenSSL 0.9.8q: ++ Major changes between OpenSSL 0.9.8p and OpenSSL 0.9.8q [2 Dec 2010]: + + o Fix for security issue CVE-2010-4180 + o Fix for CVE-2010-4252 + +- Major changes between OpenSSL 0.9.8o and OpenSSL 0.9.8p: ++ Major changes between OpenSSL 0.9.8o and OpenSSL 0.9.8p [16 Nov 2010]: + + o Fix for security issue CVE-2010-3864. + +- Major changes between OpenSSL 0.9.8n and OpenSSL 0.9.8o: ++ Major changes between OpenSSL 0.9.8n and OpenSSL 0.9.8o [1 Jun 2010]: + + o Fix for security issue CVE-2010-0742. + o Various DTLS fixes. +@@ -140,12 +244,12 @@ + o Fix for no-rc4 compilation. + o Chil ENGINE unload workaround. + +- Major changes between OpenSSL 0.9.8m and OpenSSL 0.9.8n: ++ Major changes between OpenSSL 0.9.8m and OpenSSL 0.9.8n [24 Mar 2010]: + + o CFB cipher definition fixes. + o Fix security issues CVE-2010-0740 and CVE-2010-0433. + +- Major changes between OpenSSL 0.9.8l and OpenSSL 0.9.8m: ++ Major changes between OpenSSL 0.9.8l and OpenSSL 0.9.8m [25 Feb 2010]: + + o Cipher definition fixes. + o Workaround for slow RAND_poll() on some WIN32 versions. +@@ -157,21 +261,21 @@ + o Ticket and SNI coexistence fixes. + o Many fixes to DTLS handling. + +- Major changes between OpenSSL 0.9.8k and OpenSSL 0.9.8l: ++ Major changes between OpenSSL 0.9.8k and OpenSSL 0.9.8l [5 Nov 2009]: + + o Temporary work around for CVE-2009-3555: disable renegotiation. + +- Major changes between OpenSSL 0.9.8j and OpenSSL 0.9.8k: ++ Major changes between OpenSSL 0.9.8j and OpenSSL 0.9.8k [25 Mar 2009]: + + o Fix various build issues. + o Fix security issues (CVE-2009-0590, CVE-2009-0591, CVE-2009-0789) + +- Major changes between OpenSSL 0.9.8i and OpenSSL 0.9.8j: ++ Major changes between OpenSSL 0.9.8i and OpenSSL 0.9.8j [7 Jan 2009]: + + o Fix security issue (CVE-2008-5077) + o Merge FIPS 140-2 branch code. + *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@FreeBSD.ORG Tue Apr 14 02:22:26 2015 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F0438AE0; Tue, 14 Apr 2015 02:22:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DC894E65; Tue, 14 Apr 2015 02:22:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3E2MQld074132; Tue, 14 Apr 2015 02:22:26 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3E2MQ9U074131; Tue, 14 Apr 2015 02:22:26 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504140222.t3E2MQ9U074131@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 14 Apr 2015 02:22:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281514 - user/ngie/more-tests/etc/mtree 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.20 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, 14 Apr 2015 02:22:27 -0000 Author: ngie Date: Tue Apr 14 02:22:25 2015 New Revision: 281514 URL: https://svnweb.freebsd.org/changeset/base/281514 Log: Fix typo (mmmap -> mmap) Modified: user/ngie/more-tests/etc/mtree/BSD.tests.dist Modified: user/ngie/more-tests/etc/mtree/BSD.tests.dist ============================================================================== --- user/ngie/more-tests/etc/mtree/BSD.tests.dist Tue Apr 14 00:32:03 2015 (r281513) +++ user/ngie/more-tests/etc/mtree/BSD.tests.dist Tue Apr 14 02:22:25 2015 (r281514) @@ -364,7 +364,7 @@ .. kqueue .. - mmmap + mmap .. mqueue .. From owner-svn-src-user@FreeBSD.ORG Tue Apr 14 02:25:16 2015 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C33AFC32; Tue, 14 Apr 2015 02:25:16 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 95BD1E7D; Tue, 14 Apr 2015 02:25:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3E2PGkI074531; Tue, 14 Apr 2015 02:25:16 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3E2PGrv074530; Tue, 14 Apr 2015 02:25:16 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504140225.t3E2PGrv074530@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 14 Apr 2015 02:25:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281515 - user/ngie/more-tests/etc/tests/rc.d 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.20 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, 14 Apr 2015 02:25:16 -0000 Author: ngie Date: Tue Apr 14 02:25:15 2015 New Revision: 281515 URL: https://svnweb.freebsd.org/changeset/base/281515 Log: Prune empty directory Deleted: user/ngie/more-tests/etc/tests/rc.d/ From owner-svn-src-user@FreeBSD.ORG Tue Apr 14 02:38:58 2015 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 76098FC9; Tue, 14 Apr 2015 02:38:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 61FB8F93; Tue, 14 Apr 2015 02:38:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3E2cwdg079145; Tue, 14 Apr 2015 02:38:58 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3E2cwo2079144; Tue, 14 Apr 2015 02:38:58 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504140238.t3E2cwo2079144@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 14 Apr 2015 02:38:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281516 - in user/ngie/more-tests/tests/sys: . socket sockets 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.20 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, 14 Apr 2015 02:38:58 -0000 Author: ngie Date: Tue Apr 14 02:38:57 2015 New Revision: 281516 URL: https://svnweb.freebsd.org/changeset/base/281516 Log: Use socket, not sockets/ (XXX: reminder to add a sanity check for this later...) Added: user/ngie/more-tests/tests/sys/socket/ - copied from r281510, user/ngie/more-tests/tests/sys/sockets/ Deleted: user/ngie/more-tests/tests/sys/sockets/ Modified: user/ngie/more-tests/tests/sys/Makefile Modified: user/ngie/more-tests/tests/sys/Makefile ============================================================================== --- user/ngie/more-tests/tests/sys/Makefile Tue Apr 14 02:25:15 2015 (r281515) +++ user/ngie/more-tests/tests/sys/Makefile Tue Apr 14 02:38:57 2015 (r281516) @@ -13,7 +13,7 @@ TESTS_SUBDIRS+= mmap TESTS_SUBDIRS+= netinet TESTS_SUBDIRS+= opencrypto TESTS_SUBDIRS+= posixshm -TESTS_SUBDIRS+= sockets +TESTS_SUBDIRS+= socket TESTS_SUBDIRS+= vfs # Items not integrated into kyua runs by default From owner-svn-src-user@FreeBSD.ORG Tue Apr 14 07:08:47 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7A07EBFE; Tue, 14 Apr 2015 07:08: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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4D1B2F66; Tue, 14 Apr 2015 07:08:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3E78kIa001657; Tue, 14 Apr 2015 07:08:46 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3E78kNC001655; Tue, 14 Apr 2015 07:08:46 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504140708.t3E78kNC001655@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 14 Apr 2015 07:08:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281518 - user/ngie/more-tests/tests/sys/socket 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.20 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, 14 Apr 2015 07:08:47 -0000 Author: ngie Date: Tue Apr 14 07:08:45 2015 New Revision: 281518 URL: https://svnweb.freebsd.org/changeset/base/281518 Log: Test for EPROTOTYPE, not EPROTONOSUPPORT Modified: user/ngie/more-tests/tests/sys/socket/rtsocket_test.c user/ngie/more-tests/tests/sys/socket/unix_socket_test.c Modified: user/ngie/more-tests/tests/sys/socket/rtsocket_test.c ============================================================================== --- user/ngie/more-tests/tests/sys/socket/rtsocket_test.c Tue Apr 14 04:52:52 2015 (r281517) +++ user/ngie/more-tests/tests/sys/socket/rtsocket_test.c Tue Apr 14 07:08:45 2015 (r281518) @@ -52,7 +52,7 @@ main(void) sock); } - if (errno != EPROTONOSUPPORT) + if (errno != EPROTOTYPE) err(-1, "socket(PF_ROUTE, SOCK_STREAM, 0)"); sock = socket(PF_ROUTE, SOCK_DGRAM, 0); @@ -62,7 +62,7 @@ main(void) sock); } - if (errno != EPROTONOSUPPORT) + if (errno != EPROTOTYPE) err(-1, "socket(PF_ROUTE, SOCK_DGRAM, 0)"); sock = socket(PF_ROUTE, SOCK_RAW, 0); @@ -77,7 +77,7 @@ main(void) "socketpair(PF_ROUTE, SOCK_STREAM, 0, socks) success"); } - if (errno != EPROTONOSUPPORT) + if (errno != EPROTOTYPE) err(-1, "socketpair(PF_ROUTE, SOCK_STREAM, 0, socks)"); if (socketpair(PF_ROUTE, SOCK_DGRAM, 0, socks) == 0) { @@ -87,7 +87,7 @@ main(void) "socketpair(PF_ROUTE, SOCK_DGRAM, 0, socks) success"); } - if (errno != EPROTONOSUPPORT) + if (errno != EPROTOTYPE) err(-1, "socketpair(PF_ROUTE, SOCK_DGRAM, 0, socks)"); if (socketpair(PF_ROUTE, SOCK_RAW, 0, socks) == 0) { Modified: user/ngie/more-tests/tests/sys/socket/unix_socket_test.c ============================================================================== --- user/ngie/more-tests/tests/sys/socket/unix_socket_test.c Tue Apr 14 04:52:52 2015 (r281517) +++ user/ngie/more-tests/tests/sys/socket/unix_socket_test.c Tue Apr 14 07:08:45 2015 (r281518) @@ -59,7 +59,7 @@ main(void) close(sock); errx(-1, "socket(PF_LOCAL, SOCK_RAW, 0) returned %d", sock); } - if (errno != EPROTONOSUPPORT) + if (errno != EPROTOTYPE) err(-1, "socket(PF_LOCAL, SOCK_RAW, 0)"); if (socketpair(PF_LOCAL, SOCK_STREAM, 0, socks) < 0) From owner-svn-src-user@FreeBSD.ORG Tue Apr 14 07:25:58 2015 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C2CAF195; Tue, 14 Apr 2015 07:25:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AE7431A0; Tue, 14 Apr 2015 07:25:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3E7Pwjb010657; Tue, 14 Apr 2015 07:25:58 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3E7Pw50010655; Tue, 14 Apr 2015 07:25:58 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504140725.t3E7Pw50010655@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 14 Apr 2015 07:25:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281519 - user/ngie/more-tests/lib/libc/tests/db 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.20 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, 14 Apr 2015 07:25:58 -0000 Author: ngie Date: Tue Apr 14 07:25:57 2015 New Revision: 281519 URL: https://svnweb.freebsd.org/changeset/base/281519 Log: Assuming a system has /bin/csh on it is a bad idea (especially with MK_TCSH on FreeBSD). Look for /bin/cat instead Modified: user/ngie/more-tests/lib/libc/tests/db/Makefile Modified: user/ngie/more-tests/lib/libc/tests/db/Makefile ============================================================================== --- user/ngie/more-tests/lib/libc/tests/db/Makefile Tue Apr 14 07:08:45 2015 (r281518) +++ user/ngie/more-tests/lib/libc/tests/db/Makefile Tue Apr 14 07:25:57 2015 (r281519) @@ -11,6 +11,7 @@ FILESDIR= ${TESTSDIR} FILES= README NETBSD_ATF_TESTS_SH+= db_test +ATF_TESTS_SH_SED_db_test= -e 's,/bin/csh,/bin/cat,g' .include "../Makefile.netbsd-tests" From owner-svn-src-user@FreeBSD.ORG Tue Apr 14 10:20:03 2015 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 094F7E2C; Tue, 14 Apr 2015 10:20: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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E912A914; Tue, 14 Apr 2015 10:20:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3EAK2nG091875; Tue, 14 Apr 2015 10:20:02 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3EAK2Yb091874; Tue, 14 Apr 2015 10:20:02 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504141020.t3EAK2Yb091874@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 14 Apr 2015 10:20:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281523 - user/ngie/more-tests/tests/sys/socket 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.20 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, 14 Apr 2015 10:20:03 -0000 Author: ngie Date: Tue Apr 14 10:20:02 2015 New Revision: 281523 URL: https://svnweb.freebsd.org/changeset/base/281523 Log: Pick a random port if a specific one isn't provided on the command line Modified: user/ngie/more-tests/tests/sys/socket/sigpipe_test.c Modified: user/ngie/more-tests/tests/sys/socket/sigpipe_test.c ============================================================================== --- user/ngie/more-tests/tests/sys/socket/sigpipe_test.c Tue Apr 14 10:15:58 2015 (r281522) +++ user/ngie/more-tests/tests/sys/socket/sigpipe_test.c Tue Apr 14 10:20:02 2015 (r281523) @@ -26,6 +26,7 @@ * $FreeBSD$ */ +#include #include #include @@ -54,7 +55,7 @@ static void usage(void) { - errx(-1, "usage: sigpipe tcpport"); + errx(-1, "usage: sigpipe [tcpport]"); } /* @@ -254,11 +255,16 @@ main(int argc, char *argv[]) int sock[2]; long port; - if (argc != 2) - usage(); + if (argc == 1) { + srandomdev(); - port = strtol(argv[1], &dummy, 10); - if (port < 0 || port > 65535 || *dummy != '\0') + /* Pick a random unprivileged port 1025-65535 */ + port = MAX((int)random() % 65535, 1025); + } else if (argc == 2) { + port = strtol(argv[1], &dummy, 10); + if (port < 0 || port > 65535 || *dummy != '\0') + usage(); + } else usage(); #ifndef SO_NOSIGPIPE From owner-svn-src-user@FreeBSD.ORG Wed Apr 15 11:48:43 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F3324230; Wed, 15 Apr 2015 11:48:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DD964F74; Wed, 15 Apr 2015 11:48:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3FBmgxU025437; Wed, 15 Apr 2015 11:48:42 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3FBmg14025435; Wed, 15 Apr 2015 11:48:42 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504151148.t3FBmg14025435@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 15 Apr 2015 11:48:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281553 - user/ngie/more-tests/tests/sys/socket 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.20 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, 15 Apr 2015 11:48:43 -0000 Author: ngie Date: Wed Apr 15 11:48:41 2015 New Revision: 281553 URL: https://svnweb.freebsd.org/changeset/base/281553 Log: Convert unix_passfd_test to ATF Mark test 8 as an expected failure so it no longer counts as an unexpected one Modified: user/ngie/more-tests/tests/sys/socket/Makefile user/ngie/more-tests/tests/sys/socket/unix_passfd_test.c Modified: user/ngie/more-tests/tests/sys/socket/Makefile ============================================================================== --- user/ngie/more-tests/tests/sys/socket/Makefile Wed Apr 15 09:39:52 2015 (r281552) +++ user/ngie/more-tests/tests/sys/socket/Makefile Wed Apr 15 11:48:41 2015 (r281553) @@ -31,8 +31,7 @@ PLAIN_TESTS_C+= unix_close_race_test TAP_TESTS_SH+= unix_cmsg_test # unix_gc: twosome_drop1: sendfd: before 0 after 0 PLAIN_TESTS_C+= unix_gc_test -# unix_passfd: test8-rights+creds+payload: recvmsg: 24 bytes received -PLAIN_TESTS_C+= unix_passfd_test +ATF_TESTS_C+= unix_passfd_test PLAIN_TESTS_C+= unix_sendtorace_test # unix_socket: socket(PF_LOCAL, SOCK_RAW, 0): Protocol wrong type for socket PLAIN_TESTS_C+= unix_socket_test Modified: user/ngie/more-tests/tests/sys/socket/unix_passfd_test.c ============================================================================== --- user/ngie/more-tests/tests/sys/socket/unix_passfd_test.c Wed Apr 15 09:39:52 2015 (r281552) +++ user/ngie/more-tests/tests/sys/socket/unix_passfd_test.c Wed Apr 15 11:48:41 2015 (r281553) @@ -32,14 +32,17 @@ #include #include -#include +#include #include #include +#include #include #include #include #include +#include + /* * UNIX domain sockets allow file descriptors to be passed via "ancillary * data", or control messages. This regression test is intended to exercise @@ -50,11 +53,12 @@ */ static void -domainsocketpair(const char *test, int *fdp) +domainsocketpair(int *fdp) { - if (socketpair(PF_UNIX, SOCK_STREAM, 0, fdp) < 0) - err(-1, "%s: socketpair(PF_UNIX, SOCK_STREAM)", test); + ATF_REQUIRE_MSG(socketpair(PF_UNIX, SOCK_STREAM, 0, fdp) != -1, + "socketpair(PF_UNIX, SOCK_STREAM, ..) failed: %s, ", + strerror(errno)); } static void @@ -66,50 +70,38 @@ closesocketpair(int *fdp) } static void -devnull(const char *test, int *fdp) -{ - int fd; - - fd = open("/dev/null", O_RDONLY); - if (fd < 0) - err(-1, "%s: open(/dev/null)", test); - *fdp = fd; -} - -static void -tempfile(const char *test, int *fdp) +tempfile(int *fdp) { char path[PATH_MAX]; int fd; - snprintf(path, PATH_MAX, "/tmp/unix_passfd.XXXXXXXXXXXXXXX"); + snprintf(path, PATH_MAX, "unix_passfd.XXXXXXXXXXXXXXX"); fd = mkstemp(path); - if (fd < 0) - err(-1, "%s: mkstemp(%s)", test, path); + ATF_REQUIRE_MSG(fd != -1, "mkstemp failed: %s", strerror(errno)); (void)unlink(path); *fdp = fd; } static void -dofstat(const char *test, int fd, struct stat *sb) +dofstat(int fd, struct stat *sb) { - if (fstat(fd, sb) < 0) - err(-1, "%s: fstat", test); + ATF_REQUIRE_MSG(fstat(fd, sb) != -1, "fstat failed: %s", + strerror(errno)); } static void -samefile(const char *test, struct stat *sb1, struct stat *sb2) +samefile(struct stat *sb1, struct stat *sb2) { - if (sb1->st_dev != sb2->st_dev) - errx(-1, "%s: samefile: different device", test); - if (sb1->st_ino != sb2->st_ino) - errx(-1, "%s: samefile: different inode", test); + ATF_REQUIRE_EQ_MSG(sb1->st_dev, sb2->st_dev, + "different devices (%d != %d)", sb1->st_dev, sb2->st_dev); + ATF_REQUIRE_EQ_MSG(sb1->st_dev, sb2->st_dev, + "different inodes (%u != %u)", sb1->st_ino, sb2->st_ino); } static void -sendfd_payload(const char *test, int sockfd, int sendfd, +sendfd_payload(int sockfd, int sendfd, void *payload, size_t paylen) { struct iovec iovec; @@ -137,23 +129,22 @@ sendfd_payload(const char *test, int soc *(int *)CMSG_DATA(cmsghdr) = sendfd; len = sendmsg(sockfd, &msghdr, 0); - if (len < 0) - err(-1, "%s: sendmsg", test); - if ((size_t)len != paylen) - errx(-1, "%s: sendmsg: %zd bytes sent", test, len); + ATF_REQUIRE_MSG(len != -1, "sendmsg failed: %s", strerror(errno)); + ATF_REQUIRE_MSG((size_t)len == paylen, + "mismatch with amount of data sent via sendmsg (%zd != %zu)", + len, paylen); } static void -sendfd(const char *test, int sockfd, int sendfd) +sendfd(int sockfd, int sendfd) { char ch; - return (sendfd_payload(test, sockfd, sendfd, &ch, sizeof(ch))); + return (sendfd_payload(sockfd, sendfd, &ch, sizeof(ch))); } static void -recvfd_payload(const char *test, int sockfd, int *recvfd, - void *buf, size_t buflen) +recvfd_payload(int sockfd, int *recvfd, void *buf, size_t buflen) { struct cmsghdr *cmsghdr; char message[CMSG_SPACE(SOCKCREDSIZE(CMGROUP_MAX)) + sizeof(int)]; @@ -173,217 +164,232 @@ recvfd_payload(const char *test, int soc msghdr.msg_iovlen = 1; len = recvmsg(sockfd, &msghdr, 0); - if (len < 0) - err(-1, "%s: recvmsg", test); - if ((size_t)len != buflen) - errx(-1, "%s: recvmsg: %zd bytes received", test, len); + ATF_REQUIRE_MSG(len != -1, "recvmsg failed: %s", strerror(errno)); + ATF_REQUIRE_MSG((size_t)len == buflen, + "mismatch with amount of data sent via recvmsg (%zd != %zu)", + len, buflen); cmsghdr = CMSG_FIRSTHDR(&msghdr); - if (cmsghdr == NULL) - errx(-1, "%s: recvmsg: did not receive control message", test); + ATF_REQUIRE_MSG(cmsghdr != NULL, "did not receive control message"); *recvfd = -1; for (; cmsghdr != NULL; cmsghdr = CMSG_NXTHDR(&msghdr, cmsghdr)) { if (cmsghdr->cmsg_level == SOL_SOCKET && cmsghdr->cmsg_type == SCM_RIGHTS && cmsghdr->cmsg_len == CMSG_LEN(sizeof(int))) { *recvfd = *(int *)CMSG_DATA(cmsghdr); - if (*recvfd == -1) - errx(-1, "%s: recvmsg: received fd -1", test); + ATF_REQUIRE(*recvfd != -1); } } - if (*recvfd == -1) - errx(-1, "%s: recvmsg: did not receive single-fd message", - test); + ATF_REQUIRE_MSG(*recvfd != -1, + "recvmsg did not receive a single fd message"); } static void -recvfd(const char *test, int sockfd, int *recvfd) +recvfd(int sockfd, int *recvfd) { char ch; - return (recvfd_payload(test, sockfd, recvfd, &ch, sizeof(ch))); + return (recvfd_payload(sockfd, recvfd, &ch, sizeof(ch))); } -int -main(void) +/* + * First test: put a temporary file into a UNIX domain socket, then + * take it out and make sure it's the same file. First time around, + * don't close the reference after sending. + */ +ATF_TC_WITHOUT_HEAD(simple_send_fd); +ATF_TC_BODY(simple_send_fd, tc) { - struct stat putfd_1_stat, putfd_2_stat, getfd_1_stat, getfd_2_stat; - int fd[2], putfd_1, putfd_2, getfd_1, getfd_2; - const char *test; - - /* - * First test: put a temporary file into a UNIX domain socket, then - * take it out and make sure it's the same file. First time around, - * don't close the reference after sending. - */ - test = "test1-simplesendfd"; - printf("beginning %s\n", test); - - domainsocketpair(test, fd); - tempfile(test, &putfd_1); - dofstat(test, putfd_1, &putfd_1_stat); - sendfd(test, fd[0], putfd_1); - recvfd(test, fd[1], &getfd_1); - dofstat(test, getfd_1, &getfd_1_stat); - samefile(test, &putfd_1_stat, &getfd_1_stat); + struct stat getfd_1_stat, putfd_1_stat; + int fd[2], getfd_1, putfd_1; + + domainsocketpair(fd); + tempfile(&putfd_1); + dofstat(putfd_1, &putfd_1_stat); + sendfd(fd[0], putfd_1); + recvfd(fd[1], &getfd_1); + dofstat(getfd_1, &getfd_1_stat); + samefile(&putfd_1_stat, &getfd_1_stat); close(putfd_1); close(getfd_1); closesocketpair(fd); +} - printf("%s passed\n", test); +/* + * Second test: same as first, only close the file reference after + * sending, so that the only reference is the descriptor in the UNIX + * domain socket buffer. + */ +ATF_TC_WITHOUT_HEAD(send_and_close); +ATF_TC_BODY(send_and_close, tc) +{ + struct stat getfd_1_stat, putfd_1_stat; + int fd[2], getfd_1, putfd_1; - /* - * Second test: same as first, only close the file reference after - * sending, so that the only reference is the descriptor in the UNIX - * domain socket buffer. - */ - test = "test2-sendandclose"; - printf("beginning %s\n", test); - - domainsocketpair(test, fd); - tempfile(test, &putfd_1); - dofstat(test, putfd_1, &putfd_1_stat); - sendfd(test, fd[0], putfd_1); + domainsocketpair(fd); + tempfile(&putfd_1); + dofstat(putfd_1, &putfd_1_stat); + sendfd(fd[0], putfd_1); close(putfd_1); - recvfd(test, fd[1], &getfd_1); - dofstat(test, getfd_1, &getfd_1_stat); - samefile(test, &putfd_1_stat, &getfd_1_stat); + recvfd(fd[1], &getfd_1); + dofstat(getfd_1, &getfd_1_stat); + samefile(&putfd_1_stat, &getfd_1_stat); close(getfd_1); closesocketpair(fd); - printf("%s passed\n", test); +} - /* - * Third test: put a temporary file into a UNIX domain socket, then - * close both endpoints causing garbage collection to kick off. - */ - test = "test3-sendandcancel"; - printf("beginning %s\n", test); - - domainsocketpair(test, fd); - tempfile(test, &putfd_1); - sendfd(test, fd[0], putfd_1); +/* + * Third test: put a temporary file into a UNIX domain socket, then + * close both endpoints causing garbage collection to kick off. + */ +ATF_TC_WITHOUT_HEAD(send_and_cancel); +ATF_TC_BODY(send_and_cancel, tc) +{ + int fd[2], putfd_1; + + domainsocketpair(fd); + tempfile(&putfd_1); + sendfd(fd[0], putfd_1); close(putfd_1); closesocketpair(fd); +} - printf("%s passed\n", test); +/* + * Send two files. Then receive them. Make sure they are returned + * in the right order, and both get there. + */ +ATF_TC_WITHOUT_HEAD(two_files); +ATF_TC_BODY(two_files, tc) +{ + struct stat getfd_1_stat, getfd_2_stat, putfd_1_stat, putfd_2_stat; + int fd[2], getfd_1, getfd_2, putfd_1, putfd_2; - /* - * Send two files. Then receive them. Make sure they are returned - * in the right order, and both get there. - */ - - test = "test4-twofile"; - printf("beginning %s\n", test); - - domainsocketpair(test, fd); - tempfile(test, &putfd_1); - tempfile(test, &putfd_2); - dofstat(test, putfd_1, &putfd_1_stat); - dofstat(test, putfd_2, &putfd_2_stat); - sendfd(test, fd[0], putfd_1); - sendfd(test, fd[0], putfd_2); + domainsocketpair(fd); + tempfile(&putfd_1); + tempfile(&putfd_2); + dofstat(putfd_1, &putfd_1_stat); + dofstat(putfd_2, &putfd_2_stat); + sendfd(fd[0], putfd_1); + sendfd(fd[0], putfd_2); close(putfd_1); close(putfd_2); - recvfd(test, fd[1], &getfd_1); - recvfd(test, fd[1], &getfd_2); - dofstat(test, getfd_1, &getfd_1_stat); - dofstat(test, getfd_2, &getfd_2_stat); - samefile(test, &putfd_1_stat, &getfd_1_stat); - samefile(test, &putfd_2_stat, &getfd_2_stat); + recvfd(fd[1], &getfd_1); + recvfd(fd[1], &getfd_2); + dofstat(getfd_1, &getfd_1_stat); + dofstat(getfd_2, &getfd_2_stat); + samefile(&putfd_1_stat, &getfd_1_stat); + samefile(&putfd_2_stat, &getfd_2_stat); close(getfd_1); close(getfd_2); closesocketpair(fd); +} - printf("%s passed\n", test); - - /* - * Big bundling test. Send an endpoint of the UNIX domain socket - * over itself, closing the door behind it. - */ - - test = "test5-bundle"; - printf("beginning %s\n", test); +/* + * Big bundling test. Send an endpoint of the UNIX domain socket + * over itself, closing the door behind it. + */ +ATF_TC_WITHOUT_HEAD(bundle); +ATF_TC_BODY(bundle, tc) +{ + int fd[2], getfd_1; - domainsocketpair(test, fd); + domainsocketpair(fd); - sendfd(test, fd[0], fd[0]); + sendfd(fd[0], fd[0]); close(fd[0]); - recvfd(test, fd[1], &getfd_1); + recvfd(fd[1], &getfd_1); close(getfd_1); close(fd[1]); +} - printf("%s passed\n", test); +/* + * Big bundling test part two: Send an endpoint of the UNIX domain + * socket over itself, close the door behind it, and never remove it + * from the other end. + */ +ATF_TC_WITHOUT_HEAD(bundle_cancel); +ATF_TC_BODY(bundle_cancel, tc) +{ + int fd[2]; - /* - * Big bundling test part two: Send an endpoint of the UNIX domain - * socket over itself, close the door behind it, and never remove it - * from the other end. - */ - - test = "test6-bundlecancel"; - printf("beginning %s\n", test); - - domainsocketpair(test, fd); - sendfd(test, fd[0], fd[0]); - sendfd(test, fd[1], fd[0]); + domainsocketpair(fd); + sendfd(fd[0], fd[0]); + sendfd(fd[1], fd[0]); closesocketpair(fd); +} - printf("%s passed\n", test); +/* + * Test for PR 151758: Send an character device over the UNIX + * domain socket and then close both sockets to orphan the + * device. + */ +ATF_TC_WITHOUT_HEAD(devfs_orphan); +ATF_TC_BODY(devfs_orphan, tc) +{ + int fd[2], putfd_1; - /* - * Test for PR 151758: Send an character device over the UNIX - * domain socket and then close both sockets to orphan the - * device. - */ - - test = "test7-devfsorphan"; - printf("beginning %s\n", test); - - domainsocketpair(test, fd); - devnull(test, &putfd_1); - sendfd(test, fd[0], putfd_1); + domainsocketpair(fd); + putfd_1 = open(_PATH_DEVNULL, O_RDONLY); + ATF_REQUIRE_MSG(putfd_1 != -1, + "opening %s failed: %s", _PATH_DEVNULL, strerror(errno)); + sendfd(fd[0], putfd_1); close(putfd_1); closesocketpair(fd); +} - printf("%s passed\n", test); +#define LOCAL_STREAM_SENDSPACE "net.local.stream.sendspace" - /* - * Test for PR 181741. Receiver sets LOCAL_CREDS, and kernel - * prepends a control message to the data. Sender sends large - * payload. Payload + SCM_RIGHTS + LOCAL_CREDS hit socket buffer - * limit, and receiver receives truncated data. - */ - test = "test8-rights+creds+payload"; - printf("beginning %s\n", test); - - { - const int on = 1; - u_long sendspace; - size_t len; - void *buf; - - len = sizeof(sendspace); - if (sysctlbyname("net.local.stream.sendspace", &sendspace, - &len, NULL, 0) < 0) - err(-1, "%s: sysctlbyname(net.local.stream.sendspace)", - test); - - if ((buf = malloc(sendspace)) == NULL) - err(-1, "%s: malloc", test); - - domainsocketpair(test, fd); - if (setsockopt(fd[1], 0, LOCAL_CREDS, &on, sizeof(on)) < 0) - err(-1, "%s: setsockopt(LOCAL_CREDS)", test); - tempfile(test, &putfd_1); - sendfd_payload(test, fd[0], putfd_1, buf, sendspace); - recvfd_payload(test, fd[1], &getfd_1, buf, sendspace); - close(putfd_1); - close(getfd_1); - closesocketpair(fd); - } +/* + * Test for PR 181741. Receiver sets LOCAL_CREDS, and kernel + * prepends a control message to the data. Sender sends large + * payload. Payload + SCM_RIGHTS + LOCAL_CREDS hit socket buffer + * limit, and receiver receives truncated data. + */ +ATF_TC_WITHOUT_HEAD(rights_with_LOCAL_CREDS_and_large_payload); +ATF_TC_BODY(rights_with_LOCAL_CREDS_and_large_payload, tc) +{ + void *buf; + int fd[2]; + size_t len; + u_long sendspace; + const int on = 1; + int getfd_1, putfd_1, rc; + + atf_tc_expect_fail("Bug 181741 has not been fixed yet"); + + len = sizeof(sendspace); + rc = sysctlbyname(LOCAL_STREAM_SENDSPACE, &sendspace, &len, NULL, 0); + ATF_REQUIRE_MSG(rc == 0, "sysctlbyname %s failed: %s", + LOCAL_STREAM_SENDSPACE, strerror(errno)); + + ATF_REQUIRE((buf = malloc(sendspace)) != NULL); + + domainsocketpair(fd); + rc = setsockopt(fd[1], 0, LOCAL_CREDS, &on, sizeof(on)); + ATF_REQUIRE_MSG(rc == 0, "setsockopt failed: %s", strerror(errno)); + + tempfile(&putfd_1); + + sendfd_payload(fd[0], putfd_1, buf, sendspace); + recvfd_payload(fd[1], &getfd_1, buf, sendspace); + + close(putfd_1); + close(getfd_1); + closesocketpair(fd); +} + +ATF_TP_ADD_TCS(tp) +{ + + ATF_TP_ADD_TC(tp, simple_send_fd); + ATF_TP_ADD_TC(tp, send_and_close); + ATF_TP_ADD_TC(tp, send_and_cancel); + ATF_TP_ADD_TC(tp, two_files); + ATF_TP_ADD_TC(tp, bundle); + ATF_TP_ADD_TC(tp, bundle_cancel); + ATF_TP_ADD_TC(tp, devfs_orphan); + ATF_TP_ADD_TC(tp, rights_with_LOCAL_CREDS_and_large_payload); - printf("%s passed\n", test); - - return (0); + return (atf_no_error()); } From owner-svn-src-user@FreeBSD.ORG Wed Apr 15 14:20:04 2015 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 51DC3411; Wed, 15 Apr 2015 14:20:04 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3A918763; Wed, 15 Apr 2015 14:20:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3FEK4Nl096286; Wed, 15 Apr 2015 14:20:04 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3FEK3t0096280; Wed, 15 Apr 2015 14:20:03 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504151420.t3FEK3t0096280@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 15 Apr 2015 14:20:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281555 - user/ngie/more-tests/tests/sys/socket 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.20 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, 15 Apr 2015 14:20:04 -0000 Author: ngie Date: Wed Apr 15 14:20:03 2015 New Revision: 281555 URL: https://svnweb.freebsd.org/changeset/base/281555 Log: - Convert zerosend_test to an ATF format testcase - bind to random ports - Close the server port so the TCP testcases won't terminate prematurely because bind(2) failed Modified: user/ngie/more-tests/tests/sys/socket/Makefile user/ngie/more-tests/tests/sys/socket/zerosend_test.c Modified: user/ngie/more-tests/tests/sys/socket/Makefile ============================================================================== --- user/ngie/more-tests/tests/sys/socket/Makefile Wed Apr 15 14:18:25 2015 (r281554) +++ user/ngie/more-tests/tests/sys/socket/Makefile Wed Apr 15 14:20:03 2015 (r281555) @@ -37,7 +37,7 @@ PLAIN_TESTS_C+= unix_sendtorace_test PLAIN_TESTS_C+= unix_socket_test PLAIN_TESTS_C+= unix_sorflush_test # zerosend: tcp_0write: bind(127.0.0.1, 10001): Address already in use -PLAIN_TESTS_C+= zerosend_test +ATF_TESTS_C+= zerosend_test DPADD.sendfile_test+= ${LIBMD} LDADD.sendfile_test+= -lmd Modified: user/ngie/more-tests/tests/sys/socket/zerosend_test.c ============================================================================== --- user/ngie/more-tests/tests/sys/socket/zerosend_test.c Wed Apr 15 14:18:25 2015 (r281554) +++ user/ngie/more-tests/tests/sys/socket/zerosend_test.c Wed Apr 15 14:20:03 2015 (r281555) @@ -26,6 +26,7 @@ * $FreeBSD$ */ +#include #include #include #include @@ -38,85 +39,80 @@ #include #include #include +#include #include #include #include -#define PORT1 10001 -#define PORT2 10002 +#include static void -try_0send(const char *test, int fd) +try_0send(int fd) { ssize_t len; char ch; ch = 0; len = send(fd, &ch, 0, 0); - if (len < 0) - err(-1, "%s: try_0send", test); - if (len != 0) - errx(-1, "%s: try_0send: returned %zd", test, len); + ATF_REQUIRE_MSG(len != -1, "send failed: %s", strerror(errno)); + ATF_REQUIRE_MSG(len == 0, "send returned %zd (not 0): %s", + len, strerror(errno)); } static void -try_0write(const char *test, int fd) +try_0write(int fd) { ssize_t len; char ch; ch = 0; len = write(fd, &ch, 0); - if (len < 0) - err(-1, "%s: try_0write", test); - if (len != 0) - errx(-1, "%s: try_0write: returned %zd", test, len); + ATF_REQUIRE_MSG(len != -1, "write failed: %s", strerror(errno)); + ATF_REQUIRE_MSG(len == 0, "write returned: %zd (not 0): %s", + len, strerror(errno)); } static void -setup_udp(const char *test, int *fdp) +setup_udp(int *fdp) { struct sockaddr_in sin; - int sock1, sock2; + int port_base, sock1, sock2; bzero(&sin, sizeof(sin)); sin.sin_len = sizeof(sin); sin.sin_family = AF_INET; sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); - sin.sin_port = htons(PORT1); + port_base = MAX((int)random() % 65535, 1025); + + sin.sin_port = htons(port_base); sock1 = socket(PF_INET, SOCK_DGRAM, 0); - if (sock1 < 0) - err(-1, "%s: setup_udp: socket", test); - if (bind(sock1, (struct sockaddr *)&sin, sizeof(sin)) < 0) - err(-1, "%s: setup_udp: bind(%s, %d)", test, - inet_ntoa(sin.sin_addr), PORT1); - sin.sin_port = htons(PORT2); - if (connect(sock1, (struct sockaddr *)&sin, sizeof(sin)) < 0) - err(-1, "%s: setup_udp: connect(%s, %d)", test, - inet_ntoa(sin.sin_addr), PORT2); + ATF_REQUIRE_MSG(sock1 != -1, "socket # 1 failed: %s", strerror(errno)); + ATF_REQUIRE_MSG(bind(sock1, (struct sockaddr *)&sin, sizeof(sin)) == 0, + "bind # 1 failed: %s", strerror(errno)); + sin.sin_port = htons(port_base + 1); + ATF_REQUIRE_MSG(connect(sock1, (struct sockaddr *)&sin, sizeof(sin)) + == 0, "connect # 1 failed: %s", strerror(errno)); sock2 = socket(PF_INET, SOCK_DGRAM, 0); - if (sock2 < 0) - err(-1, "%s: setup_udp: socket", test); - if (bind(sock2, (struct sockaddr *)&sin, sizeof(sin)) < 0) - err(-1, "%s: setup_udp: bind(%s, %d)", test, - inet_ntoa(sin.sin_addr), PORT2); - sin.sin_port = htons(PORT1); - if (connect(sock2, (struct sockaddr *)&sin, sizeof(sin)) < 0) - err(-1, "%s: setup_udp: connect(%s, %d)", test, - inet_ntoa(sin.sin_addr), PORT1); + ATF_REQUIRE_MSG(sock2 != -1, "socket # 2 failed: %s", strerror(errno)); + ATF_REQUIRE_MSG(bind(sock2, (struct sockaddr *)&sin, sizeof(sin)) == 0, + "bind # 2 failed: %s", strerror(errno)); + sin.sin_port = htons(port_base); + ATF_REQUIRE_MSG(connect(sock2, (struct sockaddr *)&sin, sizeof(sin)) + == 0, "connect # 2 failed: %s", strerror(errno)); fdp[0] = sock1; fdp[1] = sock2; + fdp[2] = -1; } static void -setup_tcp(const char *test, int *fdp) +setup_tcp(int *fdp) { fd_set writefds, exceptfds; struct sockaddr_in sin; - int ret, sock1, sock2, sock3; + int port_base, ret, sock1, sock2, sock3; struct timeval tv; bzero(&sin, sizeof(sin)); @@ -124,44 +120,40 @@ setup_tcp(const char *test, int *fdp) sin.sin_family = AF_INET; sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); + port_base = MAX((int)random() % 65535, 1025); + /* * First set up the listen socket. */ - sin.sin_port = htons(PORT1); + sin.sin_port = htons(port_base); sock1 = socket(PF_INET, SOCK_STREAM, 0); - if (sock1 < 0) - err(-1, "%s: setup_tcp: socket", test); - if (bind(sock1, (struct sockaddr *)&sin, sizeof(sin)) < 0) - err(-1, "%s: bind(%s, %d)", test, inet_ntoa(sin.sin_addr), - PORT1); - if (listen(sock1, -1) < 0) - err(-1, "%s: listen", test); + ATF_REQUIRE_MSG(sock1 != -1, "socket # 1 failed: %s", strerror(errno)); + ATF_REQUIRE_MSG(bind(sock1, (struct sockaddr *)&sin, sizeof(sin)) == 0, + "bind # 1 failed: %s", strerror(errno)); + ATF_REQUIRE_MSG(listen(sock1, -1) == 0, + "listen # 1 failed: %s", strerror(errno)); /* * Now connect to it, non-blocking so that we don't deadlock against * ourselves. */ sock2 = socket(PF_INET, SOCK_STREAM, 0); - if (sock2 < 0) - err(-1, "%s: setup_tcp: socket", test); - if (fcntl(sock2, F_SETFL, O_NONBLOCK) < 0) - err(-1, "%s: setup_tcp: fcntl(O_NONBLOCK)", test); - if (connect(sock2, (struct sockaddr *)&sin, sizeof(sin)) < 0 && - errno != EINPROGRESS) - err(-1, "%s: setup_tcp: connect(%s, %d)", test, - inet_ntoa(sin.sin_addr), PORT1); + ATF_REQUIRE_MSG(sock2 != -1, "socket # 2 failed: %s", strerror(errno)); + ATF_REQUIRE_MSG(fcntl(sock2, F_SETFL, O_NONBLOCK) == 0, + "setting socket as nonblocking failed: %s", strerror(errno)); + ATF_REQUIRE_MSG( + (connect(sock2, (struct sockaddr *)&sin, sizeof(sin)) == 0 || + errno == EINPROGRESS), + "connect # 2 failed: %s", strerror(errno)); /* * Now pick up the connection after sleeping a moment to make sure * there's been time for some packets to go back and forth. */ - if (sleep(1) < 0) - err(-1, "%s: sleep(1)", test); + ATF_REQUIRE_MSG(sleep(1) == 0, "sleep(1) <= 0"); sock3 = accept(sock1, NULL, NULL); - if (sock3 < 0) - err(-1, "%s: accept", test); - if (sleep(1) < 0) - err(-1, "%s: sleep(1)", test); + ATF_REQUIRE_MSG(sock3 != -1, "accept failed: %s", strerror(errno)); + ATF_REQUIRE_MSG(sleep(1) == 0, "sleep(1) <= 0"); FD_ZERO(&writefds); FD_SET(sock2, &writefds); @@ -170,121 +162,181 @@ setup_tcp(const char *test, int *fdp) tv.tv_sec = 1; tv.tv_usec = 0; ret = select(sock2 + 1, NULL, &writefds, &exceptfds, &tv); - if (ret < 0) - err(-1, "%s: setup_tcp: select", test); - if (FD_ISSET(sock2, &exceptfds)) - errx(-1, "%s: setup_tcp: select: exception", test); - if (!FD_ISSET(sock2, &writefds)) - errx(-1, "%s: setup_tcp: select: not writable", test); + ATF_REQUIRE_MSG(ret != -1, "select failed: %s", strerror(errno)); + ATF_REQUIRE_MSG(!FD_ISSET(sock2, &exceptfds), + "select: exception occurred with sock2"); + ATF_REQUIRE_MSG(FD_ISSET(sock2, &writefds), + "not writable"); close(sock1); fdp[0] = sock2; fdp[1] = sock3; + fdp[2] = sock1; } static void -setup_udsstream(const char *test, int *fdp) +setup_udsstream(int *fdp) { - if (socketpair(PF_LOCAL, SOCK_STREAM, 0, fdp) < 0) - err(-1, "%s: setup_udsstream: socketpair", test); + ATF_REQUIRE_MSG(socketpair(PF_LOCAL, SOCK_STREAM, 0, fdp) == 0, + "socketpair failed: %s", strerror(errno)); } static void -setup_udsdgram(const char *test, int *fdp) +setup_udsdgram(int *fdp) { - if (socketpair(PF_LOCAL, SOCK_DGRAM, 0, fdp) < 0) - err(-1, "%s: setup_udsdgram: socketpair", test); + ATF_REQUIRE_MSG(socketpair(PF_LOCAL, SOCK_DGRAM, 0, fdp) == 0, + "socketpair failed: %s", strerror(errno)); } static void -setup_pipe(const char *test, int *fdp) +setup_pipe(int *fdp) { - if (pipe(fdp) < 0) - err(-1, "%s: setup_pipe: pipe", test); + ATF_REQUIRE_MSG(pipe(fdp) == 0, "pipe failed: %s", strerror(errno)); } static void -setup_fifo(const char *test, int *fdp) +setup_fifo(int *fdp) { char path[] = "0send_fifo.XXXXXXX"; int fd1, fd2; - if (mkstemp(path) == -1) - err(-1, "%s: setup_fifo: mktemp", test); + ATF_REQUIRE_MSG(mkstemp(path) != -1, + "mkstemp failed: %s", strerror(errno)); unlink(path); - if (mkfifo(path, 0600) < 0) - err(-1, "%s: setup_fifo: mkfifo(%s)", test, path); + ATF_REQUIRE_MSG(mkfifo(path, 0600) == 0, + "mkfifo(\"%s\", 0600) failed: %s", path, strerror(errno)); fd1 = open(path, O_RDONLY | O_NONBLOCK); - if (fd1 < 0) - err(-1, "%s: setup_fifo: open(%s, O_RDONLY)", test, path); + ATF_REQUIRE_MSG(fd1 != -1, "open(\"%s\", O_RDONLY)", path); fd2 = open(path, O_WRONLY | O_NONBLOCK); - if (fd2 < 0) - err(-1, "%s: setup_fifo: open(%s, O_WRONLY)", test, path); + ATF_REQUIRE_MSG(fd2 != -1, "open(\"%s\", O_WRONLY)", path); fdp[0] = fd2; fdp[1] = fd1; + fdp[2] = -1; } +static int fd[3]; + static void -close_both(int *fdp) +close_fds(int *fdp) +{ + int i; + + for (i = 0; i < nitems(fdp); i++) + close(fdp[i]); +} + +ATF_TC_WITHOUT_HEAD(udp_zero_send); +ATF_TC_BODY(udp_zero_send, tc) +{ + + setup_udp(fd); + try_0send(fd[0]); + close_fds(fd); +} + +ATF_TC_WITHOUT_HEAD(udp_zero_write); +ATF_TC_BODY(udp_zero_write, tc) { - close(fdp[0]); - fdp[0] = -1; - close(fdp[1]); - fdp[1] = -1; + setup_udp(fd); + try_0write(fd[0]); + close_fds(fd); } -int -main(int argc, char *argv[]) +ATF_TC_WITHOUT_HEAD(tcp_zero_send); +ATF_TC_BODY(tcp_zero_send, tc) { - int fd[2]; - setup_udp("udp_0send", fd); - try_0send("udp_0send", fd[0]); - close_both(fd); + setup_tcp(fd); + try_0send(fd[0]); + close_fds(fd); +} - setup_udp("udp_0write", fd); - try_0write("udp_0write", fd[0]); - close_both(fd); +ATF_TC_WITHOUT_HEAD(tcp_zero_write); +ATF_TC_BODY(tcp_zero_write, tc) +{ - setup_tcp("tcp_0send", fd); - try_0send("tcp_0send", fd[0]); - close_both(fd); + setup_tcp(fd); + try_0write(fd[0]); + close_fds(fd); +} - setup_tcp("tcp_0write", fd); - try_0write("tcp_0write", fd[0]); - close_both(fd); +ATF_TC_WITHOUT_HEAD(udsstream_zero_send); +ATF_TC_BODY(udsstream_zero_send, tc) +{ - setup_udsstream("udsstream_0send", fd); - try_0send("udsstream_0send", fd[0]); - close_both(fd); + setup_udsstream(fd); + try_0send(fd[0]); + close_fds(fd); +} - setup_udsstream("udsstream_0write", fd); - try_0write("udsstream_0write", fd[0]); - close_both(fd); +ATF_TC_WITHOUT_HEAD(udsstream_zero_write); +ATF_TC_BODY(udsstream_zero_write, tc) +{ - setup_udsdgram("udsdgram_0send", fd); - try_0send("udsdgram_0send", fd[0]); - close_both(fd); + setup_udsstream(fd); + try_0write(fd[0]); + close_fds(fd); +} - setup_udsdgram("udsdgram_0write", fd); - try_0write("udsdgram_0write", fd[0]); - close_both(fd); +ATF_TC_WITHOUT_HEAD(udsdgram_zero_send); +ATF_TC_BODY(udsdgram_zero_send, tc) +{ + + setup_udsdgram(fd); + try_0send(fd[0]); + close_fds(fd); +} + +ATF_TC_WITHOUT_HEAD(udsdgram_zero_write); +ATF_TC_BODY(udsdgram_zero_write, tc) +{ + + setup_udsdgram(fd); + try_0write(fd[0]); + close_fds(fd); +} + +ATF_TC_WITHOUT_HEAD(pipe_zero_write); +ATF_TC_BODY(pipe_zero_write, tc) +{ + + setup_pipe(fd); + try_0write(fd[0]); + close_fds(fd); +} + +ATF_TC_WITHOUT_HEAD(fifo_zero_write); +ATF_TC_BODY(fifo_zero_write, tc) +{ + + setup_fifo(fd); + try_0write(fd[0]); + close_fds(fd); +} + +ATF_TP_ADD_TCS(tp) +{ - setup_pipe("pipe_0write", fd); - try_0write("pipd_0write", fd[0]); - close_both(fd); + srandomdev(); - setup_fifo("fifo_0write", fd); - try_0write("fifo_0write", fd[0]); - close_both(fd); + ATF_TP_ADD_TC(tp, udp_zero_send); + ATF_TP_ADD_TC(tp, udp_zero_write); + ATF_TP_ADD_TC(tp, tcp_zero_send); + ATF_TP_ADD_TC(tp, tcp_zero_write); + ATF_TP_ADD_TC(tp, udsstream_zero_write); + ATF_TP_ADD_TC(tp, udsstream_zero_send); + ATF_TP_ADD_TC(tp, udsdgram_zero_write); + ATF_TP_ADD_TC(tp, udsdgram_zero_send); + ATF_TP_ADD_TC(tp, pipe_zero_write); + ATF_TP_ADD_TC(tp, fifo_zero_write); - return (0); + return (atf_no_error()); } From owner-svn-src-user@FreeBSD.ORG Thu Apr 16 00:37:12 2015 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B5C38DC4; Thu, 16 Apr 2015 00:37:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 97BD5D15; Thu, 16 Apr 2015 00:37:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3G0bCoZ094433; Thu, 16 Apr 2015 00:37:12 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3G0bC2g094430; Thu, 16 Apr 2015 00:37:12 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504160037.t3G0bC2g094430@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 16 Apr 2015 00:37:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281576 - user/ngie/more-tests/tests/sys/socket 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.20 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, 16 Apr 2015 00:37:12 -0000 Author: ngie Date: Thu Apr 16 00:37:11 2015 New Revision: 281576 URL: https://svnweb.freebsd.org/changeset/base/281576 Log: Convert accf_data_attach_test over to ATF and mark all steps after step 8 in the sourcecode broken (it fails on my system at least; more investigation needed) Modified: user/ngie/more-tests/tests/sys/socket/Makefile user/ngie/more-tests/tests/sys/socket/accf_data_attach_test.c Modified: user/ngie/more-tests/tests/sys/socket/Makefile ============================================================================== --- user/ngie/more-tests/tests/sys/socket/Makefile Thu Apr 16 00:37:05 2015 (r281575) +++ user/ngie/more-tests/tests/sys/socket/Makefile Thu Apr 16 00:37:11 2015 (r281576) @@ -10,7 +10,7 @@ PROGS+= unix_cmsg TAP_TESTS_C+= accept_fd_leak_test # accf_data_attach: not ok 9 - setsockopt() after listen() failed with 2 (No such file or directory) -TAP_TESTS_C+= accf_data_attach_test +ATF_TESTS_C+= accf_data_attach_test PLAIN_TESTS_C+= fstat_test PLAIN_TESTS_C+= kqueue_test PLAIN_TESTS_C+= listen_backlog_test Modified: user/ngie/more-tests/tests/sys/socket/accf_data_attach_test.c ============================================================================== --- user/ngie/more-tests/tests/sys/socket/accf_data_attach_test.c Thu Apr 16 00:37:05 2015 (r281575) +++ user/ngie/more-tests/tests/sys/socket/accf_data_attach_test.c Thu Apr 16 00:37:11 2015 (r281576) @@ -38,6 +38,8 @@ #include #include +#include + #define ACCF_NAME "dataready" /* @@ -57,23 +59,19 @@ * - That once an accept filter is attached, we can remove it and query to * make sure it is removed. */ -int -main(void) +ATF_TC_WITHOUT_HEAD(accf_data_attach_test); +ATF_TC_BODY(accf_data_attach_test, tc) { struct accept_filter_arg afa; struct sockaddr_in sin; socklen_t len; int lso, ret; - printf("1..11\n"); - /* * Step 0. Open socket(). */ lso = socket(PF_INET, SOCK_STREAM, 0); - if (lso == -1) - errx(-1, "not ok 1 - socket: %s", strerror(errno)); - printf("ok 1 - socket\n"); + ATF_REQUIRE_MSG(lso != -1, "socket failed: %s", strerror(errno)); /* * Step 1. After socket(). Should return EINVAL, since no accept @@ -81,13 +79,8 @@ main(void) */ bzero(&afa, sizeof(afa)); len = sizeof(afa); - ret = getsockopt(lso, SOL_SOCKET, SO_ACCEPTFILTER, &afa, &len); - if (ret != -1) - errx(-1, "not ok 2 - getsockopt() after socket() succeeded"); - if (errno != EINVAL) - errx(-1, "not ok 2 - getsockopt() after socket() failed with " - "%d (%s)", errno, strerror(errno)); - printf("ok 2 - getsockopt\n"); + ATF_REQUIRE_ERRNO(EINVAL, + getsockopt(lso, SOL_SOCKET, SO_ACCEPTFILTER, &afa, &len) == -1); /* * Step 2. Bind(). Ideally this will succeed. @@ -97,22 +90,16 @@ main(void) sin.sin_family = AF_INET; sin.sin_port = htons(8080); sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); - if (bind(lso, (struct sockaddr *)&sin, sizeof(sin)) < 0) - errx(-1, "not ok 3 - bind %s", strerror(errno)); - printf("ok 3 - bind\n"); + ATF_REQUIRE_MSG(bind(lso, (struct sockaddr *)&sin, sizeof(sin)) == 0, + "bind failed: %s", strerror(errno)); /* * Step 3: After bind(). getsockopt() should return EINVAL, since no * accept filter should be attached. */ len = sizeof(afa); - ret = getsockopt(lso, SOL_SOCKET, SO_ACCEPTFILTER, &afa, &len); - if (ret != -1) - errx(-1, "not ok 4 - getsockopt() after bind() succeeded"); - if (errno != EINVAL) - errx(-1, "not ok 4 - getsockopt() after bind() failed with %d (%s)", - errno, strerror(errno)); - printf("ok 4 - getsockopt\n"); + ATF_REQUIRE_ERRNO(EINVAL, + getsockopt(lso, SOL_SOCKET, SO_ACCEPTFILTER, &afa, &len) == -1); /* * Step 4: Setsockopt() before listen(). Should fail, since it's not @@ -120,10 +107,8 @@ main(void) */ bzero(&afa, sizeof(afa)); strcpy(afa.af_name, ACCF_NAME); - ret = setsockopt(lso, SOL_SOCKET, SO_ACCEPTFILTER, &afa, sizeof(afa)); - if (ret == 0) - errx(-1, "not ok 5 - setsockopt() before listen() succeeded"); - printf("ok 5 - setsockopt\n"); + ATF_REQUIRE_MSG(setsockopt(lso, SOL_SOCKET, SO_ACCEPTFILTER, &afa, + sizeof(afa)) != 0, "setsockopt succeeded unexpectedly"); /* * Step 5: Getsockopt() after pre-listen() setsockopt(). Should @@ -131,20 +116,13 @@ main(void) */ len = sizeof(afa); ret = getsockopt(lso, SOL_SOCKET, SO_ACCEPTFILTER, &afa, &len); - if (ret == 0) - errx(-1, "not ok 6 - getsockopt() after pre-listen() setsockopt() " - "succeeded"); - if (errno != EINVAL) - errx(-1, "not ok 6 - pre-listen() getsockopt() failed with %d (%s)", - errno, strerror(errno)); - printf("ok 6 - getsockopt\n"); + ATF_REQUIRE_ERRNO(EINVAL, ret != 0); /* * Step 6: listen(). */ - if (listen(lso, -1) < 0) - errx(-1, "not ok 7 - listen: %s", strerror(errno)); - printf("ok 7 - listen\n"); + ATF_REQUIRE_MSG(listen(lso, 1) == 0, + "listen failed: %s", strerror(errno)); /* * Step 7: Getsockopt() after listen(). Should fail with EINVAL, @@ -152,13 +130,10 @@ main(void) */ len = sizeof(afa); ret = getsockopt(lso, SOL_SOCKET, SO_ACCEPTFILTER, &afa, &len); - if (ret == 0) - errx(-1, "not ok 8 - getsockopt() after listen() but before " - "setsockopt() succeeded"); - if (errno != EINVAL) - errx(-1, "not ok 8 - getsockopt() after listen() but before " - "setsockopt() failed with %d (%s)", errno, strerror(errno)); - printf("ok 8 - getsockopt\n"); + ATF_REQUIRE_MSG(ret == -1 && errno == EINVAL, + "getsockopt after listen failed: %s", strerror(errno)); + + atf_tc_expect_fail("XXX(ngie): step 8 always fails on my system for some odd reason"); /* * Step 8: After listen(). This call to setsockopt() should succeed. @@ -166,10 +141,9 @@ main(void) bzero(&afa, sizeof(afa)); strcpy(afa.af_name, ACCF_NAME); ret = setsockopt(lso, SOL_SOCKET, SO_ACCEPTFILTER, &afa, sizeof(afa)); - if (ret != 0) - errx(-1, "not ok 9 - setsockopt() after listen() failed with %d " - "(%s)", errno, strerror(errno)); - printf("ok 9 - setsockopt\n"); + //ATF_REQUIRE_MSG(ret == 0, + ATF_REQUIRE_MSG(ret == 0, + "setsockopt after listen failed: %s", strerror(errno)); /* * Step 9: After setsockopt(). Should succeed and identify @@ -178,39 +152,33 @@ main(void) bzero(&afa, sizeof(afa)); len = sizeof(afa); ret = getsockopt(lso, SOL_SOCKET, SO_ACCEPTFILTER, &afa, &len); - if (ret != 0) - errx(-1, "not ok 10 - getsockopt() after listen() setsockopt() " - "failed with %d (%s)", errno, strerror(errno)); - if (len != sizeof(afa)) - errx(-1, "not ok 10 - getsockopt() after setsockopet() after " - "listen() returned wrong size (got %d expected %zd)", len, - sizeof(afa)); - if (strcmp(afa.af_name, ACCF_NAME) != 0) - errx(-1, "not ok 10 - getsockopt() after setsockopt() after " - "listen() mismatch (got %s expected %s)", afa.af_name, - ACCF_NAME); - printf("ok 10 - getsockopt\n"); + ATF_REQUIRE_MSG(ret == 0, + "getsockopt after listen/setsockopt failed: %s", strerror(errno)); + ATF_REQUIRE_EQ(len, sizeof(afa)); + ATF_REQUIRE_STREQ(afa.af_name, ACCF_NAME); /* * Step 10: Remove accept filter. After removing the accept filter * getsockopt() should fail with EINVAL. */ ret = setsockopt(lso, SOL_SOCKET, SO_ACCEPTFILTER, NULL, 0); - if (ret != 0) - errx(-1, "not ok 11 - setsockopt() after listen() " - "failed with %d (%s)", errno, strerror(errno)); + ATF_REQUIRE_MSG(ret == 0, + "setsockopt failed to remove accept filter: %s", strerror(errno)); bzero(&afa, sizeof(afa)); len = sizeof(afa); ret = getsockopt(lso, SOL_SOCKET, SO_ACCEPTFILTER, &afa, &len); - if (ret == 0) - errx(-1, "not ok 11 - getsockopt() after removing " - "the accept filter returns valid accept filter %s", - afa.af_name); - if (errno != EINVAL) - errx(-1, "not ok 11 - getsockopt() after removing the accept" - "filter failed with %d (%s)", errno, strerror(errno)); - printf("ok 11 - setsockopt\n"); + ATF_REQUIRE_MSG(ret == -1 && errno == EINVAL, + "getsockopt failed after removing the accept filter: %s", + strerror(errno)); close(lso); - return (0); + +} + +ATF_TP_ADD_TCS(tp) +{ + + ATF_TP_ADD_TC(tp, accf_data_attach_test); + + return (atf_no_error()); } From owner-svn-src-user@FreeBSD.ORG Thu Apr 16 00:39:22 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1B579FE2; Thu, 16 Apr 2015 00:39: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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 06ACCD23; Thu, 16 Apr 2015 00:39:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3G0dLn1094844; Thu, 16 Apr 2015 00:39:21 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3G0dLBe094839; Thu, 16 Apr 2015 00:39:21 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504160039.t3G0dLBe094839@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 16 Apr 2015 00:39:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281578 - user/ngie/more-tests/tests/sys/socket 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.20 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, 16 Apr 2015 00:39:22 -0000 Author: ngie Date: Thu Apr 16 00:39:20 2015 New Revision: 281578 URL: https://svnweb.freebsd.org/changeset/base/281578 Log: Rename unix_sendtorace_test to unix_sendto_race_test Added: user/ngie/more-tests/tests/sys/socket/unix_sendto_race_test.c - copied unchanged from r281516, user/ngie/more-tests/tests/sys/socket/unix_sendtorace_test.c Deleted: user/ngie/more-tests/tests/sys/socket/unix_sendtorace_test.c Modified: user/ngie/more-tests/tests/sys/socket/Makefile Modified: user/ngie/more-tests/tests/sys/socket/Makefile ============================================================================== --- user/ngie/more-tests/tests/sys/socket/Makefile Thu Apr 16 00:39:16 2015 (r281577) +++ user/ngie/more-tests/tests/sys/socket/Makefile Thu Apr 16 00:39:20 2015 (r281578) @@ -32,7 +32,7 @@ TAP_TESTS_SH+= unix_cmsg_test # unix_gc: twosome_drop1: sendfd: before 0 after 0 PLAIN_TESTS_C+= unix_gc_test ATF_TESTS_C+= unix_passfd_test -PLAIN_TESTS_C+= unix_sendtorace_test +PLAIN_TESTS_C+= unix_sendto_race_test # unix_socket: socket(PF_LOCAL, SOCK_RAW, 0): Protocol wrong type for socket PLAIN_TESTS_C+= unix_socket_test PLAIN_TESTS_C+= unix_sorflush_test Copied: user/ngie/more-tests/tests/sys/socket/unix_sendto_race_test.c (from r281516, user/ngie/more-tests/tests/sys/socket/unix_sendtorace_test.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests/tests/sys/socket/unix_sendto_race_test.c Thu Apr 16 00:39:20 2015 (r281578, copy of r281516, user/ngie/more-tests/tests/sys/socket/unix_sendtorace_test.c) @@ -0,0 +1,215 @@ +/*- + * Copyright (c) 2006 Robert N. M. Watson + * 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$ + */ + +/* + * Attempts to exercise UNIX domain socket races relating to the non-atomic + * connect-and-send properties of sendto(). As the result of such a race is + * a kernel panic, this test simply completes or doesn't. + * + * XXX: Despite implementing support for sendto() on stream sockets with + * implied connect, the appropriate flag isn't set in the FreeBSD kernel so + * it does not work. For now, don't call the stream test. + */ + +#include +#include +#include + +#include +#include +#include +#include + +#define ITERATIONS 1000000 + +static char socket_path[] = "tmp.XXXXXX"; + +static void +stream_server(int listenfd) +{ + int acceptfd; + + while (1) { + acceptfd = accept(listenfd, NULL, NULL); + if (acceptfd < 0) { + warn("stream_server: accept"); + continue; + } + sleep(1); + close(acceptfd); + } +} + +static void +stream_client(void) +{ + struct sockaddr_un sun; + ssize_t len; + char c = 0; + int fd, i; + + bzero(&sun, sizeof(sun)); + sun.sun_len = sizeof(sun); + sun.sun_family = AF_UNIX; + strcpy(sun.sun_path, socket_path); + for (i = 0; i < ITERATIONS; i++) { + fd = socket(PF_UNIX, SOCK_STREAM, 0); + if (fd < 0) { + warn("stream_client: socket"); + return; + } + len = sendto(fd, &c, sizeof(c), 0, (struct sockaddr *)&sun, + sizeof(sun)); + if (len < 0) + warn("stream_client: sendto"); + close(fd); + } +} + +static void +stream_test(void) +{ + struct sockaddr_un sun; + pid_t childpid; + int listenfd; + + listenfd = socket(PF_UNIX, SOCK_STREAM, 0); + if (listenfd < 0) + err(-1, "stream_test: socket"); + + bzero(&sun, sizeof(sun)); + sun.sun_len = sizeof(sun); + sun.sun_family = AF_UNIX; + strcpy(sun.sun_path, socket_path); + + if (bind(listenfd, (struct sockaddr *)&sun, sizeof(sun)) < 0) + err(-1, "stream_test: bind"); + + if (listen(listenfd, -1) < 0) + err(-1, "stream_test: listen"); + + childpid = fork(); + if (childpid < 0) + err(-1, "stream_test: fork"); + + if (childpid != 0) { + sleep(1); + stream_client(); + kill(childpid, SIGTERM); + sleep(1); + } else + stream_server(listenfd); + + (void)unlink(socket_path); +} + +static void +datagram_server(int serverfd) +{ + ssize_t len; + char c; + + while (1) { + len = recv(serverfd, &c, sizeof(c), 0); + if (len < 0) + warn("datagram_server: recv"); + } +} + +static void +datagram_client(void) +{ + struct sockaddr_un sun; + ssize_t len; + char c = 0; + int fd, i; + + bzero(&sun, sizeof(sun)); + sun.sun_len = sizeof(sun); + sun.sun_family = AF_UNIX; + strcpy(sun.sun_path, socket_path); + for (i = 0; i < ITERATIONS; i++) { + fd = socket(PF_UNIX, SOCK_DGRAM, 0); + if (fd < 0) { + warn("datagram_client: socket"); + return; + } + len = sendto(fd, &c, sizeof(c), 0, (struct sockaddr *)&sun, + sizeof(sun)); + if (len < 0) + warn("datagram_client: sendto"); + close(fd); + } +} + +static void +datagram_test(void) +{ + struct sockaddr_un sun; + pid_t childpid; + int serverfd; + + serverfd = socket(PF_UNIX, SOCK_DGRAM, 0); + if (serverfd < 0) + err(-1, "datagram_test: socket"); + + bzero(&sun, sizeof(sun)); + sun.sun_len = sizeof(sun); + sun.sun_family = AF_UNIX; + strcpy(sun.sun_path, socket_path); + + if (bind(serverfd, (struct sockaddr *)&sun, sizeof(sun)) < 0) + err(-1, "datagram_test: bind"); + + childpid = fork(); + if (childpid < 0) + err(-1, "datagram_test: fork"); + + if (childpid != 0) { + sleep(1); + datagram_client(); + kill(childpid, SIGTERM); + sleep(1); + } else + datagram_server(serverfd); + + (void)unlink(socket_path); +} + +int +main(void) +{ + + if (mkstemp(socket_path) == -1) + err(1, "mkstemp failed"); + (void)unlink(socket_path); + datagram_test(); + if (0) + stream_test(); + return (0); +} From owner-svn-src-user@FreeBSD.ORG Thu Apr 16 00:45:00 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CB2222AB; Thu, 16 Apr 2015 00:45:00 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B6617DE6; Thu, 16 Apr 2015 00:45:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3G0j0jI099191; Thu, 16 Apr 2015 00:45:00 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3G0ixp4099156; Thu, 16 Apr 2015 00:44:59 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504160044.t3G0ixp4099156@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 16 Apr 2015 00:44:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281580 - user/ngie/more-tests/tests/sys/socket 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.20 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, 16 Apr 2015 00:45:00 -0000 Author: ngie Date: Thu Apr 16 00:44:59 2015 New Revision: 281580 URL: https://svnweb.freebsd.org/changeset/base/281580 Log: Don't use /tmp for temporary files; this violates ATF/kyuas sandbox Modified: user/ngie/more-tests/tests/sys/socket/unix_bindconnect_test.c user/ngie/more-tests/tests/sys/socket/unix_gc_test.c Modified: user/ngie/more-tests/tests/sys/socket/unix_bindconnect_test.c ============================================================================== --- user/ngie/more-tests/tests/sys/socket/unix_bindconnect_test.c Thu Apr 16 00:44:05 2015 (r281579) +++ user/ngie/more-tests/tests/sys/socket/unix_bindconnect_test.c Thu Apr 16 00:44:59 2015 (r281580) @@ -303,7 +303,7 @@ main(void) char directory_path[PATH_MAX]; int error; - strlcpy(directory_path, "/tmp/unix_bind.XXXXXXX", PATH_MAX); + strlcpy(directory_path, "unix_bind.XXXXXXX", PATH_MAX); if (mkdtemp(directory_path) == NULL) err(-1, "mkdtemp"); push_path(directory_path); Modified: user/ngie/more-tests/tests/sys/socket/unix_gc_test.c ============================================================================== --- user/ngie/more-tests/tests/sys/socket/unix_gc_test.c Thu Apr 16 00:44:05 2015 (r281579) +++ user/ngie/more-tests/tests/sys/socket/unix_gc_test.c Thu Apr 16 00:44:59 2015 (r281580) @@ -758,7 +758,7 @@ main(int argc, char *argv[]) int serrno; pid_t pid; - strlcpy(dpath, "/tmp/unpgc.XXXXXXXX", sizeof(dpath)); + strlcpy(dpath, "unpgc.XXXXXXXX", sizeof(dpath)); if (mkdtemp(dpath) == NULL) err(-1, "mkdtemp"); From owner-svn-src-user@FreeBSD.ORG Thu Apr 16 03:39:52 2015 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AC000B7; Thu, 16 Apr 2015 03:39: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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 93782195; Thu, 16 Apr 2015 03:39:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3G3dq1T082909; Thu, 16 Apr 2015 03:39:52 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3G3dYY8082748; Thu, 16 Apr 2015 03:39:34 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504160339.t3G3dYY8082748@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 16 Apr 2015 03:39:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281585 - in user/ngie/more-tests: . bin/csh contrib/pjdfstest/tests/open contrib/pjdfstest/tests/truncate contrib/smbfs/include/netsmb contrib/smbfs/lib/smb etc etc/rc.d include lib/li... 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.20 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, 16 Apr 2015 03:39:52 -0000 Author: ngie Date: Thu Apr 16 03:39:33 2015 New Revision: 281585 URL: https://svnweb.freebsd.org/changeset/base/281585 Log: MFhead @ r281584 Added: user/ngie/more-tests/sys/arm64/include/psl.h - copied unchanged from r281584, head/sys/arm64/include/psl.h user/ngie/more-tests/sys/boot/Makefile.arm64 - copied unchanged from r281584, head/sys/boot/Makefile.arm64 user/ngie/more-tests/sys/boot/arm64/ - copied from r281584, head/sys/boot/arm64/ user/ngie/more-tests/sys/boot/efi/boot1/fat-arm64.tmpl.bz2.uu - copied unchanged from r281584, head/sys/boot/efi/boot1/fat-arm64.tmpl.bz2.uu user/ngie/more-tests/sys/boot/efi/include/arm64/ - copied from r281584, head/sys/boot/efi/include/arm64/ user/ngie/more-tests/sys/boot/efi/loader/arch/arm64/ - copied from r281584, head/sys/boot/efi/loader/arch/arm64/ Modified: user/ngie/more-tests/UPDATING user/ngie/more-tests/bin/csh/config.h user/ngie/more-tests/contrib/pjdfstest/tests/open/20.t user/ngie/more-tests/contrib/pjdfstest/tests/truncate/11.t user/ngie/more-tests/contrib/smbfs/include/netsmb/smb_lib.h user/ngie/more-tests/contrib/smbfs/lib/smb/nls.c user/ngie/more-tests/contrib/smbfs/lib/smb/print.c user/ngie/more-tests/contrib/smbfs/lib/smb/rq.c user/ngie/more-tests/etc/login.conf user/ngie/more-tests/etc/rc.d/hostid_save user/ngie/more-tests/include/iconv.h user/ngie/more-tests/lib/libarchive/Makefile user/ngie/more-tests/lib/libc/iconv/__iconv.c user/ngie/more-tests/lib/libc/iconv/bsd_iconv.c user/ngie/more-tests/lib/libc/iconv/citrus_iconv.h user/ngie/more-tests/lib/libc/iconv/citrus_iconv_local.h user/ngie/more-tests/lib/libc/iconv/citrus_none.c user/ngie/more-tests/lib/libc/iconv/citrus_stdenc.h user/ngie/more-tests/lib/libc/iconv/citrus_stdenc_local.h user/ngie/more-tests/lib/libc/iconv/citrus_stdenc_template.h user/ngie/more-tests/lib/libc/iconv/iconv-internal.h user/ngie/more-tests/lib/libc/iconv/iconv.3 user/ngie/more-tests/lib/libc/iconv/iconv.c user/ngie/more-tests/lib/libc/iconv/iconv_compat.c user/ngie/more-tests/lib/libc/locale/cXXrtomb_iconv.h user/ngie/more-tests/lib/libc/locale/mbrtocXX_iconv.h user/ngie/more-tests/lib/libiconv_modules/BIG5/citrus_big5.c user/ngie/more-tests/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c user/ngie/more-tests/lib/libiconv_modules/EUC/citrus_euc.c user/ngie/more-tests/lib/libiconv_modules/EUCTW/citrus_euctw.c user/ngie/more-tests/lib/libiconv_modules/GBK2K/citrus_gbk2k.c user/ngie/more-tests/lib/libiconv_modules/HZ/citrus_hz.c user/ngie/more-tests/lib/libiconv_modules/ISO2022/citrus_iso2022.c user/ngie/more-tests/lib/libiconv_modules/JOHAB/citrus_johab.c user/ngie/more-tests/lib/libiconv_modules/MSKanji/citrus_mskanji.c user/ngie/more-tests/lib/libiconv_modules/UES/citrus_ues.c user/ngie/more-tests/lib/libiconv_modules/UTF1632/citrus_utf1632.c user/ngie/more-tests/lib/libiconv_modules/UTF7/citrus_utf7.c user/ngie/more-tests/lib/libiconv_modules/UTF8/citrus_utf8.c user/ngie/more-tests/lib/libiconv_modules/VIQR/citrus_viqr.c user/ngie/more-tests/lib/libiconv_modules/ZW/citrus_zw.c user/ngie/more-tests/lib/libiconv_modules/iconv_none/citrus_iconv_none.c user/ngie/more-tests/lib/libiconv_modules/iconv_std/citrus_iconv_std.c user/ngie/more-tests/lib/libkiconv/xlat16_iconv.c user/ngie/more-tests/libexec/rtld-elf/aarch64/reloc.c user/ngie/more-tests/libexec/rtld-elf/rtld.c user/ngie/more-tests/libexec/rtld-elf/rtld.h user/ngie/more-tests/sys/arm64/arm64/vfp.c user/ngie/more-tests/sys/arm64/arm64/vm_machdep.c user/ngie/more-tests/sys/boot/Makefile.arm user/ngie/more-tests/sys/boot/common/Makefile.inc user/ngie/more-tests/sys/boot/efi/Makefile user/ngie/more-tests/sys/boot/efi/boot1/Makefile user/ngie/more-tests/sys/boot/efi/boot1/generate-fat.sh user/ngie/more-tests/sys/boot/efi/fdt/Makefile user/ngie/more-tests/sys/boot/efi/libefi/Makefile user/ngie/more-tests/sys/boot/efi/loader/Makefile user/ngie/more-tests/sys/boot/efi/loader/arch/arm/start.S user/ngie/more-tests/sys/boot/efi/loader/copy.c user/ngie/more-tests/sys/cam/cam_xpt.c user/ngie/more-tests/sys/compat/freebsd32/freebsd32_misc.c user/ngie/more-tests/sys/compat/linprocfs/linprocfs.c user/ngie/more-tests/sys/dev/sound/pci/hda/hdaa_patches.c user/ngie/more-tests/sys/dev/sound/pci/hda/hdac.c user/ngie/more-tests/sys/dev/sound/pci/hda/hdac.h user/ngie/more-tests/sys/dev/sound/pci/hda/hdacc.c user/ngie/more-tests/sys/dev/vt/vt_font.c user/ngie/more-tests/sys/fs/ext2fs/ext2_vfsops.c user/ngie/more-tests/sys/fs/fuse/fuse_vfsops.c user/ngie/more-tests/sys/fs/msdosfs/msdosfs_vfsops.c user/ngie/more-tests/sys/fs/nandfs/nandfs_vfsops.c user/ngie/more-tests/sys/fs/nfsclient/nfs_clvfsops.c user/ngie/more-tests/sys/fs/nfsserver/nfs_nfsdport.c user/ngie/more-tests/sys/fs/nullfs/null_vfsops.c user/ngie/more-tests/sys/kern/imgact_elf.c user/ngie/more-tests/sys/kern/kern_exec.c user/ngie/more-tests/sys/kern/kern_poll.c user/ngie/more-tests/sys/kern/kern_resource.c user/ngie/more-tests/sys/kern/kern_timeout.c user/ngie/more-tests/sys/kern/subr_bus.c user/ngie/more-tests/sys/kern/vfs_subr.c user/ngie/more-tests/sys/kern/vfs_syscalls.c user/ngie/more-tests/sys/net/if_types.h user/ngie/more-tests/sys/net/pfvar.h user/ngie/more-tests/sys/net/route.c user/ngie/more-tests/sys/netinet/ip_reass.c user/ngie/more-tests/sys/netpfil/pf/pf.c user/ngie/more-tests/sys/netpfil/pf/pf_norm.c user/ngie/more-tests/sys/sys/imgact.h user/ngie/more-tests/sys/sys/mount.h user/ngie/more-tests/sys/sys/param.h user/ngie/more-tests/sys/sys/syscallsubr.h user/ngie/more-tests/sys/ufs/ffs/ffs_vfsops.c user/ngie/more-tests/usr.bin/Makefile user/ngie/more-tests/usr.bin/gzip/gzip.c user/ngie/more-tests/usr.bin/iconv/iconv.c user/ngie/more-tests/usr.bin/ipcs/ipc.c user/ngie/more-tests/usr.bin/ipcs/ipc.h user/ngie/more-tests/usr.bin/lockf/lockf.c user/ngie/more-tests/usr.sbin/bhyve/bhyverun.c user/ngie/more-tests/usr.sbin/bhyvectl/bhyvectl.c user/ngie/more-tests/usr.sbin/ctld/discovery.c user/ngie/more-tests/usr.sbin/ctld/isns.c user/ngie/more-tests/usr.sbin/ctld/keys.c user/ngie/more-tests/usr.sbin/ctld/login.c user/ngie/more-tests/usr.sbin/ctld/parse.y user/ngie/more-tests/usr.sbin/ctld/pdu.c user/ngie/more-tests/usr.sbin/ctld/token.l user/ngie/more-tests/usr.sbin/freebsd-update/freebsd-update.sh user/ngie/more-tests/usr.sbin/vidcontrol/vidcontrol.c Directory Properties: user/ngie/more-tests/ (props changed) user/ngie/more-tests/etc/ (props changed) user/ngie/more-tests/include/ (props changed) user/ngie/more-tests/lib/libc/ (props changed) user/ngie/more-tests/sys/ (props changed) user/ngie/more-tests/sys/boot/ (props changed) user/ngie/more-tests/usr.sbin/bhyve/ (props changed) user/ngie/more-tests/usr.sbin/bhyvectl/ (props changed) Modified: user/ngie/more-tests/UPDATING ============================================================================== --- user/ngie/more-tests/UPDATING Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/UPDATING Thu Apr 16 03:39:33 2015 (r281585) @@ -31,6 +31,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20150415: + The const qualifier has been removed from iconv(3) to comply with + POSIX. The ports tree is aware of this from r384038 onwards. + 20150324: From legacy ata(4) driver was removed support for SATA controllers supported by more functional drivers ahci(4), siis(4) and mvs(4). Modified: user/ngie/more-tests/bin/csh/config.h ============================================================================== --- user/ngie/more-tests/bin/csh/config.h Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/bin/csh/config.h Thu Apr 16 03:39:33 2015 (r281585) @@ -198,7 +198,7 @@ #define HAVE_WCWIDTH 1 /* Define as const if the declaration of iconv() needs const. */ -#define ICONV_CONST const +#define ICONV_CONST /* Support NLS. */ #define NLS 1 Modified: user/ngie/more-tests/contrib/pjdfstest/tests/open/20.t ============================================================================== --- user/ngie/more-tests/contrib/pjdfstest/tests/open/20.t Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/contrib/pjdfstest/tests/open/20.t Thu Apr 16 03:39:33 2015 (r281585) @@ -14,7 +14,11 @@ n0=`namegen` cp -pf `which sleep` ${n0} ./${n0} 3 & +while ! pkill -0 -f ./${n0}; do + sleep 0.1 +done expect ETXTBSY open ${n0} O_WRONLY expect ETXTBSY open ${n0} O_RDWR expect ETXTBSY open ${n0} O_RDONLY,O_TRUNC +pkill -9 -f ./${n0} expect 0 unlink ${n0} Modified: user/ngie/more-tests/contrib/pjdfstest/tests/truncate/11.t ============================================================================== --- user/ngie/more-tests/contrib/pjdfstest/tests/truncate/11.t Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/contrib/pjdfstest/tests/truncate/11.t Thu Apr 16 03:39:33 2015 (r281585) @@ -14,5 +14,9 @@ n0=`namegen` cp -pf `which sleep` ${n0} ./${n0} 3 & +while ! pkill -0 -f ./${n0}; do + sleep 0.1 +done expect ETXTBSY truncate ${n0} 123 +pkill -9 -f ./${n0} expect 0 unlink ${n0} Modified: user/ngie/more-tests/contrib/smbfs/include/netsmb/smb_lib.h ============================================================================== --- user/ngie/more-tests/contrib/smbfs/include/netsmb/smb_lib.h Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/contrib/smbfs/include/netsmb/smb_lib.h Thu Apr 16 03:39:33 2015 (r281585) @@ -191,7 +191,7 @@ int smb_ctx_readrc(struct smb_ctx *); int smb_ctx_resolve(struct smb_ctx *); int smb_ctx_setflags(struct smb_ctx *, int, int, int); -int smb_smb_open_print_file(struct smb_ctx *, int, int, const char *, smbfh*); +int smb_smb_open_print_file(struct smb_ctx *, int, int, char *, smbfh*); int smb_smb_close_print_file(struct smb_ctx *, smbfh); int smb_read(struct smb_ctx *, smbfh, off_t, size_t, char *); @@ -204,8 +204,8 @@ int smb_rq_init(struct smb_ctx *, u_cha void smb_rq_done(struct smb_rq *); void smb_rq_wend(struct smb_rq *); int smb_rq_simple(struct smb_rq *); -int smb_rq_dmem(struct mbdata *, const char *, size_t); -int smb_rq_dstring(struct mbdata *, const char *); +int smb_rq_dmem(struct mbdata *, char *, size_t); +int smb_rq_dstring(struct mbdata *, char *); int smb_t2_request(struct smb_ctx *, int, int, const char *, int, void *, int, void *, int *, void *, int *, void *); @@ -246,10 +246,10 @@ extern u_char nls_lower[256], nls_upper[ int nls_setrecode(const char *, const char *); int nls_setlocale(const char *); -char* nls_str_toext(char *, const char *); -char* nls_str_toloc(char *, const char *); -void* nls_mem_toext(void *, const void *, int); -void* nls_mem_toloc(void *, const void *, int); +char* nls_str_toext(char *, char *); +char* nls_str_toloc(char *, char *); +void* nls_mem_toext(void *, void *, int); +void* nls_mem_toloc(void *, void *, int); char* nls_str_upper(char *, const char *); char* nls_str_lower(char *, const char *); Modified: user/ngie/more-tests/contrib/smbfs/lib/smb/nls.c ============================================================================== --- user/ngie/more-tests/contrib/smbfs/lib/smb/nls.c Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/contrib/smbfs/lib/smb/nls.c Thu Apr 16 03:39:33 2015 (r281585) @@ -102,7 +102,7 @@ nls_setrecode(const char *local, const c } char * -nls_str_toloc(char *dst, const char *src) +nls_str_toloc(char *dst, char *src) { #ifdef HAVE_ICONV char *p = dst; @@ -125,7 +125,7 @@ nls_str_toloc(char *dst, const char *src } char * -nls_str_toext(char *dst, const char *src) +nls_str_toext(char *dst, char *src) { #ifdef HAVE_ICONV char *p = dst; @@ -148,11 +148,11 @@ nls_str_toext(char *dst, const char *src } void * -nls_mem_toloc(void *dst, const void *src, int size) +nls_mem_toloc(void *dst, void *src, int size) { #ifdef HAVE_ICONV char *p = dst; - const char *s = src; + char *s = src; size_t inlen, outlen; if (size == 0) @@ -174,11 +174,11 @@ nls_mem_toloc(void *dst, const void *src } void * -nls_mem_toext(void *dst, const void *src, int size) +nls_mem_toext(void *dst, void *src, int size) { #ifdef HAVE_ICONV char *p = dst; - const char *s = src; + char *s = src; size_t inlen, outlen; if (size == 0) Modified: user/ngie/more-tests/contrib/smbfs/lib/smb/print.c ============================================================================== --- user/ngie/more-tests/contrib/smbfs/lib/smb/print.c Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/contrib/smbfs/lib/smb/print.c Thu Apr 16 03:39:33 2015 (r281585) @@ -54,7 +54,7 @@ int smb_smb_open_print_file(struct smb_ctx *ctx, int setuplen, int mode, - const char *ident, smbfh *fhp) + char *ident, smbfh *fhp) { struct smb_rq *rqp; struct mbdata *mbp; Modified: user/ngie/more-tests/contrib/smbfs/lib/smb/rq.c ============================================================================== --- user/ngie/more-tests/contrib/smbfs/lib/smb/rq.c Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/contrib/smbfs/lib/smb/rq.c Thu Apr 16 03:39:33 2015 (r281585) @@ -86,7 +86,7 @@ smb_rq_wend(struct smb_rq *rqp) } int -smb_rq_dmem(struct mbdata *mbp, const char *src, size_t size) +smb_rq_dmem(struct mbdata *mbp, char *src, size_t size) { struct mbuf *m; char * dst; @@ -118,7 +118,7 @@ smb_rq_dmem(struct mbdata *mbp, const ch } int -smb_rq_dstring(struct mbdata *mbp, const char *s) +smb_rq_dstring(struct mbdata *mbp, char *s) { return smb_rq_dmem(mbp, s, strlen(s) + 1); } Modified: user/ngie/more-tests/etc/login.conf ============================================================================== --- user/ngie/more-tests/etc/login.conf Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/etc/login.conf Thu Apr 16 03:39:33 2015 (r281585) @@ -26,7 +26,7 @@ default:\ :passwd_format=sha512:\ :copyright=/etc/COPYRIGHT:\ :welcome=/etc/motd:\ - :setenv=MAIL=/var/mail/$,BLOCKSIZE=K:LC_COLLATE=C:\ + :setenv=MAIL=/var/mail/$,BLOCKSIZE=K,LC_COLLATE=C:\ :path=/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin ~/bin:\ :nologin=/var/run/nologin:\ :cputime=unlimited:\ Modified: user/ngie/more-tests/etc/rc.d/hostid_save ============================================================================== --- user/ngie/more-tests/etc/rc.d/hostid_save Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/etc/rc.d/hostid_save Thu Apr 16 03:39:33 2015 (r281585) @@ -16,12 +16,19 @@ rcvar="hostid_enable" hostid_save() { - if [ ! -r ${hostid_file} ]; then - $SYSCTL_N kern.hostuuid > ${hostid_file} - if [ $? -ne 0 ]; then - warn "could not store hostuuid in ${hostid_file}." + current_hostid=`$SYSCTL_N kern.hostuuid` + + if [ -r ${hostid_file} ]; then + read saved_hostid < ${hostid_file} + if [ ${saved_hostid} = ${current_hostid} ]; then + exit 0 fi fi + + echo ${current_hostid} > ${hostid_file} + if [ $? -ne 0 ]; then + warn "could not store hostuuid in ${hostid_file}." + fi } load_rc_config $name Modified: user/ngie/more-tests/include/iconv.h ============================================================================== --- user/ngie/more-tests/include/iconv.h Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/include/iconv.h Thu Apr 16 03:39:33 2015 (r281585) @@ -53,7 +53,7 @@ typedef struct __tag_iconv_t *iconv_t; __BEGIN_DECLS iconv_t iconv_open(const char *, const char *); -size_t iconv(iconv_t, const char ** __restrict, +size_t iconv(iconv_t, char ** __restrict, size_t * __restrict, char ** __restrict, size_t * __restrict); int iconv_close(iconv_t); @@ -62,7 +62,7 @@ int iconv_close(iconv_t); */ int __iconv_get_list(char ***, size_t *, __iconv_bool); void __iconv_free_list(char **, size_t); -size_t __iconv(iconv_t, const char **, size_t *, char **, +size_t __iconv(iconv_t, char **, size_t *, char **, size_t *, __uint32_t, size_t *); #define __ICONV_F_HIDE_INVALID 0x0001 Modified: user/ngie/more-tests/lib/libarchive/Makefile ============================================================================== --- user/ngie/more-tests/lib/libarchive/Makefile Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/lib/libarchive/Makefile Thu Apr 16 03:39:33 2015 (r281585) @@ -25,7 +25,7 @@ LIBADD+= md .if ${MK_ICONV} != "no" # TODO: This can be changed back to CFLAGS once iconv works correctly # with statically linked binaries. -SHARED_CFLAGS+= -DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST=const +SHARED_CFLAGS+= -DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST= .endif .if ${MACHINE_ARCH:Marm*} != "" || ${MACHINE_ARCH:Mmips*} != "" || \ Modified: user/ngie/more-tests/lib/libc/iconv/__iconv.c ============================================================================== --- user/ngie/more-tests/lib/libc/iconv/__iconv.c Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/lib/libc/iconv/__iconv.c Thu Apr 16 03:39:33 2015 (r281585) @@ -31,7 +31,7 @@ #include "iconv-internal.h" size_t -__iconv(iconv_t a, const char **b, size_t *c, char **d, +__iconv(iconv_t a, char **b, size_t *c, char **d, size_t *e, __uint32_t f, size_t *g) { return __bsd___iconv(a, b, c, d, e, f, g); Modified: user/ngie/more-tests/lib/libc/iconv/bsd_iconv.c ============================================================================== --- user/ngie/more-tests/lib/libc/iconv/bsd_iconv.c Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/lib/libc/iconv/bsd_iconv.c Thu Apr 16 03:39:33 2015 (r281585) @@ -120,7 +120,7 @@ __bsd_iconv_close(iconv_t handle) } size_t -__bsd_iconv(iconv_t handle, const char **in, size_t *szin, char **out, size_t *szout) +__bsd_iconv(iconv_t handle, char **in, size_t *szin, char **out, size_t *szout) { size_t ret; int err; @@ -141,7 +141,7 @@ __bsd_iconv(iconv_t handle, const char * } size_t -__bsd___iconv(iconv_t handle, const char **in, size_t *szin, char **out, +__bsd___iconv(iconv_t handle, char **in, size_t *szin, char **out, size_t *szout, uint32_t flags, size_t *invalids) { size_t ret; Modified: user/ngie/more-tests/lib/libc/iconv/citrus_iconv.h ============================================================================== --- user/ngie/more-tests/lib/libc/iconv/citrus_iconv.h Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/lib/libc/iconv/citrus_iconv.h Thu Apr 16 03:39:33 2015 (r281585) @@ -52,7 +52,7 @@ __END_DECLS */ static __inline int _citrus_iconv_convert(struct _citrus_iconv * __restrict cv, - const char * __restrict * __restrict in, size_t * __restrict inbytes, + char * __restrict * __restrict in, size_t * __restrict inbytes, char * __restrict * __restrict out, size_t * __restrict outbytes, uint32_t flags, size_t * __restrict nresults) { Modified: user/ngie/more-tests/lib/libc/iconv/citrus_iconv_local.h ============================================================================== --- user/ngie/more-tests/lib/libc/iconv/citrus_iconv_local.h Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/lib/libc/iconv/citrus_iconv_local.h Thu Apr 16 03:39:33 2015 (r281585) @@ -46,7 +46,7 @@ static void _citrus_##_m_##_iconv_unini (struct _citrus_iconv_shared *); \ static int _citrus_##_m_##_iconv_convert \ (struct _citrus_iconv * __restrict, \ - const char * __restrict * __restrict, \ + char * __restrict * __restrict, \ size_t * __restrict, \ char * __restrict * __restrict, \ size_t * __restrict outbytes, \ @@ -75,7 +75,7 @@ typedef void (*_citrus_iconv_uninit_shar (struct _citrus_iconv_shared *); typedef int (*_citrus_iconv_convert_t) (struct _citrus_iconv * __restrict, - const char *__restrict* __restrict, size_t * __restrict, + char *__restrict* __restrict, size_t * __restrict, char * __restrict * __restrict, size_t * __restrict, uint32_t, size_t * __restrict); typedef int (*_citrus_iconv_init_context_t)(struct _citrus_iconv *); Modified: user/ngie/more-tests/lib/libc/iconv/citrus_none.c ============================================================================== --- user/ngie/more-tests/lib/libc/iconv/citrus_none.c Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/lib/libc/iconv/citrus_none.c Thu Apr 16 03:39:33 2015 (r281585) @@ -83,7 +83,7 @@ _citrus_NONE_stdenc_init_state(struct _c static int _citrus_NONE_stdenc_mbtocs(struct _citrus_stdenc * __restrict ce __unused, - _csid_t *csid, _index_t *idx, const char **s, size_t n, + _csid_t *csid, _index_t *idx, char **s, size_t n, void *ps __unused, size_t *nresult, struct iconv_hooks *hooks) { @@ -159,7 +159,7 @@ _citrus_NONE_stdenc_cstomb(struct _citru static int _citrus_NONE_stdenc_mbtowc(struct _citrus_stdenc * __restrict ce __unused, - _wc_t * __restrict pwc, const char ** __restrict s, size_t n, + _wc_t * __restrict pwc, char ** __restrict s, size_t n, void * __restrict pspriv __unused, size_t * __restrict nresult, struct iconv_hooks *hooks) { Modified: user/ngie/more-tests/lib/libc/iconv/citrus_stdenc.h ============================================================================== --- user/ngie/more-tests/lib/libc/iconv/citrus_stdenc.h Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/lib/libc/iconv/citrus_stdenc.h Thu Apr 16 03:39:33 2015 (r281585) @@ -69,7 +69,7 @@ _citrus_stdenc_init_state(struct _citrus static __inline int _citrus_stdenc_mbtocs(struct _citrus_stdenc * __restrict ce, _citrus_csid_t * __restrict csid, _citrus_index_t * __restrict idx, - const char ** __restrict s, size_t n, void * __restrict ps, + char ** __restrict s, size_t n, void * __restrict ps, size_t * __restrict nresult, struct iconv_hooks *hooks) { Modified: user/ngie/more-tests/lib/libc/iconv/citrus_stdenc_local.h ============================================================================== --- user/ngie/more-tests/lib/libc/iconv/citrus_stdenc_local.h Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/lib/libc/iconv/citrus_stdenc_local.h Thu Apr 16 03:39:33 2015 (r281585) @@ -55,7 +55,7 @@ static int _citrus_##_e_##_stdenc_mbtoc (struct _citrus_stdenc * __restrict, \ _citrus_csid_t * __restrict, \ _citrus_index_t * __restrict, \ - const char ** __restrict, size_t, \ + char ** __restrict, size_t, \ void * __restrict, size_t * __restrict, \ struct iconv_hooks *); \ static int _citrus_##_e_##_stdenc_cstomb \ @@ -66,7 +66,7 @@ static int _citrus_##_e_##_stdenc_cstom static int _citrus_##_e_##_stdenc_mbtowc \ (struct _citrus_stdenc * __restrict, \ _citrus_wc_t * __restrict, \ - const char ** __restrict, size_t, \ + char ** __restrict, size_t, \ void * __restrict, size_t * __restrict, \ struct iconv_hooks *); \ static int _citrus_##_e_##_stdenc_wctomb \ @@ -106,7 +106,7 @@ typedef int (*_citrus_stdenc_init_state_ typedef int (*_citrus_stdenc_mbtocs_t) (struct _citrus_stdenc * __restrict, _citrus_csid_t * __restrict, _citrus_index_t * __restrict, - const char ** __restrict, size_t, + char ** __restrict, size_t, void * __restrict, size_t * __restrict, struct iconv_hooks *); typedef int (*_citrus_stdenc_cstomb_t) @@ -116,7 +116,7 @@ typedef int (*_citrus_stdenc_cstomb_t) typedef int (*_citrus_stdenc_mbtowc_t) (struct _citrus_stdenc * __restrict, _citrus_wc_t * __restrict, - const char ** __restrict, size_t, + char ** __restrict, size_t, void * __restrict, size_t * __restrict, struct iconv_hooks *); typedef int (*_citrus_stdenc_wctomb_t) Modified: user/ngie/more-tests/lib/libc/iconv/citrus_stdenc_template.h ============================================================================== --- user/ngie/more-tests/lib/libc/iconv/citrus_stdenc_template.h Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/lib/libc/iconv/citrus_stdenc_template.h Thu Apr 16 03:39:33 2015 (r281585) @@ -112,7 +112,7 @@ _FUNCNAME(stdenc_init_state)(struct _cit static int _FUNCNAME(stdenc_mbtocs)(struct _citrus_stdenc * __restrict ce, _citrus_csid_t * __restrict csid, _citrus_index_t * __restrict idx, - const char ** __restrict s, size_t n, void * __restrict ps, + char ** __restrict s, size_t n, void * __restrict ps, size_t * __restrict nresult, struct iconv_hooks *hooks) { wchar_t wc; @@ -151,7 +151,7 @@ _FUNCNAME(stdenc_cstomb)(struct _citrus_ static int _FUNCNAME(stdenc_mbtowc)(struct _citrus_stdenc * __restrict ce, - _citrus_wc_t * __restrict wc, const char ** __restrict s, size_t n, + _citrus_wc_t * __restrict wc, char ** __restrict s, size_t n, void * __restrict ps, size_t * __restrict nresult, struct iconv_hooks *hooks) { Modified: user/ngie/more-tests/lib/libc/iconv/iconv-internal.h ============================================================================== --- user/ngie/more-tests/lib/libc/iconv/iconv-internal.h Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/lib/libc/iconv/iconv-internal.h Thu Apr 16 03:39:33 2015 (r281585) @@ -29,11 +29,11 @@ /* * Interal prototypes for our back-end functions. */ -size_t __bsd___iconv(iconv_t, const char **, size_t *, char **, +size_t __bsd___iconv(iconv_t, char **, size_t *, char **, size_t *, __uint32_t, size_t *); void __bsd___iconv_free_list(char **, size_t); int __bsd___iconv_get_list(char ***, size_t *, __iconv_bool); -size_t __bsd_iconv(iconv_t, const char ** __restrict, +size_t __bsd_iconv(iconv_t, char ** __restrict, size_t * __restrict, char ** __restrict, size_t * __restrict); const char *__bsd_iconv_canonicalize(const char *); Modified: user/ngie/more-tests/lib/libc/iconv/iconv.3 ============================================================================== --- user/ngie/more-tests/lib/libc/iconv/iconv.3 Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/lib/libc/iconv/iconv.3 Thu Apr 16 03:39:33 2015 (r281585) @@ -48,7 +48,7 @@ .Ft size_t .Fn iconv "iconv_t cd" "char ** restrict src" "size_t * restrict srcleft" "char ** restrict dst" "size_t * restrict dstleft" .Ft size_t -.Fn __iconv "iconv_t cd" "const char ** restrict src" "size_t * restrict srcleft" "char ** restrict dst" "size_t * restrict dstleft" "uint32_t flags" "size_t * invalids" +.Fn __iconv "iconv_t cd" "char ** restrict src" "size_t * restrict srcleft" "char ** restrict dst" "size_t * restrict dstleft" "uint32_t flags" "size_t * invalids" .Sh DESCRIPTION The .Fn iconv_open Modified: user/ngie/more-tests/lib/libc/iconv/iconv.c ============================================================================== --- user/ngie/more-tests/lib/libc/iconv/iconv.c Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/lib/libc/iconv/iconv.c Thu Apr 16 03:39:33 2015 (r281585) @@ -31,7 +31,7 @@ #include "iconv-internal.h" size_t -iconv(iconv_t a, const char ** __restrict b, +iconv(iconv_t a, char ** __restrict b, size_t * __restrict c, char ** __restrict d, size_t * __restrict e) { Modified: user/ngie/more-tests/lib/libc/iconv/iconv_compat.c ============================================================================== --- user/ngie/more-tests/lib/libc/iconv/iconv_compat.c Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/lib/libc/iconv/iconv_compat.c Thu Apr 16 03:39:33 2015 (r281585) @@ -37,7 +37,7 @@ #include "iconv-internal.h" size_t -__iconv_compat(iconv_t a, const char ** b, size_t * c, char ** d, +__iconv_compat(iconv_t a, char ** b, size_t * c, char ** d, size_t * e, __uint32_t f, size_t *g) { return __bsd___iconv(a, b, c, d, e, f, g); @@ -56,7 +56,7 @@ __iconv_get_list_compat(char ***a, size_ } size_t -iconv_compat(iconv_t a, const char ** __restrict b, +iconv_compat(iconv_t a, char ** __restrict b, size_t * __restrict c, char ** __restrict d, size_t * __restrict e) { Modified: user/ngie/more-tests/lib/libc/locale/cXXrtomb_iconv.h ============================================================================== --- user/ngie/more-tests/lib/libc/locale/cXXrtomb_iconv.h Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/lib/libc/locale/cXXrtomb_iconv.h Thu Apr 16 03:39:33 2015 (r281585) @@ -57,8 +57,7 @@ cXXrtomb_l(char * __restrict s, charXX_t { _ConversionState *cs; struct _citrus_iconv *handle; - const char *src; - char *dst; + char *src, *dst; size_t srcleft, dstleft, invlen; int err; Modified: user/ngie/more-tests/lib/libc/locale/mbrtocXX_iconv.h ============================================================================== --- user/ngie/more-tests/lib/libc/locale/mbrtocXX_iconv.h Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/lib/libc/locale/mbrtocXX_iconv.h Thu Apr 16 03:39:33 2015 (r281585) @@ -99,8 +99,7 @@ mbrtocXX_l(charXX_t * __restrict pc, con /* Convert as few characters to the dst buffer as possible. */ for (i = 0; ; i++) { - const char *src; - char *dst; + char *src, *dst; size_t srcleft, dstleft, invlen; int err; Modified: user/ngie/more-tests/lib/libiconv_modules/BIG5/citrus_big5.c ============================================================================== --- user/ngie/more-tests/lib/libiconv_modules/BIG5/citrus_big5.c Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/lib/libiconv_modules/BIG5/citrus_big5.c Thu Apr 16 03:39:33 2015 (r281585) @@ -269,12 +269,12 @@ static int /*ARGSUSED*/ _citrus_BIG5_mbrtowc_priv(_BIG5EncodingInfo * __restrict ei, wchar_t * __restrict pwc, - const char ** __restrict s, size_t n, + char ** __restrict s, size_t n, _BIG5State * __restrict psenc, size_t * __restrict nresult) { wchar_t wchar; - const char *s0; + char *s0; int c, chlenbak; s0 = *s; Modified: user/ngie/more-tests/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c ============================================================================== --- user/ngie/more-tests/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c Thu Apr 16 03:39:33 2015 (r281585) @@ -165,10 +165,10 @@ is_94charset(int c) static int /*ARGSUSED*/ _citrus_DECHanyu_mbrtowc_priv(_DECHanyuEncodingInfo * __restrict ei, - wchar_t * __restrict pwc, const char ** __restrict s, size_t n, + wchar_t * __restrict pwc, char ** __restrict s, size_t n, _DECHanyuState * __restrict psenc, size_t * __restrict nresult) { - const char *s0; + char *s0; wchar_t wc; int ch; Modified: user/ngie/more-tests/lib/libiconv_modules/EUC/citrus_euc.c ============================================================================== --- user/ngie/more-tests/lib/libiconv_modules/EUC/citrus_euc.c Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/lib/libiconv_modules/EUC/citrus_euc.c Thu Apr 16 03:39:33 2015 (r281585) @@ -190,12 +190,12 @@ _citrus_EUC_unpack_state(_EUCEncodingInf #endif static int -_citrus_EUC_mbrtowc_priv(_EUCEncodingInfo *ei, wchar_t *pwc, const char **s, +_citrus_EUC_mbrtowc_priv(_EUCEncodingInfo *ei, wchar_t *pwc, char **s, size_t n, _EUCState *psenc, size_t *nresult) { wchar_t wchar; int c, chlenbak, cs, len; - const char *s0, *s1 = NULL; + char *s0, *s1 = NULL; s0 = *s; Modified: user/ngie/more-tests/lib/libiconv_modules/EUCTW/citrus_euctw.c ============================================================================== --- user/ngie/more-tests/lib/libiconv_modules/EUCTW/citrus_euctw.c Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/lib/libiconv_modules/EUCTW/citrus_euctw.c Thu Apr 16 03:39:33 2015 (r281585) @@ -176,10 +176,10 @@ _citrus_EUCTW_encoding_module_uninit(_EU static int _citrus_EUCTW_mbrtowc_priv(_EUCTWEncodingInfo * __restrict ei, - wchar_t * __restrict pwc, const char ** __restrict s, + wchar_t * __restrict pwc, char ** __restrict s, size_t n, _EUCTWState * __restrict psenc, size_t * __restrict nresult) { - const char *s0; + char *s0; wchar_t wchar; int c, chlenbak, cs; Modified: user/ngie/more-tests/lib/libiconv_modules/GBK2K/citrus_gbk2k.c ============================================================================== --- user/ngie/more-tests/lib/libiconv_modules/GBK2K/citrus_gbk2k.c Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/lib/libiconv_modules/GBK2K/citrus_gbk2k.c Thu Apr 16 03:39:33 2015 (r281585) @@ -149,10 +149,10 @@ _mb_count(wchar_t v) static int _citrus_GBK2K_mbrtowc_priv(_GBK2KEncodingInfo * __restrict ei, - wchar_t * __restrict pwc, const char ** __restrict s, size_t n, + wchar_t * __restrict pwc, char ** __restrict s, size_t n, _GBK2KState * __restrict psenc, size_t * __restrict nresult) { - const char *s0, *s1; + char *s0, *s1; wchar_t wc; int chlenbak, len; Modified: user/ngie/more-tests/lib/libiconv_modules/HZ/citrus_hz.c ============================================================================== --- user/ngie/more-tests/lib/libiconv_modules/HZ/citrus_hz.c Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/lib/libiconv_modules/HZ/citrus_hz.c Thu Apr 16 03:39:33 2015 (r281585) @@ -175,13 +175,13 @@ _citrus_HZ_unpack_state(_HZEncodingInfo static int _citrus_HZ_mbrtowc_priv(_HZEncodingInfo * __restrict ei, - wchar_t * __restrict pwc, const char ** __restrict s, size_t n, + wchar_t * __restrict pwc, char ** __restrict s, size_t n, _HZState * __restrict psenc, size_t * __restrict nresult) { escape_t *candidate, *init; graphic_t *graphic; const range_t *range; - const char *s0; + char *s0; wchar_t wc; int bit, ch, head, len, tail; Modified: user/ngie/more-tests/lib/libiconv_modules/ISO2022/citrus_iso2022.c ============================================================================== --- user/ngie/more-tests/lib/libiconv_modules/ISO2022/citrus_iso2022.c Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/lib/libiconv_modules/ISO2022/citrus_iso2022.c Thu Apr 16 03:39:33 2015 (r281585) @@ -574,7 +574,7 @@ terminate: static wchar_t _ISO2022_sgetwchar(_ISO2022EncodingInfo * __restrict ei __unused, - const char * __restrict string, size_t n, const char ** __restrict result, + char * __restrict string, size_t n, char ** __restrict result, _ISO2022State * __restrict psenc) { const struct seqtable *sp; @@ -842,10 +842,10 @@ asis: static int _citrus_ISO2022_mbrtowc_priv(_ISO2022EncodingInfo * __restrict ei, - wchar_t * __restrict pwc, const char ** __restrict s, + wchar_t * __restrict pwc, char ** __restrict s, size_t n, _ISO2022State * __restrict psenc, size_t * __restrict nresult) { - const char *p, *result, *s0; + char *p, *result, *s0; wchar_t wchar; int c, chlenbak; Modified: user/ngie/more-tests/lib/libiconv_modules/JOHAB/citrus_johab.c ============================================================================== --- user/ngie/more-tests/lib/libiconv_modules/JOHAB/citrus_johab.c Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/lib/libiconv_modules/JOHAB/citrus_johab.c Thu Apr 16 03:39:33 2015 (r281585) @@ -145,10 +145,10 @@ ishanja(int l, int t) static int /*ARGSUSED*/ _citrus_JOHAB_mbrtowc_priv(_JOHABEncodingInfo * __restrict ei, - wchar_t * __restrict pwc, const char ** __restrict s, size_t n, + wchar_t * __restrict pwc, char ** __restrict s, size_t n, _JOHABState * __restrict psenc, size_t * __restrict nresult) { - const char *s0; + char *s0; int l, t; if (*s == NULL) { Modified: user/ngie/more-tests/lib/libiconv_modules/MSKanji/citrus_mskanji.c ============================================================================== --- user/ngie/more-tests/lib/libiconv_modules/MSKanji/citrus_mskanji.c Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/lib/libiconv_modules/MSKanji/citrus_mskanji.c Thu Apr 16 03:39:33 2015 (r281585) @@ -153,10 +153,10 @@ _citrus_MSKanji_unpack_state(_MSKanjiEnc static int /*ARGSUSED*/ _citrus_MSKanji_mbrtowc_priv(_MSKanjiEncodingInfo * __restrict ei, - wchar_t * __restrict pwc, const char ** __restrict s, size_t n, + wchar_t * __restrict pwc, char ** __restrict s, size_t n, _MSKanjiState * __restrict psenc, size_t * __restrict nresult) { - const char *s0; + char *s0; wchar_t wchar; int chlenbak, len; Modified: user/ngie/more-tests/lib/libiconv_modules/UES/citrus_ues.c ============================================================================== --- user/ngie/more-tests/lib/libiconv_modules/UES/citrus_ues.c Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/lib/libiconv_modules/UES/citrus_ues.c Thu Apr 16 03:39:33 2015 (r281585) @@ -185,10 +185,10 @@ is_basic(wchar_t wc) static int _citrus_UES_mbrtowc_priv(_UESEncodingInfo * __restrict ei, - wchar_t * __restrict pwc, const char ** __restrict s, size_t n, + wchar_t * __restrict pwc, char ** __restrict s, size_t n, _UESState * __restrict psenc, size_t * __restrict nresult) { - const char *s0; + char *s0; int ch, head, num, tail; wchar_t hi, wc; Modified: user/ngie/more-tests/lib/libiconv_modules/UTF1632/citrus_utf1632.c ============================================================================== --- user/ngie/more-tests/lib/libiconv_modules/UTF1632/citrus_utf1632.c Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/lib/libiconv_modules/UTF1632/citrus_utf1632.c Thu Apr 16 03:39:33 2015 (r281585) @@ -97,9 +97,9 @@ _citrus_UTF1632_init_state(_UTF1632Encod static int _citrus_UTF1632_mbrtowc_priv(_UTF1632EncodingInfo *ei, wchar_t *pwc, - const char **s, size_t n, _UTF1632State *psenc, size_t *nresult) + char **s, size_t n, _UTF1632State *psenc, size_t *nresult) { - const char *s0; + char *s0; size_t result; wchar_t wc = L'\0'; int chlenbak, endian, needlen; Modified: user/ngie/more-tests/lib/libiconv_modules/UTF7/citrus_utf7.c ============================================================================== --- user/ngie/more-tests/lib/libiconv_modules/UTF7/citrus_utf7.c Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/lib/libiconv_modules/UTF7/citrus_utf7.c Thu Apr 16 03:39:33 2015 (r281585) @@ -151,11 +151,11 @@ static const char spaces[] = " \t\r\n"; static int _citrus_UTF7_mbtoutf16(_UTF7EncodingInfo * __restrict ei, - uint16_t * __restrict u16, const char ** __restrict s, size_t n, + uint16_t * __restrict u16, char ** __restrict s, size_t n, _UTF7State * __restrict psenc, size_t * __restrict nresult) { _UTF7State sv; - const char *s0; + char *s0; int done, i, len; s0 = *s; @@ -244,7 +244,7 @@ ilseq: static int _citrus_UTF7_mbrtowc_priv(_UTF7EncodingInfo * __restrict ei, - wchar_t * __restrict pwc, const char ** __restrict s, size_t n, + wchar_t * __restrict pwc, char ** __restrict s, size_t n, _UTF7State * __restrict psenc, size_t * __restrict nresult) { uint32_t u32; Modified: user/ngie/more-tests/lib/libiconv_modules/UTF8/citrus_utf8.c ============================================================================== --- user/ngie/more-tests/lib/libiconv_modules/UTF8/citrus_utf8.c Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/lib/libiconv_modules/UTF8/citrus_utf8.c Thu Apr 16 03:39:33 2015 (r281585) @@ -177,10 +177,10 @@ _citrus_UTF8_unpack_state(_UTF8EncodingI #endif static int -_citrus_UTF8_mbrtowc_priv(_UTF8EncodingInfo *ei, wchar_t *pwc, const char **s, +_citrus_UTF8_mbrtowc_priv(_UTF8EncodingInfo *ei, wchar_t *pwc, char **s, size_t n, _UTF8State *psenc, size_t *nresult) { - const char *s0; + char *s0; wchar_t wchar; int i; uint8_t c; Modified: user/ngie/more-tests/lib/libiconv_modules/VIQR/citrus_viqr.c ============================================================================== --- user/ngie/more-tests/lib/libiconv_modules/VIQR/citrus_viqr.c Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/lib/libiconv_modules/VIQR/citrus_viqr.c Thu Apr 16 03:39:33 2015 (r281585) @@ -252,11 +252,11 @@ _citrus_VIQR_unpack_state(_VIQREncodingI static int _citrus_VIQR_mbrtowc_priv(_VIQREncodingInfo * __restrict ei, - wchar_t * __restrict pwc, const char ** __restrict s, size_t n, + wchar_t * __restrict pwc, char ** __restrict s, size_t n, _VIQRState * __restrict psenc, size_t * __restrict nresult) { mnemonic_t *m, *m0; - const char *s0; + char *s0; wchar_t wc; ssize_t i; int ch, escape; Modified: user/ngie/more-tests/lib/libiconv_modules/ZW/citrus_zw.c ============================================================================== --- user/ngie/more-tests/lib/libiconv_modules/ZW/citrus_zw.c Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/lib/libiconv_modules/ZW/citrus_zw.c Thu Apr 16 03:39:33 2015 (r281585) @@ -107,10 +107,10 @@ _citrus_ZW_unpack_state(_ZWEncodingInfo static int _citrus_ZW_mbrtowc_priv(_ZWEncodingInfo * __restrict ei, - wchar_t * __restrict pwc, const char **__restrict s, size_t n, + wchar_t * __restrict pwc, char **__restrict s, size_t n, _ZWState * __restrict psenc, size_t * __restrict nresult) { - const char *s0; + char *s0; wchar_t wc; int ch, len; Modified: user/ngie/more-tests/lib/libiconv_modules/iconv_none/citrus_iconv_none.c ============================================================================== --- user/ngie/more-tests/lib/libiconv_modules/iconv_none/citrus_iconv_none.c Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/lib/libiconv_modules/iconv_none/citrus_iconv_none.c Thu Apr 16 03:39:33 2015 (r281585) @@ -97,7 +97,7 @@ _citrus_iconv_none_iconv_uninit_context( static int /*ARGSUSED*/ _citrus_iconv_none_iconv_convert(struct _citrus_iconv * __restrict ci __unused, - const char * __restrict * __restrict in, size_t * __restrict inbytes, + char * __restrict * __restrict in, size_t * __restrict inbytes, char * __restrict * __restrict out, size_t * __restrict outbytes, uint32_t flags __unused, size_t * __restrict invalids) { Modified: user/ngie/more-tests/lib/libiconv_modules/iconv_std/citrus_iconv_std.c ============================================================================== --- user/ngie/more-tests/lib/libiconv_modules/iconv_std/citrus_iconv_std.c Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/lib/libiconv_modules/iconv_std/citrus_iconv_std.c Thu Apr 16 03:39:33 2015 (r281585) @@ -104,7 +104,7 @@ init_encoding_state(struct _citrus_iconv static __inline int mbtocsx(struct _citrus_iconv_std_encoding *se, - _csid_t *csid, _index_t *idx, const char **s, size_t n, size_t *nresult, + _csid_t *csid, _index_t *idx, char **s, size_t n, size_t *nresult, struct iconv_hooks *hooks) { @@ -461,7 +461,7 @@ _citrus_iconv_std_iconv_uninit_context(s static int _citrus_iconv_std_iconv_convert(struct _citrus_iconv * __restrict cv, - const char * __restrict * __restrict in, size_t * __restrict inbytes, + char * __restrict * __restrict in, size_t * __restrict inbytes, char * __restrict * __restrict out, size_t * __restrict outbytes, uint32_t flags, size_t * __restrict invalids) { @@ -469,7 +469,7 @@ _citrus_iconv_std_iconv_convert(struct _ struct _citrus_iconv_std_context *sc = cv->cv_closure; _csid_t csid; _index_t idx; - const char *tmpin; + char *tmpin; size_t inval, szrin, szrout; int ret, state = 0; Modified: user/ngie/more-tests/lib/libkiconv/xlat16_iconv.c ============================================================================== --- user/ngie/more-tests/lib/libkiconv/xlat16_iconv.c Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/lib/libkiconv/xlat16_iconv.c Thu Apr 16 03:39:33 2015 (r281585) @@ -62,7 +62,7 @@ static int chklocale(int, const char *); typedef void *iconv_t; static int my_iconv_init(void); static iconv_t (*my_iconv_open)(const char *, const char *); -static size_t (*my_iconv)(iconv_t, const char **, size_t *, char **, size_t *); +static size_t (*my_iconv)(iconv_t, char **, size_t *, char **, size_t *); static int (*my_iconv_close)(iconv_t); #else #include @@ -71,7 +71,7 @@ static int (*my_iconv_close)(iconv_t); #define my_iconv iconv #define my_iconv_close iconv_close #endif -static size_t my_iconv_char(iconv_t, const u_char **, size_t *, u_char **, size_t *); +static size_t my_iconv_char(iconv_t, u_char **, size_t *, u_char **, size_t *); int kiconv_add_xlat16_cspair(const char *tocode, const char *fromcode, int flag) @@ -221,8 +221,8 @@ kiconv_xlat16_open(const char *tocode, c src[0] = (u_char)(c >> 8); src[1] = (u_char)c; - ret = my_iconv_char(cd, (const u_char **)&srcp, - &inbytesleft, &dstp, &outbytesleft); + ret = my_iconv_char(cd, &srcp, &inbytesleft, + &dstp, &outbytesleft); if (ret == -1) { table[us] = 0; continue; @@ -338,11 +338,10 @@ my_iconv_init(void) #endif static size_t -my_iconv_char(iconv_t cd, const u_char **ibuf, size_t * ilen, u_char **obuf, +my_iconv_char(iconv_t cd, u_char **ibuf, size_t * ilen, u_char **obuf, size_t * olen) { - const u_char *sp; - u_char *dp, ilocal[3], olocal[3]; + u_char *sp, *dp, ilocal[3], olocal[3]; u_char c1, c2; int ret; size_t ir, or; @@ -352,7 +351,7 @@ my_iconv_char(iconv_t cd, const u_char * ir = *ilen; bzero(*obuf, *olen); - ret = my_iconv(cd, (const char **)&sp, ilen, (char **)&dp, olen); + ret = my_iconv(cd, (char **)&sp, ilen, (char **)&dp, olen); c1 = (*obuf)[0]; c2 = (*obuf)[1]; @@ -375,7 +374,7 @@ my_iconv_char(iconv_t cd, const u_char * sp = ilocal; dp = olocal; - if ((my_iconv(cd,(const char **)&sp, &ir, (char **)&dp, &or)) != -1) { + if ((my_iconv(cd,(char **)&sp, &ir, (char **)&dp, &or)) != -1) { if (olocal[0] != c1) return (ret); @@ -429,7 +428,7 @@ my_iconv_char(iconv_t cd, const u_char * sp = ilocal + 1; dp = olocal; - if ((my_iconv(cd,(const char **)&sp, &ir, (char **)&dp, &or)) != -1) { + if ((my_iconv(cd,(char **)&sp, &ir, (char **)&dp, &or)) != -1) { if (olocal[0] == c2) /* * inbuf is a single byte char Modified: user/ngie/more-tests/libexec/rtld-elf/aarch64/reloc.c ============================================================================== --- user/ngie/more-tests/libexec/rtld-elf/aarch64/reloc.c Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/libexec/rtld-elf/aarch64/reloc.c Thu Apr 16 03:39:33 2015 (r281585) @@ -161,7 +161,7 @@ rtld_tlsdesc_handle_locked(struct tls_da if (def == NULL) rtld_die(); - tlsdesc->index = defobj->tlsindex + def->st_value + rela->r_addend; + tlsdesc->index = defobj->tlsoffset + def->st_value + rela->r_addend; return (tlsdesc->index); } @@ -206,7 +206,7 @@ reloc_plt(Obj_Entry *obj) case R_AARCH64_TLSDESC: if (ELF_R_SYM(rela->r_info) == 0) { where[0] = (Elf_Addr)_rtld_tlsdesc; - where[1] = obj->tlsindex + rela->r_addend; + where[1] = obj->tlsoffset + rela->r_addend; } else { where[0] = (Elf_Addr)_rtld_tlsdesc_dynamic; where[1] = (Elf_Addr)reloc_tlsdesc_alloc(obj, Modified: user/ngie/more-tests/libexec/rtld-elf/rtld.c ============================================================================== --- user/ngie/more-tests/libexec/rtld-elf/rtld.c Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/libexec/rtld-elf/rtld.c Thu Apr 16 03:39:33 2015 (r281585) @@ -1158,8 +1158,8 @@ digest_dynamic1(Obj_Entry *obj, int earl obj->z_noopen = true; if ((dynp->d_un.d_val & DF_1_ORIGIN) && trust) obj->z_origin = true; - /*if (dynp->d_un.d_val & DF_1_GLOBAL) - XXX ;*/ + if (dynp->d_un.d_val & DF_1_GLOBAL) + obj->z_global = true; if (dynp->d_un.d_val & DF_1_BIND_NOW) obj->bind_now = true; if (dynp->d_un.d_val & DF_1_NODELETE) @@ -1790,22 +1790,35 @@ init_dag(Obj_Entry *root) } static void -process_nodelete(Obj_Entry *root) +process_z(Obj_Entry *root) { const Objlist_Entry *elm; + Obj_Entry *obj; /* - * Walk over object DAG and process every dependent object that - * is marked as DF_1_NODELETE. They need to grow their own DAG, - * which then should have its reference upped separately. + * Walk over object DAG and process every dependent object + * that is marked as DF_1_NODELETE or DF_1_GLOBAL. They need + * to grow their own DAG. + * + * For DF_1_GLOBAL, DAG is required for symbol lookups in + * symlook_global() to work. + * + * For DF_1_NODELETE, the DAG should have its reference upped. */ STAILQ_FOREACH(elm, &root->dagmembers, link) { - if (elm->obj != NULL && elm->obj->z_nodelete && - !elm->obj->ref_nodel) { - dbg("obj %s nodelete", elm->obj->path); - init_dag(elm->obj); - ref_dag(elm->obj); - elm->obj->ref_nodel = true; + obj = elm->obj; + if (obj == NULL) + continue; + if (obj->z_nodelete && !obj->ref_nodel) { + dbg("obj %s -z nodelete", obj->path); + init_dag(obj); + ref_dag(obj); + obj->ref_nodel = true; + } + if (obj->z_global && objlist_find(&list_global, obj) == NULL) { + dbg("obj %s -z global", obj->path); + objlist_push_tail(&list_global, obj); + init_dag(obj); } } } @@ -3044,13 +3057,13 @@ dlopen_object(const char *name, int fd, initlist_add_objects(obj, &obj->next, &initlist); } /* - * Process all no_delete objects here, given them own - * DAGs to prevent their dependencies from being unloaded. - * This has to be done after we have loaded all of the - * dependencies, so that we do not miss any. + * Process all no_delete or global objects here, given + * them own DAGs to prevent their dependencies from being + * unloaded. This has to be done after we have loaded all + * of the dependencies, so that we do not miss any. */ if (obj != NULL) - process_nodelete(obj); + process_z(obj); } else { /* * Bump the reference counts for objects on this DAG. If Modified: user/ngie/more-tests/libexec/rtld-elf/rtld.h ============================================================================== --- user/ngie/more-tests/libexec/rtld-elf/rtld.h Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/libexec/rtld-elf/rtld.h Thu Apr 16 03:39:33 2015 (r281585) @@ -264,6 +264,7 @@ typedef struct Struct_Obj_Entry { bool z_loadfltr : 1; /* Immediately load filtees */ bool z_interpose : 1; /* Interpose all objects but main */ bool z_nodeflib : 1; /* Don't search default library path */ + bool z_global : 1; /* Make the object global */ bool ref_nodel : 1; /* Refcount increased to prevent dlclose */ bool init_scanned: 1; /* Object is already on init list. */ bool on_fini_list: 1; /* Object is already on fini list. */ Modified: user/ngie/more-tests/sys/arm64/arm64/vfp.c ============================================================================== --- user/ngie/more-tests/sys/arm64/arm64/vfp.c Thu Apr 16 03:35:47 2015 (r281584) +++ user/ngie/more-tests/sys/arm64/arm64/vfp.c Thu Apr 16 03:39:33 2015 (r281585) @@ -88,41 +88,42 @@ vfp_save_state(struct thread *td) uint64_t fpcr, fpsr; uint32_t cpacr; + critical_enter(); /* * Only store the registers if the VFP is enabled, * i.e. return if we are trapping on FP access. */ cpacr = READ_SPECIALREG(cpacr_el1); - if ((cpacr & CPACR_FPEN_MASK) != CPACR_FPEN_TRAP_NONE) - return; - - vfp_state = td->td_pcb->pcb_vfp; - __asm __volatile( - "mrs %0, fpcr \n" - "mrs %1, fpsr \n" - "stp q0, q1, [%2, #16 * 0]\n" - "stp q2, q3, [%2, #16 * 2]\n" - "stp q4, q5, [%2, #16 * 4]\n" - "stp q6, q7, [%2, #16 * 6]\n" - "stp q8, q9, [%2, #16 * 8]\n" - "stp q10, q11, [%2, #16 * 10]\n" - "stp q12, q13, [%2, #16 * 12]\n" - "stp q14, q15, [%2, #16 * 14]\n" - "stp q16, q17, [%2, #16 * 16]\n" - "stp q18, q19, [%2, #16 * 18]\n" - "stp q20, q21, [%2, #16 * 20]\n" - "stp q22, q23, [%2, #16 * 22]\n" - "stp q24, q25, [%2, #16 * 24]\n" - "stp q26, q27, [%2, #16 * 26]\n" - "stp q28, q29, [%2, #16 * 28]\n" - "stp q30, q31, [%2, #16 * 30]\n" - : "=&r"(fpcr), "=&r"(fpsr) : "r"(vfp_state)); + if ((cpacr & CPACR_FPEN_MASK) == CPACR_FPEN_TRAP_NONE) { + vfp_state = td->td_pcb->pcb_vfp; + __asm __volatile( + "mrs %0, fpcr \n" + "mrs %1, fpsr \n" + "stp q0, q1, [%2, #16 * 0]\n" + "stp q2, q3, [%2, #16 * 2]\n" + "stp q4, q5, [%2, #16 * 4]\n" + "stp q6, q7, [%2, #16 * 6]\n" + "stp q8, q9, [%2, #16 * 8]\n" + "stp q10, q11, [%2, #16 * 10]\n" + "stp q12, q13, [%2, #16 * 12]\n" + "stp q14, q15, [%2, #16 * 14]\n" + "stp q16, q17, [%2, #16 * 16]\n" + "stp q18, q19, [%2, #16 * 18]\n" + "stp q20, q21, [%2, #16 * 20]\n" + "stp q22, q23, [%2, #16 * 22]\n" + "stp q24, q25, [%2, #16 * 24]\n" + "stp q26, q27, [%2, #16 * 26]\n" + "stp q28, q29, [%2, #16 * 28]\n" + "stp q30, q31, [%2, #16 * 30]\n" + : "=&r"(fpcr), "=&r"(fpsr) : "r"(vfp_state)); - td->td_pcb->pcb_fpcr = fpcr; - td->td_pcb->pcb_fpsr = fpsr; + td->td_pcb->pcb_fpcr = fpcr; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@FreeBSD.ORG Thu Apr 16 05:37:22 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 551E6FDA; Thu, 16 Apr 2015 05:37: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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3605FE46; Thu, 16 Apr 2015 05:37:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3G5bLrm039128; Thu, 16 Apr 2015 05:37:21 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3G5bKBK039123; Thu, 16 Apr 2015 05:37:20 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504160537.t3G5bKBK039123@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 16 Apr 2015 05:37:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281586 - user/ngie/more-tests/tests/sys/socket 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.20 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, 16 Apr 2015 05:37:22 -0000 Author: ngie Date: Thu Apr 16 05:37:19 2015 New Revision: 281586 URL: https://svnweb.freebsd.org/changeset/base/281586 Log: Fix WARNS=6 issues with gcc Modified: user/ngie/more-tests/tests/sys/socket/reconnect_test.c user/ngie/more-tests/tests/sys/socket/sigpipe_test.c user/ngie/more-tests/tests/sys/socket/unix_gc_test.c user/ngie/more-tests/tests/sys/socket/unix_passfd_test.c user/ngie/more-tests/tests/sys/socket/zerosend_test.c Modified: user/ngie/more-tests/tests/sys/socket/reconnect_test.c ============================================================================== --- user/ngie/more-tests/tests/sys/socket/reconnect_test.c Thu Apr 16 03:39:33 2015 (r281585) +++ user/ngie/more-tests/tests/sys/socket/reconnect_test.c Thu Apr 16 05:37:19 2015 (r281586) @@ -104,7 +104,7 @@ cleanup(void) } int -main() +main(void) { int s_sock1, s_sock2, c_sock; Modified: user/ngie/more-tests/tests/sys/socket/sigpipe_test.c ============================================================================== --- user/ngie/more-tests/tests/sys/socket/sigpipe_test.c Thu Apr 16 03:39:33 2015 (r281585) +++ user/ngie/more-tests/tests/sys/socket/sigpipe_test.c Thu Apr 16 05:37:19 2015 (r281586) @@ -51,6 +51,7 @@ * * For the purposes of testing TCP, an unused port number must be specified. */ +static void usage(void) __dead2; static void usage(void) { Modified: user/ngie/more-tests/tests/sys/socket/unix_gc_test.c ============================================================================== --- user/ngie/more-tests/tests/sys/socket/unix_gc_test.c Thu Apr 16 03:39:33 2015 (r281585) +++ user/ngie/more-tests/tests/sys/socket/unix_gc_test.c Thu Apr 16 05:37:19 2015 (r281586) @@ -752,7 +752,7 @@ recursion(void) #define RMDIR "rm -Rf " int -main(int argc, char *argv[]) +main(void) { char cmd[sizeof(RMDIR) + PATH_MAX]; int serrno; Modified: user/ngie/more-tests/tests/sys/socket/unix_passfd_test.c ============================================================================== --- user/ngie/more-tests/tests/sys/socket/unix_passfd_test.c Thu Apr 16 03:39:33 2015 (r281585) +++ user/ngie/more-tests/tests/sys/socket/unix_passfd_test.c Thu Apr 16 05:37:19 2015 (r281586) @@ -136,11 +136,11 @@ sendfd_payload(int sockfd, int sendfd, } static void -sendfd(int sockfd, int sendfd) +sendfd(int sock_fd, int send_fd) { char ch; - return (sendfd_payload(sockfd, sendfd, &ch, sizeof(ch))); + return (sendfd_payload(sock_fd, send_fd, &ch, sizeof(ch))); } static void @@ -185,11 +185,11 @@ recvfd_payload(int sockfd, int *recvfd, } static void -recvfd(int sockfd, int *recvfd) +recvfd(int sock_fd, int *recv_fd) { char ch; - return (recvfd_payload(sockfd, recvfd, &ch, sizeof(ch))); + return (recvfd_payload(sock_fd, recv_fd, &ch, sizeof(ch))); } /* Modified: user/ngie/more-tests/tests/sys/socket/zerosend_test.c ============================================================================== --- user/ngie/more-tests/tests/sys/socket/zerosend_test.c Thu Apr 16 03:39:33 2015 (r281585) +++ user/ngie/more-tests/tests/sys/socket/zerosend_test.c Thu Apr 16 05:37:19 2015 (r281586) @@ -226,7 +226,7 @@ static int fd[3]; static void close_fds(int *fdp) { - int i; + unsigned int i; for (i = 0; i < nitems(fdp); i++) close(fdp[i]); From owner-svn-src-user@FreeBSD.ORG Thu Apr 16 05:38:20 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EA937135; Thu, 16 Apr 2015 05:38:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D6B09E49; Thu, 16 Apr 2015 05:38:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3G5cKj9039279; Thu, 16 Apr 2015 05:38:20 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3G5cKW8039278; Thu, 16 Apr 2015 05:38:20 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504160538.t3G5cKW8039278@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 16 Apr 2015 05:38:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281587 - user/ngie/more-tests/tests/sys/socket 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.20 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, 16 Apr 2015 05:38:21 -0000 Author: ngie Date: Thu Apr 16 05:38:19 2015 New Revision: 281587 URL: https://svnweb.freebsd.org/changeset/base/281587 Log: Set WARNS to 6, but turn off -Wcast-align; this is an issue with unix_cmsg and unix_passfd_test Modified: user/ngie/more-tests/tests/sys/socket/Makefile Modified: user/ngie/more-tests/tests/sys/socket/Makefile ============================================================================== --- user/ngie/more-tests/tests/sys/socket/Makefile Thu Apr 16 05:37:19 2015 (r281586) +++ user/ngie/more-tests/tests/sys/socket/Makefile Thu Apr 16 05:38:19 2015 (r281587) @@ -42,12 +42,9 @@ ATF_TESTS_C+= zerosend_test DPADD.sendfile_test+= ${LIBMD} LDADD.sendfile_test+= -lmd -# XXX: this doesn't work..? -#WARNS.unix_cmsg= 3 -#WARNS.unix_gc= 3 -#WARNS.unix_passfd= 3 -#WARNS.zerosend= 2 +# XXX: unix_cmsg_test and unix_passfd_test need to be fixed +NO_WCAST_ALIGN.clang= -WARNS= 2 +WARNS?= 6 .include From owner-svn-src-user@FreeBSD.ORG Thu Apr 16 06:06:46 2015 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C30A459C; Thu, 16 Apr 2015 06:06:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 921BD152; Thu, 16 Apr 2015 06:06:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3G66kpr053023; Thu, 16 Apr 2015 06:06:46 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3G66krs053022; Thu, 16 Apr 2015 06:06:46 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504160606.t3G66krs053022@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 16 Apr 2015 06:06:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281588 - user/ngie/more-tests/tests/sys/socket 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.20 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, 16 Apr 2015 06:06:46 -0000 Author: ngie Date: Thu Apr 16 06:06:45 2015 New Revision: 281588 URL: https://svnweb.freebsd.org/changeset/base/281588 Log: Update comments Don't install/test unix_cmsg because it's broken [1] PR: 199478 Modified: user/ngie/more-tests/tests/sys/socket/Makefile Modified: user/ngie/more-tests/tests/sys/socket/Makefile ============================================================================== --- user/ngie/more-tests/tests/sys/socket/Makefile Thu Apr 16 05:38:19 2015 (r281587) +++ user/ngie/more-tests/tests/sys/socket/Makefile Thu Apr 16 06:06:45 2015 (r281588) @@ -6,10 +6,10 @@ TESTSDIR= ${TESTSBASE}/sys/socket BINDIR= ${TESTSDIR} -PROGS+= unix_cmsg +# See comment below +#PROGS+= unix_cmsg TAP_TESTS_C+= accept_fd_leak_test -# accf_data_attach: not ok 9 - setsockopt() after listen() failed with 2 (No such file or directory) ATF_TESTS_C+= accf_data_attach_test PLAIN_TESTS_C+= fstat_test PLAIN_TESTS_C+= kqueue_test @@ -17,7 +17,6 @@ PLAIN_TESTS_C+= listen_backlog_test PLAIN_TESTS_C+= listenclose_test PLAIN_TESTS_C+= pr_atomic_test PLAIN_TESTS_C+= reconnect_test -# rtsocket: socket(PF_ROUTE, SOCK_STREAM, 0): Protocol wrong type for socket PLAIN_TESTS_C+= rtsocket_test PLAIN_TESTS_C+= sblock_test TAP_TESTS_C+= sendfile_test @@ -27,16 +26,13 @@ TAP_TESTS_C+= so_setfib_test PLAIN_TESTS_C+= socketpair_test PLAIN_TESTS_C+= unix_bindconnect_test PLAIN_TESTS_C+= unix_close_race_test -# Lots of failures -TAP_TESTS_SH+= unix_cmsg_test -# unix_gc: twosome_drop1: sendfd: before 0 after 0 +# Lots of failures; see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=199478 +#TAP_TESTS_SH+= unix_cmsg_test PLAIN_TESTS_C+= unix_gc_test ATF_TESTS_C+= unix_passfd_test PLAIN_TESTS_C+= unix_sendto_race_test -# unix_socket: socket(PF_LOCAL, SOCK_RAW, 0): Protocol wrong type for socket PLAIN_TESTS_C+= unix_socket_test PLAIN_TESTS_C+= unix_sorflush_test -# zerosend: tcp_0write: bind(127.0.0.1, 10001): Address already in use ATF_TESTS_C+= zerosend_test DPADD.sendfile_test+= ${LIBMD} From owner-svn-src-user@FreeBSD.ORG Thu Apr 16 06:12:26 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A1B70796; Thu, 16 Apr 2015 06:12:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 73A87231; Thu, 16 Apr 2015 06:12:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3G6CQi1057213; Thu, 16 Apr 2015 06:12:26 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3G6CQG9057212; Thu, 16 Apr 2015 06:12:26 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504160612.t3G6CQG9057212@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 16 Apr 2015 06:12:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281589 - user/ngie/more-tests/tools/regression/gaithrstress 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.20 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, 16 Apr 2015 06:12:26 -0000 Author: ngie Date: Thu Apr 16 06:12:25 2015 New Revision: 281589 URL: https://svnweb.freebsd.org/changeset/base/281589 Log: Fix warnings Modified: user/ngie/more-tests/tools/regression/gaithrstress/gaithrstress.c Modified: user/ngie/more-tests/tools/regression/gaithrstress/gaithrstress.c ============================================================================== --- user/ngie/more-tests/tools/regression/gaithrstress/gaithrstress.c Thu Apr 16 06:06:45 2015 (r281588) +++ user/ngie/more-tests/tools/regression/gaithrstress/gaithrstress.c Thu Apr 16 06:12:25 2015 (r281589) @@ -230,7 +230,7 @@ usage: err(1, "reading word file %s", wordfile); if (nrandwords < 1) errx(1, "word file %s did not have >0 words", wordfile); - printf("Read %u random words from %s.\n", nrandwords, wordfile); + printf("Read %zu random words from %s.\n", nrandwords, wordfile); workers = calloc(nworkers, sizeof(*workers)); if (workers == NULL) err(1, "allocating workers"); @@ -242,8 +242,8 @@ usage: for (i = 0; i < nworkers; i++) { if (pthread_create(&workers[i].w_thread, NULL, work, &workers[i]) != 0) - err(1, "creating worker %u", i); - printf("%u%s", i, i == nworkers - 1 ? ".\n" : ", "); + err(1, "creating worker %zu", i); + printf("%zu%s", i, i == nworkers - 1 ? ".\n" : ", "); fflush(stdout); } @@ -255,7 +255,7 @@ usage: fflush(stdout); for (i = 0; i < nworkers; i++) { pthread_join(workers[i].w_thread, NULL); - printf("%u%s", i, i == nworkers - 1 ? ".\n" : ", "); + printf("%zu%s", i, i == nworkers - 1 ? ".\n" : ", "); fflush(stdout); } @@ -264,7 +264,7 @@ usage: printf("%-10s%-20s%-20s%-29s\n", "------", "--------------", "----------", "---------------------------"); for (i = 0; i < nworkers; i++) { - printf("%-10u%-20ju%-20ju%u:%s%.2f\n", i, + printf("%-10zu%-20ju%-20ju%ld:%s%.2f\n", i, workers[i].w_lookup_success, workers[i].w_lookup_failure, workers[i].w_max_lookup_time.tv_sec / 60, workers[i].w_max_lookup_time.tv_sec % 60 < 10 ? "0" : "", From owner-svn-src-user@FreeBSD.ORG Thu Apr 16 07:49:41 2015 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 70E50398; Thu, 16 Apr 2015 07:49:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5B2E1D42; Thu, 16 Apr 2015 07:49:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3G7nfqT099106; Thu, 16 Apr 2015 07:49:41 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3G7neZW099101; Thu, 16 Apr 2015 07:49:40 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504160749.t3G7neZW099101@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 16 Apr 2015 07:49:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281593 - in user/ngie/more-tests: etc/mtree tests/sys tests/sys/aio tools/regression/aio/aiotest 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.20 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, 16 Apr 2015 07:49:41 -0000 Author: ngie Date: Thu Apr 16 07:49:39 2015 New Revision: 281593 URL: https://svnweb.freebsd.org/changeset/base/281593 Log: Integrate tools/regression/aio/aiotest into the FreeBSD test suite as tests/sys/aio Added: user/ngie/more-tests/tests/sys/aio/ user/ngie/more-tests/tests/sys/aio/Makefile - copied, changed from r281584, user/ngie/more-tests/tools/regression/aio/aiotest/Makefile user/ngie/more-tests/tests/sys/aio/aio_test.c - copied, changed from r281584, user/ngie/more-tests/tools/regression/aio/aiotest/aiotest.c Deleted: user/ngie/more-tests/tools/regression/aio/aiotest/ Modified: user/ngie/more-tests/etc/mtree/BSD.tests.dist user/ngie/more-tests/tests/sys/Makefile Modified: user/ngie/more-tests/etc/mtree/BSD.tests.dist ============================================================================== --- user/ngie/more-tests/etc/mtree/BSD.tests.dist Thu Apr 16 07:40:01 2015 (r281592) +++ user/ngie/more-tests/etc/mtree/BSD.tests.dist Thu Apr 16 07:49:39 2015 (r281593) @@ -354,6 +354,8 @@ .. .. sys + aio + .. fifo .. file Modified: user/ngie/more-tests/tests/sys/Makefile ============================================================================== --- user/ngie/more-tests/tests/sys/Makefile Thu Apr 16 07:40:01 2015 (r281592) +++ user/ngie/more-tests/tests/sys/Makefile Thu Apr 16 07:49:39 2015 (r281593) @@ -4,6 +4,7 @@ TESTSDIR= ${TESTSBASE}/sys +TESTS_SUBDIRS+= aio TESTS_SUBDIRS+= fifo TESTS_SUBDIRS+= file TESTS_SUBDIRS+= kern Copied and modified: user/ngie/more-tests/tests/sys/aio/Makefile (from r281584, user/ngie/more-tests/tools/regression/aio/aiotest/Makefile) ============================================================================== --- user/ngie/more-tests/tools/regression/aio/aiotest/Makefile Thu Apr 16 03:35:47 2015 (r281584, copy source) +++ user/ngie/more-tests/tests/sys/aio/Makefile Thu Apr 16 07:49:39 2015 (r281593) @@ -1,11 +1,12 @@ # $FreeBSD$ -PROG= aiotest -MAN= +TESTSDIR= ${TESTSBASE}/sys/aio -DPADD= ${LIBUTIL} -LDADD= -lutil +ATF_TESTS_C+= aio_test + +DPADD.aio_test+= ${LIBUTIL} +LDADD.aio_test+= -lutil WARNS?= 6 -.include +.include Copied and modified: user/ngie/more-tests/tests/sys/aio/aio_test.c (from r281584, user/ngie/more-tests/tools/regression/aio/aiotest/aiotest.c) ============================================================================== --- user/ngie/more-tests/tools/regression/aio/aiotest/aiotest.c Thu Apr 16 03:35:47 2015 (r281584, copy source) +++ user/ngie/more-tests/tests/sys/aio/aio_test.c Thu Apr 16 07:49:39 2015 (r281593) @@ -57,7 +57,9 @@ #include #include -#define PATH_TEMPLATE "/tmp/aio.XXXXXXXXXX" +#include + +#define PATH_TEMPLATE "aio.XXXXXXXXXX" /* * GLOBAL_MAX sets the largest usable buffer size to be read and written, as @@ -69,7 +71,6 @@ #define BUFFER_MAX GLOBAL_MAX struct aio_context { - const char *ac_test; int ac_read_fd, ac_write_fd; long ac_seed; char ac_buffer[GLOBAL_MAX]; @@ -86,9 +87,8 @@ aio_available(void) { if (modfind("aio") == -1) - errx(0, - "aio support not available in the kernel; skipping " - "testcases"); + atf_tc_skip("aio support not available in the kernel; " + "skipping testcases"); } /* @@ -103,23 +103,21 @@ aio_timeout_signal(int sig __unused) } static void -aio_timeout_start(const char *string1, const char *string2, int seconds) +aio_timeout_start(int seconds) { aio_timedout = 0; - if (signal(SIGALRM, aio_timeout_signal) == SIG_ERR) - errx(1, "FAIL: %s: %s: aio_timeout_set: signal(SIGALRM): %s", - string1, string2, strerror(errno)); + ATF_REQUIRE_MSG(signal(SIGALRM, aio_timeout_signal) != SIG_ERR, + "failed to set SIGALRM handler: %s", strerror(errno)); alarm(seconds); } static void -aio_timeout_stop(const char *string1, const char *string2) +aio_timeout_stop(void) { - if (signal(SIGALRM, NULL) == SIG_ERR) - errx(1, "FAIL: %s: %s: aio_timeout_stop: signal(NULL): %s", - string1, string2, strerror(errno)); + ATF_REQUIRE_MSG(signal(SIGALRM, NULL) != SIG_ERR, + "failed to reset SIGALRM handler to default: %s", strerror(errno)); alarm(0); } @@ -164,25 +162,23 @@ aio_test_buffer(char *buffer, int len, l * test setup. */ static void -aio_context_init(struct aio_context *ac, const char *test, int read_fd, +aio_context_init(struct aio_context *ac, int read_fd, int write_fd, int buflen, int seconds, void (*cleanup)(void *), void *cleanup_arg) { - if (buflen > BUFFER_MAX) - errx(1, "FAIL: %s: aio_context_init: buffer too large", - test); + ATF_REQUIRE_MSG(buflen <= BUFFER_MAX, + "aio_context_init: buffer too large (%d > %d)", + buflen, BUFFER_MAX); bzero(ac, sizeof(*ac)); - ac->ac_test = test; ac->ac_read_fd = read_fd; ac->ac_write_fd = write_fd; ac->ac_buflen = buflen; srandomdev(); ac->ac_seed = random(); aio_fill_buffer(ac->ac_buffer, buflen, ac->ac_seed); - if (aio_test_buffer(ac->ac_buffer, buflen, ac->ac_seed) == 0) - errx(1, "%s: aio_context_init: aio_test_buffer: internal " - "error", test); + ATF_REQUIRE_MSG(aio_test_buffer(ac->ac_buffer, buflen, + ac->ac_seed) != 0, "aio_test_buffer: internal error"); ac->ac_seconds = seconds; ac->ac_cleanup = cleanup; ac->ac_cleanup_arg = cleanup_arg; @@ -223,19 +219,17 @@ aio_write_test(struct aio_context *ac) aio.aio_fildes = ac->ac_write_fd; aio.aio_offset = 0; - aio_timeout_start(ac->ac_test, "aio_write_test", ac->ac_seconds); + aio_timeout_start(ac->ac_seconds); if (aio_write(&aio) < 0) { if (errno == EINTR) { if (aio_timedout) { aio_cleanup(ac); - errx(1, "FAIL: %s: aio_write_test: " - "aio_write: timed out", ac->ac_test); + atf_tc_fail("aio_write timed out"); } } aio_cleanup(ac); - errx(1, "FAIL: %s: aio_write_test: aio_write: %s", - ac->ac_test, strerror(errno)); + atf_tc_fail("aio_write failed: %s", strerror(errno)); } len = aio_waitcomplete(&aiop, NULL); @@ -243,22 +237,19 @@ aio_write_test(struct aio_context *ac) if (errno == EINTR) { if (aio_timedout) { aio_cleanup(ac); - errx(1, "FAIL: %s: aio_write_test: " - "aio_waitcomplete: timed out", - ac->ac_test); + atf_tc_fail("aio_waitcomplete timed out"); } } aio_cleanup(ac); - errx(1, "FAIL: %s: aio_write_test: aio_waitcomplete: %s", - ac->ac_test, strerror(errno)); + atf_tc_fail("aio_waitcomplete failed: %s", strerror(errno)); } - aio_timeout_stop(ac->ac_test, "aio_write_test"); + aio_timeout_stop(); if (len != ac->ac_buflen) { aio_cleanup(ac); - errx(1, "FAIL: %s: aio_write_test: aio_waitcomplete: short " - "write (%jd)", ac->ac_test, (intmax_t)len); + atf_tc_fail("aio_waitcomplete short write (%jd)", + (intmax_t)len); } } @@ -281,19 +272,17 @@ aio_read_test(struct aio_context *ac) aio.aio_fildes = ac->ac_read_fd; aio.aio_offset = 0; - aio_timeout_start(ac->ac_test, "aio_read_test", ac->ac_seconds); + aio_timeout_start(ac->ac_seconds); if (aio_read(&aio) < 0) { if (errno == EINTR) { if (aio_timedout) { aio_cleanup(ac); - errx(1, "FAIL: %s: aio_read_test: " - "aio_read: timed out", ac->ac_test); + atf_tc_fail("aio_write timed out"); } } aio_cleanup(ac); - errx(1, "FAIL: %s: aio_read_test: aio_read %s", ac->ac_test, - strerror(errno)); + atf_tc_fail("aio_read failed: %s", strerror(errno)); } len = aio_waitcomplete(&aiop, NULL); @@ -301,28 +290,24 @@ aio_read_test(struct aio_context *ac) if (errno == EINTR) { if (aio_timedout) { aio_cleanup(ac); - errx(1, "FAIL: %s: aio_read_test: " - "aio_waitcomplete: timed out", - ac->ac_test); + atf_tc_fail("aio_waitcomplete timed out"); } } aio_cleanup(ac); - errx(1, "FAIL: %s: aio_read_test: aio_waitcomplete: %s", - ac->ac_test, strerror(errno)); + atf_tc_fail("aio_waitcomplete failed: %s", strerror(errno)); } - aio_timeout_stop(ac->ac_test, "aio_read_test"); + aio_timeout_stop(); if (len != ac->ac_buflen) { aio_cleanup(ac); - errx(1, "FAIL: %s: aio_read_test: aio_waitcomplete: short " - "read (%jd)", ac->ac_test, (intmax_t)len); + atf_tc_fail("aio_waitcomplete short read (%jd)", + (intmax_t)len); } if (aio_test_buffer(ac->ac_buffer, ac->ac_buflen, ac->ac_seed) == 0) { aio_cleanup(ac); - errx(1, "FAIL: %s: aio_read_test: buffer mismatch", - ac->ac_test); + atf_tc_fail("buffer mismatched"); } } @@ -353,8 +338,8 @@ aio_file_cleanup(void *arg) #define FILE_LEN GLOBAL_MAX #define FILE_TIMEOUT 30 -static void -aio_file_test(void) +ATF_TC_WITHOUT_HEAD(aio_file_test); +ATF_TC_BODY(aio_file_test, tc) { char pathname[PATH_MAX]; struct aio_file_arg arg; @@ -365,21 +350,17 @@ aio_file_test(void) strcpy(pathname, PATH_TEMPLATE); fd = mkstemp(pathname); - if (fd == -1) - errx(1, "FAIL: aio_file_test: mkstemp: %s", - strerror(errno)); + ATF_REQUIRE_MSG(fd != -1, "mkstemp failed: %s", strerror(errno)); arg.afa_fd = fd; arg.afa_pathname = pathname; - aio_context_init(&ac, "aio_file_test", fd, fd, FILE_LEN, + aio_context_init(&ac, fd, fd, FILE_LEN, FILE_TIMEOUT, aio_file_cleanup, &arg); aio_write_test(&ac); aio_read_test(&ac); aio_file_cleanup(&arg); - - fprintf(stderr, "PASS: aio_file_test\n"); } struct aio_fifo_arg { @@ -403,8 +384,8 @@ aio_fifo_cleanup(void *arg) #define FIFO_LEN 256 #define FIFO_TIMEOUT 30 -static void -aio_fifo_test(void) +ATF_TC_WITHOUT_HEAD(aio_fifo_test); +ATF_TC_BODY(aio_fifo_test, tc) { int error, read_fd = -1, write_fd = -1; struct aio_fifo_arg arg; @@ -419,12 +400,12 @@ aio_fifo_test(void) * rather than retrying. */ strcpy(pathname, PATH_TEMPLATE); - if (mkstemp(pathname) == -1) - err(1, "FAIL: aio_fifo_test: mkstemp failed"); - if (unlink(pathname) == -1) - err(1, "FAIL: aio_fifo_test: unlink failed"); - if (mkfifo(pathname, 0600) == -1) - errx(1, "FAIL: aio_fifo_test: mkfifo: %s", strerror(errno)); + ATF_REQUIRE_MSG(mkstemp(pathname) != -1, + "mkstemp failed: %s", strerror(errno)); + ATF_REQUIRE_MSG(unlink(pathname) == 0, + "unlink failed: %s", strerror(errno)); + ATF_REQUIRE_MSG(mkfifo(pathname, 0600) != -1, + "mkfifo failed: %s", strerror(errno)); arg.afa_pathname = pathname; arg.afa_read_fd = -1; arg.afa_write_fd = -1; @@ -434,7 +415,7 @@ aio_fifo_test(void) error = errno; aio_fifo_cleanup(&arg); errno = error; - errx(1, "FAIL: aio_fifo_test: read_fd open: %s", + atf_tc_fail("read_fd open failed: %s", strerror(errno)); } arg.afa_read_fd = read_fd; @@ -444,19 +425,17 @@ aio_fifo_test(void) error = errno; aio_fifo_cleanup(&arg); errno = error; - errx(1, "FAIL: aio_fifo_test: write_fd open: %s", + atf_tc_fail("write_fd open failed: %s", strerror(errno)); } arg.afa_write_fd = write_fd; - aio_context_init(&ac, "aio_fifo_test", read_fd, write_fd, FIFO_LEN, + aio_context_init(&ac, read_fd, write_fd, FIFO_LEN, FIFO_TIMEOUT, aio_fifo_cleanup, &arg); aio_write_test(&ac); aio_read_test(&ac); aio_fifo_cleanup(&arg); - - fprintf(stderr, "PASS: aio_fifo_test\n"); } struct aio_unix_socketpair_arg { @@ -475,8 +454,8 @@ aio_unix_socketpair_cleanup(void *arg) #define UNIX_SOCKETPAIR_LEN 256 #define UNIX_SOCKETPAIR_TIMEOUT 30 -static void -aio_unix_socketpair_test(void) +ATF_TC_WITHOUT_HEAD(aio_unix_socketpair_test); +ATF_TC_BODY(aio_unix_socketpair_test, tc) { struct aio_unix_socketpair_arg arg; struct aio_context ac; @@ -484,21 +463,18 @@ aio_unix_socketpair_test(void) aio_available(); - if (socketpair(PF_UNIX, SOCK_STREAM, 0, sockets) < 0) - errx(1, "FAIL: aio_socketpair_test: socketpair: %s", - strerror(errno)); + ATF_REQUIRE_MSG(socketpair(PF_UNIX, SOCK_STREAM, 0, sockets) != -1, + "socketpair failed: %s", strerror(errno)); arg.asa_sockets[0] = sockets[0]; arg.asa_sockets[1] = sockets[1]; - aio_context_init(&ac, "aio_unix_socketpair_test", sockets[0], + aio_context_init(&ac, sockets[0], sockets[1], UNIX_SOCKETPAIR_LEN, UNIX_SOCKETPAIR_TIMEOUT, aio_unix_socketpair_cleanup, &arg); aio_write_test(&ac); aio_read_test(&ac); aio_unix_socketpair_cleanup(&arg); - - fprintf(stderr, "PASS: aio_unix_socketpair_test\n"); } struct aio_pty_arg { @@ -518,8 +494,8 @@ aio_pty_cleanup(void *arg) #define PTY_LEN 256 #define PTY_TIMEOUT 30 -static void -aio_pty_test(void) +ATF_TC_WITHOUT_HEAD(aio_pty_test); +ATF_TC_BODY(aio_pty_test, tc) { struct aio_pty_arg arg; struct aio_context ac; @@ -529,8 +505,8 @@ aio_pty_test(void) aio_available(); - if (openpty(&read_fd, &write_fd, NULL, NULL, NULL) < 0) - errx(1, "FAIL: aio_pty_test: openpty: %s", strerror(errno)); + ATF_REQUIRE_MSG(openpty(&read_fd, &write_fd, NULL, NULL, NULL) == 0, + "openpty failed: %s", strerror(errno)); arg.apa_read_fd = read_fd; arg.apa_write_fd = write_fd; @@ -539,26 +515,22 @@ aio_pty_test(void) error = errno; aio_pty_cleanup(&arg); errno = error; - errx(1, "FAIL: aio_pty_test: tcgetattr: %s", - strerror(errno)); + atf_tc_fail("tcgetattr failed: %s", strerror(errno)); } cfmakeraw(&ts); if (tcsetattr(write_fd, TCSANOW, &ts) < 0) { error = errno; aio_pty_cleanup(&arg); errno = error; - errx(1, "FAIL: aio_pty_test: tcsetattr: %s", - strerror(errno)); + atf_tc_fail("tcsetattr failed: %s", strerror(errno)); } - - aio_context_init(&ac, "aio_pty_test", read_fd, write_fd, PTY_LEN, + aio_context_init(&ac, read_fd, write_fd, PTY_LEN, PTY_TIMEOUT, aio_pty_cleanup, &arg); + aio_write_test(&ac); aio_read_test(&ac); aio_pty_cleanup(&arg); - - fprintf(stderr, "PASS: aio_pty_test\n"); } static void @@ -572,25 +544,23 @@ aio_pipe_cleanup(void *arg) #define PIPE_LEN 256 #define PIPE_TIMEOUT 30 -static void -aio_pipe_test(void) -{ +ATF_TC_WITHOUT_HEAD(aio_pipe_test); +ATF_TC_BODY(aio_pipe_test, tc) +{ struct aio_context ac; int pipes[2]; aio_available(); - if (pipe(pipes) < 0) - errx(1, "FAIL: aio_pipe_test: pipe: %s", strerror(errno)); + ATF_REQUIRE_MSG(pipe(pipes) != -1, + "pipe failed: %s", strerror(errno)); - aio_context_init(&ac, "aio_file_test", pipes[0], pipes[1], PIPE_LEN, + aio_context_init(&ac, pipes[0], pipes[1], PIPE_LEN, PIPE_TIMEOUT, aio_pipe_cleanup, pipes); aio_write_test(&ac); aio_read_test(&ac); aio_pipe_cleanup(pipes); - - fprintf(stderr, "PASS: aio_pipe_test\n"); } struct aio_md_arg { @@ -615,11 +585,11 @@ aio_md_cleanup(void *arg) bzero(&mdio, sizeof(mdio)); mdio.md_version = MDIOVERSION; mdio.md_unit = ama->ama_unit; - if (ioctl(ama->ama_mdctl_fd, MDIOCDETACH, &mdio) < 0) { + if (ioctl(ama->ama_mdctl_fd, MDIOCDETACH, &mdio) == -1) { error = errno; close(ama->ama_mdctl_fd); errno = error; - warnx("FAIL: aio_md_test: MDIOCDETACH: %s", + atf_tc_fail("ioctl MDIOCDETACH failed: %s", strerror(errno)); } } @@ -629,8 +599,13 @@ aio_md_cleanup(void *arg) #define MD_LEN GLOBAL_MAX #define MD_TIMEOUT 30 -static void -aio_md_test(void) +ATF_TC(aio_md_test); +ATF_TC_HEAD(aio_md_test, tc) +{ + + atf_tc_set_md_var(tc, "require.user", "root"); +} +ATF_TC_BODY(aio_md_test, tc) { int error, fd, mdctl_fd, unit; char pathname[PATH_MAX]; @@ -640,16 +615,9 @@ aio_md_test(void) aio_available(); - if (geteuid() != 0) { - fprintf(stderr, "WARNING: aio_md_test: skipped as euid " - "!= 0\n"); - return; - } - mdctl_fd = open("/dev/" MDCTL_NAME, O_RDWR, 0); - if (mdctl_fd < 0) - errx(1, "FAIL: aio_md_test: open(/dev/%s): %s", MDCTL_NAME, - strerror(errno)); + ATF_REQUIRE_MSG(mdctl_fd != -1, + "opening /dev/%s failed: %s", MDCTL_NAME, strerror(errno)); bzero(&mdio, sizeof(mdio)); mdio.md_version = MDIOVERSION; @@ -665,42 +633,33 @@ aio_md_test(void) error = errno; aio_md_cleanup(&arg); errno = error; - errx(1, "FAIL: aio_md_test: MDIOCATTACH: %s", - strerror(errno)); + atf_tc_fail("ioctl MDIOCATTACH failed: %s", strerror(errno)); } arg.ama_unit = unit = mdio.md_unit; snprintf(pathname, PATH_MAX, "/dev/md%d", unit); fd = open(pathname, O_RDWR); - if (fd < 0) { - error = errno; - aio_md_cleanup(&arg); - errno = error; - errx(1, "FAIL: aio_md_test: open(%s): %s", pathname, - strerror(errno)); - } + ATF_REQUIRE_MSG(fd != -1, + "opening %s failed: %s", pathname, strerror(errno)); arg.ama_fd = fd; - aio_context_init(&ac, "aio_md_test", fd, fd, MD_LEN, MD_TIMEOUT, + aio_context_init(&ac, fd, fd, MD_LEN, MD_TIMEOUT, aio_md_cleanup, &arg); aio_write_test(&ac); aio_read_test(&ac); aio_md_cleanup(&arg); - - fprintf(stderr, "PASS: aio_md_test\n"); } -int -main(void) +ATF_TP_ADD_TCS(tp) { - aio_file_test(); - aio_fifo_test(); - aio_unix_socketpair_test(); - aio_pty_test(); - aio_pipe_test(); - aio_md_test(); + ATF_TP_ADD_TC(tp, aio_file_test); + ATF_TP_ADD_TC(tp, aio_fifo_test); + ATF_TP_ADD_TC(tp, aio_unix_socketpair_test); + ATF_TP_ADD_TC(tp, aio_pty_test); + ATF_TP_ADD_TC(tp, aio_pipe_test); + ATF_TP_ADD_TC(tp, aio_md_test); - return (0); + return (atf_no_error()); } From owner-svn-src-user@FreeBSD.ORG Thu Apr 16 08:05:58 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F2922829; Thu, 16 Apr 2015 08:05: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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DDDB6F3C; Thu, 16 Apr 2015 08:05:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3G85vEX006680; Thu, 16 Apr 2015 08:05:57 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3G85viG006678; Thu, 16 Apr 2015 08:05:57 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504160805.t3G85viG006678@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 16 Apr 2015 08:05:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281594 - user/ngie/more-tests/tools/regression/aio/aiop 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.20 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, 16 Apr 2015 08:05:58 -0000 Author: ngie Date: Thu Apr 16 08:05:56 2015 New Revision: 281594 URL: https://svnweb.freebsd.org/changeset/base/281594 Log: - Fix style(9) a bit -- Fix whitespace -- Use err/errx -- Remove superfluous braces - Be a bit more defensive with input from the end-user - Don't die dividing by 0 on a zero-byte file Modified: user/ngie/more-tests/tools/regression/aio/aiop/Makefile user/ngie/more-tests/tools/regression/aio/aiop/aiop.c Modified: user/ngie/more-tests/tools/regression/aio/aiop/Makefile ============================================================================== --- user/ngie/more-tests/tools/regression/aio/aiop/Makefile Thu Apr 16 07:49:39 2015 (r281593) +++ user/ngie/more-tests/tools/regression/aio/aiop/Makefile Thu Apr 16 08:05:56 2015 (r281594) @@ -3,4 +3,6 @@ PROG= aiop MAN= +WARNS= 6 + .include Modified: user/ngie/more-tests/tools/regression/aio/aiop/aiop.c ============================================================================== --- user/ngie/more-tests/tools/regression/aio/aiop/aiop.c Thu Apr 16 07:49:39 2015 (r281593) +++ user/ngie/more-tests/tools/regression/aio/aiop/aiop.c Thu Apr 16 08:05:56 2015 (r281594) @@ -39,21 +39,22 @@ #include __FBSDID("$FreeBSD$"); -#include -#include -#include -#include -#include #include -#include -#include -#include #include +#include +#include +#include #include +#include +#include +#include #include +#include +#include +#include #include -#include -#include +#include +#include /* * This is a bit of a quick hack to do parallel IO testing through POSIX AIO. @@ -84,14 +85,12 @@ disk_getsize(int fd) { off_t mediasize; - if (ioctl(fd, DIOCGMEDIASIZE, &mediasize) < 0) { - perror("ioctl(DIOCGMEDIASIZE)"); - exit(1); - } - return mediasize; + if (ioctl(fd, DIOCGMEDIASIZE, &mediasize) < 0) + err(1, "ioctl(DIOCGMEDIASIZE)"); + return (mediasize); } -iot_t +static iot_t choose_aio(iot_t iomask) { /* choose a random read or write event, limited by the mask */ @@ -102,7 +101,7 @@ choose_aio(iot_t iomask) return (random() & 0x01 ? IOT_READ : IOT_WRITE); } -void +static void set_aio(struct aiocb *a, iot_t iot, int fd, off_t offset, int size, char *buf) { int r; @@ -115,10 +114,8 @@ set_aio(struct aiocb *a, iot_t iot, int r = aio_read(a); else r = aio_write(a); - if (r != 0) { - perror("set_aio"); - exit(1); - } + if (r != 0) + err(1, "set_aio call failed"); } int @@ -134,30 +131,35 @@ main(int argc, char *argv[]) off_t file_size, offset; struct aiocb *a; int i, n; - struct timeval st, et, rt; - float f_rt; + struct timeval st, et, rt; + float f_rt; iot_t iowhat; if (argc < 6) { - printf("Usage: %s \n", argv[0]); + printf("Usage: %s \n", + argv[0]); exit(1); } fn = argv[1]; io_size = atoi(argv[2]); + if (io_size <= 0) + errx(1, "the I/O size must be >0"); nrun = atoi(argv[3]); + if (nrun <= 0) + errx(1, "the number of runs must be >0"); aio_len = atoi(argv[4]); - if (strcmp(argv[5], "ro") == 0) { + if (aio_len <= 0) + errx(1, "AIO concurrency must be >0"); + if (strcmp(argv[5], "ro") == 0) iowhat = IOT_READ; - } else if (strcmp(argv[5], "rw") == 0) { + else if (strcmp(argv[5], "rw") == 0) iowhat = IOT_READ | IOT_WRITE; - } else if (strcmp(argv[5], "wo") == 0) { + else if (strcmp(argv[5], "wo") == 0) iowhat = IOT_WRITE; - } else { - fprintf(stderr, "needs to be ro, rw, wo!\n"); - exit(1); - } + else + errx(1, "the I/O type needs to be \"ro\", \"rw\", or \"wo\"!\n"); /* * Random returns values between 0 and (2^32)-1; only good for 4 gig. @@ -171,35 +173,31 @@ main(int argc, char *argv[]) else fd = open(fn, O_RDWR | O_DIRECT); - if (fd < 0) { - perror("open"); - exit(1); - } - if (fstat(fd, &sb) < 0) { - perror("fstat"); - exit(1); - } + if (fd < 0) + err(1, "open failed"); + if (fstat(fd, &sb) < 0) + err(1, "fstat failed"); if (S_ISREG(sb.st_mode)) { file_size = sb.st_size; } else if (S_ISBLK(sb.st_mode) || S_ISCHR(sb.st_mode)) { file_size = disk_getsize(fd); - } else { - perror("unknown file type\n"); - exit(1); - } + } else + errx(1, "unknown file type"); + if (file_size <= 0) + errx(1, "path provided too small"); + printf("File: %s; File size %jd bytes\n", fn, (intmax_t)file_size); aio = calloc(aio_len, sizeof(struct aiocb)); abuf = calloc(aio_len, sizeof(char *)); - for (i = 0; i < aio_len; i++) { + for (i = 0; i < aio_len; i++) abuf[i] = calloc(1, io_size * sizeof(char)); - } /* Fill with the initial contents */ - gettimeofday(&st, NULL); + gettimeofday(&st, NULL); for (i = 0; i < aio_len; i++) { - offset = random() % (file_size / io_size); - offset *= io_size; + offset = random() % (file_size / io_size); + offset *= io_size; set_aio(aio + i, choose_aio(iowhat), fd, offset, io_size, abuf[i]); } @@ -208,18 +206,18 @@ main(int argc, char *argv[]) n = a - aio; assert(n < aio_len); assert(n >= 0); - offset = random() % (file_size / io_size); - offset *= io_size; + offset = random() % (file_size / io_size); + offset *= io_size; set_aio(aio + n, choose_aio(iowhat), fd, offset, io_size, abuf[n]); } - gettimeofday(&et, NULL); - timersub(&et, &st, &rt); - f_rt = ((float) (rt.tv_usec)) / 1000000.0; - f_rt += (float) (rt.tv_sec); - printf("Runtime: %.2f seconds, ", f_rt); - printf("Op rate: %.2f ops/sec, ", ((float) (nrun)) / f_rt); - printf("Avg transfer rate: %.2f bytes/sec\n", ((float) (nrun)) * ((float)io_size) / f_rt); + gettimeofday(&et, NULL); + timersub(&et, &st, &rt); + f_rt = ((float) (rt.tv_usec)) / 1000000.0; + f_rt += (float) (rt.tv_sec); + printf("Runtime: %.2f seconds, ", f_rt); + printf("Op rate: %.2f ops/sec, ", ((float) (nrun)) / f_rt); + printf("Avg transfer rate: %.2f bytes/sec\n", ((float) (nrun)) * ((float)io_size) / f_rt); From owner-svn-src-user@FreeBSD.ORG Thu Apr 16 08:41:21 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 924A36F; Thu, 16 Apr 2015 08:41: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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7E09F5FB; Thu, 16 Apr 2015 08:41:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3G8fLhJ023968; Thu, 16 Apr 2015 08:41:21 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3G8fK4r023964; Thu, 16 Apr 2015 08:41:20 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504160841.t3G8fK4r023964@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 16 Apr 2015 08:41:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281595 - user/ngie/more-tests/tools/regression/p1003_1b 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.20 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, 16 Apr 2015 08:41:21 -0000 Author: ngie Date: Thu Apr 16 08:41:19 2015 New Revision: 281595 URL: https://svnweb.freebsd.org/changeset/base/281595 Log: - Fix compilation (MAP_INHERIT's dead) - Fix warnings - Use mkstemp instead of tmpnam Modified: user/ngie/more-tests/tools/regression/p1003_1b/Makefile user/ngie/more-tests/tools/regression/p1003_1b/fifo.c user/ngie/more-tests/tools/regression/p1003_1b/sched.c user/ngie/more-tests/tools/regression/p1003_1b/yield.c Modified: user/ngie/more-tests/tools/regression/p1003_1b/Makefile ============================================================================== --- user/ngie/more-tests/tools/regression/p1003_1b/Makefile Thu Apr 16 08:05:56 2015 (r281594) +++ user/ngie/more-tests/tools/regression/p1003_1b/Makefile Thu Apr 16 08:41:19 2015 (r281595) @@ -14,4 +14,5 @@ SRCS=\ MAN= CFLAGS+=-DNO_MEMLOCK + .include Modified: user/ngie/more-tests/tools/regression/p1003_1b/fifo.c ============================================================================== --- user/ngie/more-tests/tools/regression/p1003_1b/fifo.c Thu Apr 16 08:05:56 2015 (r281594) +++ user/ngie/more-tests/tools/regression/p1003_1b/fifo.c Thu Apr 16 08:41:19 2015 (r281595) @@ -31,17 +31,17 @@ * * $FreeBSD$ */ -#include -#include -#include -#include -#include -#include #include #include #include +#include +#include +#include #include #include +#include +#include +#include volatile int ticked; #define CAN_USE_ALARMS @@ -109,7 +109,7 @@ int fifo(int argc, char *argv[]) fifo_param.sched_priority = 1; p = (long *)mmap(0, sizeof(*p), - PROT_READ|PROT_WRITE, MAP_ANON|MAP_SHARED|MAP_INHERIT, -1, 0); + PROT_READ|PROT_WRITE, MAP_ANON|MAP_SHARED, -1, 0); if (p == (long *)-1) err(errno, "mmap"); Modified: user/ngie/more-tests/tools/regression/p1003_1b/sched.c ============================================================================== --- user/ngie/more-tests/tools/regression/p1003_1b/sched.c Thu Apr 16 08:05:56 2015 (r281594) +++ user/ngie/more-tests/tools/regression/p1003_1b/sched.c Thu Apr 16 08:41:19 2015 (r281595) @@ -41,16 +41,17 @@ #define _POSIX_SOURCE #define _POSIX_C_SOURCE 199309L -#include -#include - -#include -#include +#include #include #include -#include - +#include #include +#include +#define __XSI_VISIBLE 1 +#include +#undef __XSI_VISIBLE +#include +#include #include "prutil.h" @@ -209,17 +210,14 @@ int sched(int ac, char *av[]) { -#define NAM "P1003_1b_schedXXXX" - char nam[L_tmpnam]; + char nam[] = "P1003_1b_schedXXXXXX"; int fd; pid_t p; pid_t *lastrun; - strcpy(nam, NAM); - if (tmpnam(nam) != nam) - q(__LINE__, errno, "tmpnam " NAM); - q(__LINE__, (fd = open(nam, O_RDWR|O_CREAT, 0666)), - "open " NAM); + fd = mkstemp(nam); + if (fd == -1) + q(__LINE__, errno, "mkstemp failed"); (void)unlink(nam); Modified: user/ngie/more-tests/tools/regression/p1003_1b/yield.c ============================================================================== --- user/ngie/more-tests/tools/regression/p1003_1b/yield.c Thu Apr 16 08:05:56 2015 (r281594) +++ user/ngie/more-tests/tools/regression/p1003_1b/yield.c Thu Apr 16 08:41:19 2015 (r281595) @@ -89,7 +89,7 @@ int yield(int argc, char *argv[]) n = nslaves = atoi(argv[1]); p = (int *)mmap(0, sizeof(int), - PROT_READ|PROT_WRITE, MAP_ANON|MAP_SHARED|MAP_INHERIT, -1, 0); + PROT_READ|PROT_WRITE, MAP_ANON|MAP_SHARED, -1, 0); if (p == (int *)-1) err(errno, "mmap"); From owner-svn-src-user@FreeBSD.ORG Thu Apr 16 08:46:44 2015 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 789222D2; Thu, 16 Apr 2015 08: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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6247363D; Thu, 16 Apr 2015 08:46:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3G8kiM1025790; Thu, 16 Apr 2015 08:46:44 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3G8kh8a025787; Thu, 16 Apr 2015 08:46:43 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504160846.t3G8kh8a025787@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 16 Apr 2015 08:46:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281596 - in user/ngie/more-tests: tests/sys/aio tools/regression/aio/kqueue 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.20 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, 16 Apr 2015 08:46:44 -0000 Author: ngie Date: Thu Apr 16 08:46:43 2015 New Revision: 281596 URL: https://svnweb.freebsd.org/changeset/base/281596 Log: Integrate tests/sys/aio/kqueue into tests/sys/aio Added: user/ngie/more-tests/tests/sys/aio/aio_kqueue.c - copied unchanged from r281584, user/ngie/more-tests/tools/regression/aio/kqueue/aio_kqueue.c user/ngie/more-tests/tests/sys/aio/lio_kqueue.c - copied unchanged from r281584, user/ngie/more-tests/tools/regression/aio/kqueue/lio/lio_kqueue.c Deleted: user/ngie/more-tests/tools/regression/aio/kqueue/ Modified: user/ngie/more-tests/tests/sys/aio/Makefile Modified: user/ngie/more-tests/tests/sys/aio/Makefile ============================================================================== --- user/ngie/more-tests/tests/sys/aio/Makefile Thu Apr 16 08:41:19 2015 (r281595) +++ user/ngie/more-tests/tests/sys/aio/Makefile Thu Apr 16 08:46:43 2015 (r281596) @@ -2,6 +2,8 @@ TESTSDIR= ${TESTSBASE}/sys/aio +PLAIN_TESTS_C+= aio_kqueue +PLAIN_TESTS_C+= lio_kqueue ATF_TESTS_C+= aio_test DPADD.aio_test+= ${LIBUTIL} Copied: user/ngie/more-tests/tests/sys/aio/aio_kqueue.c (from r281584, user/ngie/more-tests/tools/regression/aio/kqueue/aio_kqueue.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests/tests/sys/aio/aio_kqueue.c Thu Apr 16 08:46:43 2015 (r281596, copy of r281584, user/ngie/more-tests/tools/regression/aio/kqueue/aio_kqueue.c) @@ -0,0 +1,207 @@ +/*- + * Copyright (C) 2005 IronPort Systems, Inc. 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$ + */ + +/* + * Prerequisities: + * - AIO support must be compiled into the kernel (see sys//NOTES for + * more details). + * + * Note: it is a good idea to run this against a physical drive to + * exercise the physio fast path (ie. aio_kqueue /dev/) + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define PATH_TEMPLATE "/tmp/aio.XXXXXXXXXX" + +#define MAX 128 +#define MAX_RUNS 300 +/* #define DEBUG */ + +int +main (int argc, char *argv[]) +{ + int fd; + struct aiocb *iocb[MAX], *kq_iocb; + int i, result, run, error, j; + char buffer[32768]; + int kq = kqueue(); + struct kevent ke, kq_returned; + struct timespec ts; + int cancel, pending, tmp_file = 0, failed = 0; + char *file, pathname[sizeof(PATH_TEMPLATE)+1]; + + if (kq < 0) { + perror("No kqeueue\n"); + exit(1); + } + + if (argc == 1) { + strcpy(pathname, PATH_TEMPLATE); + fd = mkstemp(pathname); + file = pathname; + tmp_file = 1; + } else { + file = argv[1]; + fd = open(file, O_RDWR|O_CREAT, 0666); + } + if (fd == -1) + err(1, "Can't open %s\n", file); + + for (run = 0; run < MAX_RUNS; run++){ +#ifdef DEBUG + printf("Run %d\n", run); +#endif + for (i = 0; i < MAX; i++) { + iocb[i] = (struct aiocb *)calloc(1, + sizeof(struct aiocb)); + if (iocb[i] == NULL) + err(1, "calloc"); + } + + pending = 0; + for (i = 0; i < MAX; i++) { + pending++; + iocb[i]->aio_nbytes = sizeof(buffer); + iocb[i]->aio_buf = buffer; + iocb[i]->aio_fildes = fd; + iocb[i]->aio_offset = iocb[i]->aio_nbytes * i * run; + + iocb[i]->aio_sigevent.sigev_notify_kqueue = kq; + iocb[i]->aio_sigevent.sigev_value.sival_ptr = iocb[i]; + iocb[i]->aio_sigevent.sigev_notify = SIGEV_KEVENT; + + result = aio_write(iocb[i]); + if (result != 0) { + perror("aio_write"); + printf("Result %d iteration %d\n", result, i); + exit(1); + } +#ifdef DEBUG + printf("WRITE %d is at %p\n", i, iocb[i]); +#endif + result = rand(); + if (result < RAND_MAX/32) { + if (result > RAND_MAX/64) { + result = aio_cancel(fd, iocb[i]); +#ifdef DEBUG + printf("Cancel %d %p result %d\n", i, iocb[i], result); +#endif + if (result == AIO_CANCELED) { + aio_return(iocb[i]); + iocb[i] = NULL; + pending--; + } + } + } + } + cancel = MAX - pending; + + i = 0; + while (pending) { + + for (;;) { + + bzero(&ke, sizeof(ke)); + bzero(&kq_returned, sizeof(ke)); + ts.tv_sec = 0; + ts.tv_nsec = 1; + result = kevent(kq, NULL, 0, + &kq_returned, 1, &ts); + error = errno; + if (result < 0) + perror("kevent error: "); + kq_iocb = kq_returned.udata; +#ifdef DEBUG + printf("kevent %d %d errno %d return.ident %p " + "return.data %p return.udata %p %p\n", + i, result, error, + kq_returned.ident, kq_returned.data, + kq_returned.udata, + kq_iocb); +#endif + + if (kq_iocb) + break; +#ifdef DEBUG + printf("Try again left %d out of %d %d\n", + pending, MAX, cancel); +#endif + } + + for (j = 0; j < MAX && iocb[j] != kq_iocb; + j++) ; +#ifdef DEBUG + printf("kq_iocb %p\n", kq_iocb); + + printf("Error Result for %d is %d pending %d\n", + j, result, pending); +#endif + result = aio_return(kq_iocb); +#ifdef DEBUG + printf("Return Result for %d is %d\n\n", j, result); +#endif + if (result != sizeof(buffer)) { + printf("FAIL: run %d, operation %d, result %d " + " (errno=%d) should be %zu\n", run, pending, + result, errno, sizeof(buffer)); + failed++; + } else + printf("PASS: run %d, left %d\n", run, + pending - 1); + + free(kq_iocb); + iocb[j] = NULL; + pending--; + i++; + } + + for (i = 0; i < MAX; i++) + free(iocb[i]); + + } + + if (tmp_file) + unlink(pathname); + + if (failed != 0) + printf("FAIL: %d tests failed\n", failed); + else + printf("PASS: All tests passed\n"); + + exit (failed == 0 ? 0 : 1); +} Copied: user/ngie/more-tests/tests/sys/aio/lio_kqueue.c (from r281584, user/ngie/more-tests/tools/regression/aio/kqueue/lio/lio_kqueue.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests/tests/sys/aio/lio_kqueue.c Thu Apr 16 08:46:43 2015 (r281596, copy of r281584, user/ngie/more-tests/tools/regression/aio/kqueue/lio/lio_kqueue.c) @@ -0,0 +1,245 @@ +/*- + * Copyright (C) 2005 IronPort Systems, Inc. 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$ + */ + +/* + * Note: it is a good idea to run this against a physical drive to + * exercise the physio fast path (ie. lio_kqueue /dev/) + * This will ensure op's counting is correct. It is currently broken. + * + * Also note that LIO & kqueue is not implemented in FreeBSD yet, LIO + * is also broken with respect to op's and some paths. + * + * A patch to make this work is at: + * http://www.ambrisko.com/doug/listio_kqueue/listio_kqueue.patch + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define PATH_TEMPLATE "/tmp/aio.XXXXXXXXXX" + +#define LIO_MAX 5 +#define MAX LIO_MAX * 16 +#define MAX_RUNS 300 + +int +main(int argc, char *argv[]){ + int fd; + struct aiocb *iocb[MAX]; + struct aiocb **lio[LIO_MAX], **lio_element, **kq_lio; + int i, result, run, error, j, k; + char buffer[32768]; + int kq = kqueue(); + struct kevent ke, kq_returned; + struct timespec ts; + struct sigevent sig; + time_t time1, time2; + char *file, pathname[sizeof(PATH_TEMPLATE)-1]; + int tmp_file = 0, failed = 0; + + if (kq < 0) { + perror("No kqeueue\n"); + exit(1); + } + + if (argc == 1) { + strcpy(pathname, PATH_TEMPLATE); + fd = mkstemp(pathname); + file = pathname; + tmp_file = 1; + } else { + file = argv[1]; + fd = open(file, O_RDWR|O_CREAT, 0666); + } + if (fd < 0){ + fprintf(stderr, "Can't open %s\n", argv[1]); + perror(""); + exit(1); + } + +#ifdef DEBUG + printf("Hello kq %d fd %d\n", kq, fd); +#endif + + for (run = 0; run < MAX_RUNS; run++){ +#ifdef DEBUG + printf("Run %d\n", run); +#endif + for (j = 0; j < LIO_MAX; j++) { + lio[j] = (struct aiocb **) + malloc(sizeof(struct aiocb *) * MAX/LIO_MAX); + for(i = 0; i < MAX / LIO_MAX; i++) { + k = (MAX / LIO_MAX * j) + i; + lio_element = lio[j]; + lio[j][i] = iocb[k] = (struct aiocb *) + malloc(sizeof(struct aiocb)); + bzero(iocb[k], sizeof(struct aiocb)); + iocb[k]->aio_nbytes = sizeof(buffer); + iocb[k]->aio_buf = buffer; + iocb[k]->aio_fildes = fd; + iocb[k]->aio_offset + = iocb[k]->aio_nbytes * k * (run + 1); + +#ifdef DEBUG + printf("hello iocb[k] %d\n", + iocb[k]->aio_offset); +#endif + iocb[k]->aio_lio_opcode = LIO_WRITE; + } + sig.sigev_notify_kqueue = kq; + sig.sigev_value.sival_ptr = lio[j]; + sig.sigev_notify = SIGEV_KEVENT; + time(&time1); + result = lio_listio(LIO_NOWAIT, lio[j], + MAX / LIO_MAX, &sig); + error = errno; + time(&time2); +#ifdef DEBUG + printf("Time %d %d %d result -> %d\n", + time1, time2, time2-time1, result); +#endif + if (result != 0) { + errno = error; + perror("list_listio"); + printf("FAIL: Result %d iteration %d\n",result, j); + exit(1); + } +#ifdef DEBUG + printf("write %d is at %p\n", j, lio[j]); +#endif + } + + for(i = 0; i < LIO_MAX; i++) { + for(j = LIO_MAX - 1; j >=0; j--) { + if (lio[j]) + break; + } + + for(;;) { + bzero(&ke, sizeof(ke)); + bzero(&kq_returned, sizeof(ke)); + ts.tv_sec = 0; + ts.tv_nsec = 1; +#ifdef DEBUG + printf("FOO lio %d -> %p\n", j, lio[j]); +#endif + EV_SET(&ke, (uintptr_t)lio[j], + EVFILT_LIO, EV_ONESHOT, 0, 0, iocb[j]); + result = kevent(kq, NULL, 0, + &kq_returned, 1, &ts); + error = errno; + if (result < 0) { + perror("kevent error: "); + } + kq_lio = kq_returned.udata; +#ifdef DEBUG + printf("kevent %d %d errno %d return.ident %p " + "return.data %p return.udata %p %p\n", + i, result, error, + kq_returned.ident, kq_returned.data, + kq_returned.udata, + lio[j]); +#endif + + if(kq_lio) + break; +#ifdef DEBUG + printf("Try again\n"); +#endif + } + +#ifdef DEBUG + printf("lio %p\n", lio); +#endif + + for (j = 0; j < LIO_MAX; j++) { + if (lio[j] == kq_lio) { + break; + } + } + if (j == LIO_MAX) { + printf("FAIL:\n"); + exit(1); + } + +#ifdef DEBUG + printf("Error Result for %d is %d\n", j, result); +#endif + if (result < 0) { + printf("FAIL: run %d, operation %d result %d \n", run, LIO_MAX - i -1, result); + failed = 1; + } else { + printf("PASS: run %d, operation %d result %d \n", run, LIO_MAX - i -1, result); + } + for(k = 0; k < MAX / LIO_MAX; k++){ + result = aio_return(kq_lio[k]); +#ifdef DEBUG + printf("Return Resulto for %d %d is %d\n", j, k, result); +#endif + if (result != sizeof(buffer)) { + printf("FAIL: run %d, operation %d sub-opt %d result %d (errno=%d) should be %zu\n", + run, LIO_MAX - i -1, k, result, errno, sizeof(buffer)); + } else { + printf("PASS: run %d, operation %d sub-opt %d result %d\n", + run, LIO_MAX - i -1, k, result); + } + } +#ifdef DEBUG + printf("\n"); +#endif + + for(k = 0; k < MAX / LIO_MAX; k++) { + free(lio[j][k]); + } + free(lio[j]); + lio[j] = NULL; + } + } +#ifdef DEBUG + printf("Done\n"); +#endif + + if (tmp_file) { + unlink(pathname); + } + + if (failed) { + printf("FAIL: Atleast one\n"); + exit(1); + } else { + printf("PASS: All\n"); + exit(0); + } +} From owner-svn-src-user@FreeBSD.ORG Thu Apr 16 08:50:42 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7DE68416; Thu, 16 Apr 2015 08:50:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 69951786; Thu, 16 Apr 2015 08:50:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3G8ogvL027906; Thu, 16 Apr 2015 08:50:42 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3G8og9h027904; Thu, 16 Apr 2015 08:50:42 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504160850.t3G8og9h027904@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 16 Apr 2015 08:50:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281597 - user/ngie/more-tests/contrib/netbsd-tests/lib/libm 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.20 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, 16 Apr 2015 08:50:42 -0000 Author: ngie Date: Thu Apr 16 08:50:41 2015 New Revision: 281597 URL: https://svnweb.freebsd.org/changeset/base/281597 Log: the fmodl compat shims on arm/mips/powerpc don't seem to be all there #if 0 the code for now PR: 199422 Modified: user/ngie/more-tests/contrib/netbsd-tests/lib/libm/t_fmod.c Modified: user/ngie/more-tests/contrib/netbsd-tests/lib/libm/t_fmod.c ============================================================================== --- user/ngie/more-tests/contrib/netbsd-tests/lib/libm/t_fmod.c Thu Apr 16 08:46:43 2015 (r281596) +++ user/ngie/more-tests/contrib/netbsd-tests/lib/libm/t_fmod.c Thu Apr 16 08:50:41 2015 (r281597) @@ -43,7 +43,9 @@ ATF_TC_BODY(fmod, tc) { ATF_CHECK(fmodf(2.0, 1.0) == 0); ATF_CHECK(fmod(2.0, 1.0) == 0); +#if !defined(__FreeBSD__) || LDBL_PREC != 53 ATF_CHECK(fmodl(2.0, 1.0) == 0); +#endif ATF_CHECK(fmodf(2.0, 0.5) == 0); ATF_CHECK(fmod(2.0, 0.5) == 0); From owner-svn-src-user@FreeBSD.ORG Thu Apr 16 09:41:38 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C01CAB20; Thu, 16 Apr 2015 09:41: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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id ABFB6D04; Thu, 16 Apr 2015 09:41:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3G9fcHr050714; Thu, 16 Apr 2015 09:41:38 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3G9fcgl050713; Thu, 16 Apr 2015 09:41:38 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504160941.t3G9fcgl050713@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 16 Apr 2015 09:41:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281598 - user/ngie/more-tests/tests/sys/socket 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.20 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, 16 Apr 2015 09:41:38 -0000 Author: ngie Date: Thu Apr 16 09:41:37 2015 New Revision: 281598 URL: https://svnweb.freebsd.org/changeset/base/281598 Log: Fix a warning related to type sizes found by testing on a 32-bit OS ;) (powerpc) Modified: user/ngie/more-tests/tests/sys/socket/so_setfib_test.c Modified: user/ngie/more-tests/tests/sys/socket/so_setfib_test.c ============================================================================== --- user/ngie/more-tests/tests/sys/socket/so_setfib_test.c Thu Apr 16 08:50:41 2015 (r281597) +++ user/ngie/more-tests/tests/sys/socket/so_setfib_test.c Thu Apr 16 09:41:37 2015 (r281598) @@ -183,8 +183,7 @@ main(int argc __unused, char *argv[] __u if (sysctlbyname("net.fibs", &rt_numfibs, &s, NULL, 0) == -1) err(1, "sysctlbyname(net.fibs, ..)"); - printf("1..%lu\n", - (nitems(t_dom) - 1) * nitems(t_type) * (2 + rt_numfibs + 2 + 3)); + printf("1..%zu\n", (nitems(t_dom) - 1) * nitems(t_type) * (2 + rt_numfibs + 2 + 3)); /* Adjust from number to index. */ rt_numfibs -= 1; From owner-svn-src-user@FreeBSD.ORG Thu Apr 16 21:47:26 2015 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5B8E9F63; Thu, 16 Apr 2015 21:47:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4707D1B6C; Thu, 16 Apr 2015 21:47:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3GLlQdk002728; Thu, 16 Apr 2015 21:47:26 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3GLlQjt002727; Thu, 16 Apr 2015 21:47:26 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504162147.t3GLlQjt002727@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 16 Apr 2015 21:47:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281619 - user/ngie/more-tests/contrib/netbsd-tests/lib/libm 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.20 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, 16 Apr 2015 21:47:26 -0000 Author: ngie Date: Thu Apr 16 21:47:25 2015 New Revision: 281619 URL: https://svnweb.freebsd.org/changeset/base/281619 Log: Similar to r281597... the fmodl compat shims on arm/mips/powerpc don't seem to be all there #if 0 the code for now Modified: user/ngie/more-tests/contrib/netbsd-tests/lib/libm/t_fmod.c Modified: user/ngie/more-tests/contrib/netbsd-tests/lib/libm/t_fmod.c ============================================================================== --- user/ngie/more-tests/contrib/netbsd-tests/lib/libm/t_fmod.c Thu Apr 16 21:45:07 2015 (r281618) +++ user/ngie/more-tests/contrib/netbsd-tests/lib/libm/t_fmod.c Thu Apr 16 21:47:25 2015 (r281619) @@ -49,11 +49,15 @@ ATF_TC_BODY(fmod, tc) ATF_CHECK(fmodf(2.0, 0.5) == 0); ATF_CHECK(fmod(2.0, 0.5) == 0); +#if !defined(__FreeBSD__) || LDBL_PREC != 53 ATF_CHECK(fmodl(2.0, 0.5) == 0); +#endif ATF_CHECK(fabsf(fmodf(1.0, 0.1) - 0.1f) <= 55 * FLT_EPSILON); ATF_CHECK(fabs(fmod(1.0, 0.1) - 0.1) <= 55 * DBL_EPSILON); +#if !defined(__FreeBSD__) || LDBL_PREC != 53 ATF_CHECK(fabsl(fmodl(1.0, 0.1L) - 0.1L) <= 55 * LDBL_EPSILON); +#endif } ATF_TP_ADD_TCS(tp) From owner-svn-src-user@FreeBSD.ORG Thu Apr 16 21:49:15 2015 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D9BA117C; Thu, 16 Apr 2015 21:49: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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C580A1B89; Thu, 16 Apr 2015 21:49:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3GLnF8T002992; Thu, 16 Apr 2015 21:49:15 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3GLnFf2002991; Thu, 16 Apr 2015 21:49:15 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504162149.t3GLnFf2002991@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 16 Apr 2015 21:49:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281620 - user/ngie/more-tests/tests/sys/socket 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.20 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, 16 Apr 2015 21:49:15 -0000 Author: ngie Date: Thu Apr 16 21:49:15 2015 New Revision: 281620 URL: https://svnweb.freebsd.org/changeset/base/281620 Log: sparc64 gcc has -Wcast-align issues as well on sparc64; disable the warning for all compilers Modified: user/ngie/more-tests/tests/sys/socket/Makefile Modified: user/ngie/more-tests/tests/sys/socket/Makefile ============================================================================== --- user/ngie/more-tests/tests/sys/socket/Makefile Thu Apr 16 21:47:25 2015 (r281619) +++ user/ngie/more-tests/tests/sys/socket/Makefile Thu Apr 16 21:49:15 2015 (r281620) @@ -39,7 +39,7 @@ DPADD.sendfile_test+= ${LIBMD} LDADD.sendfile_test+= -lmd # XXX: unix_cmsg_test and unix_passfd_test need to be fixed -NO_WCAST_ALIGN.clang= +NO_WCAST_ALIGN= WARNS?= 6 From owner-svn-src-user@FreeBSD.ORG Thu Apr 16 21:54:17 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4CED354A; Thu, 16 Apr 2015 21:54:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 34B5B1C53; Thu, 16 Apr 2015 21:54:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3GLsHL7007292; Thu, 16 Apr 2015 21:54:17 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3GLs8Di007246; Thu, 16 Apr 2015 21:54:08 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504162154.t3GLs8Di007246@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 16 Apr 2015 21:54:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281621 - in user/ngie/more-tests: . bin/csh etc/mtree include lib/libcompiler_rt sbin/pfctl share/man/man3 share/mk sys/amd64/vmm/amd sys/arm64/conf sys/boot/forth sys/conf sys/contrib... 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.20 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, 16 Apr 2015 21:54:17 -0000 Author: ngie Date: Thu Apr 16 21:54:08 2015 New Revision: 281621 URL: https://svnweb.freebsd.org/changeset/base/281621 Log: MFhead @ r281620 Added: user/ngie/more-tests/sys/crypto/aesni/aesni_os.h - copied unchanged from r281620, head/sys/crypto/aesni/aesni_os.h user/ngie/more-tests/sys/net/altq/ - copied from r281620, head/sys/net/altq/ Deleted: user/ngie/more-tests/sys/contrib/altq/ Modified: user/ngie/more-tests/Makefile.inc1 user/ngie/more-tests/ObsoleteFiles.inc user/ngie/more-tests/UPDATING user/ngie/more-tests/bin/csh/iconv_stub.h user/ngie/more-tests/etc/mtree/BSD.include.dist user/ngie/more-tests/include/Makefile user/ngie/more-tests/lib/libcompiler_rt/Makefile user/ngie/more-tests/sbin/pfctl/parse.y user/ngie/more-tests/sbin/pfctl/pfctl.c user/ngie/more-tests/sbin/pfctl/pfctl_altq.c user/ngie/more-tests/sbin/pfctl/pfctl_qstats.c user/ngie/more-tests/share/man/man3/queue.3 user/ngie/more-tests/share/mk/src.libnames.mk user/ngie/more-tests/sys/amd64/vmm/amd/svm.c user/ngie/more-tests/sys/arm64/conf/DEFAULTS user/ngie/more-tests/sys/boot/forth/check-password.4th user/ngie/more-tests/sys/boot/forth/check-password.4th.8 user/ngie/more-tests/sys/boot/forth/loader.conf user/ngie/more-tests/sys/conf/files user/ngie/more-tests/sys/conf/kern.pre.mk user/ngie/more-tests/sys/conf/kmod.mk user/ngie/more-tests/sys/crypto/aesni/aesencdec.h user/ngie/more-tests/sys/crypto/aesni/aesni_ghash.c user/ngie/more-tests/sys/dev/usb/wlan/if_urtwn.c user/ngie/more-tests/sys/kern/init_main.c user/ngie/more-tests/sys/net/if_var.h user/ngie/more-tests/sys/net/ifq.h user/ngie/more-tests/sys/netinet/tcp_subr.c user/ngie/more-tests/sys/netinet/tcp_timer.c user/ngie/more-tests/sys/netinet/tcp_timer.h user/ngie/more-tests/sys/netinet/tcp_var.h user/ngie/more-tests/sys/netpfil/pf/pf_ioctl.c user/ngie/more-tests/sys/sys/param.h user/ngie/more-tests/sys/sys/procfs.h user/ngie/more-tests/usr.bin/wc/wc.c user/ngie/more-tests/usr.sbin/bhyve/bhyverun.c user/ngie/more-tests/usr.sbin/bsdinstall/scripts/zfsboot Directory Properties: user/ngie/more-tests/ (props changed) user/ngie/more-tests/etc/ (props changed) user/ngie/more-tests/include/ (props changed) user/ngie/more-tests/sbin/ (props changed) user/ngie/more-tests/share/ (props changed) user/ngie/more-tests/sys/ (props changed) user/ngie/more-tests/sys/amd64/vmm/ (props changed) user/ngie/more-tests/sys/boot/ (props changed) user/ngie/more-tests/sys/conf/ (props changed) user/ngie/more-tests/usr.sbin/bhyve/ (props changed) Modified: user/ngie/more-tests/Makefile.inc1 ============================================================================== --- user/ngie/more-tests/Makefile.inc1 Thu Apr 16 21:49:15 2015 (r281620) +++ user/ngie/more-tests/Makefile.inc1 Thu Apr 16 21:54:08 2015 (r281621) @@ -1304,12 +1304,10 @@ _lex= usr.bin/lex _awk= usr.bin/awk .endif -.if ${BOOTSTRAPPING} < 1001506 _yacc= lib/liby \ usr.bin/yacc ${_bt}-usr.bin/yacc: ${_bt}-lib/liby -.endif .if ${MK_BSNMP} != "no" _gensnmptree= usr.sbin/bsnmpd/gensnmptree @@ -1359,8 +1357,13 @@ _kerberos5_bootstrap_tools= \ kerberos5/tools/slc \ usr.bin/compile_et -${_bt}-kerberos5/tools/slc: ${_bt}-kerberos5/lib/libroken -${_bt}-kerberos5/tools/asn1_compile: ${_bt}-kerberos5/lib/libroken +${_bt}-kerberos5/lib/libroken: ${_bt}-kerberos5/tools/make-roken +${_bt}-kerberos5/tools/asn1_compile: \ + ${_bt}-kerberos5/lib/libroken ${_bt}-kerberos5/lib/libvers +${_bt}-kerberos5/tools/slc: \ + ${_bt}-kerberos5/lib/libroken ${_bt}-kerberos5/lib/libvers +${_bt}-usr.bin/compile_et: \ + ${_bt}-kerberos5/lib/libroken ${_bt}-kerberos5/lib/libvers .endif bootstrap-tools: .PHONY Modified: user/ngie/more-tests/ObsoleteFiles.inc ============================================================================== --- user/ngie/more-tests/ObsoleteFiles.inc Thu Apr 16 21:49:15 2015 (r281620) +++ user/ngie/more-tests/ObsoleteFiles.inc Thu Apr 16 21:54:08 2015 (r281621) @@ -38,6 +38,21 @@ # xargs -n1 | sort | uniq -d; # done +# 20150416: ALTQ moved to net/altq +OLD_FILES+=usr/include/altq/altq_rmclass_debug.h +OLD_FILES+=usr/include/altq/altq.h +OLD_FILES+=usr/include/altq/altq_cdnr.h +OLD_FILES+=usr/include/altq/altq_hfsc.h +OLD_FILES+=usr/include/altq/altq_priq.h +OLD_FILES+=usr/include/altq/altqconf.h +OLD_FILES+=usr/include/altq/altq_classq.h +OLD_FILES+=usr/include/altq/altq_red.h +OLD_FILES+=usr/include/altq/if_altq.h +OLD_FILES+=usr/include/altq/altq_var.h +OLD_FILES+=usr/include/altq/altq_rmclass.h +OLD_FILES+=usr/include/altq/altq_cbq.h +OLD_FILES+=usr/include/altq/altq_rio.h +OLD_DIRS+=usr/include/altq # 20150410 OLD_FILES+=usr/share/doc/usd/10.exref/paper.ascii.gz OLD_FILES+=usr/share/doc/usd/10.exref/summary.ascii.gz Modified: user/ngie/more-tests/UPDATING ============================================================================== --- user/ngie/more-tests/UPDATING Thu Apr 16 21:49:15 2015 (r281620) +++ user/ngie/more-tests/UPDATING Thu Apr 16 21:54:08 2015 (r281621) @@ -35,6 +35,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 The const qualifier has been removed from iconv(3) to comply with POSIX. The ports tree is aware of this from r384038 onwards. +20150416: + Libraries specified by LIBADD in Makefiles must have a corresponding + DPADD_ variable to ensure correct dependencies. This is now + enforced in src.libnames.mk. + 20150324: From legacy ata(4) driver was removed support for SATA controllers supported by more functional drivers ahci(4), siis(4) and mvs(4). Modified: user/ngie/more-tests/bin/csh/iconv_stub.h ============================================================================== --- user/ngie/more-tests/bin/csh/iconv_stub.h Thu Apr 16 21:49:15 2015 (r281620) +++ user/ngie/more-tests/bin/csh/iconv_stub.h Thu Apr 16 21:54:08 2015 (r281621) @@ -30,7 +30,7 @@ #define _ICONV_H_ typedef void *iconv_t; -typedef size_t dl_iconv_t(iconv_t, const char **, size_t *, char **, size_t *); +typedef size_t dl_iconv_t(iconv_t, char **, size_t *, char **, size_t *); typedef int dl_iconv_close_t(iconv_t); extern iconv_t dl_iconv_open(const char *, const char *); Modified: user/ngie/more-tests/etc/mtree/BSD.include.dist ============================================================================== --- user/ngie/more-tests/etc/mtree/BSD.include.dist Thu Apr 16 21:49:15 2015 (r281620) +++ user/ngie/more-tests/etc/mtree/BSD.include.dist Thu Apr 16 21:54:08 2015 (r281621) @@ -5,8 +5,6 @@ /set type=dir uname=root gname=wheel mode=0755 . - altq - .. arpa .. atf-c @@ -254,6 +252,8 @@ .. .. net + altq + .. .. net80211 .. Modified: user/ngie/more-tests/include/Makefile ============================================================================== --- user/ngie/more-tests/include/Makefile Thu Apr 16 21:49:15 2015 (r281620) +++ user/ngie/more-tests/include/Makefile Thu Apr 16 21:54:08 2015 (r281621) @@ -50,6 +50,7 @@ LSUBDIRS= cam/ata cam/scsi \ geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \ geom/mirror geom/mountver geom/multipath geom/nop \ geom/raid geom/raid3 geom/shsec geom/stripe geom/virstor \ + net/altq \ netgraph/atm netgraph/netflow \ security/audit \ security/mac_biba security/mac_bsdextended security/mac_lomac \ @@ -144,7 +145,7 @@ compat: -p ${DESTDIR}${INCLUDEDIR} copies: -.for i in ${LDIRS} ${LSUBDIRS} ${LSUBSUBDIRS} altq crypto machine machine/pc \ +.for i in ${LDIRS} ${LSUBDIRS} ${LSUBSUBDIRS} crypto machine machine/pc \ ${_MARCHS} .if exists(${DESTDIR}${INCLUDEDIR}/$i) cd ${DESTDIR}${INCLUDEDIR}/$i; \ @@ -179,9 +180,6 @@ copies: cd ${.CURDIR}/../sys/dev/pci; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 pcireg.h \ ${DESTDIR}${INCLUDEDIR}/dev/pci - cd ${.CURDIR}/../sys/contrib/altq/altq; \ - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ - ${DESTDIR}${INCLUDEDIR}/altq cd ${.CURDIR}/../sys/fs/cd9660/; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ ${DESTDIR}${INCLUDEDIR}/isofs/cd9660 @@ -279,11 +277,6 @@ symlinks: ln -fs ../../../../../sys/$i/$$h ${DESTDIR}${INCLUDEDIR}/$i; \ done .endfor - cd ${.CURDIR}/../sys/contrib/altq/altq; \ - for h in *.h; do \ - ln -fs ../../../sys/contrib/altq/altq/$$h \ - ${DESTDIR}${INCLUDEDIR}/altq; \ - done .if ${MK_IPFILTER} != "no" cd ${.CURDIR}/../sys/contrib/ipfilter/netinet; \ for h in *.h; do \ Modified: user/ngie/more-tests/lib/libcompiler_rt/Makefile ============================================================================== --- user/ngie/more-tests/lib/libcompiler_rt/Makefile Thu Apr 16 21:49:15 2015 (r281620) +++ user/ngie/more-tests/lib/libcompiler_rt/Makefile Thu Apr 16 21:54:08 2015 (r281621) @@ -144,6 +144,7 @@ SRCF+= addtf3 \ fixunstfdi \ fixunstfsi \ fixunstfti \ + floatunsitf \ multf3 \ subtf3 \ trunctfdf2 \ Modified: user/ngie/more-tests/sbin/pfctl/parse.y ============================================================================== --- user/ngie/more-tests/sbin/pfctl/parse.y Thu Apr 16 21:49:15 2015 (r281620) +++ user/ngie/more-tests/sbin/pfctl/parse.y Thu Apr 16 21:54:08 2015 (r281621) @@ -44,10 +44,10 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include Modified: user/ngie/more-tests/sbin/pfctl/pfctl.c ============================================================================== --- user/ngie/more-tests/sbin/pfctl/pfctl.c Thu Apr 16 21:49:15 2015 (r281620) +++ user/ngie/more-tests/sbin/pfctl/pfctl.c Thu Apr 16 21:54:08 2015 (r281621) @@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include +#include #include #include Modified: user/ngie/more-tests/sbin/pfctl/pfctl_altq.c ============================================================================== --- user/ngie/more-tests/sbin/pfctl/pfctl_altq.c Thu Apr 16 21:49:15 2015 (r281620) +++ user/ngie/more-tests/sbin/pfctl/pfctl_altq.c Thu Apr 16 21:54:08 2015 (r281621) @@ -38,10 +38,10 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "pfctl_parser.h" #include "pfctl.h" Modified: user/ngie/more-tests/sbin/pfctl/pfctl_qstats.c ============================================================================== --- user/ngie/more-tests/sbin/pfctl/pfctl_qstats.c Thu Apr 16 21:49:15 2015 (r281620) +++ user/ngie/more-tests/sbin/pfctl/pfctl_qstats.c Thu Apr 16 21:54:08 2015 (r281621) @@ -34,10 +34,10 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "pfctl.h" #include "pfctl_parser.h" Modified: user/ngie/more-tests/share/man/man3/queue.3 ============================================================================== --- user/ngie/more-tests/share/man/man3/queue.3 Thu Apr 16 21:49:15 2015 (r281620) +++ user/ngie/more-tests/share/man/man3/queue.3 Thu Apr 16 21:54:08 2015 (r281621) @@ -147,7 +147,7 @@ lists and tail queues .Fn STAILQ_INSERT_AFTER "STAILQ_HEAD *head" "TYPE *listelm" "TYPE *elm" "STAILQ_ENTRY NAME" .Fn STAILQ_INSERT_HEAD "STAILQ_HEAD *head" "TYPE *elm" "STAILQ_ENTRY NAME" .Fn STAILQ_INSERT_TAIL "STAILQ_HEAD *head" "TYPE *elm" "STAILQ_ENTRY NAME" -.Fn STAILQ_LAST "STAILQ_HEAD *head" "TYPE" "STAILQ_ENTRY NAME" +.Fn STAILQ_LAST "STAILQ_HEAD *head" "TYPE *elm" "STAILQ_ENTRY NAME" .Fn STAILQ_NEXT "TYPE *elm" "STAILQ_ENTRY NAME" .Fn STAILQ_REMOVE_AFTER "STAILQ_HEAD *head" "TYPE *elm" "STAILQ_ENTRY NAME" .Fn STAILQ_REMOVE_HEAD "STAILQ_HEAD *head" "STAILQ_ENTRY NAME" Modified: user/ngie/more-tests/share/mk/src.libnames.mk ============================================================================== --- user/ngie/more-tests/share/mk/src.libnames.mk Thu Apr 16 21:49:15 2015 (r281620) +++ user/ngie/more-tests/share/mk/src.libnames.mk Thu Apr 16 21:54:08 2015 (r281621) @@ -282,10 +282,14 @@ LDADD_gssapi_krb5+= ${LDADD_pthread} .if ${_PRIVATELIBS:M${_l}} USEPRIVATELIB+= ${_l} .endif -DPADD+= ${DPADD_${_l}} +DPADD+= ${DPADD_${_l}:Umissing-dpadd_${_l}} LDADD+= ${LDADD_${_l}} .endfor +.if defined(DPADD) && ${DPADD:Mmissing-dpadd_*} +.error Missing ${DPADD:Mmissing-dpadd_*:S/missing-dpadd_//:S/^/DPADD_/} variable add "${DPADD:Mmissing-dpadd_*:S/missing-dpadd_//}" to _LIBRARIES, _INTERNALLIBS, or _PRIVATELIBS and define "${DPADD:Mmissing-dpadd_*:S/missing-dpadd_//:S/^/LIB/:tu}". +.endif + .if defined(USEPRIVATELIB) LDFLAGS+= -rpath ${LIBPRIVATEDIR} .endif Modified: user/ngie/more-tests/sys/amd64/vmm/amd/svm.c ============================================================================== --- user/ngie/more-tests/sys/amd64/vmm/amd/svm.c Thu Apr 16 21:49:15 2015 (r281620) +++ user/ngie/more-tests/sys/amd64/vmm/amd/svm.c Thu Apr 16 21:54:08 2015 (r281621) @@ -1917,7 +1917,7 @@ svm_vmrun(void *arg, int vcpu, register_ } /* We are asked to give the cpu by scheduler. */ - if (curthread->td_flags & (TDF_ASTPENDING | TDF_NEEDRESCHED)) { + if (vcpu_should_yield(vm, vcpu)) { enable_gintr(); vm_exit_astpending(vm, vcpu, state->rip); break; Modified: user/ngie/more-tests/sys/arm64/conf/DEFAULTS ============================================================================== --- user/ngie/more-tests/sys/arm64/conf/DEFAULTS Thu Apr 16 21:49:15 2015 (r281620) +++ user/ngie/more-tests/sys/arm64/conf/DEFAULTS Thu Apr 16 21:54:08 2015 (r281621) @@ -3,7 +3,7 @@ # # $FreeBSD$ -machine arm64 +machine arm64 aarch64 # Pseudo devices. device mem # Memory and kernel memory devices Modified: user/ngie/more-tests/sys/boot/forth/check-password.4th ============================================================================== --- user/ngie/more-tests/sys/boot/forth/check-password.4th Thu Apr 16 21:49:15 2015 (r281620) +++ user/ngie/more-tests/sys/boot/forth/check-password.4th Thu Apr 16 21:54:08 2015 (r281621) @@ -146,6 +146,15 @@ only forth definitions also password-pro 2drop read-reset else drop then + \ Prompt for GEOM ELI (geli(8)) passphrase if enabled + s" geom_eli_passphrase_prompt" getenv dup -1 <> if + s" YES" compare-insensitive 0= if + s" GELI Passphrase: " read ( prompt -- ) + readval readlen @ s" kern.geom.eli.passphrase" setenv + read-reset + then + else drop then + \ Exit if a password was not set s" password" getenv -1 = if exit else drop then Modified: user/ngie/more-tests/sys/boot/forth/check-password.4th.8 ============================================================================== --- user/ngie/more-tests/sys/boot/forth/check-password.4th.8 Thu Apr 16 21:49:15 2015 (r281620) +++ user/ngie/more-tests/sys/boot/forth/check-password.4th.8 Thu Apr 16 21:54:08 2015 (r281621) @@ -1,4 +1,4 @@ -.\" Copyright (c) 2011-2012 Devin Teske +.\" Copyright (c) 2011-2015 Devin Teske .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 10, 2012 +.Dd March 20, 2015 .Dt CHECK-PASSWORD.4TH 8 .Os .Sh NAME @@ -33,8 +33,12 @@ .Sh DESCRIPTION The file that goes by the name of .Nm -is a set of commands designed to either prevent booting or prevent modification -of boot options without an appropriately configured password. +is a set of commands designed to do one or more of the following: +.Pp +.Dl o Prevent booting without password +.Dl o Prevent modification of boot options without password +.Dl o Provide a password to mount geli(8) encrypted root disk(s) +.Pp The commands of .Nm by themselves are not enough for most uses. @@ -58,14 +62,23 @@ The commands provided by it are: .Pp .Bl -tag -width disable-module_module -compact -offset indent .It Ic check-password -Dual-purpose function that can either protect the interactive boot menu or -prevent boot without password (separately). +Multi-purpose function that can protect the interactive boot menu, +prevent boot without password, or prompt for geli(8) passphrase +.Pq depending on Xr loader.conf 5 settings . .Pp First checks .Va bootlock_password and if-set, the user cannot continue until the correct password is entered. .Pp -Next checks +Next, checks +.Va geom_eli_passphrase_prompt +and if set to +.Li YES +.Pq case-insensitive +prompts the user to enter their GELI password for later mounting of the root +device(s) during boot. +.Pp +Last, checks .Va password and if-set, tries to .Ic autoboot @@ -81,6 +94,11 @@ The environment variables that effect it Sets the bootlock password (up to 16 characters long) that is required by .Ic check-password to be entered before the system is allowed to boot. +.It Va geom_eli_passphrase_prompt +Selects whether loader(8) will prompt for GELI credentials, handing-off to the +kernel for later mounting of +.Xr geli 8 +encrypted root device(s). .It Va password Sets the password (up to 16 characters long) that is required by .Ic check-password @@ -122,6 +140,16 @@ to prevent booting without password: .Bd -literal -offset indent -compact bootlock_password="boot" .Ed +.Pp +Add the following to +.Xr loader.conf 5 +to generate a prompt at boot to collect GELI credentials for mounting +.Xr geli 8 +encrypted root device(s): +.Pp +.Bd -literal -offset indent -compact +geom_eli_passphrase_prompt="YES" +.Ed .Sh SEE ALSO .Xr loader.conf 5 , .Xr loader 8 , Modified: user/ngie/more-tests/sys/boot/forth/loader.conf ============================================================================== --- user/ngie/more-tests/sys/boot/forth/loader.conf Thu Apr 16 21:49:15 2015 (r281620) +++ user/ngie/more-tests/sys/boot/forth/loader.conf Thu Apr 16 21:54:08 2015 (r281621) @@ -62,6 +62,7 @@ entropy_cache_type="/boot/entropy" # "NO" to disable autobooting #password="" # Prevent changes to boot options #bootlock_password="" # Prevent booting (see check-password.4th(8)) +#geom_eli_passphrase_prompt="NO" # Prompt for geli(8) passphrase to mount root #beastie_disable="NO" # Turn the beastie boot menu on and off #kernels="kernel kernel.old" # Kernels to display in the boot menu #loader_logo="orbbw" # Desired logo: orbbw, orb, fbsdbw, beastiebw, beastie, none Modified: user/ngie/more-tests/sys/conf/files ============================================================================== --- user/ngie/more-tests/sys/conf/files Thu Apr 16 21:49:15 2015 (r281620) +++ user/ngie/more-tests/sys/conf/files Thu Apr 16 21:54:08 2015 (r281621) @@ -247,14 +247,6 @@ compat/freebsd32/freebsd32_ioctl.c optio compat/freebsd32/freebsd32_misc.c optional compat_freebsd32 compat/freebsd32/freebsd32_syscalls.c optional compat_freebsd32 compat/freebsd32/freebsd32_sysent.c optional compat_freebsd32 -contrib/altq/altq/altq_cbq.c optional altq -contrib/altq/altq/altq_cdnr.c optional altq -contrib/altq/altq/altq_hfsc.c optional altq -contrib/altq/altq/altq_priq.c optional altq -contrib/altq/altq/altq_red.c optional altq -contrib/altq/altq/altq_rio.c optional altq -contrib/altq/altq/altq_rmclass.c optional altq -contrib/altq/altq/altq_subr.c optional altq contrib/dev/acpica/common/ahids.c optional acpi acpi_debug contrib/dev/acpica/common/ahuuids.c optional acpi acpi_debug contrib/dev/acpica/components/debugger/dbcmds.c optional acpi acpi_debug @@ -3272,6 +3264,14 @@ libkern/strtoul.c standard libkern/strtouq.c standard libkern/strvalid.c standard libkern/timingsafe_bcmp.c standard +net/altq/altq_cbq.c optional altq +net/altq/altq_cdnr.c optional altq +net/altq/altq_hfsc.c optional altq +net/altq/altq_priq.c optional altq +net/altq/altq_red.c optional altq +net/altq/altq_rio.c optional altq +net/altq/altq_rmclass.c optional altq +net/altq/altq_subr.c optional altq net/bpf.c standard net/bpf_buffer.c optional bpf net/bpf_jitter.c optional bpf_jitter Modified: user/ngie/more-tests/sys/conf/kern.pre.mk ============================================================================== --- user/ngie/more-tests/sys/conf/kern.pre.mk Thu Apr 16 21:49:15 2015 (r281620) +++ user/ngie/more-tests/sys/conf/kern.pre.mk Thu Apr 16 21:54:08 2015 (r281621) @@ -64,13 +64,10 @@ NOSTDINC= -nostdinc INCLUDES= ${NOSTDINC} ${INCLMAGIC} -I. -I$S -# This hack lets us use the OpenBSD altq code without spamming a new -# include path into contrib'ed source files. -INCLUDES+= -I$S/contrib/altq - .if make(depend) || make(kernel-depend) -# ... and the same for ipfilter +# This hack lets us use the ipfilter code without spamming a new +# include path into contrib'ed source files. INCLUDES+= -I$S/contrib/ipfilter # ... and the same for ath Modified: user/ngie/more-tests/sys/conf/kmod.mk ============================================================================== --- user/ngie/more-tests/sys/conf/kmod.mk Thu Apr 16 21:49:15 2015 (r281620) +++ user/ngie/more-tests/sys/conf/kmod.mk Thu Apr 16 21:54:08 2015 (r281621) @@ -101,10 +101,6 @@ CFLAGS+= -DHAVE_KERNEL_OPTION_HEADERS -i # set because there are no standard paths for non-headers. CFLAGS+= -I. -I${SYSDIR} -# Add -I path for altq headers as they are included via net/if_var.h -# for example. -CFLAGS+= -I${SYSDIR}/contrib/altq - CFLAGS.gcc+= -finline-limit=${INLINE_LIMIT} CFLAGS.gcc+= -fms-extensions CFLAGS.gcc+= --param inline-unit-growth=100 Modified: user/ngie/more-tests/sys/crypto/aesni/aesencdec.h ============================================================================== --- user/ngie/more-tests/sys/crypto/aesni/aesencdec.h Thu Apr 16 21:49:15 2015 (r281620) +++ user/ngie/more-tests/sys/crypto/aesni/aesencdec.h Thu Apr 16 21:54:08 2015 (r281621) @@ -27,6 +27,8 @@ * */ +#include + #include static inline void Modified: user/ngie/more-tests/sys/crypto/aesni/aesni_ghash.c ============================================================================== --- user/ngie/more-tests/sys/crypto/aesni/aesni_ghash.c Thu Apr 16 21:49:15 2015 (r281620) +++ user/ngie/more-tests/sys/crypto/aesni/aesni_ghash.c Thu Apr 16 21:54:08 2015 (r281621) @@ -67,6 +67,7 @@ #ifdef _KERNEL #include +#include #else #include #endif Copied: user/ngie/more-tests/sys/crypto/aesni/aesni_os.h (from r281620, head/sys/crypto/aesni/aesni_os.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests/sys/crypto/aesni/aesni_os.h Thu Apr 16 21:54:08 2015 (r281621, copy of r281620, head/sys/crypto/aesni/aesni_os.h) @@ -0,0 +1,33 @@ +/*- + * Copyright 2015 Craig Rodrigues + * 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$ + * + */ + +#if defined(__GNUC__) && defined(_KERNEL) +/* Suppress inclusion of gcc's mm_malloc.h header */ +#define _MM_MALLOC_H_INCLUDED 1 +#endif Modified: user/ngie/more-tests/sys/dev/usb/wlan/if_urtwn.c ============================================================================== --- user/ngie/more-tests/sys/dev/usb/wlan/if_urtwn.c Thu Apr 16 21:49:15 2015 (r281620) +++ user/ngie/more-tests/sys/dev/usb/wlan/if_urtwn.c Thu Apr 16 21:54:08 2015 (r281621) @@ -1195,7 +1195,7 @@ urtwn_efuse_read(struct urtwn_softc *sc) uint8_t *rom = (uint8_t *)&sc->rom; uint16_t addr = 0; uint32_t reg; - uint8_t off, msk; + uint8_t off, msk, vol; int i; urtwn_efuse_switch_power(sc); @@ -1228,10 +1228,15 @@ urtwn_efuse_read(struct urtwn_softc *sc) printf("\n"); } #endif + /* Disable LDO 2.5V. */ + vol = urtwn_read_1(sc, R92C_EFUSE_TEST + 3); + urtwn_write_1(sc, R92C_EFUSE_TEST + 3, vol & ~(0x80)); + } static void urtwn_efuse_switch_power(struct urtwn_softc *sc) { + uint8_t vol; uint32_t reg; reg = urtwn_read_2(sc, R92C_SYS_ISO_CTRL); @@ -1250,6 +1255,12 @@ urtwn_efuse_switch_power(struct urtwn_so urtwn_write_2(sc, R92C_SYS_CLKR, reg | R92C_SYS_CLKR_LOADER_EN | R92C_SYS_CLKR_ANA8M); } + + /* Enable LDO 2.5V. */ + vol = urtwn_read_1(sc, R92C_EFUSE_TEST + 3); + vol &= 0x0f; + vol |= 0x30; + urtwn_write_1(sc, R92C_EFUSE_TEST + 3, (vol | 0x80)); } static int Modified: user/ngie/more-tests/sys/kern/init_main.c ============================================================================== --- user/ngie/more-tests/sys/kern/init_main.c Thu Apr 16 21:49:15 2015 (r281620) +++ user/ngie/more-tests/sys/kern/init_main.c Thu Apr 16 21:54:08 2015 (r281621) @@ -710,6 +710,9 @@ start_init(void *dummy) vfs_mountroot(); + /* Wipe GELI passphrase from the environment. */ + kern_unsetenv("kern.geom.eli.passphrase"); + /* * Need just enough stack to hold the faked-up "execve()" arguments. */ Modified: user/ngie/more-tests/sys/net/if_var.h ============================================================================== --- user/ngie/more-tests/sys/net/if_var.h Thu Apr 16 21:49:15 2015 (r281620) +++ user/ngie/more-tests/sys/net/if_var.h Thu Apr 16 21:54:08 2015 (r281621) @@ -83,7 +83,7 @@ struct netmap_adapter; #define IF_DUNIT_NONE -1 -#include +#include TAILQ_HEAD(ifnethead, ifnet); /* we use TAILQs so that the order of */ TAILQ_HEAD(ifaddrhead, ifaddr); /* instantiation is preserved in the list */ Modified: user/ngie/more-tests/sys/net/ifq.h ============================================================================== --- user/ngie/more-tests/sys/net/ifq.h Thu Apr 16 21:49:15 2015 (r281620) +++ user/ngie/more-tests/sys/net/ifq.h Thu Apr 16 21:54:08 2015 (r281621) @@ -47,7 +47,7 @@ */ #define IF_DUNIT_NONE -1 -#include +#include /* * Structure defining a queue for a network interface. Modified: user/ngie/more-tests/sys/netinet/tcp_subr.c ============================================================================== --- user/ngie/more-tests/sys/netinet/tcp_subr.c Thu Apr 16 21:49:15 2015 (r281620) +++ user/ngie/more-tests/sys/netinet/tcp_subr.c Thu Apr 16 21:54:08 2015 (r281621) @@ -230,6 +230,7 @@ static struct inpcb *tcp_notify(struct i static struct inpcb *tcp_mtudisc_notify(struct inpcb *, int); static char * tcp_log_addr(struct in_conninfo *inc, struct tcphdr *th, void *ip4hdr, const void *ip6hdr); +static void tcp_timer_discard(struct tcpcb *, uint32_t); /* * Target size of TCP PCB hash tables. Must be a power of two. @@ -801,7 +802,13 @@ tcp_newtcpcb(struct inpcb *inp) if (V_tcp_do_sack) tp->t_flags |= TF_SACK_PERMIT; TAILQ_INIT(&tp->snd_holes); - tp->t_inpcb = inp; /* XXX */ + /* + * The tcpcb will hold a reference on its inpcb until tcp_discardcb() + * is called. + */ + in_pcbref(inp); /* Reference for tcpcb */ + tp->t_inpcb = inp; + /* * Init srtt to TCPTV_SRTTBASE (0), so we can tell that we have no * rtt estimate. Set rttvar so that srtt + 4 * rttvar gives @@ -920,6 +927,7 @@ tcp_discardcb(struct tcpcb *tp) #ifdef INET6 int isipv6 = (inp->inp_vflag & INP_IPV6) != 0; #endif /* INET6 */ + int released; INP_WLOCK_ASSERT(inp); @@ -927,22 +935,15 @@ tcp_discardcb(struct tcpcb *tp) * Make sure that all of our timers are stopped before we delete the * PCB. * - * XXXRW: Really, we would like to use callout_drain() here in order - * to avoid races experienced in tcp_timer.c where a timer is already - * executing at this point. However, we can't, both because we're - * running in a context where we can't sleep, and also because we - * hold locks required by the timers. What we instead need to do is - * test to see if callout_drain() is required, and if so, defer some - * portion of the remainder of tcp_discardcb() to an asynchronous - * context that can callout_drain() and then continue. Some care - * will be required to ensure that no further processing takes place - * on the tcpcb, even though it hasn't been freed (a flag?). - */ - callout_stop(&tp->t_timers->tt_rexmt); - callout_stop(&tp->t_timers->tt_persist); - callout_stop(&tp->t_timers->tt_keep); - callout_stop(&tp->t_timers->tt_2msl); - callout_stop(&tp->t_timers->tt_delack); + * If stopping a timer fails, we schedule a discard function in same + * callout, and the last discard function called will take care of + * deleting the tcpcb. + */ + tcp_timer_stop(tp, TT_REXMT); + tcp_timer_stop(tp, TT_PERSIST); + tcp_timer_stop(tp, TT_KEEP); + tcp_timer_stop(tp, TT_2MSL); + tcp_timer_stop(tp, TT_DELACK); /* * If we got enough samples through the srtt filter, @@ -1019,8 +1020,80 @@ tcp_discardcb(struct tcpcb *tp) CC_ALGO(tp) = NULL; inp->inp_ppcb = NULL; - tp->t_inpcb = NULL; - uma_zfree(V_tcpcb_zone, tp); + if ((tp->t_timers->tt_flags & TT_MASK) == 0) { + /* We own the last reference on tcpcb, let's free it. */ + tp->t_inpcb = NULL; + uma_zfree(V_tcpcb_zone, tp); + released = in_pcbrele_wlocked(inp); + KASSERT(!released, ("%s: inp %p should not have been released " + "here", __func__, inp)); + } +} + +void +tcp_timer_2msl_discard(void *xtp) +{ + + tcp_timer_discard((struct tcpcb *)xtp, TT_2MSL); +} + +void +tcp_timer_keep_discard(void *xtp) +{ + + tcp_timer_discard((struct tcpcb *)xtp, TT_KEEP); +} + +void +tcp_timer_persist_discard(void *xtp) +{ + + tcp_timer_discard((struct tcpcb *)xtp, TT_PERSIST); +} + +void +tcp_timer_rexmt_discard(void *xtp) +{ + + tcp_timer_discard((struct tcpcb *)xtp, TT_REXMT); +} + +void +tcp_timer_delack_discard(void *xtp) +{ + + tcp_timer_discard((struct tcpcb *)xtp, TT_DELACK); +} + +void +tcp_timer_discard(struct tcpcb *tp, uint32_t timer_type) +{ + struct inpcb *inp; + + CURVNET_SET(tp->t_vnet); + INP_INFO_WLOCK(&V_tcbinfo); + inp = tp->t_inpcb; + KASSERT(inp != NULL, ("%s: tp %p tp->t_inpcb == NULL", + __func__, tp)); + INP_WLOCK(inp); + KASSERT((tp->t_timers->tt_flags & TT_STOPPED) != 0, + ("%s: tcpcb has to be stopped here", __func__)); + KASSERT((tp->t_timers->tt_flags & timer_type) != 0, + ("%s: discard callout should be running", __func__)); + tp->t_timers->tt_flags &= ~timer_type; + if ((tp->t_timers->tt_flags & TT_MASK) == 0) { + /* We own the last reference on this tcpcb, let's free it. */ + tp->t_inpcb = NULL; + uma_zfree(V_tcpcb_zone, tp); + if (in_pcbrele_wlocked(inp)) { + INP_INFO_WUNLOCK(&V_tcbinfo); + CURVNET_RESTORE(); + return; + } + } + INP_WUNLOCK(inp); + INP_INFO_WUNLOCK(&V_tcbinfo); + CURVNET_RESTORE(); } /* Modified: user/ngie/more-tests/sys/netinet/tcp_timer.c ============================================================================== --- user/ngie/more-tests/sys/netinet/tcp_timer.c Thu Apr 16 21:49:15 2015 (r281620) +++ user/ngie/more-tests/sys/netinet/tcp_timer.c Thu Apr 16 21:54:08 2015 (r281621) @@ -258,10 +258,6 @@ int tcp_backoff[TCP_MAXRXTSHIFT + 1] = static int tcp_totbackoff = 2559; /* sum of tcp_backoff[] */ -static int tcp_timer_race; -SYSCTL_INT(_net_inet_tcp, OID_AUTO, timer_race, CTLFLAG_RD, &tcp_timer_race, - 0, "Count of t_inpcb races on tcp_discardcb"); - /* * TCP timer processing. */ @@ -274,18 +270,7 @@ tcp_timer_delack(void *xtp) CURVNET_SET(tp->t_vnet); inp = tp->t_inpcb; - /* - * XXXRW: While this assert is in fact correct, bugs in the tcpcb - * tear-down mean we need it as a work-around for races between - * timers and tcp_discardcb(). - * - * KASSERT(inp != NULL, ("tcp_timer_delack: inp == NULL")); - */ - if (inp == NULL) { - tcp_timer_race++; - CURVNET_RESTORE(); - return; - } + KASSERT(inp != NULL, ("%s: tp %p tp->t_inpcb == NULL", __func__, tp)); INP_WLOCK(inp); if (callout_pending(&tp->t_timers->tt_delack) || !callout_active(&tp->t_timers->tt_delack)) { @@ -299,6 +284,10 @@ tcp_timer_delack(void *xtp) CURVNET_RESTORE(); return; } + KASSERT((tp->t_timers->tt_flags & TT_STOPPED) == 0, + ("%s: tp %p tcpcb can't be stopped here", __func__, tp)); + KASSERT((tp->t_timers->tt_flags & TT_DELACK) != 0, + ("%s: tp %p delack callout should be running", __func__, tp)); tp->t_flags |= TF_ACKNOW; TCPSTAT_INC(tcps_delack); @@ -318,24 +307,9 @@ tcp_timer_2msl(void *xtp) ostate = tp->t_state; #endif - /* - * XXXRW: Does this actually happen? - */ INP_INFO_WLOCK(&V_tcbinfo); inp = tp->t_inpcb; - /* - * XXXRW: While this assert is in fact correct, bugs in the tcpcb - * tear-down mean we need it as a work-around for races between - * timers and tcp_discardcb(). - * - * KASSERT(inp != NULL, ("tcp_timer_2msl: inp == NULL")); - */ - if (inp == NULL) { - tcp_timer_race++; - INP_INFO_WUNLOCK(&V_tcbinfo); - CURVNET_RESTORE(); - return; - } + KASSERT(inp != NULL, ("%s: tp %p tp->t_inpcb == NULL", __func__, tp)); INP_WLOCK(inp); tcp_free_sackholes(tp); if (callout_pending(&tp->t_timers->tt_2msl) || @@ -352,6 +326,10 @@ tcp_timer_2msl(void *xtp) CURVNET_RESTORE(); return; } + KASSERT((tp->t_timers->tt_flags & TT_STOPPED) == 0, + ("%s: tp %p tcpcb can't be stopped here", __func__, tp)); + KASSERT((tp->t_timers->tt_flags & TT_2MSL) != 0, + ("%s: tp %p 2msl callout should be running", __func__, tp)); /* * 2 MSL timeout in shutdown went off. If we're closed but * still waiting for peer to close and connection has been idle @@ -402,19 +380,7 @@ tcp_timer_keep(void *xtp) #endif INP_INFO_WLOCK(&V_tcbinfo); inp = tp->t_inpcb; - /* - * XXXRW: While this assert is in fact correct, bugs in the tcpcb - * tear-down mean we need it as a work-around for races between - * timers and tcp_discardcb(). - * - * KASSERT(inp != NULL, ("tcp_timer_keep: inp == NULL")); - */ - if (inp == NULL) { - tcp_timer_race++; - INP_INFO_WUNLOCK(&V_tcbinfo); - CURVNET_RESTORE(); - return; - } + KASSERT(inp != NULL, ("%s: tp %p tp->t_inpcb == NULL", __func__, tp)); INP_WLOCK(inp); if (callout_pending(&tp->t_timers->tt_keep) || !callout_active(&tp->t_timers->tt_keep)) { @@ -430,6 +396,10 @@ tcp_timer_keep(void *xtp) CURVNET_RESTORE(); return; } + KASSERT((tp->t_timers->tt_flags & TT_STOPPED) == 0, + ("%s: tp %p tcpcb can't be stopped here", __func__, tp)); + KASSERT((tp->t_timers->tt_flags & TT_KEEP) != 0, + ("%s: tp %p keep callout should be running", __func__, tp)); /* * Keep-alive timer went off; send something * or drop connection if idle for too long. @@ -505,19 +475,7 @@ tcp_timer_persist(void *xtp) #endif INP_INFO_WLOCK(&V_tcbinfo); inp = tp->t_inpcb; - /* - * XXXRW: While this assert is in fact correct, bugs in the tcpcb - * tear-down mean we need it as a work-around for races between - * timers and tcp_discardcb(). - * - * KASSERT(inp != NULL, ("tcp_timer_persist: inp == NULL")); - */ - if (inp == NULL) { - tcp_timer_race++; - INP_INFO_WUNLOCK(&V_tcbinfo); - CURVNET_RESTORE(); - return; - } + KASSERT(inp != NULL, ("%s: tp %p tp->t_inpcb == NULL", __func__, tp)); INP_WLOCK(inp); if (callout_pending(&tp->t_timers->tt_persist) || !callout_active(&tp->t_timers->tt_persist)) { @@ -533,6 +491,10 @@ tcp_timer_persist(void *xtp) CURVNET_RESTORE(); return; } + KASSERT((tp->t_timers->tt_flags & TT_STOPPED) == 0, + ("%s: tp %p tcpcb can't be stopped here", __func__, tp)); + KASSERT((tp->t_timers->tt_flags & TT_PERSIST) != 0, + ("%s: tp %p persist callout should be running", __func__, tp)); /* * Persistance timer into zero window. * Force a byte to be output, if possible. @@ -594,19 +556,7 @@ tcp_timer_rexmt(void * xtp) INP_INFO_RLOCK(&V_tcbinfo); inp = tp->t_inpcb; - /* - * XXXRW: While this assert is in fact correct, bugs in the tcpcb - * tear-down mean we need it as a work-around for races between - * timers and tcp_discardcb(). - * - * KASSERT(inp != NULL, ("tcp_timer_rexmt: inp == NULL")); - */ - if (inp == NULL) { - tcp_timer_race++; - INP_INFO_RUNLOCK(&V_tcbinfo); - CURVNET_RESTORE(); - return; - } + KASSERT(inp != NULL, ("%s: tp %p tp->t_inpcb == NULL", __func__, tp)); INP_WLOCK(inp); if (callout_pending(&tp->t_timers->tt_rexmt) || !callout_active(&tp->t_timers->tt_rexmt)) { @@ -622,6 +572,10 @@ tcp_timer_rexmt(void * xtp) CURVNET_RESTORE(); return; } + KASSERT((tp->t_timers->tt_flags & TT_STOPPED) == 0, + ("%s: tp %p tcpcb can't be stopped here", __func__, tp)); + KASSERT((tp->t_timers->tt_flags & TT_REXMT) != 0, + ("%s: tp %p rexmt callout should be running", __func__, tp)); tcp_free_sackholes(tp); /* * Retransmission timer went off. Message has not @@ -850,7 +804,7 @@ out: } void -tcp_timer_activate(struct tcpcb *tp, int timer_type, u_int delta) +tcp_timer_activate(struct tcpcb *tp, uint32_t timer_type, u_int delta) { struct callout *t_callout; timeout_t *f_callout; @@ -862,6 +816,9 @@ tcp_timer_activate(struct tcpcb *tp, int return; #endif + if (tp->t_timers->tt_flags & TT_STOPPED) + return; + switch (timer_type) { case TT_DELACK: t_callout = &tp->t_timers->tt_delack; @@ -887,14 +844,23 @@ tcp_timer_activate(struct tcpcb *tp, int panic("tp %p bad timer_type %#x", tp, timer_type); } if (delta == 0) { - callout_stop(t_callout); + if ((tp->t_timers->tt_flags & timer_type) && + callout_stop(t_callout)) { + tp->t_timers->tt_flags &= ~timer_type; + } } else { - callout_reset_on(t_callout, delta, f_callout, tp, cpu); + if ((tp->t_timers->tt_flags & timer_type) == 0) { + tp->t_timers->tt_flags |= timer_type; + callout_reset_on(t_callout, delta, f_callout, tp, cpu); + } else { + /* Reset already running callout on the same CPU. */ + callout_reset(t_callout, delta, f_callout, tp); + } } } int -tcp_timer_active(struct tcpcb *tp, int timer_type) +tcp_timer_active(struct tcpcb *tp, uint32_t timer_type) { struct callout *t_callout; @@ -920,6 +886,58 @@ tcp_timer_active(struct tcpcb *tp, int t return callout_active(t_callout); } +void +tcp_timer_stop(struct tcpcb *tp, uint32_t timer_type) +{ + struct callout *t_callout; + timeout_t *f_callout; + + tp->t_timers->tt_flags |= TT_STOPPED; + + switch (timer_type) { + case TT_DELACK: + t_callout = &tp->t_timers->tt_delack; + f_callout = tcp_timer_delack_discard; + break; + case TT_REXMT: + t_callout = &tp->t_timers->tt_rexmt; + f_callout = tcp_timer_rexmt_discard; + break; + case TT_PERSIST: + t_callout = &tp->t_timers->tt_persist; + f_callout = tcp_timer_persist_discard; + break; + case TT_KEEP: + t_callout = &tp->t_timers->tt_keep; + f_callout = tcp_timer_keep_discard; + break; + case TT_2MSL: + t_callout = &tp->t_timers->tt_2msl; + f_callout = tcp_timer_2msl_discard; + break; + default: + panic("tp %p bad timer_type %#x", tp, timer_type); + } + + if (tp->t_timers->tt_flags & timer_type) { + if (callout_stop(t_callout)) { + tp->t_timers->tt_flags &= ~timer_type; + } else { + /* + * Can't stop the callout, defer tcpcb actual deletion + * to the last tcp timer discard callout. + * The TT_STOPPED flag will ensure that no tcp timer + * callouts can be restarted on our behalf, and + * past this point currently running callouts waiting + * on inp lock will return right away after the + * classical check for callout reset/stop events: + * callout_pending() || !callout_active() + */ + callout_reset(t_callout, 1, f_callout, tp); + } + } +} *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@FreeBSD.ORG Thu Apr 16 22:03:07 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5DFF0797; Thu, 16 Apr 2015 22:03: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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 306841D3B; Thu, 16 Apr 2015 22:03:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3GM37CJ012902; Thu, 16 Apr 2015 22:03:07 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3GM37jG012901; Thu, 16 Apr 2015 22:03:07 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504162203.t3GM37jG012901@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 16 Apr 2015 22:03:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281622 - user/ngie/fix-progs 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.20 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, 16 Apr 2015 22:03:07 -0000 Author: ngie Date: Thu Apr 16 22:03:06 2015 New Revision: 281622 URL: https://svnweb.freebsd.org/changeset/base/281622 Log: Branch for making bsd.prog.mk PROGS aware instead of depending on laying violation created in bsd.test.mk that causes a lot of issues with files that get installed multiple times Prompted by: bapt, brooks, emaste Added: - copied from r281621, head/ Directory Properties: user/ngie/fix-progs/ (props changed) From owner-svn-src-user@FreeBSD.ORG Thu Apr 16 22:05:10 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7E689990; Thu, 16 Apr 2015 22:05: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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6A2ED1D5F; Thu, 16 Apr 2015 22:05:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3GM5AC4013331; Thu, 16 Apr 2015 22:05:10 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3GM5A6w013330; Thu, 16 Apr 2015 22:05:10 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504162205.t3GM5A6w013330@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 16 Apr 2015 22:05:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281623 - user/ngie/fix-progs/share/mk 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.20 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, 16 Apr 2015 22:05:10 -0000 Author: ngie Date: Thu Apr 16 22:05:09 2015 New Revision: 281623 URL: https://svnweb.freebsd.org/changeset/base/281623 Log: Just use bsd.prog.mk Modified: user/ngie/fix-progs/share/mk/bsd.test.mk Modified: user/ngie/fix-progs/share/mk/bsd.test.mk ============================================================================== --- user/ngie/fix-progs/share/mk/bsd.test.mk Thu Apr 16 22:03:06 2015 (r281622) +++ user/ngie/fix-progs/share/mk/bsd.test.mk Thu Apr 16 22:05:09 2015 (r281623) @@ -87,13 +87,4 @@ test: beforetest realtest test: aftertest .endif -.if !empty(SUBDIR) -.include -.endif - -.if !empty(PROGS) || !empty(PROGS_CXX) || !empty(SCRIPTS) -.include -.endif -.include - -.include +.include From owner-svn-src-user@FreeBSD.ORG Thu Apr 16 22:06:49 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A95E4AA9; Thu, 16 Apr 2015 22:06: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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 94AAA1D7F; Thu, 16 Apr 2015 22:06:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3GM6nnP013555; Thu, 16 Apr 2015 22:06:49 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3GM6n8P013554; Thu, 16 Apr 2015 22:06:49 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504162206.t3GM6n8P013554@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 16 Apr 2015 22:06:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281624 - user/ngie/fix-progs/share/mk 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.20 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, 16 Apr 2015 22:06:49 -0000 Author: ngie Date: Thu Apr 16 22:06:48 2015 New Revision: 281624 URL: https://svnweb.freebsd.org/changeset/base/281624 Log: Neuter bsd.progs.mk Notify users that they should replace bsd.progs.mk with bsd.prog.mk Modified: user/ngie/fix-progs/share/mk/bsd.progs.mk Modified: user/ngie/fix-progs/share/mk/bsd.progs.mk ============================================================================== --- user/ngie/fix-progs/share/mk/bsd.progs.mk Thu Apr 16 22:05:09 2015 (r281623) +++ user/ngie/fix-progs/share/mk/bsd.progs.mk Thu Apr 16 22:06:48 2015 (r281624) @@ -1,129 +1,4 @@ # $FreeBSD$ -# $Id: progs.mk,v 1.11 2012/11/06 17:18:54 sjg Exp $ -# -# @(#) Copyright (c) 2006, Simon J. Gerraty -# -# This file is provided in the hope that it will -# be of use. There is absolutely NO WARRANTY. -# Permission to copy, redistribute or otherwise -# use this file is hereby granted provided that -# the above copyright notice and this notice are -# left intact. -# -# Please send copies of changes and bug-fixes to: -# sjg@crufty.net -# -.MAIN: all - -.if defined(PROGS) || defined(PROGS_CXX) -# we really only use PROGS below... -PROGS += ${PROGS_CXX} - -# In meta mode, we can capture dependenices for _one_ of the progs. -# if makefile doesn't nominate one, we use the first. -.if defined(.PARSEDIR) -.ifndef UPDATE_DEPENDFILE_PROG -UPDATE_DEPENDFILE_PROG = ${PROGS:[1]} -.export UPDATE_DEPENDFILE_PROG -.endif -.else -UPDATE_DEPENDFILE_PROG?= no -.endif - -.ifndef PROG -# They may have asked us to build just one -.for t in ${PROGS} -.if make($t) -PROG ?= $t -.endif -.endfor -.endif - -.if defined(PROG) -# just one of many -PROG_OVERRIDE_VARS += BINDIR DPSRCS MAN SRCS -PROG_VARS += CFLAGS CPPFLAGS CXXFLAGS DPADD DPLIBS LDADD LIBADD LDFLAGS ${PROG_OVERRIDE_VARS} -.for v in ${PROG_VARS:O:u} -.if empty(${PROG_OVERRIDE_VARS:M$v}) -.if defined(${v}.${PROG}) -$v += ${${v}.${PROG}} -.elif defined(${v}_${PROG}) -$v += ${${v}_${PROG}} -.endif -.else -$v ?= -.endif -.endfor - -# for meta mode, there can be only one! -.if ${PROG} == ${UPDATE_DEPENDFILE_PROG} -UPDATE_DEPENDFILE ?= yes -.endif -UPDATE_DEPENDFILE ?= NO - -# ensure that we don't clobber each other's dependencies -DEPENDFILE?= .depend.${PROG} -# prog.mk will do the rest -.else -all: ${FILES} ${PROGS} ${SCRIPTS} - -# We cannot capture dependencies for meta mode here -UPDATE_DEPENDFILE = NO -# nor can we safely run in parallel. -.NOTPARALLEL: -.endif -.endif - -# The non-recursive call to bsd.progs.mk will handle FILES; NUL out -# FILESGROUPS so recursive calls don't duplicate the work -.ifdef _RECURSING_PROGS -FILESGROUPS= -.endif - -# handle being called [bsd.]progs.mk +.warning "Please use bsd.prog.mk instead of bsd.progs.mk" .include - -.ifndef _RECURSING_PROGS -# tell progs.mk we might want to install things -PROGS_TARGETS+= checkdpadd clean cleandepend cleandir cleanobj depend install - -.for p in ${PROGS} -.if defined(PROGS_CXX) && !empty(PROGS_CXX:M$p) -# bsd.prog.mk may need to know this -x.$p= PROG_CXX=$p -.endif - -$p ${p}_p: .PHONY .MAKE - (cd ${.CURDIR} && ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS= \ - SUBDIR= PROG=$p \ - DEPENDFILE=.depend.$p .MAKE.DEPENDFILE=.depend.$p \ - ${x.$p}) - -.for t in ${PROGS_TARGETS:O:u} -$p.$t: .PHONY .MAKE - (cd ${.CURDIR} && ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS= \ - SUBDIR= PROG=$p \ - DEPENDFILE=.depend.$p .MAKE.DEPENDFILE=.depend.$p \ - ${x.$p} ${@:E}) -.endfor -.endfor - -.if !empty(PROGS) -.for t in ${PROGS_TARGETS:O:u} -$t: ${PROGS:%=%.$t} -.endfor -.endif - -.if empty(PROGS) && !empty(SCRIPTS) - -.for t in ${PROGS_TARGETS:O:u} -scripts.$t: .PHONY .MAKE - (cd ${.CURDIR} && ${MAKE} -f ${MAKEFILE} SUBDIR= _RECURSING_PROGS= \ - $t) -$t: scripts.$t -.endfor - -.endif - -.endif From owner-svn-src-user@FreeBSD.ORG Fri Apr 17 00:05:35 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7C91E5F5; Fri, 17 Apr 2015 00:05:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5DD28C2C; Fri, 17 Apr 2015 00:05:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3H05ZJ2071110; Fri, 17 Apr 2015 00:05:35 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3H05Ytv071108; Fri, 17 Apr 2015 00:05:34 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201504170005.t3H05Ytv071108@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Fri, 17 Apr 2015 00:05:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281631 - in user/delphij/zfs-arc-rebase/sys/cddl/compat/opensolaris: kern sys 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.20 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, 17 Apr 2015 00:05:35 -0000 Author: delphij Date: Fri Apr 17 00:05:34 2015 New Revision: 281631 URL: https://svnweb.freebsd.org/changeset/base/281631 Log: Implement a hacky implementation of ks_update callback. Modified: user/delphij/zfs-arc-rebase/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c user/delphij/zfs-arc-rebase/sys/cddl/compat/opensolaris/sys/kstat.h Modified: user/delphij/zfs-arc-rebase/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c ============================================================================== --- user/delphij/zfs-arc-rebase/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c Thu Apr 16 22:44:51 2015 (r281630) +++ user/delphij/zfs-arc-rebase/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c Fri Apr 17 00:05:34 2015 (r281631) @@ -56,6 +56,7 @@ kstat_create(char *module, int instance, */ ksp = malloc(sizeof(*ksp), M_KSTAT, M_WAITOK); ksp->ks_ndata = ndata; + ksp->ks_update = NULL; /* * Create sysctl tree for those statistics: @@ -96,6 +97,23 @@ kstat_create(char *module, int instance, } static int +kstat_update(SYSCTL_HANDLER_ARGS) +{ + kstat_t *ksp = arg1; + uint64_t val; + struct bintime bt; + + KASSERT(ksp->ks_update != NULL, + ("ksp(%p)->ks_update is NULL", ksp)); + + ksp->ks_update(ksp, KSTAT_READ); + bintime(&bt); + val = (uint64_t)(bttosbt(bt)); + + return sysctl_handle_64(oidp, &val, 0, req); +} + +static int kstat_sysctl(SYSCTL_HANDLER_ARGS) { kstat_named_t *ksent = arg1; @@ -112,6 +130,7 @@ kstat_install(kstat_t *ksp) u_int i; ksent = ksp->ks_data; + for (i = 0; i < ksp->ks_ndata; i++, ksent++) { KASSERT(ksent->data_type == KSTAT_DATA_UINT64, ("data_type=%d", ksent->data_type)); @@ -120,6 +139,17 @@ kstat_install(kstat_t *ksp) CTLTYPE_U64 | CTLFLAG_RD, ksent, sizeof(*ksent), kstat_sysctl, "QU", ksent->desc); } + /* + * If we have a ks_update callback, create an additional sysctl + * node that would refresh the subtree and return the system time + * after that. + */ + if (ksp->ks_update != NULL) { + SYSCTL_ADD_PROC(&ksp->ks_sysctl_ctx, + SYSCTL_CHILDREN(ksp->ks_sysctl_root), OID_AUTO, "snapshot_bintime", + CTLTYPE_U64 | CTLFLAG_RD, ksp, sizeof(*ksp), + kstat_update, "QU", "Snapshot time"); + } } void Modified: user/delphij/zfs-arc-rebase/sys/cddl/compat/opensolaris/sys/kstat.h ============================================================================== --- user/delphij/zfs-arc-rebase/sys/cddl/compat/opensolaris/sys/kstat.h Thu Apr 16 22:44:51 2015 (r281630) +++ user/delphij/zfs-arc-rebase/sys/cddl/compat/opensolaris/sys/kstat.h Fri Apr 17 00:05:34 2015 (r281631) @@ -35,10 +35,14 @@ #define KSTAT_FLAG_VIRTUAL 0x01 +#define KSTAT_READ 0 +#define KSTAT_WRITE 1 + typedef struct kstat { void *ks_data; u_int ks_ndata; #ifdef _KERNEL + int (*ks_update)(struct kstat *, int); /* dynamic update callback */ struct sysctl_ctx_list ks_sysctl_ctx; struct sysctl_oid *ks_sysctl_root; #endif From owner-svn-src-user@FreeBSD.ORG Fri Apr 17 00:11:00 2015 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 399D79B7; Fri, 17 Apr 2015 00:11:00 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 24400D0A; Fri, 17 Apr 2015 00:11:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3H0B0DM072565; Fri, 17 Apr 2015 00:11:00 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3H0B0Fh072554; Fri, 17 Apr 2015 00:11:00 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201504170011.t3H0B0Fh072554@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Fri, 17 Apr 2015 00:10:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281632 - user/delphij/zfs-arc-rebase/sys/cddl/compat/opensolaris/sys 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.20 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, 17 Apr 2015 00:11:00 -0000 Author: delphij Date: Fri Apr 17 00:10:59 2015 New Revision: 281632 URL: https://svnweb.freebsd.org/changeset/base/281632 Log: ks_update has to be defined outside _KERNEL scope, otherwise code that assigns it would have to protect the assignment inside #ifdef _KERNEL. Modified: user/delphij/zfs-arc-rebase/sys/cddl/compat/opensolaris/sys/kstat.h Modified: user/delphij/zfs-arc-rebase/sys/cddl/compat/opensolaris/sys/kstat.h ============================================================================== --- user/delphij/zfs-arc-rebase/sys/cddl/compat/opensolaris/sys/kstat.h Fri Apr 17 00:05:34 2015 (r281631) +++ user/delphij/zfs-arc-rebase/sys/cddl/compat/opensolaris/sys/kstat.h Fri Apr 17 00:10:59 2015 (r281632) @@ -41,8 +41,8 @@ typedef struct kstat { void *ks_data; u_int ks_ndata; -#ifdef _KERNEL int (*ks_update)(struct kstat *, int); /* dynamic update callback */ +#ifdef _KERNEL struct sysctl_ctx_list ks_sysctl_ctx; struct sysctl_oid *ks_sysctl_root; #endif From owner-svn-src-user@FreeBSD.ORG Fri Apr 17 00:16:29 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6483BB2B; Fri, 17 Apr 2015 00:16: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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 45C94D3F; Fri, 17 Apr 2015 00:16:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3H0GT3u076270; Fri, 17 Apr 2015 00:16:29 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3H0GSFu076267; Fri, 17 Apr 2015 00:16:28 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201504170016.t3H0GSFu076267@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Fri, 17 Apr 2015 00:16:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281633 - in user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs: . sys 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.20 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, 17 Apr 2015 00:16:29 -0000 Author: delphij Date: Fri Apr 17 00:16:28 2015 New Revision: 281633 URL: https://svnweb.freebsd.org/changeset/base/281633 Log: MFV r277427: Add more visibility via arcstats; specifically arc_state_t stats and differentiate between "data" and "metadata". Note that for now the FreeBSD implementation requires the observer to poke at snapshot_bintime before reading the variables. Illumos issue: 5445 Add more visibility via arcstats; specifically arc_state_t stats and differentiate between "data" and "metadata" Modified: user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h Directory Properties: user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/ (props changed) Modified: user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c ============================================================================== --- user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Fri Apr 17 00:10:59 2015 (r281632) +++ user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Fri Apr 17 00:16:28 2015 (r281633) @@ -375,9 +375,137 @@ typedef struct arc_stats { kstat_named_t arcstat_c_min; kstat_named_t arcstat_c_max; kstat_named_t arcstat_size; + /* + * Number of bytes consumed by internal ARC structures necessary + * for tracking purposes; these structures are not actually + * backed by ARC buffers. This includes arc_buf_hdr_t structures + * (allocated via arc_buf_hdr_t_full and arc_buf_hdr_t_l2only + * caches), and arc_buf_t structures (allocated via arc_buf_t + * cache). + */ kstat_named_t arcstat_hdr_size; + /* + * Number of bytes consumed by ARC buffers of type equal to + * ARC_BUFC_DATA. This is generally consumed by buffers backing + * on disk user data (e.g. plain file contents). + */ kstat_named_t arcstat_data_size; + /* + * Number of bytes consumed by ARC buffers of type equal to + * ARC_BUFC_METADATA. This is generally consumed by buffers + * backing on disk data that is used for internal ZFS + * structures (e.g. ZAP, dnode, indirect blocks, etc). + */ + kstat_named_t arcstat_metadata_size; + /* + * Number of bytes consumed by various buffers and structures + * not actually backed with ARC buffers. This includes bonus + * buffers (allocated directly via zio_buf_* functions), + * dmu_buf_impl_t structures (allocated via dmu_buf_impl_t + * cache), and dnode_t structures (allocated via dnode_t cache). + */ kstat_named_t arcstat_other_size; + /* + * Total number of bytes consumed by ARC buffers residing in the + * arc_anon state. This includes *all* buffers in the arc_anon + * state; e.g. data, metadata, evictable, and unevictable buffers + * are all included in this value. + */ + kstat_named_t arcstat_anon_size; + /* + * Number of bytes consumed by ARC buffers that meet the + * following criteria: backing buffers of type ARC_BUFC_DATA, + * residing in the arc_anon state, and are eligible for eviction + * (e.g. have no outstanding holds on the buffer). + */ + kstat_named_t arcstat_anon_evictable_data; + /* + * Number of bytes consumed by ARC buffers that meet the + * following criteria: backing buffers of type ARC_BUFC_METADATA, + * residing in the arc_anon state, and are eligible for eviction + * (e.g. have no outstanding holds on the buffer). + */ + kstat_named_t arcstat_anon_evictable_metadata; + /* + * Total number of bytes consumed by ARC buffers residing in the + * arc_mru state. This includes *all* buffers in the arc_mru + * state; e.g. data, metadata, evictable, and unevictable buffers + * are all included in this value. + */ + kstat_named_t arcstat_mru_size; + /* + * Number of bytes consumed by ARC buffers that meet the + * following criteria: backing buffers of type ARC_BUFC_DATA, + * residing in the arc_mru state, and are eligible for eviction + * (e.g. have no outstanding holds on the buffer). + */ + kstat_named_t arcstat_mru_evictable_data; + /* + * Number of bytes consumed by ARC buffers that meet the + * following criteria: backing buffers of type ARC_BUFC_METADATA, + * residing in the arc_mru state, and are eligible for eviction + * (e.g. have no outstanding holds on the buffer). + */ + kstat_named_t arcstat_mru_evictable_metadata; + /* + * Total number of bytes that *would have been* consumed by ARC + * buffers in the arc_mru_ghost state. The key thing to note + * here, is the fact that this size doesn't actually indicate + * RAM consumption. The ghost lists only consist of headers and + * don't actually have ARC buffers linked off of these headers. + * Thus, *if* the headers had associated ARC buffers, these + * buffers *would have* consumed this number of bytes. + */ + kstat_named_t arcstat_mru_ghost_size; + /* + * Number of bytes that *would have been* consumed by ARC + * buffers that are eligible for eviction, of type + * ARC_BUFC_DATA, and linked off the arc_mru_ghost state. + */ + kstat_named_t arcstat_mru_ghost_evictable_data; + /* + * Number of bytes that *would have been* consumed by ARC + * buffers that are eligible for eviction, of type + * ARC_BUFC_METADATA, and linked off the arc_mru_ghost state. + */ + kstat_named_t arcstat_mru_ghost_evictable_metadata; + /* + * Total number of bytes consumed by ARC buffers residing in the + * arc_mfu state. This includes *all* buffers in the arc_mfu + * state; e.g. data, metadata, evictable, and unevictable buffers + * are all included in this value. + */ + kstat_named_t arcstat_mfu_size; + /* + * Number of bytes consumed by ARC buffers that are eligible for + * eviction, of type ARC_BUFC_DATA, and reside in the arc_mfu + * state. + */ + kstat_named_t arcstat_mfu_evictable_data; + /* + * Number of bytes consumed by ARC buffers that are eligible for + * eviction, of type ARC_BUFC_METADATA, and reside in the + * arc_mfu state. + */ + kstat_named_t arcstat_mfu_evictable_metadata; + /* + * Total number of bytes that *would have been* consumed by ARC + * buffers in the arc_mfu_ghost state. See the comment above + * arcstat_mru_ghost_size for more details. + */ + kstat_named_t arcstat_mfu_ghost_size; + /* + * Number of bytes that *would have been* consumed by ARC + * buffers that are eligible for eviction, of type + * ARC_BUFC_DATA, and linked off the arc_mfu_ghost state. + */ + kstat_named_t arcstat_mfu_ghost_evictable_data; + /* + * Number of bytes that *would have been* consumed by ARC + * buffers that are eligible for eviction, of type + * ARC_BUFC_METADATA, and linked off the arc_mru_ghost state. + */ + kstat_named_t arcstat_mfu_ghost_evictable_metadata; kstat_named_t arcstat_l2_hits; kstat_named_t arcstat_l2_misses; kstat_named_t arcstat_l2_feeds; @@ -459,7 +587,23 @@ static arc_stats_t arc_stats = { { "size", KSTAT_DATA_UINT64 }, { "hdr_size", KSTAT_DATA_UINT64 }, { "data_size", KSTAT_DATA_UINT64 }, + { "metadata_size", KSTAT_DATA_UINT64 }, { "other_size", KSTAT_DATA_UINT64 }, + { "anon_size", KSTAT_DATA_UINT64 }, + { "anon_evictable_data", KSTAT_DATA_UINT64 }, + { "anon_evictable_metadata", KSTAT_DATA_UINT64 }, + { "mru_size", KSTAT_DATA_UINT64 }, + { "mru_evictable_data", KSTAT_DATA_UINT64 }, + { "mru_evictable_metadata", KSTAT_DATA_UINT64 }, + { "mru_ghost_size", KSTAT_DATA_UINT64 }, + { "mru_ghost_evictable_data", KSTAT_DATA_UINT64 }, + { "mru_ghost_evictable_metadata", KSTAT_DATA_UINT64 }, + { "mfu_size", KSTAT_DATA_UINT64 }, + { "mfu_evictable_data", KSTAT_DATA_UINT64 }, + { "mfu_evictable_metadata", KSTAT_DATA_UINT64 }, + { "mfu_ghost_size", KSTAT_DATA_UINT64 }, + { "mfu_ghost_evictable_data", KSTAT_DATA_UINT64 }, + { "mfu_ghost_evictable_metadata", KSTAT_DATA_UINT64 }, { "l2_hits", KSTAT_DATA_UINT64 }, { "l2_misses", KSTAT_DATA_UINT64 }, { "l2_feeds", KSTAT_DATA_UINT64 }, @@ -1688,6 +1832,9 @@ arc_space_consume(uint64_t space, arc_sp case ARC_SPACE_DATA: ARCSTAT_INCR(arcstat_data_size, space); break; + case ARC_SPACE_META: + ARCSTAT_INCR(arcstat_metadata_size, space); + break; case ARC_SPACE_OTHER: ARCSTAT_INCR(arcstat_other_size, space); break; @@ -1699,7 +1846,9 @@ arc_space_consume(uint64_t space, arc_sp break; } - ARCSTAT_INCR(arcstat_meta_used, space); + if (type != ARC_SPACE_DATA) + ARCSTAT_INCR(arcstat_meta_used, space); + atomic_add_64(&arc_size, space); } @@ -1712,6 +1861,9 @@ arc_space_return(uint64_t space, arc_spa case ARC_SPACE_DATA: ARCSTAT_INCR(arcstat_data_size, -space); break; + case ARC_SPACE_META: + ARCSTAT_INCR(arcstat_metadata_size, -space); + break; case ARC_SPACE_OTHER: ARCSTAT_INCR(arcstat_other_size, -space); break; @@ -1723,10 +1875,13 @@ arc_space_return(uint64_t space, arc_spa break; } - ASSERT(arc_meta_used >= space); - if (arc_meta_max < arc_meta_used) - arc_meta_max = arc_meta_used; - ARCSTAT_INCR(arcstat_meta_used, -space); + if (type != ARC_SPACE_DATA) { + ASSERT(arc_meta_used >= space); + if (arc_meta_max < arc_meta_used) + arc_meta_max = arc_meta_used; + ARCSTAT_INCR(arcstat_meta_used, -space); + } + ASSERT(arc_size >= space); atomic_add_64(&arc_size, -space); } @@ -1934,12 +2089,11 @@ arc_buf_destroy(arc_buf_t *buf, boolean_ if (!recycle) { if (type == ARC_BUFC_METADATA) { arc_buf_data_free(buf, zio_buf_free); - arc_space_return(size, ARC_SPACE_DATA); + arc_space_return(size, ARC_SPACE_META); } else { ASSERT(type == ARC_BUFC_DATA); arc_buf_data_free(buf, zio_data_buf_free); - ARCSTAT_INCR(arcstat_data_size, -size); - atomic_add_64(&arc_size, -size); + arc_space_return(size, ARC_SPACE_DATA); } } if (list_link_active(&buf->b_hdr->b_l1hdr.b_arc_node)) { @@ -2981,6 +3135,22 @@ arc_reclaim_thread(void *dummy __unused) } #endif +#ifdef illumos + /* + * This is necessary in order for the mdb ::arc dcmd to + * show up to date information. Since the ::arc command + * does not call the kstat's update function, without + * this call, the command may show stale stats for the + * anon, mru, mru_ghost, mfu, and mfu_ghost lists. Even + * with this change, the data might be up to 1 second + * out of date; but that should suffice. The arc_state_t + * structures can be queried directly if more accurate + * information is needed. + */ + if (arc_ksp != NULL) + arc_ksp->ks_update(arc_ksp, KSTAT_READ); +#endif + /* block until needed, or one second, whichever is shorter */ CALLB_CPR_SAFE_BEGIN(&cpr); (void) cv_timedwait(&arc_reclaim_thr_cv, @@ -3118,12 +3288,11 @@ arc_get_data_buf(arc_buf_t *buf) if (!arc_evict_needed(type)) { if (type == ARC_BUFC_METADATA) { buf->b_data = zio_buf_alloc(size); - arc_space_consume(size, ARC_SPACE_DATA); + arc_space_consume(size, ARC_SPACE_META); } else { ASSERT(type == ARC_BUFC_DATA); buf->b_data = zio_data_buf_alloc(size); - ARCSTAT_INCR(arcstat_data_size, size); - atomic_add_64(&arc_size, size); + arc_space_consume(size, ARC_SPACE_DATA); } goto out; } @@ -3150,12 +3319,11 @@ arc_get_data_buf(arc_buf_t *buf) if ((buf->b_data = arc_evict(state, 0, size, TRUE, type)) == NULL) { if (type == ARC_BUFC_METADATA) { buf->b_data = zio_buf_alloc(size); - arc_space_consume(size, ARC_SPACE_DATA); + arc_space_consume(size, ARC_SPACE_META); } else { ASSERT(type == ARC_BUFC_DATA); buf->b_data = zio_data_buf_alloc(size); - ARCSTAT_INCR(arcstat_data_size, size); - atomic_add_64(&arc_size, size); + arc_space_consume(size, ARC_SPACE_DATA); } ARCSTAT_BUMP(arcstat_recycle_miss); } @@ -4393,6 +4561,48 @@ arc_lowmem(void *arg __unused, int howto } #endif +static void +arc_kstat_update_state(arc_state_t *state, kstat_named_t *size, + kstat_named_t *evict_data, kstat_named_t *evict_metadata) +{ + size->value.ui64 = state->arcs_size; + evict_data->value.ui64 = state->arcs_lsize[ARC_BUFC_DATA]; + evict_metadata->value.ui64 = state->arcs_lsize[ARC_BUFC_METADATA]; +} + +static int +arc_kstat_update(kstat_t *ksp, int rw) +{ + arc_stats_t *as = ksp->ks_data; + + if (rw == KSTAT_WRITE) { + return (EACCES); + } else { + arc_kstat_update_state(arc_anon, + &as->arcstat_anon_size, + &as->arcstat_anon_evictable_data, + &as->arcstat_anon_evictable_metadata); + arc_kstat_update_state(arc_mru, + &as->arcstat_mru_size, + &as->arcstat_mru_evictable_data, + &as->arcstat_mru_evictable_metadata); + arc_kstat_update_state(arc_mru_ghost, + &as->arcstat_mru_ghost_size, + &as->arcstat_mru_ghost_evictable_data, + &as->arcstat_mru_ghost_evictable_metadata); + arc_kstat_update_state(arc_mfu, + &as->arcstat_mfu_size, + &as->arcstat_mfu_evictable_data, + &as->arcstat_mfu_evictable_metadata); + arc_kstat_update_state(arc_mfu_ghost, + &as->arcstat_mfu_ghost_size, + &as->arcstat_mfu_ghost_evictable_data, + &as->arcstat_mfu_ghost_evictable_metadata); + } + + return (0); +} + void arc_init(void) { @@ -4552,6 +4762,7 @@ arc_init(void) if (arc_ksp != NULL) { arc_ksp->ks_data = &arc_stats; + arc_ksp->ks_update = arc_kstat_update; kstat_install(arc_ksp); } Modified: user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h ============================================================================== --- user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h Fri Apr 17 00:10:59 2015 (r281632) +++ user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h Fri Apr 17 00:16:28 2015 (r281633) @@ -115,6 +115,7 @@ typedef enum arc_buf_contents { */ typedef enum arc_space_type { ARC_SPACE_DATA, + ARC_SPACE_META, ARC_SPACE_HDRS, ARC_SPACE_L2HDRS, ARC_SPACE_OTHER, From owner-svn-src-user@FreeBSD.ORG Fri Apr 17 00:28:52 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 78F33D7B; Fri, 17 Apr 2015 00:28: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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5D439E33; Fri, 17 Apr 2015 00:28:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3H0SqPr081322; Fri, 17 Apr 2015 00:28:52 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3H0SfLw081279; Fri, 17 Apr 2015 00:28:41 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201504170028.t3H0SfLw081279@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Fri, 17 Apr 2015 00:28:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281634 - in user/delphij/zfs-arc-rebase: . bin/cp bin/csh bin/expr bin/mv bin/pax bin/sh/tests/expansion cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs cddl/contrib/opensola... 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.20 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, 17 Apr 2015 00:28:52 -0000 Author: delphij Date: Fri Apr 17 00:28:35 2015 New Revision: 281634 URL: https://svnweb.freebsd.org/changeset/base/281634 Log: IFC head@281633. Added: user/delphij/zfs-arc-rebase/bin/sh/tests/expansion/ifs6.0 - copied unchanged from r281633, head/bin/sh/tests/expansion/ifs6.0 user/delphij/zfs-arc-rebase/bin/sh/tests/expansion/ifs7.0 - copied unchanged from r281633, head/bin/sh/tests/expansion/ifs7.0 user/delphij/zfs-arc-rebase/cddl/usr.sbin/dtrace/tests/tools/dtest.sh - copied unchanged from r281633, head/cddl/usr.sbin/dtrace/tests/tools/dtest.sh user/delphij/zfs-arc-rebase/contrib/compiler-rt/lib/builtins/floatditf.c - copied unchanged from r281633, head/contrib/compiler-rt/lib/builtins/floatditf.c user/delphij/zfs-arc-rebase/contrib/compiler-rt/lib/builtins/floatunditf.c - copied unchanged from r281633, head/contrib/compiler-rt/lib/builtins/floatunditf.c user/delphij/zfs-arc-rebase/contrib/compiler-rt/lib/builtins/multc3.c - copied unchanged from r281633, head/contrib/compiler-rt/lib/builtins/multc3.c user/delphij/zfs-arc-rebase/contrib/gcc/config/aarch64/ - copied from r281633, head/contrib/gcc/config/aarch64/ user/delphij/zfs-arc-rebase/contrib/llvm/FREEBSD-Xlist - copied unchanged from r281633, head/contrib/llvm/FREEBSD-Xlist user/delphij/zfs-arc-rebase/contrib/llvm/patches/patch-10-llvm-r230348-arm-fix-bad-ha.diff - copied unchanged from r281633, head/contrib/llvm/patches/patch-10-llvm-r230348-arm-fix-bad-ha.diff user/delphij/zfs-arc-rebase/contrib/llvm/patches/patch-11-llvm-r231227-aarch64-tls-relocs.diff - copied unchanged from r281633, head/contrib/llvm/patches/patch-11-llvm-r231227-aarch64-tls-relocs.diff user/delphij/zfs-arc-rebase/contrib/llvm/patches/patch-12-clang-r227115-constantarraytype.diff - copied unchanged from r281633, head/contrib/llvm/patches/patch-12-clang-r227115-constantarraytype.diff user/delphij/zfs-arc-rebase/contrib/llvm/tools/clang/FREEBSD-Xlist - copied unchanged from r281633, head/contrib/llvm/tools/clang/FREEBSD-Xlist user/delphij/zfs-arc-rebase/contrib/llvm/tools/lldb/FREEBSD-Xlist - copied unchanged from r281633, head/contrib/llvm/tools/lldb/FREEBSD-Xlist user/delphij/zfs-arc-rebase/contrib/llvm/tools/llvm-cov/ - copied from r281633, head/contrib/llvm/tools/llvm-cov/ user/delphij/zfs-arc-rebase/contrib/llvm/tools/llvm-profdata/ - copied from r281633, head/contrib/llvm/tools/llvm-profdata/ user/delphij/zfs-arc-rebase/contrib/ntp/FREEBSD-Xlist - copied unchanged from r281633, head/contrib/ntp/FREEBSD-Xlist user/delphij/zfs-arc-rebase/contrib/ntp/FREEBSD-upgrade - copied unchanged from r281633, head/contrib/ntp/FREEBSD-upgrade user/delphij/zfs-arc-rebase/contrib/ntp/check-libopts.mf - copied unchanged from r281633, head/contrib/ntp/check-libopts.mf user/delphij/zfs-arc-rebase/contrib/ntp/deps-ver - copied unchanged from r281633, head/contrib/ntp/deps-ver user/delphij/zfs-arc-rebase/contrib/ntp/depsver.mf - copied unchanged from r281633, head/contrib/ntp/depsver.mf user/delphij/zfs-arc-rebase/contrib/ntp/html/access.html - copied unchanged from r281633, head/contrib/ntp/html/access.html user/delphij/zfs-arc-rebase/contrib/ntp/html/authentic.html - copied unchanged from r281633, head/contrib/ntp/html/authentic.html user/delphij/zfs-arc-rebase/contrib/ntp/html/autokey.html - copied unchanged from r281633, head/contrib/ntp/html/autokey.html user/delphij/zfs-arc-rebase/contrib/ntp/html/bugs.html - copied unchanged from r281633, head/contrib/ntp/html/bugs.html user/delphij/zfs-arc-rebase/contrib/ntp/html/build.html - copied unchanged from r281633, head/contrib/ntp/html/build.html user/delphij/zfs-arc-rebase/contrib/ntp/html/clock.html - copied unchanged from r281633, head/contrib/ntp/html/clock.html user/delphij/zfs-arc-rebase/contrib/ntp/html/cluster.html - copied unchanged from r281633, head/contrib/ntp/html/cluster.html user/delphij/zfs-arc-rebase/contrib/ntp/html/comdex.html - copied unchanged from r281633, head/contrib/ntp/html/comdex.html user/delphij/zfs-arc-rebase/contrib/ntp/html/config.html - copied unchanged from r281633, head/contrib/ntp/html/config.html user/delphij/zfs-arc-rebase/contrib/ntp/html/decode.html - copied unchanged from r281633, head/contrib/ntp/html/decode.html user/delphij/zfs-arc-rebase/contrib/ntp/html/discipline.html - copied unchanged from r281633, head/contrib/ntp/html/discipline.html user/delphij/zfs-arc-rebase/contrib/ntp/html/discover.html - copied unchanged from r281633, head/contrib/ntp/html/discover.html user/delphij/zfs-arc-rebase/contrib/ntp/html/drivers/driver45.html - copied unchanged from r281633, head/contrib/ntp/html/drivers/driver45.html user/delphij/zfs-arc-rebase/contrib/ntp/html/drivers/driver46.html - copied unchanged from r281633, head/contrib/ntp/html/drivers/driver46.html user/delphij/zfs-arc-rebase/contrib/ntp/html/drivers/mx4200data.html - copied unchanged from r281633, head/contrib/ntp/html/drivers/mx4200data.html user/delphij/zfs-arc-rebase/contrib/ntp/html/filter.html - copied unchanged from r281633, head/contrib/ntp/html/filter.html user/delphij/zfs-arc-rebase/contrib/ntp/html/hints/ - copied from r281633, head/contrib/ntp/html/hints/ user/delphij/zfs-arc-rebase/contrib/ntp/html/hints.html - copied unchanged from r281633, head/contrib/ntp/html/hints.html user/delphij/zfs-arc-rebase/contrib/ntp/html/history.html - copied unchanged from r281633, head/contrib/ntp/html/history.html user/delphij/zfs-arc-rebase/contrib/ntp/html/huffpuff.html - copied unchanged from r281633, head/contrib/ntp/html/huffpuff.html user/delphij/zfs-arc-rebase/contrib/ntp/html/icons/sitemap.png - copied unchanged from r281633, head/contrib/ntp/html/icons/sitemap.png user/delphij/zfs-arc-rebase/contrib/ntp/html/kernpps.html - copied unchanged from r281633, head/contrib/ntp/html/kernpps.html user/delphij/zfs-arc-rebase/contrib/ntp/html/leap.html - copied unchanged from r281633, head/contrib/ntp/html/leap.html user/delphij/zfs-arc-rebase/contrib/ntp/html/ntp-wait.html - copied unchanged from r281633, head/contrib/ntp/html/ntp-wait.html user/delphij/zfs-arc-rebase/contrib/ntp/html/orphan.html - copied unchanged from r281633, head/contrib/ntp/html/orphan.html user/delphij/zfs-arc-rebase/contrib/ntp/html/pic/ - copied from r281633, head/contrib/ntp/html/pic/ user/delphij/zfs-arc-rebase/contrib/ntp/html/poll.html - copied unchanged from r281633, head/contrib/ntp/html/poll.html user/delphij/zfs-arc-rebase/contrib/ntp/html/quick.html - copied unchanged from r281633, head/contrib/ntp/html/quick.html user/delphij/zfs-arc-rebase/contrib/ntp/html/rate.html - copied unchanged from r281633, head/contrib/ntp/html/rate.html user/delphij/zfs-arc-rebase/contrib/ntp/html/scripts/accopt.txt - copied unchanged from r281633, head/contrib/ntp/html/scripts/accopt.txt user/delphij/zfs-arc-rebase/contrib/ntp/html/scripts/audio.txt - copied unchanged from r281633, head/contrib/ntp/html/scripts/audio.txt user/delphij/zfs-arc-rebase/contrib/ntp/html/scripts/authopt.txt - copied unchanged from r281633, head/contrib/ntp/html/scripts/authopt.txt user/delphij/zfs-arc-rebase/contrib/ntp/html/scripts/clockopt.txt - copied unchanged from r281633, head/contrib/ntp/html/scripts/clockopt.txt user/delphij/zfs-arc-rebase/contrib/ntp/html/scripts/command.txt - copied unchanged from r281633, head/contrib/ntp/html/scripts/command.txt user/delphij/zfs-arc-rebase/contrib/ntp/html/scripts/config.txt - copied unchanged from r281633, head/contrib/ntp/html/scripts/config.txt user/delphij/zfs-arc-rebase/contrib/ntp/html/scripts/confopt.txt - copied unchanged from r281633, head/contrib/ntp/html/scripts/confopt.txt user/delphij/zfs-arc-rebase/contrib/ntp/html/scripts/external.txt - copied unchanged from r281633, head/contrib/ntp/html/scripts/external.txt user/delphij/zfs-arc-rebase/contrib/ntp/html/scripts/hand.txt - copied unchanged from r281633, head/contrib/ntp/html/scripts/hand.txt user/delphij/zfs-arc-rebase/contrib/ntp/html/scripts/install.txt - copied unchanged from r281633, head/contrib/ntp/html/scripts/install.txt user/delphij/zfs-arc-rebase/contrib/ntp/html/scripts/manual.txt - copied unchanged from r281633, head/contrib/ntp/html/scripts/manual.txt user/delphij/zfs-arc-rebase/contrib/ntp/html/scripts/misc.txt - copied unchanged from r281633, head/contrib/ntp/html/scripts/misc.txt user/delphij/zfs-arc-rebase/contrib/ntp/html/scripts/miscopt.txt - copied unchanged from r281633, head/contrib/ntp/html/scripts/miscopt.txt user/delphij/zfs-arc-rebase/contrib/ntp/html/scripts/monopt.txt - copied unchanged from r281633, head/contrib/ntp/html/scripts/monopt.txt user/delphij/zfs-arc-rebase/contrib/ntp/html/scripts/refclock.txt - copied unchanged from r281633, head/contrib/ntp/html/scripts/refclock.txt user/delphij/zfs-arc-rebase/contrib/ntp/html/scripts/special.txt - copied unchanged from r281633, head/contrib/ntp/html/scripts/special.txt user/delphij/zfs-arc-rebase/contrib/ntp/html/select.html - copied unchanged from r281633, head/contrib/ntp/html/select.html user/delphij/zfs-arc-rebase/contrib/ntp/html/sitemap.html - copied unchanged from r281633, head/contrib/ntp/html/sitemap.html user/delphij/zfs-arc-rebase/contrib/ntp/html/stats.html - copied unchanged from r281633, head/contrib/ntp/html/stats.html user/delphij/zfs-arc-rebase/contrib/ntp/html/warp.html - copied unchanged from r281633, head/contrib/ntp/html/warp.html user/delphij/zfs-arc-rebase/contrib/ntp/html/xleave.html - copied unchanged from r281633, head/contrib/ntp/html/xleave.html user/delphij/zfs-arc-rebase/contrib/ntp/include/declcond.h - copied unchanged from r281633, head/contrib/ntp/include/declcond.h user/delphij/zfs-arc-rebase/contrib/ntp/include/intreswork.h - copied unchanged from r281633, head/contrib/ntp/include/intreswork.h user/delphij/zfs-arc-rebase/contrib/ntp/include/lib_strbuf.h - copied unchanged from r281633, head/contrib/ntp/include/lib_strbuf.h user/delphij/zfs-arc-rebase/contrib/ntp/include/libntp.h - copied unchanged from r281633, head/contrib/ntp/include/libntp.h user/delphij/zfs-arc-rebase/contrib/ntp/include/ntp_assert.h - copied unchanged from r281633, head/contrib/ntp/include/ntp_assert.h user/delphij/zfs-arc-rebase/contrib/ntp/include/ntp_intres.h - copied unchanged from r281633, head/contrib/ntp/include/ntp_intres.h user/delphij/zfs-arc-rebase/contrib/ntp/include/ntp_libopts.h - copied unchanged from r281633, head/contrib/ntp/include/ntp_libopts.h user/delphij/zfs-arc-rebase/contrib/ntp/include/ntp_lineedit.h - copied unchanged from r281633, head/contrib/ntp/include/ntp_lineedit.h user/delphij/zfs-arc-rebase/contrib/ntp/include/ntp_lists.h - copied unchanged from r281633, head/contrib/ntp/include/ntp_lists.h user/delphij/zfs-arc-rebase/contrib/ntp/include/ntp_net.h - copied unchanged from r281633, head/contrib/ntp/include/ntp_net.h user/delphij/zfs-arc-rebase/contrib/ntp/include/ntp_prio_q.h - copied unchanged from r281633, head/contrib/ntp/include/ntp_prio_q.h user/delphij/zfs-arc-rebase/contrib/ntp/include/ntp_worker.h - copied unchanged from r281633, head/contrib/ntp/include/ntp_worker.h user/delphij/zfs-arc-rebase/contrib/ntp/include/ntp_workimpl.h - copied unchanged from r281633, head/contrib/ntp/include/ntp_workimpl.h user/delphij/zfs-arc-rebase/contrib/ntp/include/refclock_atom.h - copied unchanged from r281633, head/contrib/ntp/include/refclock_atom.h user/delphij/zfs-arc-rebase/contrib/ntp/include/ssl_applink.c - copied unchanged from r281633, head/contrib/ntp/include/ssl_applink.c user/delphij/zfs-arc-rebase/contrib/ntp/include/timespecops.h - copied unchanged from r281633, head/contrib/ntp/include/timespecops.h user/delphij/zfs-arc-rebase/contrib/ntp/include/timetoa.h - copied unchanged from r281633, head/contrib/ntp/include/timetoa.h user/delphij/zfs-arc-rebase/contrib/ntp/include/timevalops.h - copied unchanged from r281633, head/contrib/ntp/include/timevalops.h user/delphij/zfs-arc-rebase/contrib/ntp/include/vint64ops.h - copied unchanged from r281633, head/contrib/ntp/include/vint64ops.h user/delphij/zfs-arc-rebase/contrib/ntp/includes.mf - copied unchanged from r281633, head/contrib/ntp/includes.mf user/delphij/zfs-arc-rebase/contrib/ntp/lib/ - copied from r281633, head/contrib/ntp/lib/ user/delphij/zfs-arc-rebase/contrib/ntp/libjsmn/ - copied from r281633, head/contrib/ntp/libjsmn/ user/delphij/zfs-arc-rebase/contrib/ntp/libntp/bsd_strerror.c - copied unchanged from r281633, head/contrib/ntp/libntp/bsd_strerror.c user/delphij/zfs-arc-rebase/contrib/ntp/libntp/ntp_calendar.c - copied unchanged from r281633, head/contrib/ntp/libntp/ntp_calendar.c user/delphij/zfs-arc-rebase/contrib/ntp/libntp/ntp_crypto_rnd.c - copied unchanged from r281633, head/contrib/ntp/libntp/ntp_crypto_rnd.c user/delphij/zfs-arc-rebase/contrib/ntp/libntp/ntp_intres.c - copied unchanged from r281633, head/contrib/ntp/libntp/ntp_intres.c user/delphij/zfs-arc-rebase/contrib/ntp/libntp/ntp_libopts.c - copied unchanged from r281633, head/contrib/ntp/libntp/ntp_libopts.c user/delphij/zfs-arc-rebase/contrib/ntp/libntp/ntp_lineedit.c - copied unchanged from r281633, head/contrib/ntp/libntp/ntp_lineedit.c user/delphij/zfs-arc-rebase/contrib/ntp/libntp/ntp_worker.c - copied unchanged from r281633, head/contrib/ntp/libntp/ntp_worker.c user/delphij/zfs-arc-rebase/contrib/ntp/libntp/socket.c - copied unchanged from r281633, head/contrib/ntp/libntp/socket.c user/delphij/zfs-arc-rebase/contrib/ntp/libntp/ssl_init.c - copied unchanged from r281633, head/contrib/ntp/libntp/ssl_init.c user/delphij/zfs-arc-rebase/contrib/ntp/libntp/strl_obsd.c - copied unchanged from r281633, head/contrib/ntp/libntp/strl_obsd.c user/delphij/zfs-arc-rebase/contrib/ntp/libntp/timetoa.c - copied unchanged from r281633, head/contrib/ntp/libntp/timetoa.c user/delphij/zfs-arc-rebase/contrib/ntp/libntp/timevalops.c - copied unchanged from r281633, head/contrib/ntp/libntp/timevalops.c user/delphij/zfs-arc-rebase/contrib/ntp/libntp/vint64ops.c - copied unchanged from r281633, head/contrib/ntp/libntp/vint64ops.c user/delphij/zfs-arc-rebase/contrib/ntp/libntp/work_fork.c - copied unchanged from r281633, head/contrib/ntp/libntp/work_fork.c user/delphij/zfs-arc-rebase/contrib/ntp/libntp/work_thread.c - copied unchanged from r281633, head/contrib/ntp/libntp/work_thread.c user/delphij/zfs-arc-rebase/contrib/ntp/libparse/clk_sel240x.c - copied unchanged from r281633, head/contrib/ntp/libparse/clk_sel240x.c user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/complete.conf.in - copied unchanged from r281633, head/contrib/ntp/ntpd/complete.conf.in user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/declcond.h - copied unchanged from r281633, head/contrib/ntp/ntpd/declcond.h user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/invoke-ntp.conf.menu - copied unchanged from r281633, head/contrib/ntp/ntpd/invoke-ntp.conf.menu user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/invoke-ntp.conf.texi - copied unchanged from r281633, head/contrib/ntp/ntpd/invoke-ntp.conf.texi user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/invoke-ntp.keys.menu - copied unchanged from r281633, head/contrib/ntp/ntpd/invoke-ntp.keys.menu user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/invoke-ntp.keys.texi - copied unchanged from r281633, head/contrib/ntp/ntpd/invoke-ntp.keys.texi user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/invoke-ntpd.menu - copied unchanged from r281633, head/contrib/ntp/ntpd/invoke-ntpd.menu user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/invoke-ntpd.texi - copied unchanged from r281633, head/contrib/ntp/ntpd/invoke-ntpd.texi user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/keyword-gen-utd - copied unchanged from r281633, head/contrib/ntp/ntpd/keyword-gen-utd user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/keyword-gen.c - copied unchanged from r281633, head/contrib/ntp/ntpd/keyword-gen.c user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntp.conf.5man - copied unchanged from r281633, head/contrib/ntp/ntpd/ntp.conf.5man user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntp.conf.5mdoc - copied unchanged from r281633, head/contrib/ntp/ntpd/ntp.conf.5mdoc user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntp.conf.def - copied unchanged from r281633, head/contrib/ntp/ntpd/ntp.conf.def user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntp.conf.html - copied unchanged from r281633, head/contrib/ntp/ntpd/ntp.conf.html user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntp.conf.man.in - copied unchanged from r281633, head/contrib/ntp/ntpd/ntp.conf.man.in user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntp.conf.mdoc.in - copied unchanged from r281633, head/contrib/ntp/ntpd/ntp.conf.mdoc.in user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntp.conf.texi - copied unchanged from r281633, head/contrib/ntp/ntpd/ntp.conf.texi user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntp.keys.5man - copied unchanged from r281633, head/contrib/ntp/ntpd/ntp.keys.5man user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntp.keys.5mdoc - copied unchanged from r281633, head/contrib/ntp/ntpd/ntp.keys.5mdoc user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntp.keys.def - copied unchanged from r281633, head/contrib/ntp/ntpd/ntp.keys.def user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntp.keys.html - copied unchanged from r281633, head/contrib/ntp/ntpd/ntp.keys.html user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntp.keys.man.in - copied unchanged from r281633, head/contrib/ntp/ntpd/ntp.keys.man.in user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntp.keys.mdoc.in - copied unchanged from r281633, head/contrib/ntp/ntpd/ntp.keys.mdoc.in user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntp.keys.texi - copied unchanged from r281633, head/contrib/ntp/ntpd/ntp.keys.texi user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntp_keyword.h - copied unchanged from r281633, head/contrib/ntp/ntpd/ntp_keyword.h user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntp_leapsec.c - copied unchanged from r281633, head/contrib/ntp/ntpd/ntp_leapsec.c user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntp_leapsec.h - copied unchanged from r281633, head/contrib/ntp/ntpd/ntp_leapsec.h user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntp_parser.c - copied unchanged from r281633, head/contrib/ntp/ntpd/ntp_parser.c user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntp_parser.h - copied unchanged from r281633, head/contrib/ntp/ntpd/ntp_parser.h user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntp_prio_q.c - copied unchanged from r281633, head/contrib/ntp/ntpd/ntp_prio_q.c user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntp_scanner.c - copied unchanged from r281633, head/contrib/ntp/ntpd/ntp_scanner.c user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntp_scanner.h - copied unchanged from r281633, head/contrib/ntp/ntpd/ntp_scanner.h user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntp_signd.c - copied unchanged from r281633, head/contrib/ntp/ntpd/ntp_signd.c user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntpd.1ntpdman - copied unchanged from r281633, head/contrib/ntp/ntpd/ntpd.1ntpdman user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntpd.1ntpdmdoc - copied unchanged from r281633, head/contrib/ntp/ntpd/ntpd.1ntpdmdoc user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntpd.html - copied unchanged from r281633, head/contrib/ntp/ntpd/ntpd.html user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntpd.man.in - copied unchanged from r281633, head/contrib/ntp/ntpd/ntpd.man.in user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntpd.mdoc.in - copied unchanged from r281633, head/contrib/ntp/ntpd/ntpd.mdoc.in user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntpd.texi - copied unchanged from r281633, head/contrib/ntp/ntpd/ntpd.texi user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/refclock_gpsdjson.c - copied unchanged from r281633, head/contrib/ntp/ntpd/refclock_gpsdjson.c user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/refclock_tsyncpci.c - copied unchanged from r281633, head/contrib/ntp/ntpd/refclock_tsyncpci.c user/delphij/zfs-arc-rebase/contrib/ntp/ntpdc/invoke-ntpdc.menu - copied unchanged from r281633, head/contrib/ntp/ntpdc/invoke-ntpdc.menu user/delphij/zfs-arc-rebase/contrib/ntp/ntpdc/invoke-ntpdc.texi - copied unchanged from r281633, head/contrib/ntp/ntpdc/invoke-ntpdc.texi user/delphij/zfs-arc-rebase/contrib/ntp/ntpdc/ntpdc.1ntpdcman - copied unchanged from r281633, head/contrib/ntp/ntpdc/ntpdc.1ntpdcman user/delphij/zfs-arc-rebase/contrib/ntp/ntpdc/ntpdc.1ntpdcmdoc - copied unchanged from r281633, head/contrib/ntp/ntpdc/ntpdc.1ntpdcmdoc user/delphij/zfs-arc-rebase/contrib/ntp/ntpdc/ntpdc.html - copied unchanged from r281633, head/contrib/ntp/ntpdc/ntpdc.html user/delphij/zfs-arc-rebase/contrib/ntp/ntpdc/ntpdc.man.in - copied unchanged from r281633, head/contrib/ntp/ntpdc/ntpdc.man.in user/delphij/zfs-arc-rebase/contrib/ntp/ntpdc/ntpdc.mdoc.in - copied unchanged from r281633, head/contrib/ntp/ntpdc/ntpdc.mdoc.in user/delphij/zfs-arc-rebase/contrib/ntp/ntpdc/ntpdc.texi - copied unchanged from r281633, head/contrib/ntp/ntpdc/ntpdc.texi user/delphij/zfs-arc-rebase/contrib/ntp/ntpq/invoke-ntpq.menu - copied unchanged from r281633, head/contrib/ntp/ntpq/invoke-ntpq.menu user/delphij/zfs-arc-rebase/contrib/ntp/ntpq/invoke-ntpq.texi - copied unchanged from r281633, head/contrib/ntp/ntpq/invoke-ntpq.texi user/delphij/zfs-arc-rebase/contrib/ntp/ntpq/libntpq.c - copied unchanged from r281633, head/contrib/ntp/ntpq/libntpq.c user/delphij/zfs-arc-rebase/contrib/ntp/ntpq/libntpq.h - copied unchanged from r281633, head/contrib/ntp/ntpq/libntpq.h user/delphij/zfs-arc-rebase/contrib/ntp/ntpq/libntpq_subs.c - copied unchanged from r281633, head/contrib/ntp/ntpq/libntpq_subs.c user/delphij/zfs-arc-rebase/contrib/ntp/ntpq/ntpq.1ntpqman - copied unchanged from r281633, head/contrib/ntp/ntpq/ntpq.1ntpqman user/delphij/zfs-arc-rebase/contrib/ntp/ntpq/ntpq.1ntpqmdoc - copied unchanged from r281633, head/contrib/ntp/ntpq/ntpq.1ntpqmdoc user/delphij/zfs-arc-rebase/contrib/ntp/ntpq/ntpq.html - copied unchanged from r281633, head/contrib/ntp/ntpq/ntpq.html user/delphij/zfs-arc-rebase/contrib/ntp/ntpq/ntpq.man.in - copied unchanged from r281633, head/contrib/ntp/ntpq/ntpq.man.in user/delphij/zfs-arc-rebase/contrib/ntp/ntpq/ntpq.mdoc.in - copied unchanged from r281633, head/contrib/ntp/ntpq/ntpq.mdoc.in user/delphij/zfs-arc-rebase/contrib/ntp/ntpq/ntpq.texi - copied unchanged from r281633, head/contrib/ntp/ntpq/ntpq.texi user/delphij/zfs-arc-rebase/contrib/ntp/ntpsnmpd/ - copied from r281633, head/contrib/ntp/ntpsnmpd/ user/delphij/zfs-arc-rebase/contrib/ntp/scripts/build/ - copied from r281633, head/contrib/ntp/scripts/build/ user/delphij/zfs-arc-rebase/contrib/ntp/scripts/calc_tickadj/ - copied from r281633, head/contrib/ntp/scripts/calc_tickadj/ user/delphij/zfs-arc-rebase/contrib/ntp/scripts/deprecated/ - copied from r281633, head/contrib/ntp/scripts/deprecated/ user/delphij/zfs-arc-rebase/contrib/ntp/scripts/invoke-plot_summary.menu - copied unchanged from r281633, head/contrib/ntp/scripts/invoke-plot_summary.menu user/delphij/zfs-arc-rebase/contrib/ntp/scripts/invoke-plot_summary.texi - copied unchanged from r281633, head/contrib/ntp/scripts/invoke-plot_summary.texi user/delphij/zfs-arc-rebase/contrib/ntp/scripts/invoke-summary.menu - copied unchanged from r281633, head/contrib/ntp/scripts/invoke-summary.menu user/delphij/zfs-arc-rebase/contrib/ntp/scripts/invoke-summary.texi - copied unchanged from r281633, head/contrib/ntp/scripts/invoke-summary.texi user/delphij/zfs-arc-rebase/contrib/ntp/scripts/lib/ - copied from r281633, head/contrib/ntp/scripts/lib/ user/delphij/zfs-arc-rebase/contrib/ntp/scripts/ntp-wait/ - copied from r281633, head/contrib/ntp/scripts/ntp-wait/ user/delphij/zfs-arc-rebase/contrib/ntp/scripts/ntpsweep/ - copied from r281633, head/contrib/ntp/scripts/ntpsweep/ user/delphij/zfs-arc-rebase/contrib/ntp/scripts/ntptrace/ - copied from r281633, head/contrib/ntp/scripts/ntptrace/ user/delphij/zfs-arc-rebase/contrib/ntp/scripts/plot_summary-opts - copied unchanged from r281633, head/contrib/ntp/scripts/plot_summary-opts user/delphij/zfs-arc-rebase/contrib/ntp/scripts/plot_summary-opts.def - copied unchanged from r281633, head/contrib/ntp/scripts/plot_summary-opts.def user/delphij/zfs-arc-rebase/contrib/ntp/scripts/plot_summary.1plot_summaryman - copied unchanged from r281633, head/contrib/ntp/scripts/plot_summary.1plot_summaryman user/delphij/zfs-arc-rebase/contrib/ntp/scripts/plot_summary.1plot_summarymdoc - copied unchanged from r281633, head/contrib/ntp/scripts/plot_summary.1plot_summarymdoc user/delphij/zfs-arc-rebase/contrib/ntp/scripts/plot_summary.html - copied unchanged from r281633, head/contrib/ntp/scripts/plot_summary.html user/delphij/zfs-arc-rebase/contrib/ntp/scripts/plot_summary.man.in - copied unchanged from r281633, head/contrib/ntp/scripts/plot_summary.man.in user/delphij/zfs-arc-rebase/contrib/ntp/scripts/plot_summary.mdoc.in - copied unchanged from r281633, head/contrib/ntp/scripts/plot_summary.mdoc.in user/delphij/zfs-arc-rebase/contrib/ntp/scripts/plot_summary.texi - copied unchanged from r281633, head/contrib/ntp/scripts/plot_summary.texi user/delphij/zfs-arc-rebase/contrib/ntp/scripts/rc/ - copied from r281633, head/contrib/ntp/scripts/rc/ user/delphij/zfs-arc-rebase/contrib/ntp/scripts/summary-opts - copied unchanged from r281633, head/contrib/ntp/scripts/summary-opts user/delphij/zfs-arc-rebase/contrib/ntp/scripts/summary-opts.def - copied unchanged from r281633, head/contrib/ntp/scripts/summary-opts.def user/delphij/zfs-arc-rebase/contrib/ntp/scripts/summary.1summaryman - copied unchanged from r281633, head/contrib/ntp/scripts/summary.1summaryman user/delphij/zfs-arc-rebase/contrib/ntp/scripts/summary.1summarymdoc - copied unchanged from r281633, head/contrib/ntp/scripts/summary.1summarymdoc user/delphij/zfs-arc-rebase/contrib/ntp/scripts/summary.html - copied unchanged from r281633, head/contrib/ntp/scripts/summary.html user/delphij/zfs-arc-rebase/contrib/ntp/scripts/summary.man.in - copied unchanged from r281633, head/contrib/ntp/scripts/summary.man.in user/delphij/zfs-arc-rebase/contrib/ntp/scripts/summary.mdoc.in - copied unchanged from r281633, head/contrib/ntp/scripts/summary.mdoc.in user/delphij/zfs-arc-rebase/contrib/ntp/scripts/summary.texi - copied unchanged from r281633, head/contrib/ntp/scripts/summary.texi user/delphij/zfs-arc-rebase/contrib/ntp/sntp/ag-tpl/ - copied from r281633, head/contrib/ntp/sntp/ag-tpl/ user/delphij/zfs-arc-rebase/contrib/ntp/sntp/check-libntp.mf - copied unchanged from r281633, head/contrib/ntp/sntp/check-libntp.mf user/delphij/zfs-arc-rebase/contrib/ntp/sntp/check-libopts.mf - copied unchanged from r281633, head/contrib/ntp/sntp/check-libopts.mf user/delphij/zfs-arc-rebase/contrib/ntp/sntp/crypto.c - copied unchanged from r281633, head/contrib/ntp/sntp/crypto.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/crypto.h - copied unchanged from r281633, head/contrib/ntp/sntp/crypto.h user/delphij/zfs-arc-rebase/contrib/ntp/sntp/data_formats.h - copied unchanged from r281633, head/contrib/ntp/sntp/data_formats.h user/delphij/zfs-arc-rebase/contrib/ntp/sntp/deps-ver - copied unchanged from r281633, head/contrib/ntp/sntp/deps-ver user/delphij/zfs-arc-rebase/contrib/ntp/sntp/depsver.mf - copied unchanged from r281633, head/contrib/ntp/sntp/depsver.mf user/delphij/zfs-arc-rebase/contrib/ntp/sntp/include/ - copied from r281633, head/contrib/ntp/sntp/include/ user/delphij/zfs-arc-rebase/contrib/ntp/sntp/includes.mf - copied unchanged from r281633, head/contrib/ntp/sntp/includes.mf user/delphij/zfs-arc-rebase/contrib/ntp/sntp/invoke-sntp.menu - copied unchanged from r281633, head/contrib/ntp/sntp/invoke-sntp.menu user/delphij/zfs-arc-rebase/contrib/ntp/sntp/invoke-sntp.texi - copied unchanged from r281633, head/contrib/ntp/sntp/invoke-sntp.texi user/delphij/zfs-arc-rebase/contrib/ntp/sntp/kod_management.c - copied unchanged from r281633, head/contrib/ntp/sntp/kod_management.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/kod_management.h - copied unchanged from r281633, head/contrib/ntp/sntp/kod_management.h user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libevent/ - copied from r281633, head/contrib/ntp/sntp/libevent/ user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/COPYING.gplv3 - copied unchanged from r281633, head/contrib/ntp/sntp/libopts/COPYING.gplv3 user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/COPYING.lgplv3 - copied unchanged from r281633, head/contrib/ntp/sntp/libopts/COPYING.lgplv3 user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/ag-char-map.h - copied unchanged from r281633, head/contrib/ntp/sntp/libopts/ag-char-map.h user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/alias.c - copied unchanged from r281633, head/contrib/ntp/sntp/libopts/alias.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/ao-strs.c - copied unchanged from r281633, head/contrib/ntp/sntp/libopts/ao-strs.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/ao-strs.h - copied unchanged from r281633, head/contrib/ntp/sntp/libopts/ao-strs.h user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/autoopts/project.h - copied unchanged from r281633, head/contrib/ntp/sntp/libopts/autoopts/project.h user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/check.c - copied unchanged from r281633, head/contrib/ntp/sntp/libopts/check.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/compat/_Noreturn.h - copied unchanged from r281633, head/contrib/ntp/sntp/libopts/compat/_Noreturn.h user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/enum.c - copied unchanged from r281633, head/contrib/ntp/sntp/libopts/enum.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/env.c - copied unchanged from r281633, head/contrib/ntp/sntp/libopts/env.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/file.c - copied unchanged from r281633, head/contrib/ntp/sntp/libopts/file.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/find.c - copied unchanged from r281633, head/contrib/ntp/sntp/libopts/find.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/gettext.h - copied unchanged from r281633, head/contrib/ntp/sntp/libopts/gettext.h user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/init.c - copied unchanged from r281633, head/contrib/ntp/sntp/libopts/init.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/intprops.h - copied unchanged from r281633, head/contrib/ntp/sntp/libopts/intprops.h user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/m4/stdnoreturn.m4 - copied unchanged from r281633, head/contrib/ntp/sntp/libopts/m4/stdnoreturn.m4 user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/option-value-type.c - copied unchanged from r281633, head/contrib/ntp/sntp/libopts/option-value-type.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/option-value-type.h - copied unchanged from r281633, head/contrib/ntp/sntp/libopts/option-value-type.h user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/option-xat-attribute.c - copied unchanged from r281633, head/contrib/ntp/sntp/libopts/option-xat-attribute.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/option-xat-attribute.h - copied unchanged from r281633, head/contrib/ntp/sntp/libopts/option-xat-attribute.h user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/parse-duration.c - copied unchanged from r281633, head/contrib/ntp/sntp/libopts/parse-duration.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/parse-duration.h - copied unchanged from r281633, head/contrib/ntp/sntp/libopts/parse-duration.h user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/reset.c - copied unchanged from r281633, head/contrib/ntp/sntp/libopts/reset.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/stdnoreturn.in.h - copied unchanged from r281633, head/contrib/ntp/sntp/libopts/stdnoreturn.in.h user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/time.c - copied unchanged from r281633, head/contrib/ntp/sntp/libopts/time.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/loc/ - copied from r281633, head/contrib/ntp/sntp/loc/ user/delphij/zfs-arc-rebase/contrib/ntp/sntp/log.c - copied unchanged from r281633, head/contrib/ntp/sntp/log.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/log.h - copied unchanged from r281633, head/contrib/ntp/sntp/log.h user/delphij/zfs-arc-rebase/contrib/ntp/sntp/m4/ - copied from r281633, head/contrib/ntp/sntp/m4/ user/delphij/zfs-arc-rebase/contrib/ntp/sntp/main.h - copied unchanged from r281633, head/contrib/ntp/sntp/main.h user/delphij/zfs-arc-rebase/contrib/ntp/sntp/networking.c - copied unchanged from r281633, head/contrib/ntp/sntp/networking.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/networking.h - copied unchanged from r281633, head/contrib/ntp/sntp/networking.h user/delphij/zfs-arc-rebase/contrib/ntp/sntp/scm-rev - copied unchanged from r281633, head/contrib/ntp/sntp/scm-rev user/delphij/zfs-arc-rebase/contrib/ntp/sntp/scripts/ - copied from r281633, head/contrib/ntp/sntp/scripts/ user/delphij/zfs-arc-rebase/contrib/ntp/sntp/sntp.1sntpman - copied unchanged from r281633, head/contrib/ntp/sntp/sntp.1sntpman user/delphij/zfs-arc-rebase/contrib/ntp/sntp/sntp.1sntpmdoc - copied unchanged from r281633, head/contrib/ntp/sntp/sntp.1sntpmdoc user/delphij/zfs-arc-rebase/contrib/ntp/sntp/sntp.c - copied unchanged from r281633, head/contrib/ntp/sntp/sntp.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/sntp.html - copied unchanged from r281633, head/contrib/ntp/sntp/sntp.html user/delphij/zfs-arc-rebase/contrib/ntp/sntp/sntp.man.in - copied unchanged from r281633, head/contrib/ntp/sntp/sntp.man.in user/delphij/zfs-arc-rebase/contrib/ntp/sntp/sntp.mdoc.in - copied unchanged from r281633, head/contrib/ntp/sntp/sntp.mdoc.in user/delphij/zfs-arc-rebase/contrib/ntp/sntp/sntp.texi - copied unchanged from r281633, head/contrib/ntp/sntp/sntp.texi user/delphij/zfs-arc-rebase/contrib/ntp/sntp/tests/ - copied from r281633, head/contrib/ntp/sntp/tests/ user/delphij/zfs-arc-rebase/contrib/ntp/sntp/tests_main.cpp - copied unchanged from r281633, head/contrib/ntp/sntp/tests_main.cpp user/delphij/zfs-arc-rebase/contrib/ntp/sntp/tests_main.h - copied unchanged from r281633, head/contrib/ntp/sntp/tests_main.h user/delphij/zfs-arc-rebase/contrib/ntp/sntp/utilities.c - copied unchanged from r281633, head/contrib/ntp/sntp/utilities.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/utilities.h - copied unchanged from r281633, head/contrib/ntp/sntp/utilities.h user/delphij/zfs-arc-rebase/contrib/ntp/tests/ - copied from r281633, head/contrib/ntp/tests/ user/delphij/zfs-arc-rebase/contrib/ntp/util/invoke-ntp-keygen.menu - copied unchanged from r281633, head/contrib/ntp/util/invoke-ntp-keygen.menu user/delphij/zfs-arc-rebase/contrib/ntp/util/invoke-ntp-keygen.texi - copied unchanged from r281633, head/contrib/ntp/util/invoke-ntp-keygen.texi user/delphij/zfs-arc-rebase/contrib/ntp/util/ntp-keygen.1ntp-keygenman - copied unchanged from r281633, head/contrib/ntp/util/ntp-keygen.1ntp-keygenman user/delphij/zfs-arc-rebase/contrib/ntp/util/ntp-keygen.1ntp-keygenmdoc - copied unchanged from r281633, head/contrib/ntp/util/ntp-keygen.1ntp-keygenmdoc user/delphij/zfs-arc-rebase/contrib/ntp/util/ntp-keygen.html - copied unchanged from r281633, head/contrib/ntp/util/ntp-keygen.html user/delphij/zfs-arc-rebase/contrib/ntp/util/ntp-keygen.man.in - copied unchanged from r281633, head/contrib/ntp/util/ntp-keygen.man.in user/delphij/zfs-arc-rebase/contrib/ntp/util/ntp-keygen.mdoc.in - copied unchanged from r281633, head/contrib/ntp/util/ntp-keygen.mdoc.in user/delphij/zfs-arc-rebase/contrib/ntp/util/ntp-keygen.texi - copied unchanged from r281633, head/contrib/ntp/util/ntp-keygen.texi user/delphij/zfs-arc-rebase/contrib/ntp/util/tg2.c - copied unchanged from r281633, head/contrib/ntp/util/tg2.c user/delphij/zfs-arc-rebase/contrib/ntp/ylwrap - copied unchanged from r281633, head/contrib/ntp/ylwrap user/delphij/zfs-arc-rebase/contrib/nvi/docs/man/ - copied from r281633, head/contrib/nvi/docs/man/ user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/evp_extra_test.c - copied unchanged from r281633, head/crypto/openssl/crypto/evp/evp_extra_test.c user/delphij/zfs-arc-rebase/crypto/openssl/doc/crypto/d2i_CMS_ContentInfo.pod - copied unchanged from r281633, head/crypto/openssl/doc/crypto/d2i_CMS_ContentInfo.pod user/delphij/zfs-arc-rebase/crypto/openssl/doc/crypto/d2i_ECPrivateKey.pod - copied unchanged from r281633, head/crypto/openssl/doc/crypto/d2i_ECPrivateKey.pod user/delphij/zfs-arc-rebase/crypto/openssl/doc/ssl/SSL_CTX_set_read_ahead.pod - copied unchanged from r281633, head/crypto/openssl/doc/ssl/SSL_CTX_set_read_ahead.pod user/delphij/zfs-arc-rebase/crypto/openssl/util/indent.pro - copied unchanged from r281633, head/crypto/openssl/util/indent.pro user/delphij/zfs-arc-rebase/crypto/openssl/util/openssl-format-source - copied unchanged from r281633, head/crypto/openssl/util/openssl-format-source user/delphij/zfs-arc-rebase/crypto/openssl/util/su-filter.pl - copied unchanged from r281633, head/crypto/openssl/util/su-filter.pl user/delphij/zfs-arc-rebase/etc/etc.aarch64/ - copied from r281633, head/etc/etc.aarch64/ user/delphij/zfs-arc-rebase/lib/csu/aarch64/ - copied from r281633, head/lib/csu/aarch64/ user/delphij/zfs-arc-rebase/lib/libc/aarch64/ - copied from r281633, head/lib/libc/aarch64/ user/delphij/zfs-arc-rebase/lib/libc/sys/kevent.c - copied unchanged from r281633, head/lib/libc/sys/kevent.c user/delphij/zfs-arc-rebase/lib/libc/sys/trivial-vdso_tc.c - copied unchanged from r281633, head/lib/libc/sys/trivial-vdso_tc.c user/delphij/zfs-arc-rebase/lib/libkvm/kvm_aarch64.c - copied unchanged from r281633, head/lib/libkvm/kvm_aarch64.c user/delphij/zfs-arc-rebase/lib/libthr/arch/aarch64/ - copied from r281633, head/lib/libthr/arch/aarch64/ user/delphij/zfs-arc-rebase/lib/libthread_db/arch/aarch64/ - copied from r281633, head/lib/libthread_db/arch/aarch64/ user/delphij/zfs-arc-rebase/lib/msun/aarch64/ - copied from r281633, head/lib/msun/aarch64/ user/delphij/zfs-arc-rebase/libexec/rtld-elf/aarch64/ - copied from r281633, head/libexec/rtld-elf/aarch64/ user/delphij/zfs-arc-rebase/release/Makefile.ec2 - copied unchanged from r281633, head/release/Makefile.ec2 user/delphij/zfs-arc-rebase/release/tools/ec2.conf - copied unchanged from r281633, head/release/tools/ec2.conf user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/d2i_CMS_ContentInfo.3 - copied unchanged from r281633, head/secure/lib/libcrypto/man/d2i_CMS_ContentInfo.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/d2i_ECPrivateKey.3 - copied unchanged from r281633, head/secure/lib/libcrypto/man/d2i_ECPrivateKey.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/opensslconf-aarch64.h - copied unchanged from r281633, head/secure/lib/libcrypto/opensslconf-aarch64.h user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_CTX_set_read_ahead.3 - copied unchanged from r281633, head/secure/lib/libssl/man/SSL_CTX_set_read_ahead.3 user/delphij/zfs-arc-rebase/share/man/man4/ds1307.4 - copied unchanged from r281633, head/share/man/man4/ds1307.4 user/delphij/zfs-arc-rebase/sys/arm/amlogic/ - copied from r281633, head/sys/arm/amlogic/ user/delphij/zfs-arc-rebase/sys/arm/arm/pmap-v6-new.c - copied unchanged from r281633, head/sys/arm/arm/pmap-v6-new.c user/delphij/zfs-arc-rebase/sys/arm/broadcom/bcm2835/bcm2836.c - copied unchanged from r281633, head/sys/arm/broadcom/bcm2835/bcm2836.c user/delphij/zfs-arc-rebase/sys/arm/broadcom/bcm2835/bcm2836.h - copied unchanged from r281633, head/sys/arm/broadcom/bcm2835/bcm2836.h user/delphij/zfs-arc-rebase/sys/arm/broadcom/bcm2835/files.bcm2836 - copied unchanged from r281633, head/sys/arm/broadcom/bcm2835/files.bcm2836 user/delphij/zfs-arc-rebase/sys/arm/broadcom/bcm2835/files.bcm283x - copied unchanged from r281633, head/sys/arm/broadcom/bcm2835/files.bcm283x user/delphij/zfs-arc-rebase/sys/arm/broadcom/bcm2835/std.bcm2836 - copied unchanged from r281633, head/sys/arm/broadcom/bcm2835/std.bcm2836 user/delphij/zfs-arc-rebase/sys/arm/conf/ODROIDC1 - copied unchanged from r281633, head/sys/arm/conf/ODROIDC1 user/delphij/zfs-arc-rebase/sys/arm/conf/RPI2 - copied unchanged from r281633, head/sys/arm/conf/RPI2 user/delphij/zfs-arc-rebase/sys/arm/conf/SOCKIT.common - copied unchanged from r281633, head/sys/arm/conf/SOCKIT.common user/delphij/zfs-arc-rebase/sys/arm/conf/VIRT - copied unchanged from r281633, head/sys/arm/conf/VIRT user/delphij/zfs-arc-rebase/sys/arm/conf/VSATV102 - copied unchanged from r281633, head/sys/arm/conf/VSATV102 user/delphij/zfs-arc-rebase/sys/arm/include/pmap-v6.h - copied unchanged from r281633, head/sys/arm/include/pmap-v6.h user/delphij/zfs-arc-rebase/sys/arm/include/pmap_var.h - copied unchanged from r281633, head/sys/arm/include/pmap_var.h user/delphij/zfs-arc-rebase/sys/arm/include/pte-v6.h - copied unchanged from r281633, head/sys/arm/include/pte-v6.h user/delphij/zfs-arc-rebase/sys/arm/qemu/ - copied from r281633, head/sys/arm/qemu/ user/delphij/zfs-arc-rebase/sys/arm64/ - copied from r281633, head/sys/arm64/ user/delphij/zfs-arc-rebase/sys/boot/Makefile.arm64 - copied unchanged from r281633, head/sys/boot/Makefile.arm64 user/delphij/zfs-arc-rebase/sys/boot/arm64/ - copied from r281633, head/sys/boot/arm64/ user/delphij/zfs-arc-rebase/sys/boot/efi/boot1/ - copied from r281633, head/sys/boot/efi/boot1/ user/delphij/zfs-arc-rebase/sys/boot/efi/fdt/ - copied from r281633, head/sys/boot/efi/fdt/ user/delphij/zfs-arc-rebase/sys/boot/efi/include/arm/ - copied from r281633, head/sys/boot/efi/include/arm/ user/delphij/zfs-arc-rebase/sys/boot/efi/include/arm64/ - copied from r281633, head/sys/boot/efi/include/arm64/ user/delphij/zfs-arc-rebase/sys/boot/efi/loader/ - copied from r281633, head/sys/boot/efi/loader/ user/delphij/zfs-arc-rebase/sys/boot/fdt/dts/arm/bcm2836.dtsi - copied unchanged from r281633, head/sys/boot/fdt/dts/arm/bcm2836.dtsi user/delphij/zfs-arc-rebase/sys/boot/fdt/dts/arm/meson8b.dtsi - copied unchanged from r281633, head/sys/boot/fdt/dts/arm/meson8b.dtsi user/delphij/zfs-arc-rebase/sys/boot/fdt/dts/arm/odroidc1.dts - copied unchanged from r281633, head/sys/boot/fdt/dts/arm/odroidc1.dts user/delphij/zfs-arc-rebase/sys/boot/fdt/dts/arm/rpi2.dts - copied unchanged from r281633, head/sys/boot/fdt/dts/arm/rpi2.dts user/delphij/zfs-arc-rebase/sys/boot/fdt/dts/arm/vsatv102-m6.dts - copied unchanged from r281633, head/sys/boot/fdt/dts/arm/vsatv102-m6.dts user/delphij/zfs-arc-rebase/sys/boot/ficl/aarch64/ - copied from r281633, head/sys/boot/ficl/aarch64/ user/delphij/zfs-arc-rebase/sys/boot/forth/Makefile - copied unchanged from r281633, head/sys/boot/forth/Makefile user/delphij/zfs-arc-rebase/sys/boot/forth/Makefile.inc - copied unchanged from r281633, head/sys/boot/forth/Makefile.inc user/delphij/zfs-arc-rebase/sys/boot/forth/brand-fbsd.4th - copied unchanged from r281633, head/sys/boot/forth/brand-fbsd.4th user/delphij/zfs-arc-rebase/sys/boot/forth/logo-beastie.4th - copied unchanged from r281633, head/sys/boot/forth/logo-beastie.4th user/delphij/zfs-arc-rebase/sys/boot/forth/logo-beastiebw.4th - copied unchanged from r281633, head/sys/boot/forth/logo-beastiebw.4th user/delphij/zfs-arc-rebase/sys/boot/forth/logo-fbsdbw.4th - copied unchanged from r281633, head/sys/boot/forth/logo-fbsdbw.4th user/delphij/zfs-arc-rebase/sys/boot/forth/logo-orb.4th - copied unchanged from r281633, head/sys/boot/forth/logo-orb.4th user/delphij/zfs-arc-rebase/sys/boot/forth/logo-orbbw.4th - copied unchanged from r281633, head/sys/boot/forth/logo-orbbw.4th user/delphij/zfs-arc-rebase/sys/boot/i386/libi386/smbios.h - copied unchanged from r281633, head/sys/boot/i386/libi386/smbios.h user/delphij/zfs-arc-rebase/sys/conf/Makefile.arm64 - copied unchanged from r281633, head/sys/conf/Makefile.arm64 user/delphij/zfs-arc-rebase/sys/conf/files.arm64 - copied unchanged from r281633, head/sys/conf/files.arm64 user/delphij/zfs-arc-rebase/sys/conf/ldscript.arm64 - copied unchanged from r281633, head/sys/conf/ldscript.arm64 user/delphij/zfs-arc-rebase/sys/conf/options.arm64 - copied unchanged from r281633, head/sys/conf/options.arm64 user/delphij/zfs-arc-rebase/sys/crypto/aesni/aesni_os.h - copied unchanged from r281633, head/sys/crypto/aesni/aesni_os.h user/delphij/zfs-arc-rebase/sys/dev/fdt/fdt_arm64.c - copied unchanged from r281633, head/sys/dev/fdt/fdt_arm64.c user/delphij/zfs-arc-rebase/sys/dev/hwpmc/hwpmc_mips74k.c - copied unchanged from r281633, head/sys/dev/hwpmc/hwpmc_mips74k.c user/delphij/zfs-arc-rebase/sys/dev/iicbus/ds1307.c - copied unchanged from r281633, head/sys/dev/iicbus/ds1307.c user/delphij/zfs-arc-rebase/sys/dev/iicbus/ds1307reg.h - copied unchanged from r281633, head/sys/dev/iicbus/ds1307reg.h user/delphij/zfs-arc-rebase/sys/dev/psci/ - copied from r281633, head/sys/dev/psci/ user/delphij/zfs-arc-rebase/sys/dev/xen/debug/ - copied from r281633, head/sys/dev/xen/debug/ user/delphij/zfs-arc-rebase/sys/mips/conf/DIR-655A1 - copied unchanged from r281633, head/sys/mips/conf/DIR-655A1 user/delphij/zfs-arc-rebase/sys/mips/conf/DIR-655A1.hints - copied unchanged from r281633, head/sys/mips/conf/DIR-655A1.hints user/delphij/zfs-arc-rebase/sys/mips/conf/TL-WDR4300 - copied unchanged from r281633, head/sys/mips/conf/TL-WDR4300 user/delphij/zfs-arc-rebase/sys/mips/conf/TL-WDR4300.hints - copied unchanged from r281633, head/sys/mips/conf/TL-WDR4300.hints user/delphij/zfs-arc-rebase/sys/net/altq/ - copied from r281633, head/sys/net/altq/ user/delphij/zfs-arc-rebase/sys/netinet/ip_reass.c - copied unchanged from r281633, head/sys/netinet/ip_reass.c user/delphij/zfs-arc-rebase/sys/pc98/pc98/genassym.c - copied unchanged from r281633, head/sys/pc98/pc98/genassym.c user/delphij/zfs-arc-rebase/sys/powerpc/mpc85xx/mpc85xx_gpio.c - copied unchanged from r281633, head/sys/powerpc/mpc85xx/mpc85xx_gpio.c user/delphij/zfs-arc-rebase/sys/powerpc/powerpc/trap.c - copied unchanged from r281633, head/sys/powerpc/powerpc/trap.c user/delphij/zfs-arc-rebase/sys/x86/iommu/intel_intrmap.c - copied unchanged from r281633, head/sys/x86/iommu/intel_intrmap.c user/delphij/zfs-arc-rebase/sys/x86/iommu/iommu_intrmap.h - copied unchanged from r281633, head/sys/x86/iommu/iommu_intrmap.h user/delphij/zfs-arc-rebase/tools/debugscripts/netstat-anr.gdb - copied unchanged from r281633, head/tools/debugscripts/netstat-anr.gdb user/delphij/zfs-arc-rebase/usr.bin/clang/llvm-cov/ - copied from r281633, head/usr.bin/clang/llvm-cov/ user/delphij/zfs-arc-rebase/usr.bin/clang/llvm-profdata/ - copied from r281633, head/usr.bin/clang/llvm-profdata/ user/delphij/zfs-arc-rebase/usr.sbin/ntp/doc/drivers/ - copied from r281633, head/usr.sbin/ntp/doc/drivers/ user/delphij/zfs-arc-rebase/usr.sbin/ntp/doc/hints/ - copied from r281633, head/usr.sbin/ntp/doc/hints/ user/delphij/zfs-arc-rebase/usr.sbin/ntp/doc/icons/ - copied from r281633, head/usr.sbin/ntp/doc/icons/ user/delphij/zfs-arc-rebase/usr.sbin/ntp/doc/pic/ - copied from r281633, head/usr.sbin/ntp/doc/pic/ user/delphij/zfs-arc-rebase/usr.sbin/ntp/doc/scripts/ - copied from r281633, head/usr.sbin/ntp/doc/scripts/ user/delphij/zfs-arc-rebase/usr.sbin/ntp/doc/sntp.8 - copied unchanged from r281633, head/usr.sbin/ntp/doc/sntp.8 user/delphij/zfs-arc-rebase/usr.sbin/ntp/libntpevent/ - copied from r281633, head/usr.sbin/ntp/libntpevent/ user/delphij/zfs-arc-rebase/usr.sbin/ntp/ntpdc/nl.c - copied unchanged from r281633, head/usr.sbin/ntp/ntpdc/nl.c user/delphij/zfs-arc-rebase/usr.sbin/pmcstudy/pmcstudy.8 - copied unchanged from r281633, head/usr.sbin/pmcstudy/pmcstudy.8 Deleted: user/delphij/zfs-arc-rebase/contrib/ntp/arlib/ user/delphij/zfs-arc-rebase/contrib/ntp/clockstuff/clktest.c user/delphij/zfs-arc-rebase/contrib/ntp/excludes user/delphij/zfs-arc-rebase/contrib/ntp/html/build/ user/delphij/zfs-arc-rebase/contrib/ntp/html/drivers/driver2.html user/delphij/zfs-arc-rebase/contrib/ntp/html/gadget.html user/delphij/zfs-arc-rebase/contrib/ntp/html/groups.html user/delphij/zfs-arc-rebase/contrib/ntp/html/ldisc.html user/delphij/zfs-arc-rebase/contrib/ntp/html/manyopt.html user/delphij/zfs-arc-rebase/contrib/ntp/html/measure.html user/delphij/zfs-arc-rebase/contrib/ntp/html/mx4200data.html user/delphij/zfs-arc-rebase/contrib/ntp/html/notes.html user/delphij/zfs-arc-rebase/contrib/ntp/html/scripts/links10.txt user/delphij/zfs-arc-rebase/contrib/ntp/html/scripts/links11.txt user/delphij/zfs-arc-rebase/contrib/ntp/html/scripts/links12.txt user/delphij/zfs-arc-rebase/contrib/ntp/html/scripts/links7.txt user/delphij/zfs-arc-rebase/contrib/ntp/html/scripts/links8.txt user/delphij/zfs-arc-rebase/contrib/ntp/html/scripts/links9.txt user/delphij/zfs-arc-rebase/contrib/ntp/include/autogen-version.def user/delphij/zfs-arc-rebase/contrib/ntp/include/copyright.def user/delphij/zfs-arc-rebase/contrib/ntp/include/debug-opt.def user/delphij/zfs-arc-rebase/contrib/ntp/include/global.h user/delphij/zfs-arc-rebase/contrib/ntp/include/homerc.def user/delphij/zfs-arc-rebase/contrib/ntp/include/isc/app.h user/delphij/zfs-arc-rebase/contrib/ntp/include/isc/assertions.h user/delphij/zfs-arc-rebase/contrib/ntp/include/isc/boolean.h user/delphij/zfs-arc-rebase/contrib/ntp/include/isc/buffer.h user/delphij/zfs-arc-rebase/contrib/ntp/include/isc/error.h user/delphij/zfs-arc-rebase/contrib/ntp/include/isc/formatcheck.h user/delphij/zfs-arc-rebase/contrib/ntp/include/isc/int.h user/delphij/zfs-arc-rebase/contrib/ntp/include/isc/interfaceiter.h user/delphij/zfs-arc-rebase/contrib/ntp/include/isc/ipv6.h user/delphij/zfs-arc-rebase/contrib/ntp/include/isc/lang.h user/delphij/zfs-arc-rebase/contrib/ntp/include/isc/lib.h user/delphij/zfs-arc-rebase/contrib/ntp/include/isc/list.h user/delphij/zfs-arc-rebase/contrib/ntp/include/isc/magic.h user/delphij/zfs-arc-rebase/contrib/ntp/include/isc/msgcat.h user/delphij/zfs-arc-rebase/contrib/ntp/include/isc/msgs.h user/delphij/zfs-arc-rebase/contrib/ntp/include/isc/mutex.h user/delphij/zfs-arc-rebase/contrib/ntp/include/isc/net.h user/delphij/zfs-arc-rebase/contrib/ntp/include/isc/netaddr.h user/delphij/zfs-arc-rebase/contrib/ntp/include/isc/netscope.h user/delphij/zfs-arc-rebase/contrib/ntp/include/isc/offset.h user/delphij/zfs-arc-rebase/contrib/ntp/include/isc/once.h user/delphij/zfs-arc-rebase/contrib/ntp/include/isc/platform.h user/delphij/zfs-arc-rebase/contrib/ntp/include/isc/print.h user/delphij/zfs-arc-rebase/contrib/ntp/include/isc/region.h user/delphij/zfs-arc-rebase/contrib/ntp/include/isc/result.h user/delphij/zfs-arc-rebase/contrib/ntp/include/isc/sockaddr.h user/delphij/zfs-arc-rebase/contrib/ntp/include/isc/strerror.h user/delphij/zfs-arc-rebase/contrib/ntp/include/isc/string.h user/delphij/zfs-arc-rebase/contrib/ntp/include/isc/types.h user/delphij/zfs-arc-rebase/contrib/ntp/include/isc/util.h user/delphij/zfs-arc-rebase/contrib/ntp/include/ntp_sprintf.h user/delphij/zfs-arc-rebase/contrib/ntp/include/rsa_md5.h user/delphij/zfs-arc-rebase/contrib/ntp/include/version.def user/delphij/zfs-arc-rebase/contrib/ntp/kernel/README user/delphij/zfs-arc-rebase/contrib/ntp/kernel/chuinit.c user/delphij/zfs-arc-rebase/contrib/ntp/kernel/clkinit.c user/delphij/zfs-arc-rebase/contrib/ntp/kernel/sys/chudefs.h user/delphij/zfs-arc-rebase/contrib/ntp/kernel/sys/clkdefs.h user/delphij/zfs-arc-rebase/contrib/ntp/kernel/tty_chu.c user/delphij/zfs-arc-rebase/contrib/ntp/kernel/tty_chu_STREAMS.c user/delphij/zfs-arc-rebase/contrib/ntp/kernel/tty_clk.c user/delphij/zfs-arc-rebase/contrib/ntp/kernel/tty_clk_STREAMS.c user/delphij/zfs-arc-rebase/contrib/ntp/libisc/ user/delphij/zfs-arc-rebase/contrib/ntp/libntp/fptoa.c user/delphij/zfs-arc-rebase/contrib/ntp/libntp/fptoms.c user/delphij/zfs-arc-rebase/contrib/ntp/libntp/inttoa.c user/delphij/zfs-arc-rebase/contrib/ntp/libntp/lib_strbuf.h user/delphij/zfs-arc-rebase/contrib/ntp/libntp/md5c.c user/delphij/zfs-arc-rebase/contrib/ntp/libntp/memmove.c user/delphij/zfs-arc-rebase/contrib/ntp/libntp/mfptoa.c user/delphij/zfs-arc-rebase/contrib/ntp/libntp/mfptoms.c user/delphij/zfs-arc-rebase/contrib/ntp/libntp/msutotsf.c user/delphij/zfs-arc-rebase/contrib/ntp/libntp/strerror.c user/delphij/zfs-arc-rebase/contrib/ntp/libntp/strstr.c user/delphij/zfs-arc-rebase/contrib/ntp/libntp/tsftomsu.c user/delphij/zfs-arc-rebase/contrib/ntp/libntp/tstotv.c user/delphij/zfs-arc-rebase/contrib/ntp/libntp/tvtoa.c user/delphij/zfs-arc-rebase/contrib/ntp/libntp/tvtots.c user/delphij/zfs-arc-rebase/contrib/ntp/libntp/uinttoa.c user/delphij/zfs-arc-rebase/contrib/ntp/libntp/utvtoa.c user/delphij/zfs-arc-rebase/contrib/ntp/libopts/ user/delphij/zfs-arc-rebase/contrib/ntp/m4/ user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntp_intres.c user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntpd-opts.menu user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntpd-opts.texi user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntpd.1 user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntpdsim-opts.c user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntpdsim-opts.def user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntpdsim-opts.h user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntpdsim-opts.menu user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntpdsim-opts.texi user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntpdsim.1 user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/refclock_trak.c user/delphij/zfs-arc-rebase/contrib/ntp/ntpdate/ntptime_config.c user/delphij/zfs-arc-rebase/contrib/ntp/ntpdate/ntptimeset.c user/delphij/zfs-arc-rebase/contrib/ntp/ntpdc/ntpdc-opts.menu user/delphij/zfs-arc-rebase/contrib/ntp/ntpdc/ntpdc-opts.texi user/delphij/zfs-arc-rebase/contrib/ntp/ntpdc/ntpdc.1 user/delphij/zfs-arc-rebase/contrib/ntp/ntpq/ntpq-opts.menu user/delphij/zfs-arc-rebase/contrib/ntp/ntpq/ntpq-opts.texi user/delphij/zfs-arc-rebase/contrib/ntp/ntpq/ntpq.1 user/delphij/zfs-arc-rebase/contrib/ntp/scripts/VersionName user/delphij/zfs-arc-rebase/contrib/ntp/scripts/calc_tickadj.in user/delphij/zfs-arc-rebase/contrib/ntp/scripts/checktime.in user/delphij/zfs-arc-rebase/contrib/ntp/scripts/fixautomakedepsmagic user/delphij/zfs-arc-rebase/contrib/ntp/scripts/freq_adj.in user/delphij/zfs-arc-rebase/contrib/ntp/scripts/genCommitLog user/delphij/zfs-arc-rebase/contrib/ntp/scripts/genver user/delphij/zfs-arc-rebase/contrib/ntp/scripts/hpadjtime.sh user/delphij/zfs-arc-rebase/contrib/ntp/scripts/html2man.in user/delphij/zfs-arc-rebase/contrib/ntp/scripts/mkver.in user/delphij/zfs-arc-rebase/contrib/ntp/scripts/ntp-close user/delphij/zfs-arc-rebase/contrib/ntp/scripts/ntp-groper user/delphij/zfs-arc-rebase/contrib/ntp/scripts/ntp-restart user/delphij/zfs-arc-rebase/contrib/ntp/scripts/ntp-status user/delphij/zfs-arc-rebase/contrib/ntp/scripts/ntp-wait.in user/delphij/zfs-arc-rebase/contrib/ntp/scripts/ntpsweep.in user/delphij/zfs-arc-rebase/contrib/ntp/scripts/ntptrace.in user/delphij/zfs-arc-rebase/contrib/ntp/scripts/rc1/ user/delphij/zfs-arc-rebase/contrib/ntp/scripts/rc2/ user/delphij/zfs-arc-rebase/contrib/ntp/sntp/README user/delphij/zfs-arc-rebase/contrib/ntp/sntp/autogen-version.def user/delphij/zfs-arc-rebase/contrib/ntp/sntp/header.h user/delphij/zfs-arc-rebase/contrib/ntp/sntp/internet.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/internet.h user/delphij/zfs-arc-rebase/contrib/ntp/sntp/kludges.h user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/COPYING.lgpl user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/enumeration.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/environment.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/sntp-opts.menu user/delphij/zfs-arc-rebase/contrib/ntp/sntp/sntp-opts.texi user/delphij/zfs-arc-rebase/contrib/ntp/sntp/sntp.1 user/delphij/zfs-arc-rebase/contrib/ntp/sntp/socket.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/timing.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/unix.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/version.def user/delphij/zfs-arc-rebase/contrib/ntp/util/ntp-keygen-opts.menu user/delphij/zfs-arc-rebase/contrib/ntp/util/ntp-keygen-opts.texi user/delphij/zfs-arc-rebase/contrib/ntp/util/ntp-keygen.1 user/delphij/zfs-arc-rebase/contrib/ntp/version user/delphij/zfs-arc-rebase/contrib/ntp/version.m4 user/delphij/zfs-arc-rebase/contrib/nvi/catalog/spell.ok user/delphij/zfs-arc-rebase/contrib/nvi/docs/TODO user/delphij/zfs-arc-rebase/contrib/nvi/docs/USD.doc/ user/delphij/zfs-arc-rebase/contrib/nvi/docs/changelog user/delphij/zfs-arc-rebase/contrib/nvi/docs/ev user/delphij/zfs-arc-rebase/contrib/nvi/docs/features user/delphij/zfs-arc-rebase/contrib/nvi/docs/help user/delphij/zfs-arc-rebase/contrib/nvi/docs/internals/ user/delphij/zfs-arc-rebase/contrib/nvi/docs/interp/ user/delphij/zfs-arc-rebase/contrib/nvi/docs/spell.ok user/delphij/zfs-arc-rebase/contrib/nvi/docs/tutorial/ user/delphij/zfs-arc-rebase/lib/libc/arm/sys/__vdso_gettc.c user/delphij/zfs-arc-rebase/lib/libc/mips/sys/__vdso_gettc.c user/delphij/zfs-arc-rebase/lib/libc/powerpc/sys/__vdso_gettc.c user/delphij/zfs-arc-rebase/lib/libc/powerpc64/sys/__vdso_gettc.c user/delphij/zfs-arc-rebase/lib/libc/sparc64/sys/__vdso_gettc.c user/delphij/zfs-arc-rebase/share/doc/usd/10.exref/ user/delphij/zfs-arc-rebase/share/doc/usd/11.vitut/ user/delphij/zfs-arc-rebase/share/doc/usd/12.vi/ user/delphij/zfs-arc-rebase/share/doc/usd/13.viref/ user/delphij/zfs-arc-rebase/sys/arm/arm/bootconfig.c user/delphij/zfs-arc-rebase/sys/arm/arm/cpufunc_asm_armv5.S user/delphij/zfs-arc-rebase/sys/arm/include/bootconfig.h user/delphij/zfs-arc-rebase/sys/arm/mv/mv_sata.c user/delphij/zfs-arc-rebase/sys/boot/amd64/ user/delphij/zfs-arc-rebase/sys/boot/i386/efi/ user/delphij/zfs-arc-rebase/sys/contrib/altq/ user/delphij/zfs-arc-rebase/sys/dev/ata/chipsets/ata-adaptec.c user/delphij/zfs-arc-rebase/sys/dev/ata/chipsets/ata-ahci.c user/delphij/zfs-arc-rebase/sys/modules/ata/atapci/chipsets/ataadaptec/ user/delphij/zfs-arc-rebase/sys/modules/ata/atapci/chipsets/ataahci/ user/delphij/zfs-arc-rebase/sys/powerpc/aim/trap.c user/delphij/zfs-arc-rebase/sys/powerpc/booke/trap.c user/delphij/zfs-arc-rebase/tools/regression/sockets/so_setfib/so_setfib.t user/delphij/zfs-arc-rebase/usr.sbin/pmcstudy/pmcstudy.1 Modified: user/delphij/zfs-arc-rebase/Makefile user/delphij/zfs-arc-rebase/Makefile.inc1 user/delphij/zfs-arc-rebase/ObsoleteFiles.inc user/delphij/zfs-arc-rebase/README user/delphij/zfs-arc-rebase/UPDATING user/delphij/zfs-arc-rebase/bin/cp/utils.c user/delphij/zfs-arc-rebase/bin/csh/config.h user/delphij/zfs-arc-rebase/bin/csh/iconv_stub.h user/delphij/zfs-arc-rebase/bin/expr/Makefile user/delphij/zfs-arc-rebase/bin/mv/mv.c user/delphij/zfs-arc-rebase/bin/pax/ar_io.c user/delphij/zfs-arc-rebase/bin/pax/extern.h user/delphij/zfs-arc-rebase/bin/pax/options.c user/delphij/zfs-arc-rebase/bin/pax/pax.1 user/delphij/zfs-arc-rebase/bin/pax/pax.c user/delphij/zfs-arc-rebase/bin/sh/tests/expansion/Makefile user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d.out user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localicmp.ksh user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localicmp.ksh.out user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localtcp.ksh user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4remotetcp.ksh user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv6localicmp.ksh user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv6localicmp.ksh.out user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.localtcpstate.ksh user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.remotetcpstate.ksh user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c user/delphij/zfs-arc-rebase/cddl/lib/libdtrace/libproc_compat.h user/delphij/zfs-arc-rebase/cddl/usr.bin/ctfmerge/Makefile user/delphij/zfs-arc-rebase/cddl/usr.sbin/dtrace/tests/Makefile user/delphij/zfs-arc-rebase/cddl/usr.sbin/dtrace/tests/Makefile.inc1 user/delphij/zfs-arc-rebase/cddl/usr.sbin/dtrace/tests/tools/gentest.sh user/delphij/zfs-arc-rebase/contrib/binutils/bfd/elf-bfd.h user/delphij/zfs-arc-rebase/contrib/binutils/bfd/elf32-arm.c user/delphij/zfs-arc-rebase/contrib/binutils/include/elf/arm.h user/delphij/zfs-arc-rebase/contrib/compiler-rt/lib/builtins/clear_cache.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/addr2line/addr2line.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/common/_elftc.h user/delphij/zfs-arc-rebase/contrib/elftoolchain/common/elfdefinitions.h user/delphij/zfs-arc-rebase/contrib/elftoolchain/common/native-elf-format user/delphij/zfs-arc-rebase/contrib/elftoolchain/cxxfilt/cxxfilt.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/elfcopy/archive.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/elfcopy/ascii.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/elfcopy/binary.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/elfcopy/elfcopy.1 user/delphij/zfs-arc-rebase/contrib/elftoolchain/elfcopy/elfcopy.h user/delphij/zfs-arc-rebase/contrib/elftoolchain/elfcopy/main.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/elfcopy/sections.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/elfcopy/segments.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/elfcopy/symbols.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libdwarf/_libdwarf.h user/delphij/zfs-arc-rebase/contrib/elftoolchain/libdwarf/libdwarf.h user/delphij/zfs-arc-rebase/contrib/elftoolchain/libdwarf/libdwarf_lineno.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/_libelf.h user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/_libelf_config.h user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/elf_data.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/elf_end.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/elf_errmsg.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/elf_errno.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/elf_fill.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/elf_flag.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/elf_getarhdr.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/elf_getarsym.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/elf_getbase.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/elf_getident.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/elf_hash.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/elf_kind.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/elf_next.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/elf_phnum.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/elf_rand.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/elf_rawfile.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/elf_scn.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/elf_shnum.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/elf_shstrndx.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/elf_version.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/gelf.h user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/gelf_cap.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/gelf_checksum.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/gelf_dyn.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/gelf_ehdr.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/gelf_fsize.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/gelf_getclass.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/gelf_move.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/gelf_phdr.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/gelf_rel.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/gelf_rela.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/gelf_shdr.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/gelf_sym.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/gelf_syminfo.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/gelf_symshndx.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/gelf_xlate.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/libelf.h user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/libelf_align.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/libelf_allocate.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/libelf_ar.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/libelf_ar_util.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/libelf_checksum.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/libelf_convert.m4 user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/libelf_data.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/libelf_ehdr.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/libelf_extended.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/libelf_msize.m4 user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/libelf_phdr.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/libelf_shdr.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelf/libelf_xlate.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelftc/_libelftc.h user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelftc/elftc_bfdtarget.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelftc/elftc_demangle.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelftc/libelftc.h user/delphij/zfs-arc-rebase/contrib/elftoolchain/libelftc/libelftc_bfdtarget.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/nm/nm.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/readelf/readelf.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/size/size.c user/delphij/zfs-arc-rebase/contrib/elftoolchain/strings/strings.c user/delphij/zfs-arc-rebase/contrib/gcc/unwind-dw2.c user/delphij/zfs-arc-rebase/contrib/ipfilter/ipsend/44arp.c user/delphij/zfs-arc-rebase/contrib/ipfilter/ipsend/ip.c user/delphij/zfs-arc-rebase/contrib/ipfilter/ipsend/resend.c user/delphij/zfs-arc-rebase/contrib/ipfilter/lib/kmem.c user/delphij/zfs-arc-rebase/contrib/ipfilter/tools/ipfs.c user/delphij/zfs-arc-rebase/contrib/ipfilter/tools/ipftest.c user/delphij/zfs-arc-rebase/contrib/ipfilter/tools/ipnat.c user/delphij/zfs-arc-rebase/contrib/ipfilter/tools/ipnat_y.y user/delphij/zfs-arc-rebase/contrib/ipfilter/tools/ippool.c user/delphij/zfs-arc-rebase/contrib/ipfilter/tools/ippool_y.y user/delphij/zfs-arc-rebase/contrib/libarchive/libarchive/archive_read_disk_posix.c user/delphij/zfs-arc-rebase/contrib/libc++/include/type_traits user/delphij/zfs-arc-rebase/contrib/llvm/include/llvm/CodeGen/CallingConvLower.h user/delphij/zfs-arc-rebase/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp user/delphij/zfs-arc-rebase/contrib/llvm/lib/Target/AArch64/AArch64AsmPrinter.cpp user/delphij/zfs-arc-rebase/contrib/llvm/lib/Target/AArch64/AArch64CleanupLocalDynamicTLSPass.cpp user/delphij/zfs-arc-rebase/contrib/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp user/delphij/zfs-arc-rebase/contrib/llvm/lib/Target/AArch64/AArch64ISelLowering.h user/delphij/zfs-arc-rebase/contrib/llvm/lib/Target/AArch64/AArch64InstrInfo.td user/delphij/zfs-arc-rebase/contrib/llvm/lib/Target/AArch64/AArch64MCInstLower.cpp user/delphij/zfs-arc-rebase/contrib/llvm/lib/Target/AArch64/Utils/AArch64BaseInfo.h user/delphij/zfs-arc-rebase/contrib/llvm/lib/Target/ARM/ARMCallingConv.h user/delphij/zfs-arc-rebase/contrib/llvm/lib/Target/ARM/ARMCallingConv.td user/delphij/zfs-arc-rebase/contrib/llvm/lib/Target/ARM/ARMISelLowering.cpp user/delphij/zfs-arc-rebase/contrib/llvm/tools/clang/lib/Sema/SemaInit.cpp user/delphij/zfs-arc-rebase/contrib/llvm/tools/lldb/source/Core/Mangled.cpp user/delphij/zfs-arc-rebase/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp user/delphij/zfs-arc-rebase/contrib/ntp/COPYRIGHT (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ChangeLog (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/CommitLog user/delphij/zfs-arc-rebase/contrib/ntp/Makefile.am (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/Makefile.in (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/NEWS (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/README.hackers (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/WHERE-TO-START (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/aclocal.m4 (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/adjtimed/Makefile.am (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/adjtimed/Makefile.in (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/bincheck.mf user/delphij/zfs-arc-rebase/contrib/ntp/bootstrap user/delphij/zfs-arc-rebase/contrib/ntp/build (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/clockstuff/Makefile.am (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/clockstuff/Makefile.in (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/clockstuff/README (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/clockstuff/chutest.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/clockstuff/propdelay.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/conf/beauregard.conf (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/config.guess (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/config.h.in (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/config.sub (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/configure (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/configure.ac user/delphij/zfs-arc-rebase/contrib/ntp/dot.emacs (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/flock-build (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/accopt.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/assoc.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/audio.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/authopt.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/clockopt.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/confopt.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/copyright.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/debug.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/drivers/driver1.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/drivers/driver10.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/drivers/driver11.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/drivers/driver12.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/drivers/driver16.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/drivers/driver18.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/drivers/driver19.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/drivers/driver20.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/drivers/driver22.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/drivers/driver26.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/drivers/driver27.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/drivers/driver28.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/drivers/driver29.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/drivers/driver3.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/drivers/driver30.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/drivers/driver31.html user/delphij/zfs-arc-rebase/contrib/ntp/html/drivers/driver32.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/drivers/driver33.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/drivers/driver34.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/drivers/driver35.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/drivers/driver36.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/drivers/driver37.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/drivers/driver38.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/drivers/driver39.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/drivers/driver4.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/drivers/driver40.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/drivers/driver42.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/drivers/driver43.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/drivers/driver44.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/drivers/driver5.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/drivers/driver6.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/drivers/driver7.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/drivers/driver8.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/drivers/driver9.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/drivers/oncore-shmem.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/drivers/scripts/footer.txt user/delphij/zfs-arc-rebase/contrib/ntp/html/drivers/scripts/style.css user/delphij/zfs-arc-rebase/contrib/ntp/html/drivers/tf582_4.html user/delphij/zfs-arc-rebase/contrib/ntp/html/extern.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/howto.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/index.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/kern.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/keygen.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/miscopt.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/monopt.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/msyslog.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/ntp_conf.html user/delphij/zfs-arc-rebase/contrib/ntp/html/ntpd.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/ntpdate.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/ntpdc.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/ntpdsim.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/ntpdsim_new.html user/delphij/zfs-arc-rebase/contrib/ntp/html/ntpq.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/ntptime.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/ntptrace.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/parsedata.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/parsenew.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/pps.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/prefer.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/rdebug.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/refclock.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/release.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/scripts/footer.txt (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/scripts/style.css (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/sntp.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/html/tickadj.html (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/Makefile.am (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/Makefile.in (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/audio.h (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/binio.h (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/icom.h (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/ieee754io.h (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/iosignal.h (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/isc/Makefile.am (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/isc/Makefile.in (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/isc/mem.h (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/l_stdlib.h (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/mbg_gps166.h (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/ntp.h (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/ntp_calendar.h (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/ntp_cmdargs.h (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/ntp_config.h (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/ntp_control.h (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/ntp_crypto.h (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/ntp_debug.h user/delphij/zfs-arc-rebase/contrib/ntp/include/ntp_filegen.h (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/ntp_fp.h (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/ntp_io.h (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/ntp_machine.h (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/ntp_malloc.h (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/ntp_md5.h (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/ntp_proto.h (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/ntp_random.h user/delphij/zfs-arc-rebase/contrib/ntp/include/ntp_refclock.h (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/ntp_request.h (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/ntp_rfc2553.h (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/ntp_select.h (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/ntp_stdlib.h (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/ntp_string.h (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/ntp_syscall.h (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/ntp_syslog.h (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/ntp_tty.h (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/ntp_types.h (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/ntp_unixtime.h (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/ntpd.h (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/ntpsim.h (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/parse.h (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/recvbuff.h (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/timepps-SCO.h user/delphij/zfs-arc-rebase/contrib/ntp/include/timepps-Solaris.h user/delphij/zfs-arc-rebase/contrib/ntp/include/timepps-SunOS.h user/delphij/zfs-arc-rebase/contrib/ntp/include/trimble.h (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/kernel/Makefile.am (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/kernel/Makefile.in (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/kernel/sys/Makefile.am (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/kernel/sys/Makefile.in (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/Makefile.am (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/Makefile.in (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/a_md5encrypt.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/atoint.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/atolfp.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/atouint.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/audio.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/authkeys.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/authreadkeys.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/authusekey.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/buftvtots.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/caljulian.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/caltontp.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/calyearstart.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/clocktime.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/clocktypes.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/decodenetnum.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/dofptoa.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/dolfptoa.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/emalloc.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/findconfig.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/getopt.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/hextoint.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/hextolfp.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/humandate.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/icom.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/iosignal.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/lib_strbuf.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/machines.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/mktime.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/modetoa.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/mstolfp.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/msyslog.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/netof.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/ntp_random.c user/delphij/zfs-arc-rebase/contrib/ntp/libntp/ntp_rfc2553.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/numtoa.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/numtohost.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/octtoint.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/prettydate.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/recvbuff.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/refnumtoa.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/snprintf.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/socktoa.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/socktohost.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/statestr.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/strdup.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/syssignal.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/systime.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/uglydate.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/ymd2yd.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libparse/Makefile.am (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libparse/Makefile.in (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libparse/binio.c user/delphij/zfs-arc-rebase/contrib/ntp/libparse/clk_computime.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libparse/clk_dcf7000.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libparse/clk_hopf6021.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libparse/clk_meinberg.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libparse/clk_rawdcf.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libparse/clk_rcc8000.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libparse/clk_schmid.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libparse/clk_trimtaip.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libparse/clk_trimtsip.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libparse/clk_varitext.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libparse/clk_wharton.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libparse/data_mbg.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libparse/gpstolfp.c user/delphij/zfs-arc-rebase/contrib/ntp/libparse/ieee754io.c user/delphij/zfs-arc-rebase/contrib/ntp/libparse/info_trimble.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libparse/mfp_mul.c user/delphij/zfs-arc-rebase/contrib/ntp/libparse/mkinfo_rcmd.sed (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libparse/mkinfo_scmd.sed (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libparse/parse.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libparse/parse_conf.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libparse/parsesolaris.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libparse/parsestreams.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libparse/trim_info.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ltmain.sh user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/Makefile.am (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/Makefile.in (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/check_y2k.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/cmd_args.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntp_config.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntp_control.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntp_crypto.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntp_filegen.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntp_io.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntp_loopfilter.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntp_monitor.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntp_peer.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntp_proto.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntp_refclock.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntp_request.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntp_restrict.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntp_timer.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntp_util.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntpd-opts.c user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntpd-opts.def user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntpd-opts.h user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntpd.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntpdbase-opts.def user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/ntpsim.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/refclock_acts.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/refclock_arbiter.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/refclock_arc.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/refclock_as2201.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/refclock_atom.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/refclock_bancomm.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/refclock_chronolog.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/refclock_chu.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/refclock_conf.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/refclock_datum.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/refclock_dumbclock.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/refclock_fg.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/refclock_gpsvme.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/refclock_heath.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/refclock_hopfpci.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/refclock_hopfser.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/refclock_hpgps.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/refclock_irig.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/refclock_jjy.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/refclock_jupiter.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/refclock_leitch.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/refclock_local.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/refclock_msfees.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/refclock_mx4200.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/refclock_neoclock4x.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/refclock_nmea.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/refclock_oncore.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/refclock_palisade.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/refclock_palisade.h (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/refclock_parse.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/refclock_pcf.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/refclock_pst.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/refclock_ripencc.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/refclock_shm.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/refclock_tpro.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/refclock_true.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/refclock_tt560.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/refclock_ulink.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/refclock_wwv.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/refclock_wwvb.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/refclock_zyfer.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpdate/Makefile.am (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpdate/Makefile.in (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpdate/ntpdate.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpdate/ntpdate.h (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpdc/Makefile.am (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpdc/Makefile.in (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpdc/layout.std (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpdc/nl.pl (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpdc/nl.pl.in (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpdc/ntpdc-layout.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpdc/ntpdc-opts.c user/delphij/zfs-arc-rebase/contrib/ntp/ntpdc/ntpdc-opts.def user/delphij/zfs-arc-rebase/contrib/ntp/ntpdc/ntpdc-opts.h user/delphij/zfs-arc-rebase/contrib/ntp/ntpdc/ntpdc.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpdc/ntpdc.h (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpdc/ntpdc_ops.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpq/Makefile.am (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpq/Makefile.in (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpq/ntpq-opts.c user/delphij/zfs-arc-rebase/contrib/ntp/ntpq/ntpq-opts.def user/delphij/zfs-arc-rebase/contrib/ntp/ntpq/ntpq-opts.h user/delphij/zfs-arc-rebase/contrib/ntp/ntpq/ntpq-subs.c user/delphij/zfs-arc-rebase/contrib/ntp/ntpq/ntpq.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpq/ntpq.h (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/packageinfo.sh user/delphij/zfs-arc-rebase/contrib/ntp/parseutil/Makefile.am (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/parseutil/Makefile.in (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/parseutil/dcfd.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/parseutil/testdcf.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/readme.y2kfixes (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/scripts/Makefile.am (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/scripts/Makefile.in (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/scripts/README (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/scripts/monitoring/ntp.pl (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/scripts/monitoring/ntptrap (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/scripts/ntpver.in (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/scripts/plot_summary.in (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/scripts/summary.in (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/sntp/COPYRIGHT user/delphij/zfs-arc-rebase/contrib/ntp/sntp/Makefile.am (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/sntp/Makefile.in (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/sntp/aclocal.m4 (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/sntp/bincheck.mf user/delphij/zfs-arc-rebase/contrib/ntp/sntp/config.guess (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/sntp/config.h.in user/delphij/zfs-arc-rebase/contrib/ntp/sntp/config.sub (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/sntp/configure (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/sntp/configure.ac (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/Makefile.am user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/Makefile.in user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/README user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/autoopts.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/autoopts.h user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/autoopts/options.h user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/autoopts/usage-txt.h user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/boolean.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/compat/compat.h user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/compat/pathfind.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/compat/snprintf.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/compat/strchr.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/compat/strdup.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/compat/windows-config.h user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/configfile.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/cook.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/genshell.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/genshell.h user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/libopts.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/load.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/m4/libopts.m4 user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/m4/liboptschk.m4 user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/makeshell.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/nested.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/numeric.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/pgusage.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/proto.h user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/putshell.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/restore.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/save.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/sort.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/stack.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/streqvcmp.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/text_mmap.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/tokenize.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/usage.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/libopts/version.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/ltmain.sh user/delphij/zfs-arc-rebase/contrib/ntp/sntp/main.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/sntp/sntp-opts.c user/delphij/zfs-arc-rebase/contrib/ntp/sntp/sntp-opts.def user/delphij/zfs-arc-rebase/contrib/ntp/sntp/sntp-opts.h user/delphij/zfs-arc-rebase/contrib/ntp/util/Makefile.am (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/util/Makefile.in (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/util/README (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/util/audio-pcm.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/util/hist.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/util/jitter.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/util/jitter.h user/delphij/zfs-arc-rebase/contrib/ntp/util/ntp-keygen-opts.c user/delphij/zfs-arc-rebase/contrib/ntp/util/ntp-keygen-opts.def user/delphij/zfs-arc-rebase/contrib/ntp/util/ntp-keygen-opts.h user/delphij/zfs-arc-rebase/contrib/ntp/util/ntp-keygen.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/util/ntptime.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/util/sht.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/ntp/util/tg.c user/delphij/zfs-arc-rebase/contrib/ntp/util/tickadj.c (contents, props changed) user/delphij/zfs-arc-rebase/contrib/nvi/README user/delphij/zfs-arc-rebase/contrib/nvi/catalog/dump.c user/delphij/zfs-arc-rebase/contrib/nvi/cl/cl.h user/delphij/zfs-arc-rebase/contrib/nvi/cl/cl_funcs.c user/delphij/zfs-arc-rebase/contrib/nvi/cl/cl_main.c user/delphij/zfs-arc-rebase/contrib/nvi/cl/cl_read.c user/delphij/zfs-arc-rebase/contrib/nvi/cl/cl_screen.c user/delphij/zfs-arc-rebase/contrib/nvi/cl/cl_term.c user/delphij/zfs-arc-rebase/contrib/nvi/cl/extern.h user/delphij/zfs-arc-rebase/contrib/nvi/common/common.h user/delphij/zfs-arc-rebase/contrib/nvi/common/conv.c user/delphij/zfs-arc-rebase/contrib/nvi/common/cut.c user/delphij/zfs-arc-rebase/contrib/nvi/common/delete.c user/delphij/zfs-arc-rebase/contrib/nvi/common/encoding.c user/delphij/zfs-arc-rebase/contrib/nvi/common/exf.c user/delphij/zfs-arc-rebase/contrib/nvi/common/extern.h user/delphij/zfs-arc-rebase/contrib/nvi/common/gs.h user/delphij/zfs-arc-rebase/contrib/nvi/common/key.c user/delphij/zfs-arc-rebase/contrib/nvi/common/line.c user/delphij/zfs-arc-rebase/contrib/nvi/common/log.c user/delphij/zfs-arc-rebase/contrib/nvi/common/main.c user/delphij/zfs-arc-rebase/contrib/nvi/common/mark.c user/delphij/zfs-arc-rebase/contrib/nvi/common/msg.c user/delphij/zfs-arc-rebase/contrib/nvi/common/options.c user/delphij/zfs-arc-rebase/contrib/nvi/common/options.h user/delphij/zfs-arc-rebase/contrib/nvi/common/options_f.c user/delphij/zfs-arc-rebase/contrib/nvi/common/put.c user/delphij/zfs-arc-rebase/contrib/nvi/common/recover.c user/delphij/zfs-arc-rebase/contrib/nvi/common/screen.c user/delphij/zfs-arc-rebase/contrib/nvi/common/search.c user/delphij/zfs-arc-rebase/contrib/nvi/common/seq.c user/delphij/zfs-arc-rebase/contrib/nvi/common/util.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex.h user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_abbrev.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_append.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_args.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_argv.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_at.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_bang.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_cd.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_cscope.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_delete.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_display.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_edit.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_equal.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_file.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_filter.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_global.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_init.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_join.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_map.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_mark.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_mkexrc.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_move.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_open.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_preserve.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_print.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_put.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_quit.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_read.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_screen.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_script.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_set.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_shell.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_shift.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_source.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_stop.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_subst.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_tag.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_txt.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_undo.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_usage.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_util.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_version.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_visual.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_write.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_yank.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/ex_z.c user/delphij/zfs-arc-rebase/contrib/nvi/ex/extern.h user/delphij/zfs-arc-rebase/contrib/nvi/ex/version.h user/delphij/zfs-arc-rebase/contrib/nvi/regex/COPYRIGHT user/delphij/zfs-arc-rebase/contrib/nvi/regex/cclass.h user/delphij/zfs-arc-rebase/contrib/nvi/regex/cname.h user/delphij/zfs-arc-rebase/contrib/nvi/regex/engine.c user/delphij/zfs-arc-rebase/contrib/nvi/regex/re_format.7 user/delphij/zfs-arc-rebase/contrib/nvi/regex/regcomp.c user/delphij/zfs-arc-rebase/contrib/nvi/regex/regerror.c user/delphij/zfs-arc-rebase/contrib/nvi/regex/regex.3 user/delphij/zfs-arc-rebase/contrib/nvi/regex/regex.h user/delphij/zfs-arc-rebase/contrib/nvi/regex/regex2.h user/delphij/zfs-arc-rebase/contrib/nvi/regex/regexec.c user/delphij/zfs-arc-rebase/contrib/nvi/regex/regfree.c user/delphij/zfs-arc-rebase/contrib/nvi/regex/utils.h user/delphij/zfs-arc-rebase/contrib/nvi/vi/extern.h user/delphij/zfs-arc-rebase/contrib/nvi/vi/getc.c user/delphij/zfs-arc-rebase/contrib/nvi/vi/v_at.c user/delphij/zfs-arc-rebase/contrib/nvi/vi/v_ch.c user/delphij/zfs-arc-rebase/contrib/nvi/vi/v_delete.c user/delphij/zfs-arc-rebase/contrib/nvi/vi/v_ex.c user/delphij/zfs-arc-rebase/contrib/nvi/vi/v_increment.c user/delphij/zfs-arc-rebase/contrib/nvi/vi/v_init.c user/delphij/zfs-arc-rebase/contrib/nvi/vi/v_itxt.c user/delphij/zfs-arc-rebase/contrib/nvi/vi/v_left.c user/delphij/zfs-arc-rebase/contrib/nvi/vi/v_mark.c user/delphij/zfs-arc-rebase/contrib/nvi/vi/v_match.c user/delphij/zfs-arc-rebase/contrib/nvi/vi/v_paragraph.c user/delphij/zfs-arc-rebase/contrib/nvi/vi/v_put.c user/delphij/zfs-arc-rebase/contrib/nvi/vi/v_redraw.c user/delphij/zfs-arc-rebase/contrib/nvi/vi/v_replace.c user/delphij/zfs-arc-rebase/contrib/nvi/vi/v_right.c user/delphij/zfs-arc-rebase/contrib/nvi/vi/v_screen.c user/delphij/zfs-arc-rebase/contrib/nvi/vi/v_scroll.c user/delphij/zfs-arc-rebase/contrib/nvi/vi/v_search.c user/delphij/zfs-arc-rebase/contrib/nvi/vi/v_section.c user/delphij/zfs-arc-rebase/contrib/nvi/vi/v_sentence.c user/delphij/zfs-arc-rebase/contrib/nvi/vi/v_status.c user/delphij/zfs-arc-rebase/contrib/nvi/vi/v_txt.c user/delphij/zfs-arc-rebase/contrib/nvi/vi/v_ulcase.c user/delphij/zfs-arc-rebase/contrib/nvi/vi/v_undo.c user/delphij/zfs-arc-rebase/contrib/nvi/vi/v_util.c user/delphij/zfs-arc-rebase/contrib/nvi/vi/v_word.c user/delphij/zfs-arc-rebase/contrib/nvi/vi/v_xchar.c user/delphij/zfs-arc-rebase/contrib/nvi/vi/v_yank.c user/delphij/zfs-arc-rebase/contrib/nvi/vi/v_z.c user/delphij/zfs-arc-rebase/contrib/nvi/vi/v_zexit.c user/delphij/zfs-arc-rebase/contrib/nvi/vi/vi.c user/delphij/zfs-arc-rebase/contrib/nvi/vi/vi.h user/delphij/zfs-arc-rebase/contrib/nvi/vi/vs_line.c user/delphij/zfs-arc-rebase/contrib/nvi/vi/vs_msg.c user/delphij/zfs-arc-rebase/contrib/nvi/vi/vs_refresh.c user/delphij/zfs-arc-rebase/contrib/nvi/vi/vs_relative.c user/delphij/zfs-arc-rebase/contrib/nvi/vi/vs_smap.c user/delphij/zfs-arc-rebase/contrib/nvi/vi/vs_split.c user/delphij/zfs-arc-rebase/contrib/ofed/libibverbs/examples/build/Makefile.inc user/delphij/zfs-arc-rebase/contrib/ofed/librdmacm/examples/build/Makefile.inc user/delphij/zfs-arc-rebase/contrib/pjdfstest/tests/open/20.t user/delphij/zfs-arc-rebase/contrib/pjdfstest/tests/truncate/11.t user/delphij/zfs-arc-rebase/contrib/smbfs/include/netsmb/smb_lib.h user/delphij/zfs-arc-rebase/contrib/smbfs/lib/smb/nls.c user/delphij/zfs-arc-rebase/contrib/smbfs/lib/smb/print.c user/delphij/zfs-arc-rebase/contrib/smbfs/lib/smb/rq.c user/delphij/zfs-arc-rebase/contrib/tzdata/asia user/delphij/zfs-arc-rebase/contrib/tzdata/australasia user/delphij/zfs-arc-rebase/contrib/tzdata/europe user/delphij/zfs-arc-rebase/contrib/tzdata/leap-seconds.list user/delphij/zfs-arc-rebase/contrib/tzdata/northamerica user/delphij/zfs-arc-rebase/contrib/tzdata/southamerica user/delphij/zfs-arc-rebase/contrib/xz/ChangeLog user/delphij/zfs-arc-rebase/contrib/xz/THANKS user/delphij/zfs-arc-rebase/contrib/xz/src/common/tuklib_cpucores.c user/delphij/zfs-arc-rebase/contrib/xz/src/common/tuklib_integer.h user/delphij/zfs-arc-rebase/contrib/xz/src/liblzma/api/lzma/version.h user/delphij/zfs-arc-rebase/contrib/xz/src/liblzma/common/memcmplen.h user/delphij/zfs-arc-rebase/contrib/xz/src/liblzma/lz/lz_encoder.c user/delphij/zfs-arc-rebase/contrib/xz/src/liblzma/lzma/lzma_encoder_optimum_fast.c user/delphij/zfs-arc-rebase/contrib/xz/src/xz/file_io.c user/delphij/zfs-arc-rebase/crypto/openssh/clientloop.c user/delphij/zfs-arc-rebase/crypto/openssh/ssh_config.5 user/delphij/zfs-arc-rebase/crypto/openssh/sshd_config.5 user/delphij/zfs-arc-rebase/crypto/openssl/CHANGES user/delphij/zfs-arc-rebase/crypto/openssl/Configure user/delphij/zfs-arc-rebase/crypto/openssl/Makefile user/delphij/zfs-arc-rebase/crypto/openssl/NEWS user/delphij/zfs-arc-rebase/crypto/openssl/README user/delphij/zfs-arc-rebase/crypto/openssl/apps/app_rand.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/apps.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/apps.h user/delphij/zfs-arc-rebase/crypto/openssl/apps/asn1pars.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/ca.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/ciphers.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/cms.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/crl.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/crl2p7.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/dgst.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/dh.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/dhparam.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/dsa.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/dsaparam.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/ec.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/ecparam.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/enc.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/engine.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/errstr.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/gendh.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/gendsa.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/genpkey.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/genrsa.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/nseq.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/ocsp.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/openssl.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/passwd.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/pkcs12.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/pkcs7.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/pkcs8.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/pkey.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/pkeyparam.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/pkeyutl.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/prime.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/progs.h user/delphij/zfs-arc-rebase/crypto/openssl/apps/rand.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/req.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/rsa.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/rsautl.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/s_apps.h user/delphij/zfs-arc-rebase/crypto/openssl/apps/s_cb.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/s_client.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/s_server.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/s_socket.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/s_time.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/sess_id.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/smime.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/speed.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/spkac.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/srp.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/testdsa.h user/delphij/zfs-arc-rebase/crypto/openssl/apps/testrsa.h user/delphij/zfs-arc-rebase/crypto/openssl/apps/timeouts.h user/delphij/zfs-arc-rebase/crypto/openssl/apps/ts.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/verify.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/version.c user/delphij/zfs-arc-rebase/crypto/openssl/apps/x509.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/LPdir_unix.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/aes/aes.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/aes/aes_cbc.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/aes/aes_cfb.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/aes/aes_core.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/aes/aes_ctr.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/aes/aes_ecb.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/aes/aes_ige.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/aes/aes_locl.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/aes/aes_misc.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/aes/aes_ofb.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/aes/aes_wrap.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/aes/aes_x86core.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/arm_arch.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/armcap.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/a_bitstr.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/a_bool.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/a_bytes.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/a_d2i_fp.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/a_digest.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/a_dup.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/a_enum.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/a_gentm.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/a_i2d_fp.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/a_int.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/a_mbstr.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/a_object.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/a_octet.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/a_print.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/a_set.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/a_sign.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/a_strex.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/a_strnid.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/a_time.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/a_type.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/a_utctm.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/a_utf8.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/a_verify.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/ameth_lib.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/asn1.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/asn1_err.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/asn1_gen.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/asn1_lib.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/asn1_locl.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/asn1_mac.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/asn1_par.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/asn1t.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/asn_mime.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/asn_moid.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/asn_pack.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/bio_asn1.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/bio_ndef.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/charmap.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/d2i_pr.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/d2i_pu.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/evp_asn1.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/f_enum.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/f_int.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/f_string.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/i2d_pr.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/i2d_pu.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/n_pkey.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/nsseq.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/p5_pbe.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/p5_pbev2.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/p8_pkey.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/t_bitst.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/t_crl.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/t_pkey.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/t_req.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/t_spki.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/t_x509.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/t_x509a.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/tasn_dec.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/tasn_enc.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/tasn_fre.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/tasn_new.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/tasn_prn.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/tasn_typ.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/tasn_utl.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/x_algor.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/x_attrib.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/x_bignum.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/x_crl.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/x_exten.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/x_info.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/x_long.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/x_name.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/x_nx509.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/x_pkey.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/x_pubkey.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/x_req.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/x_sig.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/x_spki.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/x_val.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/x_x509.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/asn1/x_x509a.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bf/bf_cbc.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bf/bf_cfb64.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bf/bf_ecb.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bf/bf_enc.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bf/bf_locl.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bf/bf_ofb64.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bf/bf_opts.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bf/bf_pi.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bf/bf_skey.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bf/bfspeed.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bf/bftest.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bf/blowfish.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bio/b_dump.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bio/b_print.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bio/b_sock.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bio/bf_buff.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bio/bf_lbuf.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bio/bf_nbio.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bio/bf_null.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bio/bio.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bio/bio_cb.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bio/bio_err.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bio/bio_lcl.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bio/bio_lib.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bio/bss_acpt.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bio/bss_bio.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bio/bss_conn.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bio/bss_dgram.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bio/bss_fd.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bio/bss_file.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bio/bss_log.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bio/bss_mem.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bio/bss_null.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bio/bss_rtcp.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bio/bss_sock.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bn/asm/x86_64-gcc.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bn/bn.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bn/bn_add.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bn/bn_asm.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bn/bn_blind.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bn/bn_const.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bn/bn_ctx.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bn/bn_depr.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bn/bn_div.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bn/bn_err.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bn/bn_exp.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bn/bn_exp2.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bn/bn_gcd.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bn/bn_gf2m.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bn/bn_kron.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bn/bn_lcl.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bn/bn_lib.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bn/bn_mod.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bn/bn_mont.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bn/bn_mpi.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bn/bn_mul.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bn/bn_nist.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bn/bn_prime.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bn/bn_prime.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bn/bn_print.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bn/bn_rand.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bn/bn_recp.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bn/bn_shift.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bn/bn_sqr.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bn/bn_sqrt.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bn/bn_word.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bn/bn_x931p.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bn/bnspeed.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bn/bntest.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bn/divtest.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bn/exp.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bn/expspeed.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/bn/exptest.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/buffer/buf_err.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/buffer/buf_str.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/buffer/buffer.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/buffer/buffer.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/camellia/camellia.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/camellia/camellia.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/camellia/cmll_cbc.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/camellia/cmll_cfb.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/camellia/cmll_ctr.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/camellia/cmll_ecb.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/camellia/cmll_locl.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/camellia/cmll_misc.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/camellia/cmll_ofb.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/camellia/cmll_utl.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/cast/c_cfb64.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/cast/c_ecb.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/cast/c_enc.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/cast/c_ofb64.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/cast/c_skey.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/cast/cast.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/cast/cast_lcl.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/cast/cast_s.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/cast/cast_spd.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/cast/castopts.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/cast/casttest.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/cmac/cm_ameth.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/cmac/cm_pmeth.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/cmac/cmac.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/cmac/cmac.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/cms/cms.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/cms/cms_asn1.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/cms/cms_att.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/cms/cms_cd.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/cms/cms_dd.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/cms/cms_enc.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/cms/cms_env.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/cms/cms_err.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/cms/cms_ess.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/cms/cms_io.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/cms/cms_lcl.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/cms/cms_lib.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/cms/cms_pwri.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/cms/cms_sd.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/cms/cms_smime.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/comp/c_rle.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/comp/c_zlib.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/comp/comp.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/comp/comp_err.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/comp/comp_lib.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/conf/cnf_save.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/conf/conf.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/conf/conf_api.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/conf/conf_api.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/conf/conf_def.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/conf/conf_def.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/conf/conf_err.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/conf/conf_lib.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/conf/conf_mall.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/conf/conf_mod.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/conf/conf_sap.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/conf/test.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/constant_time_locl.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/constant_time_test.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/cpt_err.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/cryptlib.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/cryptlib.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/crypto.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/cversion.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/des/cbc3_enc.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/des/cbc_cksm.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/des/cbc_enc.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/des/cfb64ede.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/des/cfb64enc.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/des/cfb_enc.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/des/des.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/des/des.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/des/des_enc.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/des/des_locl.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/des/des_old.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/des/des_old.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/des/des_old2.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/des/des_opts.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/des/des_ver.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/des/destest.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/des/ecb3_enc.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/des/ecb_enc.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/des/ede_cbcm_enc.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/des/enc_read.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/des/enc_writ.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/des/fcrypt.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/des/fcrypt_b.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/des/ncbc_enc.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/des/ofb64ede.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/des/ofb64enc.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/des/ofb_enc.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/des/pcbc_enc.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/des/qud_cksm.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/des/rand_key.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/des/read2pwd.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/des/read_pwd.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/des/rpc_des.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/des/rpc_enc.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/des/rpw.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/des/set_key.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/des/speed.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/des/spr.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/des/str2key.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/des/xcbc_enc.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/dh/dh.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/dh/dh_ameth.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/dh/dh_asn1.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/dh/dh_check.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/dh/dh_depr.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/dh/dh_err.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/dh/dh_gen.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/dh/dh_key.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/dh/dh_lib.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/dh/dh_pmeth.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/dh/dh_prn.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/dh/dhtest.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/dh/p1024.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/dh/p192.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/dh/p512.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/dsa/dsa.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/dsa/dsa_ameth.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/dsa/dsa_asn1.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/dsa/dsa_depr.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/dsa/dsa_err.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/dsa/dsa_gen.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/dsa/dsa_key.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/dsa/dsa_lib.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/dsa/dsa_locl.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/dsa/dsa_ossl.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/dsa/dsa_pmeth.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/dsa/dsa_prn.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/dsa/dsa_sign.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/dsa/dsa_vrf.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/dsa/dsagen.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/dsa/dsatest.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/dso/dso.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/dso/dso_beos.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/dso/dso_dl.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/dso/dso_dlfcn.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/dso/dso_err.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/dso/dso_lib.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/dso/dso_null.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/dso/dso_openssl.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ebcdic.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ebcdic.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ec/ec.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ec/ec2_mult.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ec/ec2_oct.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ec/ec2_smpl.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ec/ec_ameth.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ec/ec_asn1.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ec/ec_check.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ec/ec_curve.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ec/ec_cvt.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ec/ec_err.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ec/ec_key.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ec/ec_lcl.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ec/ec_lib.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ec/ec_mult.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ec/ec_oct.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ec/ec_pmeth.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ec/ec_print.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ec/eck_prn.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ec/ecp_mont.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ec/ecp_nist.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ec/ecp_nistp224.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ec/ecp_nistp256.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ec/ecp_nistp521.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ec/ecp_nistputil.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ec/ecp_oct.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ec/ecp_smpl.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ec/ectest.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ecdh/ecdh.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ecdh/ecdhtest.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ecdh/ech_err.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ecdh/ech_key.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ecdh/ech_lib.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ecdh/ech_locl.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ecdh/ech_ossl.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ecdsa/ecdsa.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ecdsa/ecdsatest.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ecdsa/ecs_asn1.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ecdsa/ecs_err.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ecdsa/ecs_lib.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ecdsa/ecs_locl.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ecdsa/ecs_ossl.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ecdsa/ecs_sign.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ecdsa/ecs_vrf.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/engine/eng_all.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/engine/eng_cnf.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/engine/eng_cryptodev.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/engine/eng_ctrl.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/engine/eng_dyn.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/engine/eng_err.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/engine/eng_fat.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/engine/eng_init.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/engine/eng_int.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/engine/eng_lib.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/engine/eng_list.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/engine/eng_openssl.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/engine/eng_pkey.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/engine/eng_rdrand.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/engine/eng_rsax.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/engine/eng_table.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/engine/engine.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/engine/enginetest.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/engine/tb_asnmth.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/engine/tb_cipher.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/engine/tb_dh.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/engine/tb_digest.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/engine/tb_dsa.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/engine/tb_ecdh.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/engine/tb_ecdsa.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/engine/tb_pkmeth.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/engine/tb_rand.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/engine/tb_rsa.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/engine/tb_store.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/err/err.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/err/err.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/err/err_all.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/err/err_prn.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/Makefile user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/bio_b64.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/bio_enc.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/bio_md.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/bio_ok.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/c_all.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/c_allc.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/c_alld.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/digest.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/e_aes.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/e_aes_cbc_hmac_sha1.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/e_bf.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/e_camellia.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/e_cast.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/e_des.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/e_des3.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/e_dsa.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/e_idea.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/e_null.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/e_old.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/e_rc2.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/e_rc4.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/e_rc4_hmac_md5.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/e_rc5.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/e_seed.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/e_xcbc_d.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/encode.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/evp.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/evp_acnf.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/evp_cnf.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/evp_enc.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/evp_err.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/evp_fips.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/evp_key.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/evp_lib.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/evp_locl.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/evp_pbe.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/evp_pkey.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/evp_test.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/m_dss.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/m_dss1.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/m_ecdsa.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/m_md2.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/m_md4.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/m_md5.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/m_mdc2.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/m_null.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/m_ripemd.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/m_sha.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/m_sha1.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/m_sigver.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/m_wp.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/names.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/openbsd_hw.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/p5_crpt.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/p5_crpt2.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/p_dec.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/p_enc.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/p_lib.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/p_open.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/p_seal.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/p_sign.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/p_verify.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/pmeth_fn.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/pmeth_gn.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/evp/pmeth_lib.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ex_data.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/fips_err.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/fips_ers.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/hmac/hm_ameth.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/hmac/hm_pmeth.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/hmac/hmac.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/hmac/hmac.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/hmac/hmactest.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/idea/i_cbc.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/idea/i_cfb64.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/idea/i_ecb.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/idea/i_ofb64.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/idea/i_skey.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/idea/idea.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/idea/idea_lcl.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/idea/idea_spd.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/idea/ideatest.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/jpake/jpake.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/jpake/jpake.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/jpake/jpake_err.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/jpake/jpaketest.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/krb5/krb5_asn.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/krb5/krb5_asn.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/lhash/lh_stats.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/lhash/lh_test.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/lhash/lhash.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/lhash/lhash.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/md2/md2.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/md2/md2.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/md2/md2_dgst.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/md2/md2_one.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/md2/md2test.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/md32_common.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/md4/md4.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/md4/md4.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/md4/md4_dgst.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/md4/md4_locl.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/md4/md4_one.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/md4/md4test.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/md5/md5.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/md5/md5.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/md5/md5_dgst.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/md5/md5_locl.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/md5/md5_one.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/md5/md5test.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/mdc2/mdc2.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/mdc2/mdc2_one.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/mdc2/mdc2dgst.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/mdc2/mdc2test.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/mem.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/mem_clr.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/mem_dbg.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/modes/cbc128.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/modes/ccm128.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/modes/cfb128.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/modes/ctr128.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/modes/cts128.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/modes/gcm128.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/modes/modes.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/modes/modes_lcl.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/modes/ofb128.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/modes/xts128.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/o_dir.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/o_dir.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/o_dir_test.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/o_fips.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/o_init.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/o_str.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/o_str.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/o_time.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/o_time.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/objects/o_names.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/objects/obj_dat.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/objects/obj_err.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/objects/obj_lib.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/objects/obj_mac.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/objects/obj_xref.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/objects/obj_xref.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/objects/objects.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/objects/objects.pl user/delphij/zfs-arc-rebase/crypto/openssl/crypto/objects/objxref.pl user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ocsp/ocsp.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ocsp/ocsp_asn.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ocsp/ocsp_cl.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ocsp/ocsp_err.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ocsp/ocsp_ext.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ocsp/ocsp_ht.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ocsp/ocsp_lib.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ocsp/ocsp_prn.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ocsp/ocsp_srv.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ocsp/ocsp_vfy.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/opensslv.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ossl_typ.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/pem/pem.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/pem/pem2.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/pem/pem_all.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/pem/pem_err.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/pem/pem_info.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/pem/pem_lib.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/pem/pem_oth.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/pem/pem_pk8.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/pem/pem_pkey.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/pem/pem_seal.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/pem/pem_sign.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/pem/pem_x509.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/pem/pem_xaux.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/pem/pvkfmt.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/pkcs12/p12_add.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/pkcs12/p12_asn.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/pkcs12/p12_attr.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/pkcs12/p12_crpt.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/pkcs12/p12_crt.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/pkcs12/p12_decr.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/pkcs12/p12_init.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/pkcs12/p12_key.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/pkcs12/p12_kiss.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/pkcs12/p12_mutl.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/pkcs12/p12_npas.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/pkcs12/p12_p8d.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/pkcs12/p12_p8e.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/pkcs12/p12_utl.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/pkcs12/pk12err.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/pkcs12/pkcs12.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/pkcs7/bio_pk7.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/pkcs7/pk7_asn1.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/pkcs7/pk7_attr.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/pkcs7/pk7_dgst.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/pkcs7/pk7_doit.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/pkcs7/pk7_enc.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/pkcs7/pk7_lib.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/pkcs7/pk7_mime.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/pkcs7/pk7_smime.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/pkcs7/pkcs7.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/pkcs7/pkcs7err.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ppccap.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/pqueue/pq_test.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/pqueue/pqueue.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/pqueue/pqueue.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rand/md_rand.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rand/rand.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rand/rand_egd.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rand/rand_err.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rand/rand_lcl.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rand/rand_lib.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rand/rand_unix.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rand/randfile.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rand/randtest.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rc2/rc2.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rc2/rc2_cbc.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rc2/rc2_ecb.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rc2/rc2_locl.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rc2/rc2_skey.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rc2/rc2cfb64.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rc2/rc2ofb64.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rc2/rc2speed.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rc2/rc2test.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rc2/tab.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rc4/rc4.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rc4/rc4.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rc4/rc4_enc.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rc4/rc4_locl.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rc4/rc4_skey.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rc4/rc4_utl.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rc4/rc4speed.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rc4/rc4test.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rc5/rc5.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rc5/rc5_ecb.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rc5/rc5_enc.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rc5/rc5_locl.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rc5/rc5_skey.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rc5/rc5cfb64.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rc5/rc5ofb64.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rc5/rc5speed.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rc5/rc5test.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ripemd/ripemd.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ripemd/rmd160.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ripemd/rmd_dgst.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ripemd/rmd_locl.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ripemd/rmd_one.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ripemd/rmdconst.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ripemd/rmdtest.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rsa/rsa.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rsa/rsa_ameth.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rsa/rsa_asn1.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rsa/rsa_chk.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rsa/rsa_crpt.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rsa/rsa_depr.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rsa/rsa_eay.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rsa/rsa_err.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rsa/rsa_gen.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rsa/rsa_lib.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rsa/rsa_locl.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rsa/rsa_none.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rsa/rsa_null.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rsa/rsa_oaep.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rsa/rsa_pk1.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rsa/rsa_pmeth.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rsa/rsa_prn.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rsa/rsa_pss.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rsa/rsa_saos.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rsa/rsa_sign.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rsa/rsa_ssl.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rsa/rsa_test.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/rsa/rsa_x931.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/s390xcap.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/seed/seed.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/seed/seed.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/seed/seed_cbc.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/seed/seed_cfb.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/seed/seed_ecb.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/seed/seed_locl.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/seed/seed_ofb.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/sha/sha.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/sha/sha.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/sha/sha1.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/sha/sha1_one.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/sha/sha1dgst.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/sha/sha1test.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/sha/sha256.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/sha/sha256t.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/sha/sha512.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/sha/sha512t.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/sha/sha_dgst.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/sha/sha_locl.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/sha/sha_one.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/sha/shatest.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/sparcv9cap.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/srp/srp.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/srp/srp_grps.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/srp/srp_lcl.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/srp/srp_lib.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/srp/srp_vfy.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/srp/srptest.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/stack/safestack.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/stack/stack.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/stack/stack.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/store/store.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/store/str_err.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/store/str_lib.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/store/str_locl.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/store/str_mem.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/store/str_meth.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/symhacks.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/threads/mttest.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/threads/th-lock.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ts/ts.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ts/ts_asn1.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ts/ts_conf.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ts/ts_err.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ts/ts_lib.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ts/ts_req_print.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ts/ts_req_utils.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ts/ts_rsp_print.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ts/ts_rsp_sign.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ts/ts_rsp_utils.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ts/ts_rsp_verify.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ts/ts_verify_ctx.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/txt_db/txt_db.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/txt_db/txt_db.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ui/ui.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ui/ui_compat.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ui/ui_compat.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ui/ui_err.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ui/ui_lib.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ui/ui_locl.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ui/ui_openssl.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/ui/ui_util.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/uid.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/vms_rms.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/whrlpool/whrlpool.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/whrlpool/wp_block.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/whrlpool/wp_dgst.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/whrlpool/wp_locl.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/whrlpool/wp_test.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509/by_dir.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509/by_file.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509/x509.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509/x509_att.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509/x509_cmp.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509/x509_d2.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509/x509_def.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509/x509_err.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509/x509_ext.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509/x509_lu.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509/x509_obj.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509/x509_r2x.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509/x509_req.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509/x509_set.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509/x509_trs.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509/x509_txt.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509/x509_v3.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509/x509_vfy.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509/x509_vfy.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509/x509_vpm.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509/x509cset.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509/x509name.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509/x509rset.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509/x509spki.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509/x509type.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509/x_all.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509v3/ext_dat.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509v3/pcy_cache.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509v3/pcy_data.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509v3/pcy_int.h user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509v3/pcy_lib.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509v3/pcy_map.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509v3/pcy_node.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509v3/pcy_tree.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509v3/tabtest.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509v3/v3_addr.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509v3/v3_akey.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509v3/v3_akeya.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509v3/v3_alt.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509v3/v3_asid.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509v3/v3_bcons.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509v3/v3_bitst.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509v3/v3_conf.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509v3/v3_cpols.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509v3/v3_crld.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509v3/v3_enum.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509v3/v3_extku.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509v3/v3_genn.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509v3/v3_ia5.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509v3/v3_info.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509v3/v3_int.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509v3/v3_lib.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509v3/v3_ncons.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509v3/v3_ocsp.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509v3/v3_pci.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509v3/v3_pcia.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509v3/v3_pcons.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509v3/v3_pku.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509v3/v3_pmaps.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509v3/v3_prn.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509v3/v3_purp.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509v3/v3_skey.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509v3/v3_sxnet.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509v3/v3_utl.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509v3/v3conf.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509v3/v3err.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509v3/v3prin.c user/delphij/zfs-arc-rebase/crypto/openssl/crypto/x509v3/x509v3.h user/delphij/zfs-arc-rebase/crypto/openssl/doc/apps/ciphers.pod user/delphij/zfs-arc-rebase/crypto/openssl/doc/apps/config.pod user/delphij/zfs-arc-rebase/crypto/openssl/doc/apps/ocsp.pod user/delphij/zfs-arc-rebase/crypto/openssl/doc/crypto/CMS_get0_type.pod user/delphij/zfs-arc-rebase/crypto/openssl/doc/crypto/CONF_modules_load_file.pod user/delphij/zfs-arc-rebase/crypto/openssl/doc/crypto/OPENSSL_config.pod user/delphij/zfs-arc-rebase/crypto/openssl/doc/crypto/d2i_X509.pod user/delphij/zfs-arc-rebase/crypto/openssl/doc/ssl/SSL_pending.pod user/delphij/zfs-arc-rebase/crypto/openssl/doc/ssl/ssl.pod user/delphij/zfs-arc-rebase/crypto/openssl/e_os.h user/delphij/zfs-arc-rebase/crypto/openssl/e_os2.h user/delphij/zfs-arc-rebase/crypto/openssl/engines/ccgost/e_gost_err.c user/delphij/zfs-arc-rebase/crypto/openssl/engines/ccgost/e_gost_err.h user/delphij/zfs-arc-rebase/crypto/openssl/engines/ccgost/gost2001.c user/delphij/zfs-arc-rebase/crypto/openssl/engines/ccgost/gost2001_keyx.c user/delphij/zfs-arc-rebase/crypto/openssl/engines/ccgost/gost2001_keyx.h user/delphij/zfs-arc-rebase/crypto/openssl/engines/ccgost/gost89.c user/delphij/zfs-arc-rebase/crypto/openssl/engines/ccgost/gost89.h user/delphij/zfs-arc-rebase/crypto/openssl/engines/ccgost/gost94_keyx.c user/delphij/zfs-arc-rebase/crypto/openssl/engines/ccgost/gost_ameth.c user/delphij/zfs-arc-rebase/crypto/openssl/engines/ccgost/gost_asn1.c user/delphij/zfs-arc-rebase/crypto/openssl/engines/ccgost/gost_crypt.c user/delphij/zfs-arc-rebase/crypto/openssl/engines/ccgost/gost_ctl.c user/delphij/zfs-arc-rebase/crypto/openssl/engines/ccgost/gost_eng.c user/delphij/zfs-arc-rebase/crypto/openssl/engines/ccgost/gost_keywrap.c user/delphij/zfs-arc-rebase/crypto/openssl/engines/ccgost/gost_keywrap.h user/delphij/zfs-arc-rebase/crypto/openssl/engines/ccgost/gost_lcl.h user/delphij/zfs-arc-rebase/crypto/openssl/engines/ccgost/gost_md.c user/delphij/zfs-arc-rebase/crypto/openssl/engines/ccgost/gost_params.c user/delphij/zfs-arc-rebase/crypto/openssl/engines/ccgost/gost_params.h user/delphij/zfs-arc-rebase/crypto/openssl/engines/ccgost/gost_pmeth.c user/delphij/zfs-arc-rebase/crypto/openssl/engines/ccgost/gost_sign.c user/delphij/zfs-arc-rebase/crypto/openssl/engines/ccgost/gosthash.c user/delphij/zfs-arc-rebase/crypto/openssl/engines/ccgost/gosthash.h user/delphij/zfs-arc-rebase/crypto/openssl/engines/ccgost/gostsum.c user/delphij/zfs-arc-rebase/crypto/openssl/engines/e_4758cca.c user/delphij/zfs-arc-rebase/crypto/openssl/engines/e_4758cca_err.c user/delphij/zfs-arc-rebase/crypto/openssl/engines/e_4758cca_err.h user/delphij/zfs-arc-rebase/crypto/openssl/engines/e_aep.c user/delphij/zfs-arc-rebase/crypto/openssl/engines/e_aep_err.c user/delphij/zfs-arc-rebase/crypto/openssl/engines/e_aep_err.h user/delphij/zfs-arc-rebase/crypto/openssl/engines/e_atalla.c user/delphij/zfs-arc-rebase/crypto/openssl/engines/e_atalla_err.c user/delphij/zfs-arc-rebase/crypto/openssl/engines/e_atalla_err.h user/delphij/zfs-arc-rebase/crypto/openssl/engines/e_capi.c user/delphij/zfs-arc-rebase/crypto/openssl/engines/e_capi_err.c user/delphij/zfs-arc-rebase/crypto/openssl/engines/e_capi_err.h user/delphij/zfs-arc-rebase/crypto/openssl/engines/e_chil.c user/delphij/zfs-arc-rebase/crypto/openssl/engines/e_chil_err.c user/delphij/zfs-arc-rebase/crypto/openssl/engines/e_chil_err.h user/delphij/zfs-arc-rebase/crypto/openssl/engines/e_cswift.c user/delphij/zfs-arc-rebase/crypto/openssl/engines/e_cswift_err.c user/delphij/zfs-arc-rebase/crypto/openssl/engines/e_cswift_err.h user/delphij/zfs-arc-rebase/crypto/openssl/engines/e_gmp.c user/delphij/zfs-arc-rebase/crypto/openssl/engines/e_gmp_err.c user/delphij/zfs-arc-rebase/crypto/openssl/engines/e_gmp_err.h user/delphij/zfs-arc-rebase/crypto/openssl/engines/e_nuron.c user/delphij/zfs-arc-rebase/crypto/openssl/engines/e_nuron_err.c user/delphij/zfs-arc-rebase/crypto/openssl/engines/e_nuron_err.h user/delphij/zfs-arc-rebase/crypto/openssl/engines/e_padlock.c user/delphij/zfs-arc-rebase/crypto/openssl/engines/e_sureware.c user/delphij/zfs-arc-rebase/crypto/openssl/engines/e_sureware_err.c user/delphij/zfs-arc-rebase/crypto/openssl/engines/e_sureware_err.h user/delphij/zfs-arc-rebase/crypto/openssl/engines/e_ubsec.c user/delphij/zfs-arc-rebase/crypto/openssl/engines/e_ubsec_err.c user/delphij/zfs-arc-rebase/crypto/openssl/engines/e_ubsec_err.h user/delphij/zfs-arc-rebase/crypto/openssl/engines/vendor_defns/aep.h user/delphij/zfs-arc-rebase/crypto/openssl/engines/vendor_defns/atalla.h user/delphij/zfs-arc-rebase/crypto/openssl/engines/vendor_defns/cswift.h user/delphij/zfs-arc-rebase/crypto/openssl/engines/vendor_defns/hw_4758_cca.h user/delphij/zfs-arc-rebase/crypto/openssl/engines/vendor_defns/hw_ubsec.h user/delphij/zfs-arc-rebase/crypto/openssl/engines/vendor_defns/hwcryptohook.h user/delphij/zfs-arc-rebase/crypto/openssl/engines/vendor_defns/sureware.h user/delphij/zfs-arc-rebase/crypto/openssl/ssl/bio_ssl.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/d1_both.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/d1_clnt.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/d1_enc.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/d1_lib.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/d1_meth.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/d1_pkt.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/d1_srtp.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/d1_srvr.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/dtls1.h user/delphij/zfs-arc-rebase/crypto/openssl/ssl/heartbeat_test.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/kssl.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/kssl.h user/delphij/zfs-arc-rebase/crypto/openssl/ssl/kssl_lcl.h user/delphij/zfs-arc-rebase/crypto/openssl/ssl/s23_clnt.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/s23_lib.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/s23_meth.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/s23_pkt.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/s23_srvr.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/s2_clnt.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/s2_enc.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/s2_lib.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/s2_meth.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/s2_pkt.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/s2_srvr.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/s3_both.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/s3_cbc.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/s3_clnt.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/s3_enc.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/s3_lib.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/s3_meth.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/s3_pkt.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/s3_srvr.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/srtp.h user/delphij/zfs-arc-rebase/crypto/openssl/ssl/ssl.h user/delphij/zfs-arc-rebase/crypto/openssl/ssl/ssl2.h user/delphij/zfs-arc-rebase/crypto/openssl/ssl/ssl23.h user/delphij/zfs-arc-rebase/crypto/openssl/ssl/ssl3.h user/delphij/zfs-arc-rebase/crypto/openssl/ssl/ssl_algs.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/ssl_asn1.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/ssl_cert.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/ssl_ciph.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/ssl_err.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/ssl_err2.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/ssl_lib.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/ssl_locl.h user/delphij/zfs-arc-rebase/crypto/openssl/ssl/ssl_rsa.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/ssl_sess.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/ssl_stat.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/ssl_task.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/ssl_txt.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/ssl_utst.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/ssltest.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/t1_clnt.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/t1_enc.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/t1_lib.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/t1_meth.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/t1_reneg.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/t1_srvr.c user/delphij/zfs-arc-rebase/crypto/openssl/ssl/tls1.h user/delphij/zfs-arc-rebase/crypto/openssl/ssl/tls_srp.c user/delphij/zfs-arc-rebase/crypto/openssl/util/ck_errf.pl user/delphij/zfs-arc-rebase/crypto/openssl/util/libeay.num user/delphij/zfs-arc-rebase/crypto/openssl/util/mkerr.pl user/delphij/zfs-arc-rebase/etc/Makefile user/delphij/zfs-arc-rebase/etc/autofs/include_ldap user/delphij/zfs-arc-rebase/etc/defaults/periodic.conf user/delphij/zfs-arc-rebase/etc/login.conf user/delphij/zfs-arc-rebase/etc/mtree/BSD.include.dist user/delphij/zfs-arc-rebase/etc/mtree/BSD.usr.dist user/delphij/zfs-arc-rebase/etc/ntp.conf user/delphij/zfs-arc-rebase/etc/periodic/daily/420.status-network user/delphij/zfs-arc-rebase/etc/rc.d/hostid_save user/delphij/zfs-arc-rebase/etc/rc.d/pflog user/delphij/zfs-arc-rebase/games/fortune/tools/do_uniq.py user/delphij/zfs-arc-rebase/gnu/lib/libgcc/Makefile user/delphij/zfs-arc-rebase/gnu/usr.bin/binutils/Makefile user/delphij/zfs-arc-rebase/include/Makefile user/delphij/zfs-arc-rebase/include/iconv.h user/delphij/zfs-arc-rebase/include/pthread.h user/delphij/zfs-arc-rebase/include/signal.h user/delphij/zfs-arc-rebase/include/stdlib.h user/delphij/zfs-arc-rebase/lib/csu/i386-elf/Makefile user/delphij/zfs-arc-rebase/lib/libarchive/Makefile user/delphij/zfs-arc-rebase/lib/libbluetooth/bluetooth.c user/delphij/zfs-arc-rebase/lib/libbluetooth/dev.c user/delphij/zfs-arc-rebase/lib/libbluetooth/hci.c user/delphij/zfs-arc-rebase/lib/libc/Makefile user/delphij/zfs-arc-rebase/lib/libc/arm/sys/Makefile.inc user/delphij/zfs-arc-rebase/lib/libc/gen/fts.c user/delphij/zfs-arc-rebase/lib/libc/gen/nlist.c user/delphij/zfs-arc-rebase/lib/libc/gen/setmode.c user/delphij/zfs-arc-rebase/lib/libc/gen/tls.c user/delphij/zfs-arc-rebase/lib/libc/gen/wordexp.c user/delphij/zfs-arc-rebase/lib/libc/iconv/__iconv.c user/delphij/zfs-arc-rebase/lib/libc/iconv/bsd_iconv.c user/delphij/zfs-arc-rebase/lib/libc/iconv/citrus_iconv.h user/delphij/zfs-arc-rebase/lib/libc/iconv/citrus_iconv_local.h user/delphij/zfs-arc-rebase/lib/libc/iconv/citrus_none.c user/delphij/zfs-arc-rebase/lib/libc/iconv/citrus_stdenc.h user/delphij/zfs-arc-rebase/lib/libc/iconv/citrus_stdenc_local.h user/delphij/zfs-arc-rebase/lib/libc/iconv/citrus_stdenc_template.h user/delphij/zfs-arc-rebase/lib/libc/iconv/iconv-internal.h user/delphij/zfs-arc-rebase/lib/libc/iconv/iconv.3 user/delphij/zfs-arc-rebase/lib/libc/iconv/iconv.c user/delphij/zfs-arc-rebase/lib/libc/iconv/iconv_compat.c user/delphij/zfs-arc-rebase/lib/libc/include/compat.h user/delphij/zfs-arc-rebase/lib/libc/include/libc_private.h user/delphij/zfs-arc-rebase/lib/libc/locale/cXXrtomb_iconv.h user/delphij/zfs-arc-rebase/lib/libc/locale/mbrtocXX_iconv.h user/delphij/zfs-arc-rebase/lib/libc/mips/sys/Makefile.inc user/delphij/zfs-arc-rebase/lib/libc/net/Symbol.map user/delphij/zfs-arc-rebase/lib/libc/net/getaddrinfo.c user/delphij/zfs-arc-rebase/lib/libc/net/name6.c user/delphij/zfs-arc-rebase/lib/libc/powerpc/Makefile.inc user/delphij/zfs-arc-rebase/lib/libc/powerpc/gen/_setjmp.S user/delphij/zfs-arc-rebase/lib/libc/powerpc/gen/setjmp.S user/delphij/zfs-arc-rebase/lib/libc/powerpc/gen/sigsetjmp.S user/delphij/zfs-arc-rebase/lib/libc/powerpc64/Makefile.inc user/delphij/zfs-arc-rebase/lib/libc/sparc64/Makefile.inc user/delphij/zfs-arc-rebase/lib/libc/string/strlcat.c user/delphij/zfs-arc-rebase/lib/libc/string/strlcpy.c user/delphij/zfs-arc-rebase/lib/libc/sys/Makefile.inc user/delphij/zfs-arc-rebase/lib/libc/sys/fcntl.c user/delphij/zfs-arc-rebase/lib/libc/sys/interposing_table.c user/delphij/zfs-arc-rebase/lib/libc/sys/kqueue.2 user/delphij/zfs-arc-rebase/lib/libc/sys/mount.2 user/delphij/zfs-arc-rebase/lib/libc/sys/open.2 user/delphij/zfs-arc-rebase/lib/libc/sys/vfork.2 user/delphij/zfs-arc-rebase/lib/libc/xdr/xdr_float.c user/delphij/zfs-arc-rebase/lib/libcompiler_rt/Makefile user/delphij/zfs-arc-rebase/lib/libelftc/elftc_version.c user/delphij/zfs-arc-rebase/lib/libfetch/common.c user/delphij/zfs-arc-rebase/lib/libfetch/fetch.3 user/delphij/zfs-arc-rebase/lib/libgeom/geom_xml2tree.c user/delphij/zfs-arc-rebase/lib/libgpio/Makefile user/delphij/zfs-arc-rebase/lib/libiconv_modules/BIG5/citrus_big5.c user/delphij/zfs-arc-rebase/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c user/delphij/zfs-arc-rebase/lib/libiconv_modules/EUC/citrus_euc.c user/delphij/zfs-arc-rebase/lib/libiconv_modules/EUCTW/citrus_euctw.c user/delphij/zfs-arc-rebase/lib/libiconv_modules/GBK2K/citrus_gbk2k.c user/delphij/zfs-arc-rebase/lib/libiconv_modules/HZ/citrus_hz.c user/delphij/zfs-arc-rebase/lib/libiconv_modules/ISO2022/citrus_iso2022.c user/delphij/zfs-arc-rebase/lib/libiconv_modules/JOHAB/citrus_johab.c user/delphij/zfs-arc-rebase/lib/libiconv_modules/MSKanji/citrus_mskanji.c user/delphij/zfs-arc-rebase/lib/libiconv_modules/UES/citrus_ues.c user/delphij/zfs-arc-rebase/lib/libiconv_modules/UTF1632/citrus_utf1632.c user/delphij/zfs-arc-rebase/lib/libiconv_modules/UTF7/citrus_utf7.c user/delphij/zfs-arc-rebase/lib/libiconv_modules/UTF8/citrus_utf8.c user/delphij/zfs-arc-rebase/lib/libiconv_modules/VIQR/citrus_viqr.c user/delphij/zfs-arc-rebase/lib/libiconv_modules/ZW/citrus_zw.c user/delphij/zfs-arc-rebase/lib/libiconv_modules/iconv_none/citrus_iconv_none.c user/delphij/zfs-arc-rebase/lib/libiconv_modules/iconv_std/citrus_iconv_std.c user/delphij/zfs-arc-rebase/lib/libkiconv/xlat16_iconv.c user/delphij/zfs-arc-rebase/lib/liblzma/Symbol.map user/delphij/zfs-arc-rebase/lib/liblzma/config.h user/delphij/zfs-arc-rebase/lib/libmt/Makefile user/delphij/zfs-arc-rebase/lib/libpmc/libpmc.c user/delphij/zfs-arc-rebase/lib/libsdp/search.c user/delphij/zfs-arc-rebase/lib/libsdp/service.c user/delphij/zfs-arc-rebase/lib/libsdp/session.c user/delphij/zfs-arc-rebase/lib/libsdp/util.c user/delphij/zfs-arc-rebase/lib/libstand/Makefile user/delphij/zfs-arc-rebase/lib/libthr/thread/thr_syscalls.c user/delphij/zfs-arc-rebase/lib/libvmmapi/Makefile user/delphij/zfs-arc-rebase/lib/libvmmapi/vmmapi.c user/delphij/zfs-arc-rebase/lib/libvmmapi/vmmapi.h user/delphij/zfs-arc-rebase/libexec/rtld-elf/Makefile user/delphij/zfs-arc-rebase/libexec/rtld-elf/amd64/reloc.c user/delphij/zfs-arc-rebase/libexec/rtld-elf/amd64/rtld_machdep.h user/delphij/zfs-arc-rebase/libexec/rtld-elf/amd64/rtld_start.S user/delphij/zfs-arc-rebase/libexec/rtld-elf/i386/reloc.c user/delphij/zfs-arc-rebase/libexec/rtld-elf/i386/rtld_machdep.h user/delphij/zfs-arc-rebase/libexec/rtld-elf/i386/rtld_start.S user/delphij/zfs-arc-rebase/libexec/rtld-elf/mips/reloc.c user/delphij/zfs-arc-rebase/libexec/rtld-elf/rtld.c user/delphij/zfs-arc-rebase/libexec/rtld-elf/rtld.h user/delphij/zfs-arc-rebase/libexec/rtld-elf/rtld_lock.c user/delphij/zfs-arc-rebase/libexec/rtld-elf/rtld_lock.h user/delphij/zfs-arc-rebase/libexec/rtld-elf/rtld_tls.h user/delphij/zfs-arc-rebase/release/Makefile.vm user/delphij/zfs-arc-rebase/release/arm/BEAGLEBONE.conf user/delphij/zfs-arc-rebase/release/arm/PANDABOARD.conf user/delphij/zfs-arc-rebase/release/arm/RPI-B.conf user/delphij/zfs-arc-rebase/release/arm/WANDBOARD-QUAD.conf user/delphij/zfs-arc-rebase/release/arm/ZEDBOARD.conf user/delphij/zfs-arc-rebase/release/scripts/mk-vmimage.sh user/delphij/zfs-arc-rebase/release/tools/arm/crochet-BEAGLEBONE.conf user/delphij/zfs-arc-rebase/release/tools/arm/crochet-PANDABOARD.conf user/delphij/zfs-arc-rebase/release/tools/arm/crochet-RPI-B.conf user/delphij/zfs-arc-rebase/release/tools/arm/crochet-WANDBOARD-QUAD.conf user/delphij/zfs-arc-rebase/release/tools/arm/crochet-ZEDBOARD.conf user/delphij/zfs-arc-rebase/release/tools/gce.conf user/delphij/zfs-arc-rebase/release/tools/vmimage.subr user/delphij/zfs-arc-rebase/sbin/camcontrol/camcontrol.8 user/delphij/zfs-arc-rebase/sbin/camcontrol/camcontrol.c user/delphij/zfs-arc-rebase/sbin/geom/class/part/geom_part.c user/delphij/zfs-arc-rebase/sbin/ggate/ggatec/ggatec.8 user/delphij/zfs-arc-rebase/sbin/ggate/ggatel/ggatel.8 user/delphij/zfs-arc-rebase/sbin/ifconfig/af_inet.c user/delphij/zfs-arc-rebase/sbin/ifconfig/af_inet6.c user/delphij/zfs-arc-rebase/sbin/ifconfig/af_nd6.c user/delphij/zfs-arc-rebase/sbin/ifconfig/carp.c user/delphij/zfs-arc-rebase/sbin/ifconfig/ifconfig.c user/delphij/zfs-arc-rebase/sbin/ifconfig/ifmedia.c user/delphij/zfs-arc-rebase/sbin/ifconfig/ifvlan.c user/delphij/zfs-arc-rebase/sbin/ifconfig/ifvxlan.c user/delphij/zfs-arc-rebase/sbin/md5/Makefile user/delphij/zfs-arc-rebase/sbin/md5/md5.c user/delphij/zfs-arc-rebase/sbin/newfs_msdos/newfs_msdos.8 user/delphij/zfs-arc-rebase/sbin/pfctl/parse.y user/delphij/zfs-arc-rebase/sbin/pfctl/pfctl.c user/delphij/zfs-arc-rebase/sbin/pfctl/pfctl_altq.c user/delphij/zfs-arc-rebase/sbin/pfctl/pfctl_qstats.c user/delphij/zfs-arc-rebase/sbin/savecore/Makefile user/delphij/zfs-arc-rebase/sbin/savecore/savecore.c user/delphij/zfs-arc-rebase/secure/lib/libcrypto/Makefile.inc user/delphij/zfs-arc-rebase/secure/lib/libcrypto/Makefile.man user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/ASN1_OBJECT_new.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/ASN1_STRING_length.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/ASN1_STRING_new.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/ASN1_generate_nconf.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/BIO_ctrl.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/BIO_f_base64.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/BIO_f_buffer.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/BIO_f_cipher.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/BIO_f_md.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/BIO_f_null.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/BIO_f_ssl.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/BIO_find_type.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/BIO_new.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/BIO_new_CMS.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/BIO_push.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/BIO_read.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/BIO_s_accept.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/BIO_s_bio.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/BIO_s_connect.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/BIO_s_fd.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/BIO_s_file.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/BIO_s_mem.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/BIO_s_null.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/BIO_s_socket.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/BIO_set_callback.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/BIO_should_retry.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/BN_BLINDING_new.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/BN_CTX_new.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/BN_CTX_start.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/BN_add.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/BN_add_word.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/BN_bn2bin.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/BN_cmp.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/BN_copy.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/BN_generate_prime.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/BN_mod_inverse.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/BN_new.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/BN_num_bytes.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/BN_rand.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/BN_set_bit.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/BN_swap.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/BN_zero.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/CMS_add0_cert.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/CMS_add1_recipient_cert.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/CMS_add1_signer.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/CMS_compress.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/CMS_decrypt.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/CMS_encrypt.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/CMS_final.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/CMS_get0_RecipientInfos.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/CMS_get0_SignerInfos.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/CMS_get0_type.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/CMS_get1_ReceiptRequest.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/CMS_sign.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/CMS_sign_receipt.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/CMS_uncompress.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/CMS_verify.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/CMS_verify_receipt.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/CONF_modules_free.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/CONF_modules_load_file.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/DH_generate_key.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/DH_generate_parameters.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/DH_get_ex_new_index.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/DH_new.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/DH_set_method.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/DH_size.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/DSA_SIG_new.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/DSA_do_sign.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/DSA_dup_DH.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/DSA_generate_key.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/DSA_generate_parameters.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/DSA_get_ex_new_index.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/DSA_new.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/DSA_set_method.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/DSA_sign.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/DSA_size.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/ERR_GET_LIB.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/ERR_clear_error.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/ERR_error_string.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/ERR_get_error.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/ERR_load_crypto_strings.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/ERR_load_strings.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/ERR_print_errors.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/ERR_put_error.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/ERR_remove_state.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/ERR_set_mark.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/EVP_BytesToKey.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/EVP_DigestInit.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/EVP_DigestSignInit.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/EVP_DigestVerifyInit.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/EVP_EncryptInit.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/EVP_OpenInit.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/EVP_PKEY_CTX_new.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/EVP_PKEY_cmp.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/EVP_PKEY_decrypt.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/EVP_PKEY_derive.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/EVP_PKEY_encrypt.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/EVP_PKEY_get_default_digest.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/EVP_PKEY_keygen.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/EVP_PKEY_new.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/EVP_PKEY_print_private.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/EVP_PKEY_sign.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/EVP_PKEY_verify.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/EVP_PKEY_verify_recover.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/EVP_SealInit.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/EVP_SignInit.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/EVP_VerifyInit.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/OBJ_nid2obj.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/OPENSSL_Applink.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/OPENSSL_config.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/OPENSSL_ia32cap.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/PEM_write_bio_CMS_stream.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/PEM_write_bio_PKCS7_stream.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/PKCS12_create.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/PKCS12_parse.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/PKCS7_decrypt.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/PKCS7_encrypt.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/PKCS7_sign.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/PKCS7_sign_add_signer.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/PKCS7_verify.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/RAND_add.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/RAND_bytes.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/RAND_cleanup.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/RAND_egd.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/RAND_load_file.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/RAND_set_rand_method.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/RSA_blinding_on.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/RSA_check_key.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/RSA_generate_key.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/RSA_get_ex_new_index.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/RSA_new.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/RSA_print.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/RSA_private_encrypt.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/RSA_public_encrypt.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/RSA_set_method.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/RSA_sign.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/RSA_size.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/SMIME_read_CMS.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/SMIME_read_PKCS7.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/SMIME_write_CMS.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/SMIME_write_PKCS7.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/X509_NAME_print_ex.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/X509_STORE_CTX_get_error.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/X509_STORE_CTX_get_ex_new_index.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/X509_STORE_CTX_new.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/X509_STORE_CTX_set_verify_cb.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/X509_VERIFY_PARAM_set_flags.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/X509_new.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/X509_verify_cert.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/bio.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/blowfish.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/bn.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/bn_internal.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/buffer.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/crypto.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/d2i_DHparams.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/d2i_DSAPublicKey.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/d2i_RSAPublicKey.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/d2i_X509.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/d2i_X509_ALGOR.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/d2i_X509_CRL.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/d2i_X509_NAME.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/d2i_X509_REQ.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/d2i_X509_SIG.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/des.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/dh.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/dsa.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/ecdsa.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/engine.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/err.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/evp.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/hmac.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/i2d_CMS_bio_stream.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/i2d_PKCS7_bio_stream.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/lh_stats.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/lhash.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/md5.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/mdc2.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/pem.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/rand.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/rc4.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/ripemd.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/rsa.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/sha.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/threads.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/ui.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/ui_compat.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/man/x509.3 user/delphij/zfs-arc-rebase/secure/lib/libcrypto/opensslconf-arm.h user/delphij/zfs-arc-rebase/secure/lib/libcrypto/opensslconf-mips.h user/delphij/zfs-arc-rebase/secure/lib/libcrypto/opensslconf-powerpc.h user/delphij/zfs-arc-rebase/secure/lib/libcrypto/opensslconf-sparc64.h user/delphij/zfs-arc-rebase/secure/lib/libcrypto/opensslconf-x86.h user/delphij/zfs-arc-rebase/secure/lib/libssl/Makefile user/delphij/zfs-arc-rebase/secure/lib/libssl/Makefile.man user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_CIPHER_get_name.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_COMP_add_compression_method.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_CTX_add_session.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_CTX_ctrl.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_CTX_flush_sessions.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_CTX_free.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_CTX_new.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_CTX_sess_number.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_CTX_sessions.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_CTX_set_cert_store.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_CTX_set_info_callback.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_CTX_set_mode.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_CTX_set_options.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_CTX_set_psk_client_callback.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_CTX_set_timeout.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_CTX_set_tlsext_ticket_key_cb.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_CTX_set_verify.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_CTX_use_certificate.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_CTX_use_psk_identity_hint.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_SESSION_free.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_SESSION_get_time.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_accept.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_alert_type_string.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_clear.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_connect.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_do_handshake.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_free.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_get_SSL_CTX.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_get_ciphers.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_get_client_CA_list.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_get_current_cipher.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_get_default_timeout.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_get_error.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_get_ex_new_index.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_get_fd.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_get_peer_cert_chain.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_get_peer_certificate.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_get_psk_identity.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_get_rbio.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_get_session.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_get_verify_result.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_get_version.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_library_init.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_load_client_CA_file.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_new.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_pending.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_read.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_rstate_string.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_session_reused.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_set_bio.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_set_connect_state.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_set_fd.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_set_session.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_set_shutdown.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_set_verify_result.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_shutdown.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_state_string.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_want.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/SSL_write.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/d2i_SSL_SESSION.3 user/delphij/zfs-arc-rebase/secure/lib/libssl/man/ssl.3 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/CA.pl.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/asn1parse.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/c_rehash.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/ca.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/ciphers.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/cms.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/crl.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/crl2pkcs7.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/dgst.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/dhparam.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/dsa.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/dsaparam.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/ec.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/ecparam.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/enc.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/errstr.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/gendsa.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/genpkey.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/genrsa.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/nseq.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/ocsp.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/openssl.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/passwd.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/pkcs12.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/pkcs7.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/pkcs8.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/pkey.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/pkeyparam.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/pkeyutl.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/rand.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/req.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/rsa.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/rsautl.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/s_client.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/s_server.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/s_time.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/sess_id.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/smime.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/speed.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/spkac.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/ts.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/tsget.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/verify.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/version.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/x509.1 user/delphij/zfs-arc-rebase/secure/usr.bin/openssl/man/x509v3_config.1 user/delphij/zfs-arc-rebase/share/doc/usd/Makefile user/delphij/zfs-arc-rebase/share/man/man3/pthread_testcancel.3 user/delphij/zfs-arc-rebase/share/man/man3/queue.3 user/delphij/zfs-arc-rebase/share/man/man4/Makefile user/delphij/zfs-arc-rebase/share/man/man4/ahci.4 user/delphij/zfs-arc-rebase/share/man/man4/amdtemp.4 user/delphij/zfs-arc-rebase/share/man/man4/ata.4 user/delphij/zfs-arc-rebase/share/man/man4/ctl.4 user/delphij/zfs-arc-rebase/share/man/man4/epair.4 user/delphij/zfs-arc-rebase/share/man/man4/icmp.4 user/delphij/zfs-arc-rebase/share/man/man4/inet.4 user/delphij/zfs-arc-rebase/share/man/man4/ixl.4 user/delphij/zfs-arc-rebase/share/man/man4/ixlv.4 user/delphij/zfs-arc-rebase/share/man/man4/mvs.4 user/delphij/zfs-arc-rebase/share/man/man4/siftr.4 user/delphij/zfs-arc-rebase/share/man/man4/siis.4 user/delphij/zfs-arc-rebase/share/man/man4/snd_uaudio.4 user/delphij/zfs-arc-rebase/share/man/man4/tap.4 user/delphij/zfs-arc-rebase/share/man/man4/ucom.4 user/delphij/zfs-arc-rebase/share/man/man4/witness.4 user/delphij/zfs-arc-rebase/share/man/man5/periodic.conf.5 user/delphij/zfs-arc-rebase/share/man/man5/src.conf.5 user/delphij/zfs-arc-rebase/share/misc/committers-src.dot user/delphij/zfs-arc-rebase/share/misc/organization.dot user/delphij/zfs-arc-rebase/share/mk/bsd.dep.mk user/delphij/zfs-arc-rebase/share/mk/bsd.endian.mk user/delphij/zfs-arc-rebase/share/mk/bsd.sys.mk user/delphij/zfs-arc-rebase/share/mk/src.libnames.mk user/delphij/zfs-arc-rebase/share/mk/src.opts.mk user/delphij/zfs-arc-rebase/share/mk/sys.mk user/delphij/zfs-arc-rebase/sys/amd64/amd64/machdep.c user/delphij/zfs-arc-rebase/sys/amd64/amd64/mp_machdep.c user/delphij/zfs-arc-rebase/sys/amd64/amd64/pmap.c user/delphij/zfs-arc-rebase/sys/amd64/amd64/trap.c user/delphij/zfs-arc-rebase/sys/amd64/amd64/uma_machdep.c user/delphij/zfs-arc-rebase/sys/amd64/include/intr_machdep.h user/delphij/zfs-arc-rebase/sys/amd64/include/metadata.h user/delphij/zfs-arc-rebase/sys/amd64/include/vmm.h (contents, props changed) user/delphij/zfs-arc-rebase/sys/amd64/include/vmm_instruction_emul.h (contents, props changed) user/delphij/zfs-arc-rebase/sys/amd64/vmm/amd/svm.c user/delphij/zfs-arc-rebase/sys/amd64/vmm/intel/vmx.c user/delphij/zfs-arc-rebase/sys/amd64/vmm/io/vrtc.c user/delphij/zfs-arc-rebase/sys/amd64/vmm/vmm.c user/delphij/zfs-arc-rebase/sys/amd64/vmm/vmm_dev.c user/delphij/zfs-arc-rebase/sys/amd64/vmm/vmm_instruction_emul.c user/delphij/zfs-arc-rebase/sys/amd64/vmm/vmm_lapic.c user/delphij/zfs-arc-rebase/sys/arm/allwinner/a10_clk.c user/delphij/zfs-arc-rebase/sys/arm/allwinner/a10_common.c user/delphij/zfs-arc-rebase/sys/arm/allwinner/a10_gpio.c user/delphij/zfs-arc-rebase/sys/arm/allwinner/a10_sramc.c user/delphij/zfs-arc-rebase/sys/arm/allwinner/a10_wdog.c user/delphij/zfs-arc-rebase/sys/arm/allwinner/a20/a20_cpu_cfg.c user/delphij/zfs-arc-rebase/sys/arm/allwinner/a20/a20_mp.c user/delphij/zfs-arc-rebase/sys/arm/allwinner/a20/files.a20 user/delphij/zfs-arc-rebase/sys/arm/allwinner/files.a10 user/delphij/zfs-arc-rebase/sys/arm/allwinner/timer.c user/delphij/zfs-arc-rebase/sys/arm/altera/socfpga/files.socfpga user/delphij/zfs-arc-rebase/sys/arm/altera/socfpga/socfpga_gpio.c user/delphij/zfs-arc-rebase/sys/arm/altera/socfpga/socfpga_manager.c user/delphij/zfs-arc-rebase/sys/arm/altera/socfpga/socfpga_mp.c user/delphij/zfs-arc-rebase/sys/arm/arm/cpufunc.c user/delphij/zfs-arc-rebase/sys/arm/arm/cpufunc_asm_arm10.S user/delphij/zfs-arc-rebase/sys/arm/arm/cpufunc_asm_arm11.S user/delphij/zfs-arc-rebase/sys/arm/arm/cpufunc_asm_armv6.S user/delphij/zfs-arc-rebase/sys/arm/arm/devmap.c user/delphij/zfs-arc-rebase/sys/arm/arm/elf_trampoline.c user/delphij/zfs-arc-rebase/sys/arm/arm/genassym.c user/delphij/zfs-arc-rebase/sys/arm/arm/generic_timer.c user/delphij/zfs-arc-rebase/sys/arm/arm/gic.c user/delphij/zfs-arc-rebase/sys/arm/arm/intr.c user/delphij/zfs-arc-rebase/sys/arm/arm/machdep.c user/delphij/zfs-arc-rebase/sys/arm/arm/mem.c user/delphij/zfs-arc-rebase/sys/arm/arm/minidump_machdep.c user/delphij/zfs-arc-rebase/sys/arm/arm/mp_machdep.c user/delphij/zfs-arc-rebase/sys/arm/arm/mpcore_timer.c user/delphij/zfs-arc-rebase/sys/arm/arm/pl310.c user/delphij/zfs-arc-rebase/sys/arm/arm/pmap-v6.c user/delphij/zfs-arc-rebase/sys/arm/arm/pmap.c user/delphij/zfs-arc-rebase/sys/arm/arm/pmu.c user/delphij/zfs-arc-rebase/sys/arm/arm/swtch.S user/delphij/zfs-arc-rebase/sys/arm/arm/sys_machdep.c user/delphij/zfs-arc-rebase/sys/arm/arm/vm_machdep.c user/delphij/zfs-arc-rebase/sys/arm/at91/at91_common.c user/delphij/zfs-arc-rebase/sys/arm/at91/at91_machdep.c user/delphij/zfs-arc-rebase/sys/arm/at91/files.at91 user/delphij/zfs-arc-rebase/sys/arm/broadcom/bcm2835/bcm2835_common.c user/delphij/zfs-arc-rebase/sys/arm/broadcom/bcm2835/bcm2835_fbd.c user/delphij/zfs-arc-rebase/sys/arm/broadcom/bcm2835/bcm2835_intr.c user/delphij/zfs-arc-rebase/sys/arm/broadcom/bcm2835/bcm2835_machdep.c user/delphij/zfs-arc-rebase/sys/arm/broadcom/bcm2835/bcm2835_mbox.c user/delphij/zfs-arc-rebase/sys/arm/broadcom/bcm2835/bcm2835_mbox_prop.h user/delphij/zfs-arc-rebase/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c user/delphij/zfs-arc-rebase/sys/arm/broadcom/bcm2835/bcm2835_spi.c user/delphij/zfs-arc-rebase/sys/arm/broadcom/bcm2835/bcm2835_systimer.c user/delphij/zfs-arc-rebase/sys/arm/broadcom/bcm2835/bcm2835_wdog.c user/delphij/zfs-arc-rebase/sys/arm/broadcom/bcm2835/bcm283x_dwc_fdt.c user/delphij/zfs-arc-rebase/sys/arm/broadcom/bcm2835/files.bcm2835 user/delphij/zfs-arc-rebase/sys/arm/broadcom/bcm2835/std.bcm2835 user/delphij/zfs-arc-rebase/sys/arm/broadcom/bcm2835/std.rpi user/delphij/zfs-arc-rebase/sys/arm/cavium/cns11xx/econa_machdep.c user/delphij/zfs-arc-rebase/sys/arm/cavium/cns11xx/files.econa user/delphij/zfs-arc-rebase/sys/arm/conf/RPI-B user/delphij/zfs-arc-rebase/sys/arm/conf/SOCKIT user/delphij/zfs-arc-rebase/sys/arm/conf/SOCKIT-BERI user/delphij/zfs-arc-rebase/sys/arm/freescale/imx/files.imx51 user/delphij/zfs-arc-rebase/sys/arm/freescale/imx/files.imx53 user/delphij/zfs-arc-rebase/sys/arm/freescale/imx/files.imx6 user/delphij/zfs-arc-rebase/sys/arm/freescale/imx/imx51_ccm.c user/delphij/zfs-arc-rebase/sys/arm/freescale/imx/imx51_ipuv3.c user/delphij/zfs-arc-rebase/sys/arm/freescale/imx/imx51_ipuv3_fbd.c user/delphij/zfs-arc-rebase/sys/arm/freescale/imx/imx6_anatop.c user/delphij/zfs-arc-rebase/sys/arm/freescale/imx/imx6_audmux.c user/delphij/zfs-arc-rebase/sys/arm/freescale/imx/imx6_mp.c user/delphij/zfs-arc-rebase/sys/arm/freescale/imx/imx6_sdma.c user/delphij/zfs-arc-rebase/sys/arm/freescale/imx/imx6_ssi.c user/delphij/zfs-arc-rebase/sys/arm/freescale/imx/imx_common.c user/delphij/zfs-arc-rebase/sys/arm/freescale/imx/imx_gpt.c user/delphij/zfs-arc-rebase/sys/arm/freescale/imx/imx_iomux.c user/delphij/zfs-arc-rebase/sys/arm/freescale/imx/imx_wdog.c user/delphij/zfs-arc-rebase/sys/arm/freescale/vybrid/files.vybrid user/delphij/zfs-arc-rebase/sys/arm/freescale/vybrid/vf_adc.c user/delphij/zfs-arc-rebase/sys/arm/freescale/vybrid/vf_anadig.c user/delphij/zfs-arc-rebase/sys/arm/freescale/vybrid/vf_ccm.c user/delphij/zfs-arc-rebase/sys/arm/freescale/vybrid/vf_dcu4.c user/delphij/zfs-arc-rebase/sys/arm/freescale/vybrid/vf_dmamux.c user/delphij/zfs-arc-rebase/sys/arm/freescale/vybrid/vf_edma.c user/delphij/zfs-arc-rebase/sys/arm/freescale/vybrid/vf_gpio.c user/delphij/zfs-arc-rebase/sys/arm/freescale/vybrid/vf_i2c.c user/delphij/zfs-arc-rebase/sys/arm/freescale/vybrid/vf_iomuxc.c user/delphij/zfs-arc-rebase/sys/arm/freescale/vybrid/vf_mscm.c user/delphij/zfs-arc-rebase/sys/arm/freescale/vybrid/vf_nfc.c user/delphij/zfs-arc-rebase/sys/arm/freescale/vybrid/vf_port.c user/delphij/zfs-arc-rebase/sys/arm/freescale/vybrid/vf_sai.c user/delphij/zfs-arc-rebase/sys/arm/freescale/vybrid/vf_spi.c user/delphij/zfs-arc-rebase/sys/arm/freescale/vybrid/vf_src.c user/delphij/zfs-arc-rebase/sys/arm/freescale/vybrid/vf_tcon.c user/delphij/zfs-arc-rebase/sys/arm/freescale/vybrid/vf_uart.c user/delphij/zfs-arc-rebase/sys/arm/include/cpu-v6.h user/delphij/zfs-arc-rebase/sys/arm/include/cpuconf.h user/delphij/zfs-arc-rebase/sys/arm/include/cpufunc.h user/delphij/zfs-arc-rebase/sys/arm/include/fdt.h user/delphij/zfs-arc-rebase/sys/arm/include/intr.h user/delphij/zfs-arc-rebase/sys/arm/include/machdep.h user/delphij/zfs-arc-rebase/sys/arm/include/metadata.h user/delphij/zfs-arc-rebase/sys/arm/include/pcb.h user/delphij/zfs-arc-rebase/sys/arm/include/pmap.h user/delphij/zfs-arc-rebase/sys/arm/include/pmc_mdep.h user/delphij/zfs-arc-rebase/sys/arm/include/pte.h user/delphij/zfs-arc-rebase/sys/arm/include/sf_buf.h user/delphij/zfs-arc-rebase/sys/arm/include/smp.h user/delphij/zfs-arc-rebase/sys/arm/include/sysreg.h user/delphij/zfs-arc-rebase/sys/arm/include/vm.h user/delphij/zfs-arc-rebase/sys/arm/include/vmparam.h user/delphij/zfs-arc-rebase/sys/arm/lpc/files.lpc user/delphij/zfs-arc-rebase/sys/arm/mv/armadaxp/armadaxp_mp.c user/delphij/zfs-arc-rebase/sys/arm/mv/files.mv user/delphij/zfs-arc-rebase/sys/arm/mv/gpio.c user/delphij/zfs-arc-rebase/sys/arm/mv/mv_localbus.c user/delphij/zfs-arc-rebase/sys/arm/mv/mv_ts.c user/delphij/zfs-arc-rebase/sys/arm/mv/mvvar.h user/delphij/zfs-arc-rebase/sys/arm/rockchip/files.rk30xx user/delphij/zfs-arc-rebase/sys/arm/rockchip/rk30xx_common.c user/delphij/zfs-arc-rebase/sys/arm/rockchip/rk30xx_gpio.c user/delphij/zfs-arc-rebase/sys/arm/rockchip/rk30xx_grf.c user/delphij/zfs-arc-rebase/sys/arm/rockchip/rk30xx_mp.c user/delphij/zfs-arc-rebase/sys/arm/rockchip/rk30xx_pmu.c user/delphij/zfs-arc-rebase/sys/arm/samsung/exynos/exynos5_mp.c user/delphij/zfs-arc-rebase/sys/arm/samsung/exynos/exynos_uart.c user/delphij/zfs-arc-rebase/sys/arm/samsung/exynos/files.exynos5 user/delphij/zfs-arc-rebase/sys/arm/samsung/s3c2xx0/files.s3c2xx0 user/delphij/zfs-arc-rebase/sys/arm/samsung/s3c2xx0/s3c24x0_machdep.c user/delphij/zfs-arc-rebase/sys/arm/samsung/s3c2xx0/uart_dev_s3c2410.c user/delphij/zfs-arc-rebase/sys/arm/ti/am335x/am335x_dmtimer.c user/delphij/zfs-arc-rebase/sys/arm/ti/am335x/am335x_prcm.c user/delphij/zfs-arc-rebase/sys/arm/ti/files.ti user/delphij/zfs-arc-rebase/sys/arm/ti/omap4/omap4_mp.c user/delphij/zfs-arc-rebase/sys/arm/ti/ti_common.c user/delphij/zfs-arc-rebase/sys/arm/ti/ti_mbox.c user/delphij/zfs-arc-rebase/sys/arm/ti/ti_pruss.c user/delphij/zfs-arc-rebase/sys/arm/ti/ti_wdt.c user/delphij/zfs-arc-rebase/sys/arm/versatile/files.versatile user/delphij/zfs-arc-rebase/sys/arm/versatile/pl050.c user/delphij/zfs-arc-rebase/sys/arm/versatile/sp804.c user/delphij/zfs-arc-rebase/sys/arm/versatile/versatile_clcd.c user/delphij/zfs-arc-rebase/sys/arm/versatile/versatile_common.c user/delphij/zfs-arc-rebase/sys/arm/versatile/versatile_pci.c user/delphij/zfs-arc-rebase/sys/arm/versatile/versatile_timer.c user/delphij/zfs-arc-rebase/sys/arm/xilinx/files.zynq7 user/delphij/zfs-arc-rebase/sys/arm/xilinx/zy7_mp.c user/delphij/zfs-arc-rebase/sys/arm/xscale/i80321/ep80219_machdep.c user/delphij/zfs-arc-rebase/sys/arm/xscale/i80321/files.i80219 user/delphij/zfs-arc-rebase/sys/arm/xscale/i80321/files.i80321 user/delphij/zfs-arc-rebase/sys/arm/xscale/i80321/iq31244_machdep.c user/delphij/zfs-arc-rebase/sys/arm/xscale/i8134x/crb_machdep.c user/delphij/zfs-arc-rebase/sys/arm/xscale/i8134x/files.i81342 user/delphij/zfs-arc-rebase/sys/arm/xscale/ixp425/avila_machdep.c user/delphij/zfs-arc-rebase/sys/arm/xscale/ixp425/files.ixp425 user/delphij/zfs-arc-rebase/sys/arm/xscale/pxa/files.pxa user/delphij/zfs-arc-rebase/sys/arm/xscale/pxa/pxa_machdep.c user/delphij/zfs-arc-rebase/sys/boot/Makefile user/delphij/zfs-arc-rebase/sys/boot/Makefile.amd64 user/delphij/zfs-arc-rebase/sys/boot/Makefile.arm user/delphij/zfs-arc-rebase/sys/boot/arm/uboot/Makefile user/delphij/zfs-arc-rebase/sys/boot/common/Makefile.inc user/delphij/zfs-arc-rebase/sys/boot/efi/Makefile user/delphij/zfs-arc-rebase/sys/boot/efi/Makefile.inc user/delphij/zfs-arc-rebase/sys/boot/efi/libefi/Makefile user/delphij/zfs-arc-rebase/sys/boot/forth/beastie.4th user/delphij/zfs-arc-rebase/sys/boot/forth/brand.4th user/delphij/zfs-arc-rebase/sys/boot/forth/check-password.4th user/delphij/zfs-arc-rebase/sys/boot/forth/check-password.4th.8 user/delphij/zfs-arc-rebase/sys/boot/forth/delay.4th user/delphij/zfs-arc-rebase/sys/boot/forth/frames.4th user/delphij/zfs-arc-rebase/sys/boot/forth/loader.4th user/delphij/zfs-arc-rebase/sys/boot/forth/loader.conf user/delphij/zfs-arc-rebase/sys/boot/forth/menu-commands.4th user/delphij/zfs-arc-rebase/sys/boot/forth/menu.4th user/delphij/zfs-arc-rebase/sys/boot/forth/menu.rc user/delphij/zfs-arc-rebase/sys/boot/forth/menusets.4th user/delphij/zfs-arc-rebase/sys/boot/forth/pcibios.4th user/delphij/zfs-arc-rebase/sys/boot/forth/pnp.4th user/delphij/zfs-arc-rebase/sys/boot/forth/screen.4th user/delphij/zfs-arc-rebase/sys/boot/forth/support.4th user/delphij/zfs-arc-rebase/sys/boot/forth/version.4th user/delphij/zfs-arc-rebase/sys/boot/i386/boot2/Makefile user/delphij/zfs-arc-rebase/sys/boot/i386/gptboot/Makefile user/delphij/zfs-arc-rebase/sys/boot/i386/gptzfsboot/Makefile user/delphij/zfs-arc-rebase/sys/boot/i386/libi386/libi386.h user/delphij/zfs-arc-rebase/sys/boot/i386/libi386/multiboot.c user/delphij/zfs-arc-rebase/sys/boot/i386/libi386/smbios.c user/delphij/zfs-arc-rebase/sys/boot/i386/loader/Makefile user/delphij/zfs-arc-rebase/sys/boot/i386/loader/main.c user/delphij/zfs-arc-rebase/sys/boot/i386/zfsboot/Makefile user/delphij/zfs-arc-rebase/sys/boot/mips/beri/boot2/Makefile user/delphij/zfs-arc-rebase/sys/boot/mips/beri/loader/Makefile user/delphij/zfs-arc-rebase/sys/boot/pc98/boot0.5/Makefile user/delphij/zfs-arc-rebase/sys/boot/pc98/boot0/Makefile user/delphij/zfs-arc-rebase/sys/boot/pc98/boot2/Makefile user/delphij/zfs-arc-rebase/sys/boot/pc98/loader/Makefile user/delphij/zfs-arc-rebase/sys/boot/powerpc/kboot/Makefile user/delphij/zfs-arc-rebase/sys/boot/powerpc/ofw/Makefile user/delphij/zfs-arc-rebase/sys/boot/powerpc/ps3/Makefile user/delphij/zfs-arc-rebase/sys/boot/sparc64/loader/Makefile user/delphij/zfs-arc-rebase/sys/cam/ata/ata_da.c user/delphij/zfs-arc-rebase/sys/cam/cam_xpt.c user/delphij/zfs-arc-rebase/sys/cam/ctl/ctl.c user/delphij/zfs-arc-rebase/sys/cam/scsi/scsi_da.c user/delphij/zfs-arc-rebase/sys/cam/scsi/scsi_sa.h user/delphij/zfs-arc-rebase/sys/cddl/compat/opensolaris/sys/atomic.h user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h user/delphij/zfs-arc-rebase/sys/cddl/dev/dtrace/amd64/dtrace_isa.c user/delphij/zfs-arc-rebase/sys/cddl/dev/dtrace/dtrace_ioctl.c user/delphij/zfs-arc-rebase/sys/cddl/dev/dtrace/i386/dtrace_isa.c user/delphij/zfs-arc-rebase/sys/compat/freebsd32/freebsd32.h user/delphij/zfs-arc-rebase/sys/compat/freebsd32/freebsd32_misc.c user/delphij/zfs-arc-rebase/sys/compat/linprocfs/linprocfs.c user/delphij/zfs-arc-rebase/sys/compat/svr4/svr4_stream.c user/delphij/zfs-arc-rebase/sys/conf/Makefile.pc98 user/delphij/zfs-arc-rebase/sys/conf/NOTES user/delphij/zfs-arc-rebase/sys/conf/files user/delphij/zfs-arc-rebase/sys/conf/files.amd64 user/delphij/zfs-arc-rebase/sys/conf/files.arm user/delphij/zfs-arc-rebase/sys/conf/files.i386 user/delphij/zfs-arc-rebase/sys/conf/files.mips user/delphij/zfs-arc-rebase/sys/conf/files.powerpc user/delphij/zfs-arc-rebase/sys/conf/kern.opts.mk user/delphij/zfs-arc-rebase/sys/conf/kern.pre.mk user/delphij/zfs-arc-rebase/sys/conf/kmod.mk user/delphij/zfs-arc-rebase/sys/conf/newvers.sh user/delphij/zfs-arc-rebase/sys/conf/options.arm user/delphij/zfs-arc-rebase/sys/conf/options.i386 user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/acpica_prep.sh user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/changes.txt user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/common/adfile.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/common/adisasm.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/common/dmtable.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/common/dmtbdump.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/common/dmtbinfo.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/compiler/aslcodegen.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/compiler/aslcompile.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/compiler/aslcompiler.h user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/compiler/asldefine.h user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/compiler/aslfold.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/compiler/asllisting.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/compiler/aslmain.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/compiler/aslmap.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/compiler/aslmapenter.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/compiler/asloptions.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/compiler/aslrules.y user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/compiler/aslstartup.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/compiler/asltree.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/compiler/asltypes.y user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/compiler/aslutils.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/compiler/aslwalks.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/compiler/dtcompile.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/compiler/dtcompiler.h user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/compiler/dtio.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/compiler/dttable.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/compiler/dttemplate.h user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/compiler/dtutils.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/components/debugger/dbmethod.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/components/debugger/dbxface.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/components/disassembler/dmopcode.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/components/disassembler/dmwalk.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/components/dispatcher/dsopcode.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/components/dispatcher/dsutils.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/components/events/evregion.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/components/events/evxfevnt.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/components/executer/exdump.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/components/executer/exfldio.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/components/executer/exoparg3.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/components/executer/exregion.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/components/hardware/hwgpe.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/components/hardware/hwvalid.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/components/namespace/nsdump.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/components/parser/psopcode.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/components/parser/psopinfo.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/components/resources/rsaddr.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/components/resources/rsdump.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/components/resources/rsdumpinfo.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/components/resources/rsxface.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/components/tables/tbdata.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/components/tables/tbinstal.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/components/tables/tbprint.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/components/tables/tbxfroot.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/components/utilities/utaddress.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/components/utilities/utbuffer.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/components/utilities/utglobal.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/components/utilities/utmisc.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/components/utilities/utosi.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/components/utilities/utprint.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/components/utilities/utstate.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/components/utilities/utuuid.c user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/include/acdebug.h user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/include/acdisasm.h user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/include/acglobal.h user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/include/aclocal.h user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/include/acmacros.h user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/include/acopcode.h user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/include/acpixf.h user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/include/acresrc.h user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/include/acrestyp.h user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/include/acstruct.h user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/include/actables.h user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/include/actbl2.h user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/include/actypes.h user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/include/acutils.h user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/include/amlcode.h user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/include/platform/acenv.h user/delphij/zfs-arc-rebase/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h user/delphij/zfs-arc-rebase/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_ani.c user/delphij/zfs-arc-rebase/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c user/delphij/zfs-arc-rebase/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_misc.c user/delphij/zfs-arc-rebase/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c user/delphij/zfs-arc-rebase/sys/contrib/ipfilter/netinet/fil.c user/delphij/zfs-arc-rebase/sys/contrib/ipfilter/netinet/ip_compat.h user/delphij/zfs-arc-rebase/sys/contrib/ipfilter/netinet/ip_fil.h user/delphij/zfs-arc-rebase/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c (contents, props changed) user/delphij/zfs-arc-rebase/sys/contrib/ipfilter/netinet/ip_nat.c user/delphij/zfs-arc-rebase/sys/contrib/vchiq/interface/vchiq_arm/vchiq_kmod.c user/delphij/zfs-arc-rebase/sys/contrib/x86emu/x86emu.c user/delphij/zfs-arc-rebase/sys/crypto/aesni/aesencdec.h user/delphij/zfs-arc-rebase/sys/crypto/aesni/aesni_ghash.c user/delphij/zfs-arc-rebase/sys/dev/aac/aac.c user/delphij/zfs-arc-rebase/sys/dev/aacraid/aacraid.c user/delphij/zfs-arc-rebase/sys/dev/acpica/acpi.c user/delphij/zfs-arc-rebase/sys/dev/acpica/acpi_pcib_acpi.c user/delphij/zfs-arc-rebase/sys/dev/acpica/acpi_resource.c user/delphij/zfs-arc-rebase/sys/dev/acpica/acpivar.h user/delphij/zfs-arc-rebase/sys/dev/advansys/adwcam.c user/delphij/zfs-arc-rebase/sys/dev/aha/aha.c user/delphij/zfs-arc-rebase/sys/dev/ahb/ahb.c user/delphij/zfs-arc-rebase/sys/dev/ahci/ahci.c user/delphij/zfs-arc-rebase/sys/dev/ahci/ahci_pci.c user/delphij/zfs-arc-rebase/sys/dev/ahci/ahciem.c user/delphij/zfs-arc-rebase/sys/dev/amr/amr_pci.c user/delphij/zfs-arc-rebase/sys/dev/ata/ata-all.c user/delphij/zfs-arc-rebase/sys/dev/ata/ata-all.h user/delphij/zfs-arc-rebase/sys/dev/ata/ata-pci.h user/delphij/zfs-arc-rebase/sys/dev/ata/chipsets/ata-acard.c user/delphij/zfs-arc-rebase/sys/dev/ata/chipsets/ata-acerlabs.c user/delphij/zfs-arc-rebase/sys/dev/ata/chipsets/ata-amd.c user/delphij/zfs-arc-rebase/sys/dev/ata/chipsets/ata-ati.c user/delphij/zfs-arc-rebase/sys/dev/ata/chipsets/ata-cenatek.c user/delphij/zfs-arc-rebase/sys/dev/ata/chipsets/ata-cypress.c user/delphij/zfs-arc-rebase/sys/dev/ata/chipsets/ata-cyrix.c user/delphij/zfs-arc-rebase/sys/dev/ata/chipsets/ata-fsl.c user/delphij/zfs-arc-rebase/sys/dev/ata/chipsets/ata-highpoint.c user/delphij/zfs-arc-rebase/sys/dev/ata/chipsets/ata-intel.c user/delphij/zfs-arc-rebase/sys/dev/ata/chipsets/ata-ite.c user/delphij/zfs-arc-rebase/sys/dev/ata/chipsets/ata-jmicron.c user/delphij/zfs-arc-rebase/sys/dev/ata/chipsets/ata-marvell.c user/delphij/zfs-arc-rebase/sys/dev/ata/chipsets/ata-micron.c user/delphij/zfs-arc-rebase/sys/dev/ata/chipsets/ata-national.c user/delphij/zfs-arc-rebase/sys/dev/ata/chipsets/ata-netcell.c user/delphij/zfs-arc-rebase/sys/dev/ata/chipsets/ata-nvidia.c user/delphij/zfs-arc-rebase/sys/dev/ata/chipsets/ata-promise.c user/delphij/zfs-arc-rebase/sys/dev/ata/chipsets/ata-serverworks.c user/delphij/zfs-arc-rebase/sys/dev/ata/chipsets/ata-siliconimage.c user/delphij/zfs-arc-rebase/sys/dev/ata/chipsets/ata-sis.c user/delphij/zfs-arc-rebase/sys/dev/ata/chipsets/ata-via.c user/delphij/zfs-arc-rebase/sys/dev/ath/ath_hal/ah.c user/delphij/zfs-arc-rebase/sys/dev/ath/ath_hal/ah.h user/delphij/zfs-arc-rebase/sys/dev/ath/ath_hal/ah_internal.h user/delphij/zfs-arc-rebase/sys/dev/ath/ath_hal/ar5212/ar5212.h user/delphij/zfs-arc-rebase/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c user/delphij/zfs-arc-rebase/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c user/delphij/zfs-arc-rebase/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c user/delphij/zfs-arc-rebase/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c user/delphij/zfs-arc-rebase/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c user/delphij/zfs-arc-rebase/sys/dev/ath/if_ath.c user/delphij/zfs-arc-rebase/sys/dev/atkbdc/psm.c user/delphij/zfs-arc-rebase/sys/dev/buslogic/bt.c user/delphij/zfs-arc-rebase/sys/dev/bwi/if_bwi.c user/delphij/zfs-arc-rebase/sys/dev/bwn/if_bwn.c user/delphij/zfs-arc-rebase/sys/dev/bxe/bxe.c user/delphij/zfs-arc-rebase/sys/dev/ciss/ciss.c user/delphij/zfs-arc-rebase/sys/dev/ct/ct_isa.c user/delphij/zfs-arc-rebase/sys/dev/cxgbe/t4_main.c user/delphij/zfs-arc-rebase/sys/dev/cxgbe/t4_sge.c user/delphij/zfs-arc-rebase/sys/dev/cxgbe/tom/t4_cpl_io.c user/delphij/zfs-arc-rebase/sys/dev/dpt/dpt_scsi.c user/delphij/zfs-arc-rebase/sys/dev/drm2/drm_crtc_helper.c user/delphij/zfs-arc-rebase/sys/dev/drm2/drm_modes.c user/delphij/zfs-arc-rebase/sys/dev/dwc/if_dwc.c user/delphij/zfs-arc-rebase/sys/dev/etherswitch/arswitch/arswitch_vlans.c user/delphij/zfs-arc-rebase/sys/dev/fdt/fdt_pinctrl.c user/delphij/zfs-arc-rebase/sys/dev/fdt/simplebus.c user/delphij/zfs-arc-rebase/sys/dev/fdt/simplebus.h user/delphij/zfs-arc-rebase/sys/dev/gpio/gpioled.c user/delphij/zfs-arc-rebase/sys/dev/hptnr/README user/delphij/zfs-arc-rebase/sys/dev/hptnr/amd64-elf.hptnr_lib.o.uu user/delphij/zfs-arc-rebase/sys/dev/hptnr/him.h user/delphij/zfs-arc-rebase/sys/dev/hptnr/hptintf.h user/delphij/zfs-arc-rebase/sys/dev/hptnr/hptnr_config.c user/delphij/zfs-arc-rebase/sys/dev/hptnr/hptnr_config.h user/delphij/zfs-arc-rebase/sys/dev/hptnr/hptnr_osm_bsd.c user/delphij/zfs-arc-rebase/sys/dev/hptnr/i386-elf.hptnr_lib.o.uu user/delphij/zfs-arc-rebase/sys/dev/hptnr/ldm.h user/delphij/zfs-arc-rebase/sys/dev/hptnr/os_bsd.h user/delphij/zfs-arc-rebase/sys/dev/hwpmc/hwpmc_arm.c user/delphij/zfs-arc-rebase/sys/dev/hwpmc/hwpmc_armv7.c user/delphij/zfs-arc-rebase/sys/dev/hwpmc/hwpmc_core.c user/delphij/zfs-arc-rebase/sys/dev/hwpmc/hwpmc_intel.c user/delphij/zfs-arc-rebase/sys/dev/hwpmc/pmc_events.h user/delphij/zfs-arc-rebase/sys/dev/ichsmb/ichsmb_pci.c user/delphij/zfs-arc-rebase/sys/dev/ida/ida.c user/delphij/zfs-arc-rebase/sys/dev/ida/ida_eisa.c user/delphij/zfs-arc-rebase/sys/dev/ida/ida_pci.c user/delphij/zfs-arc-rebase/sys/dev/if_ndis/if_ndis_pci.c user/delphij/zfs-arc-rebase/sys/dev/iir/iir.c user/delphij/zfs-arc-rebase/sys/dev/iir/iir_pci.c user/delphij/zfs-arc-rebase/sys/dev/iscsi/icl_conn_if.m user/delphij/zfs-arc-rebase/sys/dev/iscsi/icl_soft.c user/delphij/zfs-arc-rebase/sys/dev/iscsi/icl_wrappers.h user/delphij/zfs-arc-rebase/sys/dev/iwn/if_iwn.c user/delphij/zfs-arc-rebase/sys/dev/ixgbe/if_ix.c user/delphij/zfs-arc-rebase/sys/dev/ixgbe/if_ixv.c user/delphij/zfs-arc-rebase/sys/dev/ixgbe/ix_txrx.c user/delphij/zfs-arc-rebase/sys/dev/ixgbe/ixgbe.h user/delphij/zfs-arc-rebase/sys/dev/mlx/mlx.c user/delphij/zfs-arc-rebase/sys/dev/mlx/mlx_pci.c user/delphij/zfs-arc-rebase/sys/dev/mly/mly.c user/delphij/zfs-arc-rebase/sys/dev/mmc/mmc.c user/delphij/zfs-arc-rebase/sys/dev/mvs/mvs.c user/delphij/zfs-arc-rebase/sys/dev/mvs/mvs_pci.c user/delphij/zfs-arc-rebase/sys/dev/mvs/mvs_soc.c user/delphij/zfs-arc-rebase/sys/dev/nand/nfc_fsl.c user/delphij/zfs-arc-rebase/sys/dev/netmap/ixgbe_netmap.h user/delphij/zfs-arc-rebase/sys/dev/netmap/netmap.c user/delphij/zfs-arc-rebase/sys/dev/nvme/nvme.c user/delphij/zfs-arc-rebase/sys/dev/nvme/nvme_ctrlr.c user/delphij/zfs-arc-rebase/sys/dev/nvme/nvme_ns.c user/delphij/zfs-arc-rebase/sys/dev/nvme/nvme_private.h user/delphij/zfs-arc-rebase/sys/dev/nvme/nvme_qpair.c user/delphij/zfs-arc-rebase/sys/dev/ofw/ofwbus.c user/delphij/zfs-arc-rebase/sys/dev/ofw/openfirm.c user/delphij/zfs-arc-rebase/sys/dev/re/if_re.c user/delphij/zfs-arc-rebase/sys/dev/sfxge/common/efsys.h user/delphij/zfs-arc-rebase/sys/dev/sfxge/common/efx_mcdi.c user/delphij/zfs-arc-rebase/sys/dev/sfxge/sfxge.c user/delphij/zfs-arc-rebase/sys/dev/sfxge/sfxge.h user/delphij/zfs-arc-rebase/sys/dev/sfxge/sfxge_port.c user/delphij/zfs-arc-rebase/sys/dev/sfxge/sfxge_rx.c user/delphij/zfs-arc-rebase/sys/dev/sfxge/sfxge_tx.c user/delphij/zfs-arc-rebase/sys/dev/sfxge/sfxge_tx.h user/delphij/zfs-arc-rebase/sys/dev/sfxge/sfxge_version.h user/delphij/zfs-arc-rebase/sys/dev/siis/siis.c user/delphij/zfs-arc-rebase/sys/dev/sound/pci/hda/hdaa_patches.c user/delphij/zfs-arc-rebase/sys/dev/sound/pci/hda/hdac.c user/delphij/zfs-arc-rebase/sys/dev/sound/pci/hda/hdac.h user/delphij/zfs-arc-rebase/sys/dev/sound/pci/hda/hdacc.c user/delphij/zfs-arc-rebase/sys/dev/sound/pcm/channel.c user/delphij/zfs-arc-rebase/sys/dev/sound/pcm/dsp.c user/delphij/zfs-arc-rebase/sys/dev/sound/pcm/feeder_eq.c user/delphij/zfs-arc-rebase/sys/dev/sound/pcm/feeder_rate.c user/delphij/zfs-arc-rebase/sys/dev/sound/pcm/mixer.c user/delphij/zfs-arc-rebase/sys/dev/sound/pcm/sndstat.c user/delphij/zfs-arc-rebase/sys/dev/sound/pcm/sound.c user/delphij/zfs-arc-rebase/sys/dev/sound/pcm/vchan.c user/delphij/zfs-arc-rebase/sys/dev/sound/usb/uaudio.c user/delphij/zfs-arc-rebase/sys/dev/sound/usb/uaudio.h user/delphij/zfs-arc-rebase/sys/dev/sound/usb/uaudio_pcm.c user/delphij/zfs-arc-rebase/sys/dev/streams/streams.c user/delphij/zfs-arc-rebase/sys/dev/trm/trm.c user/delphij/zfs-arc-rebase/sys/dev/twe/twe.c user/delphij/zfs-arc-rebase/sys/dev/twe/twe_freebsd.c user/delphij/zfs-arc-rebase/sys/dev/uart/uart_bus.h user/delphij/zfs-arc-rebase/sys/dev/uart/uart_bus_fdt.c user/delphij/zfs-arc-rebase/sys/dev/uart/uart_core.c user/delphij/zfs-arc-rebase/sys/dev/uart/uart_cpu.h user/delphij/zfs-arc-rebase/sys/dev/uart/uart_cpu_fdt.c user/delphij/zfs-arc-rebase/sys/dev/uart/uart_cpu_fdt.h user/delphij/zfs-arc-rebase/sys/dev/uart/uart_dev_imx.c user/delphij/zfs-arc-rebase/sys/dev/uart/uart_dev_lpc.c user/delphij/zfs-arc-rebase/sys/dev/uart/uart_dev_msm.c user/delphij/zfs-arc-rebase/sys/dev/uart/uart_dev_ns8250.c user/delphij/zfs-arc-rebase/sys/dev/uart/uart_dev_pl011.c user/delphij/zfs-arc-rebase/sys/dev/uart/uart_dev_quicc.c user/delphij/zfs-arc-rebase/sys/dev/uart/uart_dev_sab82532.c user/delphij/zfs-arc-rebase/sys/dev/uart/uart_dev_ti8250.c user/delphij/zfs-arc-rebase/sys/dev/uart/uart_dev_z8530.c user/delphij/zfs-arc-rebase/sys/dev/usb/controller/ehci_pci.c user/delphij/zfs-arc-rebase/sys/dev/usb/controller/uhci_pci.c user/delphij/zfs-arc-rebase/sys/dev/usb/controller/xhci_pci.c user/delphij/zfs-arc-rebase/sys/dev/usb/net/if_axge.c user/delphij/zfs-arc-rebase/sys/dev/usb/serial/uftdi.c user/delphij/zfs-arc-rebase/sys/dev/usb/usb.h user/delphij/zfs-arc-rebase/sys/dev/usb/usbdevs user/delphij/zfs-arc-rebase/sys/dev/usb/wlan/if_urtwn.c user/delphij/zfs-arc-rebase/sys/dev/vt/vt_font.c user/delphij/zfs-arc-rebase/sys/dev/wpi/if_wpi.c user/delphij/zfs-arc-rebase/sys/fs/devfs/devfs_devs.c user/delphij/zfs-arc-rebase/sys/fs/devfs/devfs_vnops.c user/delphij/zfs-arc-rebase/sys/fs/ext2fs/ext2_vfsops.c user/delphij/zfs-arc-rebase/sys/fs/fuse/fuse_vfsops.c user/delphij/zfs-arc-rebase/sys/fs/msdosfs/msdosfs_fat.c user/delphij/zfs-arc-rebase/sys/fs/msdosfs/msdosfs_vfsops.c user/delphij/zfs-arc-rebase/sys/fs/msdosfs/msdosfsmount.h user/delphij/zfs-arc-rebase/sys/fs/nandfs/nandfs_vfsops.c user/delphij/zfs-arc-rebase/sys/fs/nfs/nfs.h user/delphij/zfs-arc-rebase/sys/fs/nfs/nfs_commonport.c user/delphij/zfs-arc-rebase/sys/fs/nfs/nfsproto.h user/delphij/zfs-arc-rebase/sys/fs/nfsclient/nfs_clvfsops.c user/delphij/zfs-arc-rebase/sys/fs/nfsserver/nfs_nfsdport.c user/delphij/zfs-arc-rebase/sys/fs/nfsserver/nfs_nfsdserv.c user/delphij/zfs-arc-rebase/sys/fs/nullfs/null_vfsops.c user/delphij/zfs-arc-rebase/sys/fs/tmpfs/tmpfs_vnops.c user/delphij/zfs-arc-rebase/sys/geom/geom_dev.c user/delphij/zfs-arc-rebase/sys/geom/geom_dump.c user/delphij/zfs-arc-rebase/sys/geom/geom_map.c user/delphij/zfs-arc-rebase/sys/geom/geom_subr.c user/delphij/zfs-arc-rebase/sys/geom/mirror/g_mirror.c user/delphij/zfs-arc-rebase/sys/geom/multipath/g_multipath.c user/delphij/zfs-arc-rebase/sys/geom/part/g_part.c user/delphij/zfs-arc-rebase/sys/geom/raid/g_raid.c user/delphij/zfs-arc-rebase/sys/gnu/dts/arm/meson.dtsi user/delphij/zfs-arc-rebase/sys/gnu/dts/arm/meson6.dtsi user/delphij/zfs-arc-rebase/sys/gnu/dts/arm/meson8.dtsi user/delphij/zfs-arc-rebase/sys/i386/conf/NOTES user/delphij/zfs-arc-rebase/sys/i386/i386/bios.c user/delphij/zfs-arc-rebase/sys/i386/i386/initcpu.c user/delphij/zfs-arc-rebase/sys/i386/i386/locore.s user/delphij/zfs-arc-rebase/sys/i386/i386/machdep.c user/delphij/zfs-arc-rebase/sys/i386/i386/minidump_machdep.c user/delphij/zfs-arc-rebase/sys/i386/i386/mp_machdep.c user/delphij/zfs-arc-rebase/sys/i386/i386/mpboot.s user/delphij/zfs-arc-rebase/sys/i386/i386/pmap.c user/delphij/zfs-arc-rebase/sys/i386/i386/swtch.s user/delphij/zfs-arc-rebase/sys/i386/i386/trap.c user/delphij/zfs-arc-rebase/sys/i386/i386/vm86bios.s user/delphij/zfs-arc-rebase/sys/i386/i386/vm_machdep.c user/delphij/zfs-arc-rebase/sys/i386/include/intr_machdep.h user/delphij/zfs-arc-rebase/sys/i386/include/param.h user/delphij/zfs-arc-rebase/sys/i386/include/pmap.h user/delphij/zfs-arc-rebase/sys/i386/include/vmparam.h user/delphij/zfs-arc-rebase/sys/kern/imgact_elf.c user/delphij/zfs-arc-rebase/sys/kern/init_main.c user/delphij/zfs-arc-rebase/sys/kern/kern_conf.c user/delphij/zfs-arc-rebase/sys/kern/kern_descrip.c user/delphij/zfs-arc-rebase/sys/kern/kern_exec.c user/delphij/zfs-arc-rebase/sys/kern/kern_fork.c user/delphij/zfs-arc-rebase/sys/kern/kern_jail.c user/delphij/zfs-arc-rebase/sys/kern/kern_mbuf.c user/delphij/zfs-arc-rebase/sys/kern/kern_poll.c user/delphij/zfs-arc-rebase/sys/kern/kern_proc.c user/delphij/zfs-arc-rebase/sys/kern/kern_prot.c user/delphij/zfs-arc-rebase/sys/kern/kern_resource.c user/delphij/zfs-arc-rebase/sys/kern/kern_sig.c user/delphij/zfs-arc-rebase/sys/kern/kern_sysctl.c user/delphij/zfs-arc-rebase/sys/kern/kern_timeout.c user/delphij/zfs-arc-rebase/sys/kern/kern_umtx.c user/delphij/zfs-arc-rebase/sys/kern/link_elf_obj.c user/delphij/zfs-arc-rebase/sys/kern/subr_bus.c user/delphij/zfs-arc-rebase/sys/kern/subr_busdma_bufalloc.c user/delphij/zfs-arc-rebase/sys/kern/subr_vmem.c user/delphij/zfs-arc-rebase/sys/kern/sys_pipe.c user/delphij/zfs-arc-rebase/sys/kern/sysv_shm.c user/delphij/zfs-arc-rebase/sys/kern/tty_pts.c user/delphij/zfs-arc-rebase/sys/kern/uipc_mqueue.c user/delphij/zfs-arc-rebase/sys/kern/uipc_sem.c user/delphij/zfs-arc-rebase/sys/kern/uipc_shm.c user/delphij/zfs-arc-rebase/sys/kern/uipc_syscalls.c user/delphij/zfs-arc-rebase/sys/kern/vfs_subr.c user/delphij/zfs-arc-rebase/sys/kern/vfs_syscalls.c user/delphij/zfs-arc-rebase/sys/kern/vnode_if.src user/delphij/zfs-arc-rebase/sys/mips/adm5120/uart_dev_adm5120.c user/delphij/zfs-arc-rebase/sys/mips/atheros/ar71xx_gpio.c user/delphij/zfs-arc-rebase/sys/mips/atheros/ar71xx_macaddr.c user/delphij/zfs-arc-rebase/sys/mips/atheros/ar71xx_macaddr.h user/delphij/zfs-arc-rebase/sys/mips/atheros/ar71xx_machdep.c user/delphij/zfs-arc-rebase/sys/mips/atheros/ar724xreg.h user/delphij/zfs-arc-rebase/sys/mips/atheros/if_arge.c user/delphij/zfs-arc-rebase/sys/mips/atheros/qca955xreg.h user/delphij/zfs-arc-rebase/sys/mips/atheros/uart_dev_ar933x.c user/delphij/zfs-arc-rebase/sys/mips/cavium/uart_dev_oct16550.c user/delphij/zfs-arc-rebase/sys/mips/conf/AP135.hints user/delphij/zfs-arc-rebase/sys/mips/conf/AR91XX_BASE user/delphij/zfs-arc-rebase/sys/mips/conf/AR933X_BASE user/delphij/zfs-arc-rebase/sys/mips/conf/AR934X_BASE user/delphij/zfs-arc-rebase/sys/mips/conf/CARAMBOLA2.hints user/delphij/zfs-arc-rebase/sys/mips/conf/DIR-825B1.hints user/delphij/zfs-arc-rebase/sys/mips/conf/DIR-825C1.hints user/delphij/zfs-arc-rebase/sys/mips/conf/OCTEON1 user/delphij/zfs-arc-rebase/sys/mips/conf/TL-WR1043NDv2.hints user/delphij/zfs-arc-rebase/sys/mips/include/cache_mipsNN.h user/delphij/zfs-arc-rebase/sys/mips/include/cache_r4k.h user/delphij/zfs-arc-rebase/sys/mips/include/reg.h user/delphij/zfs-arc-rebase/sys/mips/mips/cache.c user/delphij/zfs-arc-rebase/sys/mips/mips/cache_mipsNN.c user/delphij/zfs-arc-rebase/sys/mips/mips/uma_machdep.c user/delphij/zfs-arc-rebase/sys/mips/rt305x/uart_dev_rt305x.c user/delphij/zfs-arc-rebase/sys/modules/Makefile user/delphij/zfs-arc-rebase/sys/modules/ata/atapci/chipsets/Makefile user/delphij/zfs-arc-rebase/sys/modules/dtb/rpi/Makefile user/delphij/zfs-arc-rebase/sys/modules/i2c/iicbb/Makefile user/delphij/zfs-arc-rebase/sys/modules/sfxge/Makefile user/delphij/zfs-arc-rebase/sys/net/ieee8023ad_lacp.c user/delphij/zfs-arc-rebase/sys/net/if.c user/delphij/zfs-arc-rebase/sys/net/if_lagg.c user/delphij/zfs-arc-rebase/sys/net/if_media.c user/delphij/zfs-arc-rebase/sys/net/if_media.h user/delphij/zfs-arc-rebase/sys/net/if_tap.c user/delphij/zfs-arc-rebase/sys/net/if_types.h user/delphij/zfs-arc-rebase/sys/net/if_var.h user/delphij/zfs-arc-rebase/sys/net/if_vlan.c user/delphij/zfs-arc-rebase/sys/net/ifq.h user/delphij/zfs-arc-rebase/sys/net/pfvar.h user/delphij/zfs-arc-rebase/sys/net/route.c user/delphij/zfs-arc-rebase/sys/net80211/ieee80211_ht.c user/delphij/zfs-arc-rebase/sys/net80211/ieee80211_mesh.c user/delphij/zfs-arc-rebase/sys/netgraph/atm/sscop/ng_sscop_cust.h user/delphij/zfs-arc-rebase/sys/netgraph/atm/uni/ng_uni_cust.h user/delphij/zfs-arc-rebase/sys/netgraph/bluetooth/hci/ng_hci_cmds.c user/delphij/zfs-arc-rebase/sys/netgraph/bluetooth/hci/ng_hci_evnt.c user/delphij/zfs-arc-rebase/sys/netgraph/bluetooth/hci/ng_hci_main.c user/delphij/zfs-arc-rebase/sys/netgraph/bluetooth/hci/ng_hci_misc.c user/delphij/zfs-arc-rebase/sys/netgraph/bluetooth/hci/ng_hci_misc.h user/delphij/zfs-arc-rebase/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c user/delphij/zfs-arc-rebase/sys/netgraph/bluetooth/hci/ng_hci_var.h user/delphij/zfs-arc-rebase/sys/netgraph/bluetooth/include/ng_btsocket.h user/delphij/zfs-arc-rebase/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h user/delphij/zfs-arc-rebase/sys/netgraph/bluetooth/include/ng_hci.h user/delphij/zfs-arc-rebase/sys/netgraph/bluetooth/include/ng_l2cap.h user/delphij/zfs-arc-rebase/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c user/delphij/zfs-arc-rebase/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h user/delphij/zfs-arc-rebase/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c user/delphij/zfs-arc-rebase/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c user/delphij/zfs-arc-rebase/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h user/delphij/zfs-arc-rebase/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c user/delphij/zfs-arc-rebase/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h user/delphij/zfs-arc-rebase/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c user/delphij/zfs-arc-rebase/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h user/delphij/zfs-arc-rebase/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c user/delphij/zfs-arc-rebase/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c user/delphij/zfs-arc-rebase/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c user/delphij/zfs-arc-rebase/sys/netinet/igmp.c user/delphij/zfs-arc-rebase/sys/netinet/in_rss.c user/delphij/zfs-arc-rebase/sys/netinet/in_var.h user/delphij/zfs-arc-rebase/sys/netinet/ip_carp.c user/delphij/zfs-arc-rebase/sys/netinet/ip_gre.c user/delphij/zfs-arc-rebase/sys/netinet/ip_id.c user/delphij/zfs-arc-rebase/sys/netinet/ip_input.c user/delphij/zfs-arc-rebase/sys/netinet/ip_mroute.c user/delphij/zfs-arc-rebase/sys/netinet/ip_output.c user/delphij/zfs-arc-rebase/sys/netinet/ip_var.h user/delphij/zfs-arc-rebase/sys/netinet/raw_ip.c user/delphij/zfs-arc-rebase/sys/netinet/sctp_auth.c user/delphij/zfs-arc-rebase/sys/netinet/sctp_indata.c user/delphij/zfs-arc-rebase/sys/netinet/sctp_output.c user/delphij/zfs-arc-rebase/sys/netinet/sctp_pcb.c user/delphij/zfs-arc-rebase/sys/netinet/sctp_structs.h user/delphij/zfs-arc-rebase/sys/netinet/sctp_syscalls.c user/delphij/zfs-arc-rebase/sys/netinet/sctp_usrreq.c user/delphij/zfs-arc-rebase/sys/netinet/sctputil.c user/delphij/zfs-arc-rebase/sys/netinet/siftr.c user/delphij/zfs-arc-rebase/sys/netinet/tcp_subr.c user/delphij/zfs-arc-rebase/sys/netinet/tcp_timer.c user/delphij/zfs-arc-rebase/sys/netinet/tcp_timer.h user/delphij/zfs-arc-rebase/sys/netinet/tcp_var.h user/delphij/zfs-arc-rebase/sys/netinet6/in6.h user/delphij/zfs-arc-rebase/sys/netinet6/in6_mcast.c user/delphij/zfs-arc-rebase/sys/netinet6/in6_var.h user/delphij/zfs-arc-rebase/sys/netinet6/ip6_forward.c user/delphij/zfs-arc-rebase/sys/netinet6/ip6_mroute.c user/delphij/zfs-arc-rebase/sys/netinet6/ip6_mroute.h user/delphij/zfs-arc-rebase/sys/netinet6/ip6_output.c user/delphij/zfs-arc-rebase/sys/netinet6/ip6_var.h user/delphij/zfs-arc-rebase/sys/netinet6/nd6.c user/delphij/zfs-arc-rebase/sys/netinet6/nd6_nbr.c user/delphij/zfs-arc-rebase/sys/netinet6/nd6_rtr.c user/delphij/zfs-arc-rebase/sys/netipsec/xform_ipip.c user/delphij/zfs-arc-rebase/sys/netpfil/ipfw/ip_fw_log.c user/delphij/zfs-arc-rebase/sys/netpfil/pf/if_pfsync.c user/delphij/zfs-arc-rebase/sys/netpfil/pf/pf.c user/delphij/zfs-arc-rebase/sys/netpfil/pf/pf_ioctl.c user/delphij/zfs-arc-rebase/sys/netpfil/pf/pf_norm.c user/delphij/zfs-arc-rebase/sys/ofed/include/linux/completion.h user/delphij/zfs-arc-rebase/sys/ofed/include/linux/file.h user/delphij/zfs-arc-rebase/sys/ofed/include/linux/fs.h user/delphij/zfs-arc-rebase/sys/ofed/include/linux/in.h user/delphij/zfs-arc-rebase/sys/ofed/include/linux/jiffies.h user/delphij/zfs-arc-rebase/sys/ofed/include/linux/linux_compat.c user/delphij/zfs-arc-rebase/sys/ofed/include/linux/timer.h user/delphij/zfs-arc-rebase/sys/opencrypto/gmac.h user/delphij/zfs-arc-rebase/sys/powerpc/aim/machdep.c user/delphij/zfs-arc-rebase/sys/powerpc/aim/mmu_oea64.c user/delphij/zfs-arc-rebase/sys/powerpc/aim/slb.c user/delphij/zfs-arc-rebase/sys/powerpc/aim/uma_machdep.c user/delphij/zfs-arc-rebase/sys/powerpc/booke/locore.S user/delphij/zfs-arc-rebase/sys/powerpc/booke/machdep.c user/delphij/zfs-arc-rebase/sys/powerpc/booke/pmap.c user/delphij/zfs-arc-rebase/sys/powerpc/conf/GENERIC64 user/delphij/zfs-arc-rebase/sys/powerpc/include/reg.h user/delphij/zfs-arc-rebase/sys/powerpc/include/trap.h user/delphij/zfs-arc-rebase/sys/rpc/svc.c user/delphij/zfs-arc-rebase/sys/rpc/svc.h user/delphij/zfs-arc-rebase/sys/rpc/svc_generic.c user/delphij/zfs-arc-rebase/sys/rpc/svc_vc.c user/delphij/zfs-arc-rebase/sys/sparc64/conf/NOTES user/delphij/zfs-arc-rebase/sys/sparc64/include/reg.h user/delphij/zfs-arc-rebase/sys/sparc64/pci/sbbc.c user/delphij/zfs-arc-rebase/sys/sparc64/sparc64/vm_machdep.c user/delphij/zfs-arc-rebase/sys/sys/_callout.h user/delphij/zfs-arc-rebase/sys/sys/bitset.h user/delphij/zfs-arc-rebase/sys/sys/buf.h user/delphij/zfs-arc-rebase/sys/sys/busdma_bufalloc.h user/delphij/zfs-arc-rebase/sys/sys/callout.h user/delphij/zfs-arc-rebase/sys/sys/cdefs.h user/delphij/zfs-arc-rebase/sys/sys/elf_common.h user/delphij/zfs-arc-rebase/sys/sys/filedesc.h user/delphij/zfs-arc-rebase/sys/sys/imgact.h user/delphij/zfs-arc-rebase/sys/sys/kerneldump.h user/delphij/zfs-arc-rebase/sys/sys/libkern.h user/delphij/zfs-arc-rebase/sys/sys/malloc.h user/delphij/zfs-arc-rebase/sys/sys/mbuf.h user/delphij/zfs-arc-rebase/sys/sys/module.h user/delphij/zfs-arc-rebase/sys/sys/mount.h user/delphij/zfs-arc-rebase/sys/sys/mouse.h user/delphij/zfs-arc-rebase/sys/sys/param.h user/delphij/zfs-arc-rebase/sys/sys/pmc.h user/delphij/zfs-arc-rebase/sys/sys/procfs.h user/delphij/zfs-arc-rebase/sys/sys/socketvar.h user/delphij/zfs-arc-rebase/sys/sys/sockio.h user/delphij/zfs-arc-rebase/sys/sys/syscallsubr.h user/delphij/zfs-arc-rebase/sys/sys/systm.h user/delphij/zfs-arc-rebase/sys/sys/types.h user/delphij/zfs-arc-rebase/sys/sys/ucred.h user/delphij/zfs-arc-rebase/sys/sys/vmem.h user/delphij/zfs-arc-rebase/sys/ufs/ffs/ffs_softdep.c user/delphij/zfs-arc-rebase/sys/ufs/ffs/ffs_vfsops.c user/delphij/zfs-arc-rebase/sys/vm/memguard.c user/delphij/zfs-arc-rebase/sys/vm/swap_pager.c user/delphij/zfs-arc-rebase/sys/vm/uma.h user/delphij/zfs-arc-rebase/sys/vm/uma_core.c user/delphij/zfs-arc-rebase/sys/vm/uma_int.h user/delphij/zfs-arc-rebase/sys/vm/vm_fault.c user/delphij/zfs-arc-rebase/sys/vm/vm_mmap.c user/delphij/zfs-arc-rebase/sys/vm/vm_object.h user/delphij/zfs-arc-rebase/sys/vm/vm_page.c user/delphij/zfs-arc-rebase/sys/vm/vm_pageout.c user/delphij/zfs-arc-rebase/sys/vm/vm_reserv.c user/delphij/zfs-arc-rebase/sys/vm/vnode_pager.c user/delphij/zfs-arc-rebase/sys/x86/acpica/OsdEnvironment.c user/delphij/zfs-arc-rebase/sys/x86/acpica/acpi_wakeup.c user/delphij/zfs-arc-rebase/sys/x86/include/apicvar.h user/delphij/zfs-arc-rebase/sys/x86/include/reg.h user/delphij/zfs-arc-rebase/sys/x86/iommu/busdma_dmar.c user/delphij/zfs-arc-rebase/sys/x86/iommu/intel_ctx.c user/delphij/zfs-arc-rebase/sys/x86/iommu/intel_dmar.h user/delphij/zfs-arc-rebase/sys/x86/iommu/intel_drv.c user/delphij/zfs-arc-rebase/sys/x86/iommu/intel_fault.c user/delphij/zfs-arc-rebase/sys/x86/iommu/intel_gas.c user/delphij/zfs-arc-rebase/sys/x86/iommu/intel_idpgtbl.c user/delphij/zfs-arc-rebase/sys/x86/iommu/intel_qi.c user/delphij/zfs-arc-rebase/sys/x86/iommu/intel_quirks.c user/delphij/zfs-arc-rebase/sys/x86/iommu/intel_reg.h user/delphij/zfs-arc-rebase/sys/x86/iommu/intel_utils.c user/delphij/zfs-arc-rebase/sys/x86/x86/intr_machdep.c user/delphij/zfs-arc-rebase/sys/x86/x86/io_apic.c user/delphij/zfs-arc-rebase/sys/x86/x86/msi.c user/delphij/zfs-arc-rebase/tools/build/check-links.sh user/delphij/zfs-arc-rebase/tools/build/mk/OptionalObsoleteFiles.inc user/delphij/zfs-arc-rebase/tools/build/options/WITHOUT_CXX user/delphij/zfs-arc-rebase/tools/regression/aio/aiotest/Makefile user/delphij/zfs-arc-rebase/tools/regression/aio/aiotest/aiotest.c user/delphij/zfs-arc-rebase/tools/regression/aio/kqueue/Makefile user/delphij/zfs-arc-rebase/tools/regression/aio/kqueue/aio_kqueue.c user/delphij/zfs-arc-rebase/tools/regression/aio/kqueue/lio/Makefile user/delphij/zfs-arc-rebase/tools/regression/aio/kqueue/lio/lio_kqueue.c user/delphij/zfs-arc-rebase/tools/regression/lib/libc/gen/test-wordexp.c user/delphij/zfs-arc-rebase/tools/regression/sockets/accept_fd_leak/Makefile user/delphij/zfs-arc-rebase/tools/regression/sockets/accept_fd_leak/accept_fd_leak.c user/delphij/zfs-arc-rebase/tools/regression/sockets/accf_data_attach/Makefile user/delphij/zfs-arc-rebase/tools/regression/sockets/accf_data_attach/accf_data_attach.c user/delphij/zfs-arc-rebase/tools/regression/sockets/fstat/Makefile user/delphij/zfs-arc-rebase/tools/regression/sockets/fstat/fstat.c user/delphij/zfs-arc-rebase/tools/regression/sockets/kqueue/Makefile user/delphij/zfs-arc-rebase/tools/regression/sockets/kqueue/kqueue.c user/delphij/zfs-arc-rebase/tools/regression/sockets/listen_backlog/Makefile user/delphij/zfs-arc-rebase/tools/regression/sockets/listen_backlog/listen_backlog.c user/delphij/zfs-arc-rebase/tools/regression/sockets/listenclose/Makefile user/delphij/zfs-arc-rebase/tools/regression/sockets/listenclose/listenclose.c user/delphij/zfs-arc-rebase/tools/regression/sockets/pr_atomic/Makefile user/delphij/zfs-arc-rebase/tools/regression/sockets/pr_atomic/pr_atomic.c user/delphij/zfs-arc-rebase/tools/regression/sockets/reconnect/Makefile user/delphij/zfs-arc-rebase/tools/regression/sockets/reconnect/reconnect.c user/delphij/zfs-arc-rebase/tools/regression/sockets/rtsocket/Makefile user/delphij/zfs-arc-rebase/tools/regression/sockets/rtsocket/rtsocket.c user/delphij/zfs-arc-rebase/tools/regression/sockets/sblock/Makefile user/delphij/zfs-arc-rebase/tools/regression/sockets/sblock/sblock.c user/delphij/zfs-arc-rebase/tools/regression/sockets/sendfile/sendfile.c user/delphij/zfs-arc-rebase/tools/regression/sockets/shutdown/Makefile user/delphij/zfs-arc-rebase/tools/regression/sockets/shutdown/shutdown.c user/delphij/zfs-arc-rebase/tools/regression/sockets/sigpipe/Makefile user/delphij/zfs-arc-rebase/tools/regression/sockets/sigpipe/sigpipe.c user/delphij/zfs-arc-rebase/tools/regression/sockets/so_setfib/Makefile user/delphij/zfs-arc-rebase/tools/regression/sockets/so_setfib/so_setfib.c user/delphij/zfs-arc-rebase/tools/regression/sockets/socketpair/Makefile user/delphij/zfs-arc-rebase/tools/regression/sockets/socketpair/socketpair.c user/delphij/zfs-arc-rebase/tools/regression/sockets/unix_bindconnect/Makefile user/delphij/zfs-arc-rebase/tools/regression/sockets/unix_bindconnect/unix_bindconnect.c user/delphij/zfs-arc-rebase/tools/regression/sockets/unix_close_race/Makefile user/delphij/zfs-arc-rebase/tools/regression/sockets/unix_close_race/unix_close_race.c user/delphij/zfs-arc-rebase/tools/regression/sockets/unix_passfd/Makefile user/delphij/zfs-arc-rebase/tools/regression/sockets/unix_passfd/unix_passfd.c user/delphij/zfs-arc-rebase/tools/regression/sockets/unix_sendtorace/Makefile user/delphij/zfs-arc-rebase/tools/regression/sockets/unix_sendtorace/unix_sendtorace.c user/delphij/zfs-arc-rebase/tools/regression/sockets/unix_socket/Makefile user/delphij/zfs-arc-rebase/tools/regression/sockets/unix_socket/unix_socket.c user/delphij/zfs-arc-rebase/tools/regression/sockets/unix_sorflush/Makefile user/delphij/zfs-arc-rebase/tools/regression/sockets/unix_sorflush/unix_sorflush.c user/delphij/zfs-arc-rebase/tools/regression/sockets/zerosend/zerosend.c user/delphij/zfs-arc-rebase/tools/regression/sysvshm/shmtest.c user/delphij/zfs-arc-rebase/tools/tools/ath/athratestats/main.c user/delphij/zfs-arc-rebase/tools/tools/ath/athstats/athstats.c user/delphij/zfs-arc-rebase/tools/tools/cxgbtool/cxgbtool.c user/delphij/zfs-arc-rebase/tools/tools/iwn/iwnstats/iwn_ioctl.c user/delphij/zfs-arc-rebase/usr.bin/Makefile user/delphij/zfs-arc-rebase/usr.bin/ar/read.c user/delphij/zfs-arc-rebase/usr.bin/bluetooth/bthost/bthost.c user/delphij/zfs-arc-rebase/usr.bin/bluetooth/btsockstat/btsockstat.c user/delphij/zfs-arc-rebase/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c user/delphij/zfs-arc-rebase/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c user/delphij/zfs-arc-rebase/usr.bin/clang/Makefile user/delphij/zfs-arc-rebase/usr.bin/col/col.c user/delphij/zfs-arc-rebase/usr.bin/column/column.c user/delphij/zfs-arc-rebase/usr.bin/fetch/fetch.1 user/delphij/zfs-arc-rebase/usr.bin/fetch/fetch.c user/delphij/zfs-arc-rebase/usr.bin/gcore/elf32core.c user/delphij/zfs-arc-rebase/usr.bin/grep/grep.c user/delphij/zfs-arc-rebase/usr.bin/gzip/gzip.1 user/delphij/zfs-arc-rebase/usr.bin/gzip/gzip.c user/delphij/zfs-arc-rebase/usr.bin/iconv/iconv.c user/delphij/zfs-arc-rebase/usr.bin/ipcs/Makefile user/delphij/zfs-arc-rebase/usr.bin/ipcs/ipc.c user/delphij/zfs-arc-rebase/usr.bin/ipcs/ipc.h user/delphij/zfs-arc-rebase/usr.bin/ipcs/ipcs.c user/delphij/zfs-arc-rebase/usr.bin/iscsictl/Makefile user/delphij/zfs-arc-rebase/usr.bin/iscsictl/iscsi.conf.5 user/delphij/zfs-arc-rebase/usr.bin/iscsictl/iscsictl.c user/delphij/zfs-arc-rebase/usr.bin/iscsictl/parse.y user/delphij/zfs-arc-rebase/usr.bin/iscsictl/periphs.c user/delphij/zfs-arc-rebase/usr.bin/jot/jot.1 user/delphij/zfs-arc-rebase/usr.bin/kdump/mkioctls user/delphij/zfs-arc-rebase/usr.bin/lam/lam.1 user/delphij/zfs-arc-rebase/usr.bin/ldd/ldd.c user/delphij/zfs-arc-rebase/usr.bin/lockf/lockf.1 user/delphij/zfs-arc-rebase/usr.bin/lockf/lockf.c user/delphij/zfs-arc-rebase/usr.bin/logger/logger.1 user/delphij/zfs-arc-rebase/usr.bin/ministat/ministat.1 user/delphij/zfs-arc-rebase/usr.bin/mt/Makefile user/delphij/zfs-arc-rebase/usr.bin/mt/mt.c user/delphij/zfs-arc-rebase/usr.bin/netstat/bpf.c user/delphij/zfs-arc-rebase/usr.bin/netstat/if.c user/delphij/zfs-arc-rebase/usr.bin/netstat/inet6.c user/delphij/zfs-arc-rebase/usr.bin/netstat/mroute6.c user/delphij/zfs-arc-rebase/usr.bin/netstat/netstat.1 user/delphij/zfs-arc-rebase/usr.bin/netstat/route.c user/delphij/zfs-arc-rebase/usr.bin/patch/inp.c user/delphij/zfs-arc-rebase/usr.bin/rs/rs.1 user/delphij/zfs-arc-rebase/usr.bin/smbutil/Makefile user/delphij/zfs-arc-rebase/usr.bin/sockstat/sockstat.1 user/delphij/zfs-arc-rebase/usr.bin/sort/bwstring.c user/delphij/zfs-arc-rebase/usr.bin/sort/coll.c user/delphij/zfs-arc-rebase/usr.bin/sort/file.c user/delphij/zfs-arc-rebase/usr.bin/sort/file.h user/delphij/zfs-arc-rebase/usr.bin/sort/mem.c user/delphij/zfs-arc-rebase/usr.bin/sort/radixsort.c user/delphij/zfs-arc-rebase/usr.bin/sort/sort.1.in user/delphij/zfs-arc-rebase/usr.bin/sort/sort.c user/delphij/zfs-arc-rebase/usr.bin/top/machine.c user/delphij/zfs-arc-rebase/usr.bin/vi/Makefile user/delphij/zfs-arc-rebase/usr.bin/w/Makefile user/delphij/zfs-arc-rebase/usr.bin/w/w.c user/delphij/zfs-arc-rebase/usr.bin/wc/wc.c user/delphij/zfs-arc-rebase/usr.bin/xlint/arch/sparc64/targparam.h user/delphij/zfs-arc-rebase/usr.bin/xlint/common/lint.h user/delphij/zfs-arc-rebase/usr.bin/xlint/common/mem.c user/delphij/zfs-arc-rebase/usr.bin/xlint/lint1/cgram.y user/delphij/zfs-arc-rebase/usr.bin/xlint/lint1/decl.c user/delphij/zfs-arc-rebase/usr.bin/xlint/lint1/emit1.c user/delphij/zfs-arc-rebase/usr.bin/xlint/lint1/err.c user/delphij/zfs-arc-rebase/usr.bin/xlint/lint1/externs1.h user/delphij/zfs-arc-rebase/usr.bin/xlint/lint1/func.c user/delphij/zfs-arc-rebase/usr.bin/xlint/lint1/init.c user/delphij/zfs-arc-rebase/usr.bin/xlint/lint1/lint1.h user/delphij/zfs-arc-rebase/usr.bin/xlint/lint1/main1.c user/delphij/zfs-arc-rebase/usr.bin/xlint/lint1/makeman user/delphij/zfs-arc-rebase/usr.bin/xlint/lint1/param.h user/delphij/zfs-arc-rebase/usr.bin/xlint/lint1/scan.l user/delphij/zfs-arc-rebase/usr.bin/xlint/lint1/tree.c user/delphij/zfs-arc-rebase/usr.bin/xlint/lint2/read.c user/delphij/zfs-arc-rebase/usr.bin/xlint/xlint/lint.1 user/delphij/zfs-arc-rebase/usr.bin/xlint/xlint/xlint.c user/delphij/zfs-arc-rebase/usr.sbin/acpi/acpiconf/acpiconf.c user/delphij/zfs-arc-rebase/usr.sbin/acpi/acpidump/acpi.c user/delphij/zfs-arc-rebase/usr.sbin/amd/include/config.h user/delphij/zfs-arc-rebase/usr.sbin/ancontrol/ancontrol.c user/delphij/zfs-arc-rebase/usr.sbin/arp/arp.c user/delphij/zfs-arc-rebase/usr.sbin/authpf/Makefile user/delphij/zfs-arc-rebase/usr.sbin/bhyve/Makefile user/delphij/zfs-arc-rebase/usr.sbin/bhyve/bhyverun.c user/delphij/zfs-arc-rebase/usr.sbin/bhyve/pci_ahci.c user/delphij/zfs-arc-rebase/usr.sbin/bhyve/pci_virtio_block.c user/delphij/zfs-arc-rebase/usr.sbin/bhyve/pci_virtio_net.c user/delphij/zfs-arc-rebase/usr.sbin/bhyve/virtio.c user/delphij/zfs-arc-rebase/usr.sbin/bhyvectl/Makefile user/delphij/zfs-arc-rebase/usr.sbin/bhyvectl/bhyvectl.c user/delphij/zfs-arc-rebase/usr.sbin/bhyveload/Makefile user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/bthidcontrol/hid.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/bthidcontrol/sdp.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/bthidd/bthidd.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/bthidd/client.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/bthidd/hid.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/bthidd/kbd.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/bthidd/lexer.l user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/bthidd/parser.y user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/bthidd/server.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/bthidd/session.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/btpand/bnep.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/btpand/btpand.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/btpand/channel.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/btpand/client.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/btpand/event.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/btpand/packet.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/btpand/sdp.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/btpand/server.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/btpand/tap.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/hccontrol/hccontrol.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/hccontrol/info.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/hccontrol/link_control.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/hccontrol/link_policy.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/hccontrol/node.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/hccontrol/util.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/hcsecd/hcsecd.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/hcsecd/parser.y user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/l2control/l2cap.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/l2control/l2control.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/l2ping/l2ping.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/sdpcontrol/search.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/sdpd/bgd.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/sdpd/dun.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/sdpd/ftrn.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/sdpd/gn.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/sdpd/irmc.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/sdpd/irmc_command.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/sdpd/lan.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/sdpd/main.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/sdpd/nap.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/sdpd/opush.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/sdpd/panu.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/sdpd/profile.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/sdpd/provider.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/sdpd/sar.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/sdpd/scr.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/sdpd/sd.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/sdpd/server.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/sdpd/sp.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/sdpd/srr.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/sdpd/ssar.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/sdpd/ssr.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/sdpd/sur.c user/delphij/zfs-arc-rebase/usr.sbin/bluetooth/sdpd/uuid.c user/delphij/zfs-arc-rebase/usr.sbin/bsdconfig/share/geom.subr user/delphij/zfs-arc-rebase/usr.sbin/bsdinstall/scripts/docsinstall user/delphij/zfs-arc-rebase/usr.sbin/bsdinstall/scripts/zfsboot user/delphij/zfs-arc-rebase/usr.sbin/bsnmpd/tools/bsnmptools/Makefile user/delphij/zfs-arc-rebase/usr.sbin/crashinfo/crashinfo.sh user/delphij/zfs-arc-rebase/usr.sbin/crunch/crunchide/Makefile user/delphij/zfs-arc-rebase/usr.sbin/ctld/ctld.c user/delphij/zfs-arc-rebase/usr.sbin/ctld/discovery.c user/delphij/zfs-arc-rebase/usr.sbin/ctld/isns.c user/delphij/zfs-arc-rebase/usr.sbin/ctld/keys.c user/delphij/zfs-arc-rebase/usr.sbin/ctld/login.c user/delphij/zfs-arc-rebase/usr.sbin/ctld/parse.y user/delphij/zfs-arc-rebase/usr.sbin/ctld/pdu.c user/delphij/zfs-arc-rebase/usr.sbin/ctld/token.l user/delphij/zfs-arc-rebase/usr.sbin/fifolog/fifolog_reader/Makefile user/delphij/zfs-arc-rebase/usr.sbin/fifolog/fifolog_writer/Makefile user/delphij/zfs-arc-rebase/usr.sbin/freebsd-update/freebsd-update.sh user/delphij/zfs-arc-rebase/usr.sbin/ifmcstat/ifmcstat.c user/delphij/zfs-arc-rebase/usr.sbin/ip6addrctl/ip6addrctl.c user/delphij/zfs-arc-rebase/usr.sbin/jail/jail.8 user/delphij/zfs-arc-rebase/usr.sbin/mld6query/mld6.c user/delphij/zfs-arc-rebase/usr.sbin/ndp/ndp.c user/delphij/zfs-arc-rebase/usr.sbin/nfsd/nfsd.c user/delphij/zfs-arc-rebase/usr.sbin/ntp/Makefile user/delphij/zfs-arc-rebase/usr.sbin/ntp/config.h user/delphij/zfs-arc-rebase/usr.sbin/ntp/doc/Makefile user/delphij/zfs-arc-rebase/usr.sbin/ntp/doc/ntp-keygen.8 user/delphij/zfs-arc-rebase/usr.sbin/ntp/doc/ntp.conf.5 user/delphij/zfs-arc-rebase/usr.sbin/ntp/doc/ntp.keys.5 user/delphij/zfs-arc-rebase/usr.sbin/ntp/doc/ntpd.8 user/delphij/zfs-arc-rebase/usr.sbin/ntp/doc/ntpdc.8 user/delphij/zfs-arc-rebase/usr.sbin/ntp/doc/ntpq.8 user/delphij/zfs-arc-rebase/usr.sbin/ntp/doc/ntptrace.8 user/delphij/zfs-arc-rebase/usr.sbin/ntp/libntp/Makefile user/delphij/zfs-arc-rebase/usr.sbin/ntp/libopts/Makefile user/delphij/zfs-arc-rebase/usr.sbin/ntp/libparse/Makefile user/delphij/zfs-arc-rebase/usr.sbin/ntp/ntp-keygen/Makefile user/delphij/zfs-arc-rebase/usr.sbin/ntp/ntpd/Makefile user/delphij/zfs-arc-rebase/usr.sbin/ntp/ntpdate/Makefile user/delphij/zfs-arc-rebase/usr.sbin/ntp/ntpdc/Makefile user/delphij/zfs-arc-rebase/usr.sbin/ntp/ntpq/Makefile user/delphij/zfs-arc-rebase/usr.sbin/ntp/ntptime/Makefile user/delphij/zfs-arc-rebase/usr.sbin/ntp/scripts/mkver user/delphij/zfs-arc-rebase/usr.sbin/ntp/sntp/Makefile user/delphij/zfs-arc-rebase/usr.sbin/pkg/pkg.c user/delphij/zfs-arc-rebase/usr.sbin/pmcstat/pmcstat.8 user/delphij/zfs-arc-rebase/usr.sbin/pmcstat/pmcstat.c user/delphij/zfs-arc-rebase/usr.sbin/pmcstudy/Makefile user/delphij/zfs-arc-rebase/usr.sbin/pmcstudy/pmcstudy.c user/delphij/zfs-arc-rebase/usr.sbin/powerd/powerd.c user/delphij/zfs-arc-rebase/usr.sbin/ppp/iface.c user/delphij/zfs-arc-rebase/usr.sbin/rip6query/rip6query.c user/delphij/zfs-arc-rebase/usr.sbin/route6d/route6d.c user/delphij/zfs-arc-rebase/usr.sbin/rpc.lockd/Makefile user/delphij/zfs-arc-rebase/usr.sbin/rrenumd/lexer.l user/delphij/zfs-arc-rebase/usr.sbin/rrenumd/parser.y user/delphij/zfs-arc-rebase/usr.sbin/rtadvctl/rtadvctl.c user/delphij/zfs-arc-rebase/usr.sbin/rtadvd/config.c user/delphij/zfs-arc-rebase/usr.sbin/rtadvd/if.c user/delphij/zfs-arc-rebase/usr.sbin/rtadvd/rrenum.c user/delphij/zfs-arc-rebase/usr.sbin/rtadvd/rtadvd.c user/delphij/zfs-arc-rebase/usr.sbin/rtsold/Makefile user/delphij/zfs-arc-rebase/usr.sbin/rtsold/if.c user/delphij/zfs-arc-rebase/usr.sbin/rtsold/probe.c user/delphij/zfs-arc-rebase/usr.sbin/rtsold/rtsold.c user/delphij/zfs-arc-rebase/usr.sbin/uhsoctl/uhsoctl.c user/delphij/zfs-arc-rebase/usr.sbin/vidcontrol/vidcontrol.c user/delphij/zfs-arc-rebase/usr.sbin/wpa/ndis_events/ndis_events.c user/delphij/zfs-arc-rebase/usr.sbin/wpa/wpa_supplicant/Packet32.c Directory Properties: user/delphij/zfs-arc-rebase/ (props changed) user/delphij/zfs-arc-rebase/cddl/ (props changed) user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/ (props changed) user/delphij/zfs-arc-rebase/contrib/binutils/ (props changed) user/delphij/zfs-arc-rebase/contrib/compiler-rt/ (props changed) user/delphij/zfs-arc-rebase/contrib/elftoolchain/ (props changed) user/delphij/zfs-arc-rebase/contrib/gcc/ (props changed) user/delphij/zfs-arc-rebase/contrib/ipfilter/ (props changed) user/delphij/zfs-arc-rebase/contrib/libarchive/ (props changed) user/delphij/zfs-arc-rebase/contrib/libarchive/libarchive/ (props changed) user/delphij/zfs-arc-rebase/contrib/libc++/ (props changed) user/delphij/zfs-arc-rebase/contrib/llvm/ (props changed) user/delphij/zfs-arc-rebase/contrib/llvm/tools/clang/ (props changed) user/delphij/zfs-arc-rebase/contrib/llvm/tools/lldb/ (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/INSTALL (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/NOTES.y2kfixes (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/README (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/README.bk (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/README.patches (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/README.refclocks (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/README.versions (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/TODO (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/adjtimed/README (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/adjtimed/adjtimed.c (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/compile (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/conf/README (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/conf/baldwin.conf (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/conf/grundoon.conf (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/conf/malarky.conf (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/conf/pogo.conf (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/conf/rackety.conf (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/depcomp (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/README (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/adjtime.h (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/ascii.h (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/gps.h (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/hopf6039.h (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/mx4200.h (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/ntif.h (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/ntp_datum.h (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/ntp_if.h (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/include/parse_conf.h (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/install-sh (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/kernel/sys/README (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/kernel/sys/bsd_audioirig.h (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/kernel/sys/i8253.h (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/kernel/sys/parsestreams.h (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/kernel/sys/pcl720.h (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/kernel/sys/ppsclock.h (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/kernel/sys/timex.h (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/kernel/sys/tpro.h (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/kernel/sys/tt560_api.h (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/README (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/adjtime.c (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/adjtimex.c (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libntp/systime_s.c (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/libparse/README (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/missing (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpd/jupiter.h (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpdate/README (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpdc/README (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpdc/nl_in.c (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/ntpq/README (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/parseutil/README (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/results.y2kfixes (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/scripts/monitoring/README (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/scripts/monitoring/loopwatch.config.SAMPLE (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/scripts/monitoring/lr.pl (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/scripts/monitoring/ntploopstat (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/scripts/monitoring/ntploopwatch (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/scripts/monitoring/timelocal.pl (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/scripts/stats/README (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/scripts/stats/README.stats (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/scripts/stats/README.timecodes (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/scripts/stats/clock.awk (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/scripts/stats/dupe.awk (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/scripts/stats/ensemble.S (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/scripts/stats/ensemble.awk (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/scripts/stats/etf.S (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/scripts/stats/etf.awk (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/scripts/stats/itf.S (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/scripts/stats/itf.awk (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/scripts/stats/loop.S (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/scripts/stats/loop.awk (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/scripts/stats/loop_summary (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/scripts/stats/peer.awk (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/scripts/stats/psummary.awk (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/scripts/stats/summary.sh (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/scripts/stats/tdata.S (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/scripts/stats/tdata.awk (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/sntp/depcomp (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/sntp/install-sh (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/sntp/missing (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/util/ansi2knr.1 (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/util/ansi2knr.c (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/util/byteorder.c (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/util/kern.c (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/util/longsize.c (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/util/pps-api.c (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/util/precision.c (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/util/testrs6000.c (props changed) user/delphij/zfs-arc-rebase/contrib/ntp/util/timetrim.c (props changed) user/delphij/zfs-arc-rebase/contrib/nvi/ (props changed) user/delphij/zfs-arc-rebase/contrib/tzdata/ (props changed) user/delphij/zfs-arc-rebase/contrib/xz/ (props changed) user/delphij/zfs-arc-rebase/crypto/openssh/ (props changed) user/delphij/zfs-arc-rebase/crypto/openssl/ (props changed) user/delphij/zfs-arc-rebase/etc/ (props changed) user/delphij/zfs-arc-rebase/gnu/lib/ (props changed) user/delphij/zfs-arc-rebase/gnu/usr.bin/binutils/ (props changed) user/delphij/zfs-arc-rebase/include/ (props changed) user/delphij/zfs-arc-rebase/lib/libc/ (props changed) user/delphij/zfs-arc-rebase/lib/libvmmapi/ (props changed) user/delphij/zfs-arc-rebase/sbin/ (props changed) user/delphij/zfs-arc-rebase/share/ (props changed) user/delphij/zfs-arc-rebase/share/man/man4/ (props changed) user/delphij/zfs-arc-rebase/sys/ (props changed) user/delphij/zfs-arc-rebase/sys/amd64/vmm/ (props changed) user/delphij/zfs-arc-rebase/sys/boot/ (props changed) user/delphij/zfs-arc-rebase/sys/boot/powerpc/kboot/ (props changed) user/delphij/zfs-arc-rebase/sys/boot/powerpc/ofw/ (props changed) user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/ (props changed) user/delphij/zfs-arc-rebase/sys/conf/ (props changed) user/delphij/zfs-arc-rebase/sys/contrib/dev/acpica/ (props changed) user/delphij/zfs-arc-rebase/sys/contrib/ipfilter/ (props changed) user/delphij/zfs-arc-rebase/sys/contrib/x86emu/ (props changed) user/delphij/zfs-arc-rebase/sys/gnu/dts/ (props changed) user/delphij/zfs-arc-rebase/sys/gnu/dts/arm/ (props changed) user/delphij/zfs-arc-rebase/usr.sbin/bhyve/ (props changed) user/delphij/zfs-arc-rebase/usr.sbin/bhyvectl/ (props changed) user/delphij/zfs-arc-rebase/usr.sbin/bhyveload/ (props changed) user/delphij/zfs-arc-rebase/usr.sbin/jail/ (props changed) user/delphij/zfs-arc-rebase/usr.sbin/rtadvctl/ (props changed) user/delphij/zfs-arc-rebase/usr.sbin/rtadvd/ (props changed) user/delphij/zfs-arc-rebase/usr.sbin/rtsold/ (props changed) Modified: user/delphij/zfs-arc-rebase/Makefile ============================================================================== --- user/delphij/zfs-arc-rebase/Makefile Fri Apr 17 00:16:28 2015 (r281633) +++ user/delphij/zfs-arc-rebase/Makefile Fri Apr 17 00:28:35 2015 (r281634) @@ -165,10 +165,10 @@ _MAKE= PATH=${PATH} ${SUB_MAKE} -f Makef # Guess machine architecture from machine type, and vice versa. .if !defined(TARGET_ARCH) && defined(TARGET) -_TARGET_ARCH= ${TARGET:S/pc98/i386/} +_TARGET_ARCH= ${TARGET:S/pc98/i386/:S/arm64/aarch64/} .elif !defined(TARGET) && defined(TARGET_ARCH) && \ ${TARGET_ARCH} != ${MACHINE_ARCH} -_TARGET= ${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb|hf)?/arm/} +_TARGET= ${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb|hf)?/arm/:C/aarch64/arm64/:C/powerpc64/powerpc/} .endif .if defined(TARGET) && !defined(_TARGET) _TARGET=${TARGET} @@ -374,6 +374,17 @@ kernel-toolchains: # .if make(universe) || make(universe_kernels) || make(tinderbox) || make(targets) TARGETS?=amd64 arm i386 mips pc98 powerpc sparc64 +# XXX Add arm64 to universe only if we have an external binutils installed. +# It does not build with the in-tree linnker. +.if exists(/usr/local/aarch64-freebsd/bin/ld) +TARGETS+=arm64 +TARGET_ARCHES_arm64?= aarch64 +.else +universe: universe_arm64_skip +universe_epilogue: universe_arm64_skip +universe_arm64_skip: universe_prologue + @echo ">> arm64 skipped - install aarch64-binutils port or package to build" +.endif TARGET_ARCHES_arm?= arm armeb armv6 armv6hf TARGET_ARCHES_mips?= mipsel mips mips64el mips64 mipsn32 TARGET_ARCHES_powerpc?= powerpc powerpc64 Modified: user/delphij/zfs-arc-rebase/Makefile.inc1 ============================================================================== --- user/delphij/zfs-arc-rebase/Makefile.inc1 Fri Apr 17 00:16:28 2015 (r281633) +++ user/delphij/zfs-arc-rebase/Makefile.inc1 Fri Apr 17 00:28:35 2015 (r281634) @@ -149,7 +149,7 @@ SRCRELDATE!= awk '/^\#define[[:space:]]* VERSION= FreeBSD ${REVISION}-${BRANCH:C/-p[0-9]+$//} ${TARGET_ARCH} ${SRCRELDATE} .endif -KNOWN_ARCHES?= amd64 arm armeb/arm armv6/arm armv6hf/arm i386 i386/pc98 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64 +KNOWN_ARCHES?= aarch64/arm64 amd64 arm armeb/arm armv6/arm armv6hf/arm i386 i386/pc98 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64 .if ${TARGET} == ${TARGET_ARCH} _t= ${TARGET} .else @@ -209,7 +209,9 @@ INSTALLTMP!= /usr/bin/mktemp -d -u -t in # 1. legacy stage [BMAKE] # This stage is responsible for creating compatibility # shims that are needed by the bootstrap-tools, -# build-tools and cross-tools stages. +# build-tools and cross-tools stages. These are generally +# APIs that tools from one of those three stages need to +# build that aren't present on the host. # 1. bootstrap-tools stage [BMAKE] # This stage is responsible for creating programs that # are needed for backward compatibility reasons. They @@ -220,7 +222,7 @@ INSTALLTMP!= /usr/bin/mktemp -d -u -t in # the build process. # 3. cross-tools stage [XMAKE] # This stage is responsible for creating any tools that -# are needed for cross-builds. A cross-compiler is one +# are needed for building the system. A cross-compiler is one # of them. # 4. world stage [WMAKE] # This stage actually builds the world. @@ -259,7 +261,8 @@ BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \ -DNO_PIC MK_PROFILE=no -DNO_SHARED \ -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \ MK_CLANG_EXTRAS=no MK_CLANG_FULL=no \ - MK_LLDB=no MK_TESTS=no + MK_LLDB=no MK_TESTS=no \ + MK_INCLUDES=yes # build-tools stage TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \ @@ -341,7 +344,8 @@ X${COMPILER}?= ${${COMPILER}} .endfor XBINUTILS= AS AR LD NM OBJCOPY OBJDUMP RANLIB SIZE STRINGS .for BINUTIL in ${XBINUTILS} -.if defined(CROSS_BINUTILS_PREFIX) +.if defined(CROSS_BINUTILS_PREFIX) && \ + exists(${CROSS_BINUTILS_PREFIX}${${BINUTIL}}) X${BINUTIL}?= ${CROSS_BINUTILS_PREFIX}${${BINUTIL}} .else X${BINUTIL}?= ${${BINUTIL}} @@ -381,9 +385,9 @@ DEPFLAGS+= -I${WORLDTMP}/usr/include/c++ TARGET_ABI?= unknown TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0 XCFLAGS+= -target ${TARGET_TRIPLE} +.endif XCFLAGS+= --sysroot=${WORLDTMP} ${BFLAGS} XCXXFLAGS+= --sysroot=${WORLDTMP} ${BFLAGS} -.endif .else .if defined(CROSS_BINUTILS_PREFIX) && exists(${CROSS_BINUTILS_PREFIX}) BFLAGS+= -B${CROSS_BINUTILS_PREFIX} @@ -408,8 +412,9 @@ LIB32CPUFLAGS= -march=${TARGET_CPUTYPE} LIB32WMAKEENV= MACHINE=i386 MACHINE_ARCH=i386 \ MACHINE_CPU="i686 mmx sse sse2" LIB32WMAKEFLAGS= \ - AS="${AS} --32" \ - LD="${LD} -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" + AS="${XAS} --32" \ + LD="${XLD} -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \ + OBJCOPY="${XOBJCOPY}" .elif ${TARGET_ARCH} == "powerpc64" .if empty(TARGET_CPUTYPE) @@ -419,7 +424,8 @@ LIB32CPUFLAGS= -mcpu=${TARGET_CPUTYPE} .endif LIB32WMAKEENV= MACHINE=powerpc MACHINE_ARCH=powerpc LIB32WMAKEFLAGS= \ - LD="${LD} -m elf32ppc_fbsd" + LD="${XLD} -m elf32ppc_fbsd" \ + OBJCOPY="${XOBJCOPY}" .endif @@ -1221,7 +1227,9 @@ update: # # -# legacy: Build compatibility shims for the next three targets +# legacy: Build compatibility shims for the next three targets. This is a minimal +# set of tools and shims necessary to compensate for older systems which don't have +# the APIs that the targets built in bootstrap-tools, build-tools or cross-tools. # legacy: .if ${BOOTSTRAPPING} < 800107 && ${BOOTSTRAPPING} != 0 @@ -1239,7 +1247,10 @@ legacy: .endfor # -# bootstrap-tools: Build tools needed for compatibility +# bootstrap-tools: Build tools needed for compatibility. These are binaries that +# are built to build other binaries in the system. However, the focus of these +# binaries is usually quite narrow. Bootstrap tools use the host's compiler and +# libraries, augmented by -legacy. # _bt= _bootstrap-tools @@ -1293,12 +1304,10 @@ _lex= usr.bin/lex _awk= usr.bin/awk .endif -.if ${BOOTSTRAPPING} < 1001506 _yacc= lib/liby \ usr.bin/yacc ${_bt}-usr.bin/yacc: ${_bt}-lib/liby -.endif .if ${MK_BSNMP} != "no" _gensnmptree= usr.sbin/bsnmpd/gensnmptree @@ -1348,8 +1357,13 @@ _kerberos5_bootstrap_tools= \ kerberos5/tools/slc \ usr.bin/compile_et -${_bt}-kerberos5/tools/slc: ${_bt}-kerberos5/lib/libroken -${_bt}-kerberos5/tools/asn1_compile: ${_bt}-kerberos5/lib/libroken +${_bt}-kerberos5/lib/libroken: ${_bt}-kerberos5/tools/make-roken +${_bt}-kerberos5/tools/asn1_compile: \ + ${_bt}-kerberos5/lib/libroken ${_bt}-kerberos5/lib/libvers +${_bt}-kerberos5/tools/slc: \ + ${_bt}-kerberos5/lib/libroken ${_bt}-kerberos5/lib/libvers +${_bt}-usr.bin/compile_et: \ + ${_bt}-kerberos5/lib/libroken ${_bt}-kerberos5/lib/libvers .endif bootstrap-tools: .PHONY @@ -1445,7 +1459,9 @@ kernel-tools: .MAKE -p ${MAKEOBJDIRPREFIX}/usr >/dev/null # -# cross-tools: Build cross-building tools +# cross-tools: All the tools needed to build the rest of the system after +# we get done with the earlier stages. It is the last set of tools needed +# to begin building the target binaries. # .if ${TARGET_ARCH} != ${MACHINE_ARCH} .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" Modified: user/delphij/zfs-arc-rebase/ObsoleteFiles.inc ============================================================================== --- user/delphij/zfs-arc-rebase/ObsoleteFiles.inc Fri Apr 17 00:16:28 2015 (r281633) +++ user/delphij/zfs-arc-rebase/ObsoleteFiles.inc Fri Apr 17 00:28:35 2015 (r281634) @@ -38,6 +38,39 @@ # xargs -n1 | sort | uniq -d; # done +# 20150416: ALTQ moved to net/altq +OLD_FILES+=usr/include/altq/altq_rmclass_debug.h +OLD_FILES+=usr/include/altq/altq.h +OLD_FILES+=usr/include/altq/altq_cdnr.h +OLD_FILES+=usr/include/altq/altq_hfsc.h +OLD_FILES+=usr/include/altq/altq_priq.h +OLD_FILES+=usr/include/altq/altqconf.h +OLD_FILES+=usr/include/altq/altq_classq.h +OLD_FILES+=usr/include/altq/altq_red.h +OLD_FILES+=usr/include/altq/if_altq.h +OLD_FILES+=usr/include/altq/altq_var.h +OLD_FILES+=usr/include/altq/altq_rmclass.h +OLD_FILES+=usr/include/altq/altq_cbq.h +OLD_FILES+=usr/include/altq/altq_rio.h +OLD_DIRS+=usr/include/altq +# 20150410 +OLD_FILES+=usr/share/doc/usd/10.exref/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/10.exref/summary.ascii.gz +OLD_DIRS+=usr/share/doc/usd/10.exref +OLD_FILES+=usr/share/doc/usd/11.edit/paper.ascii.gz +OLD_DIRS+=usr/share/doc/usd/11.edit +OLD_FILES+=usr/share/doc/usd/12.vi/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/12.vi/summary.ascii.gz +OLD_FILES+=usr/share/doc/usd/12.vi/viapwh.ascii.gz +OLD_DIRS+=usr/share/doc/usd/12.vi +OLD_FILES+=usr/share/doc/usd/13.viref/paper.ascii.gz +OLD_DIRS+=usr/share/doc/usd/13.viref +# 20150329 +.if ${TARGET_ARCH} == "arm" +OLD_FILES+=usr/include/bootconfig.h +.endif +# 20150326 +OLD_FILES+=usr/share/man/man1/pmcstudy.1.gz # 20150315: new clang import which bumps version from 3.5.1 to 3.6.0. OLD_FILES+=usr/include/clang/3.5.1/__wmmintrin_aes.h OLD_FILES+=usr/include/clang/3.5.1/__wmmintrin_pclmul.h Modified: user/delphij/zfs-arc-rebase/README ============================================================================== --- user/delphij/zfs-arc-rebase/README Fri Apr 17 00:16:28 2015 (r281633) +++ user/delphij/zfs-arc-rebase/README Fri Apr 17 00:28:35 2015 (r281634) @@ -34,9 +34,7 @@ The sample kernel configuration files re sub-directory (assuming that you've installed the kernel sources), the file named GENERIC being the one used to build your initial installation kernel. The file NOTES contains entries and documentation for all possible -devices, not just those commonly used. It is the successor of the ancient -LINT file, but in contrast to LINT, it is not buildable as a kernel but a -pure reference and documentation file. +devices, not just those commonly used. Source Roadmap: @@ -77,6 +75,9 @@ share Shared resources. sys Kernel sources. +tests Regression tests which can be run by Kyua. See tests/README + for additional information. + tools Utilities for regression testing and miscellaneous tasks. usr.bin User commands. Modified: user/delphij/zfs-arc-rebase/UPDATING ============================================================================== --- user/delphij/zfs-arc-rebase/UPDATING Fri Apr 17 00:16:28 2015 (r281633) +++ user/delphij/zfs-arc-rebase/UPDATING Fri Apr 17 00:28:35 2015 (r281634) @@ -31,6 +31,21 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20150415: + The const qualifier has been removed from iconv(3) to comply with + POSIX. The ports tree is aware of this from r384038 onwards. + +20150416: + Libraries specified by LIBADD in Makefiles must have a corresponding + DPADD_ variable to ensure correct dependencies. This is now + enforced in src.libnames.mk. + +20150324: + From legacy ata(4) driver was removed support for SATA controllers + supported by more functional drivers ahci(4), siis(4) and mvs(4). + Kernel modules ataahci and ataadaptec were removed completely, + replaced by ahci and mvs modules respectively. + 20150315: Clang, llvm and lldb have been upgraded to 3.6.0 release. Please see the 20141231 entry below for information about prerequisites and Modified: user/delphij/zfs-arc-rebase/bin/cp/utils.c ============================================================================== --- user/delphij/zfs-arc-rebase/bin/cp/utils.c Fri Apr 17 00:16:28 2015 (r281633) +++ user/delphij/zfs-arc-rebase/bin/cp/utils.c Fri Apr 17 00:28:35 2015 (r281634) @@ -342,7 +342,7 @@ setfile(struct stat *fs, int fd) tspec[0] = fs->st_atim; tspec[1] = fs->st_mtim; - if (utimensat(AT_FDCWD, to.p_path, tspec, + if (fdval ? futimens(fd, tspec) : utimensat(AT_FDCWD, to.p_path, tspec, islink ? AT_SYMLINK_NOFOLLOW : 0)) { warn("utimensat: %s", to.p_path); rval = 1; Modified: user/delphij/zfs-arc-rebase/bin/csh/config.h ============================================================================== --- user/delphij/zfs-arc-rebase/bin/csh/config.h Fri Apr 17 00:16:28 2015 (r281633) +++ user/delphij/zfs-arc-rebase/bin/csh/config.h Fri Apr 17 00:28:35 2015 (r281634) @@ -198,7 +198,7 @@ #define HAVE_WCWIDTH 1 /* Define as const if the declaration of iconv() needs const. */ -#define ICONV_CONST const +#define ICONV_CONST /* Support NLS. */ #define NLS 1 Modified: user/delphij/zfs-arc-rebase/bin/csh/iconv_stub.h ============================================================================== --- user/delphij/zfs-arc-rebase/bin/csh/iconv_stub.h Fri Apr 17 00:16:28 2015 (r281633) +++ user/delphij/zfs-arc-rebase/bin/csh/iconv_stub.h Fri Apr 17 00:28:35 2015 (r281634) @@ -30,7 +30,7 @@ #define _ICONV_H_ typedef void *iconv_t; -typedef size_t dl_iconv_t(iconv_t, const char **, size_t *, char **, size_t *); +typedef size_t dl_iconv_t(iconv_t, char **, size_t *, char **, size_t *); typedef int dl_iconv_close_t(iconv_t); extern iconv_t dl_iconv_open(const char *, const char *); Modified: user/delphij/zfs-arc-rebase/bin/expr/Makefile ============================================================================== --- user/delphij/zfs-arc-rebase/bin/expr/Makefile Fri Apr 17 00:16:28 2015 (r281633) +++ user/delphij/zfs-arc-rebase/bin/expr/Makefile Fri Apr 17 00:28:35 2015 (r281634) @@ -6,6 +6,9 @@ PROG= expr SRCS= expr.y YFLAGS= +# expr relies on signed integer wrapping +CFLAGS+= -fwrapv + NO_WMISSING_VARIABLE_DECLARATIONS= .if ${MK_TESTS} != "no" Modified: user/delphij/zfs-arc-rebase/bin/mv/mv.c ============================================================================== --- user/delphij/zfs-arc-rebase/bin/mv/mv.c Fri Apr 17 00:16:28 2015 (r281633) +++ user/delphij/zfs-arc-rebase/bin/mv/mv.c Fri Apr 17 00:28:35 2015 (r281634) @@ -352,7 +352,7 @@ err: if (unlink(to)) ts[0] = sbp->st_atim; ts[1] = sbp->st_mtim; - if (utimensat(AT_FDCWD, to, ts, 0)) + if (futimens(to_fd, ts)) warn("%s: set times", to); if (close(to_fd)) { Modified: user/delphij/zfs-arc-rebase/bin/pax/ar_io.c ============================================================================== --- user/delphij/zfs-arc-rebase/bin/pax/ar_io.c Fri Apr 17 00:16:28 2015 (r281633) +++ user/delphij/zfs-arc-rebase/bin/pax/ar_io.c Fri Apr 17 00:28:35 2015 (r281634) @@ -82,7 +82,7 @@ static int wr_trail = 1; /* trailer was static int can_unlnk = 0; /* do we unlink null archives? */ const char *arcname; /* printable name of archive */ const char *gzip_program; /* name of gzip program */ -static pid_t zpid = -1; /* pid of child process */ +static pid_t zpid = -1; /* pid of child process */ static int get_phys(void); static void ar_start_gzip(int, const char *, int); @@ -1123,7 +1123,7 @@ ar_next(void) if (sigprocmask(SIG_SETMASK, &o_mask, NULL) < 0) syswarn(0, errno, "Unable to restore signal mask"); - if (done || !wr_trail || strcmp(NM_TAR, argv0) == 0) + if (done || !wr_trail || Oflag || strcmp(NM_TAR, argv0) == 0) return(-1); tty_prnt("\nATTENTION! %s archive volume change required.\n", argv0); Modified: user/delphij/zfs-arc-rebase/bin/pax/extern.h ============================================================================== --- user/delphij/zfs-arc-rebase/bin/pax/extern.h Fri Apr 17 00:16:28 2015 (r281633) +++ user/delphij/zfs-arc-rebase/bin/pax/extern.h Fri Apr 17 00:28:35 2015 (r281634) @@ -217,6 +217,7 @@ extern int vflag; extern int Dflag; extern int Hflag; extern int Lflag; +extern int Oflag; extern int Xflag; extern int Yflag; extern int Zflag; Modified: user/delphij/zfs-arc-rebase/bin/pax/options.c ============================================================================== --- user/delphij/zfs-arc-rebase/bin/pax/options.c Fri Apr 17 00:16:28 2015 (r281633) +++ user/delphij/zfs-arc-rebase/bin/pax/options.c Fri Apr 17 00:28:35 2015 (r281634) @@ -194,7 +194,7 @@ pax_options(int argc, char **argv) /* * process option flags */ - while ((c=getopt(argc,argv,"ab:cdf:iklno:p:rs:tuvwx:zB:DE:G:HLPT:U:XYZ")) + while ((c=getopt(argc,argv,"ab:cdf:iklno:p:rs:tuvwx:zB:DE:G:HLOPT:U:XYZ")) != -1) { switch (c) { case 'a': @@ -447,6 +447,12 @@ pax_options(int argc, char **argv) Lflag = 1; flg |= CLF; break; + case 'O': + /* + * Force one volume. Non standard option. + */ + Oflag = 1; + break; case 'P': /* * do NOT follow symlinks (default) @@ -584,7 +590,7 @@ tar_options(int argc, char **argv) { int c; int fstdin = 0; - int Oflag = 0; + int tar_Oflag = 0; int nincfiles = 0; int incfiles_max = 0; struct incfile { @@ -664,7 +670,7 @@ tar_options(int argc, char **argv) if (opt_add("write_opt=nodir") < 0) tar_usage(); case 'O': - Oflag = 1; + tar_Oflag = 1; break; case 'p': /* @@ -820,8 +826,8 @@ tar_options(int argc, char **argv) * (unless -o specified) */ if (act == ARCHIVE || act == APPND) - frmt = &(fsub[Oflag ? F_OTAR : F_TAR]); - else if (Oflag) { + frmt = &(fsub[tar_Oflag ? F_OTAR : F_TAR]); + else if (tar_Oflag) { paxwarn(1, "The -O/-o options are only valid when writing an archive"); tar_usage(); /* only valid when writing */ } @@ -1526,25 +1532,25 @@ no_op(void) void pax_usage(void) { - (void)fputs("usage: pax [-cdnvz] [-E limit] [-f archive] ", stderr); + (void)fputs("usage: pax [-cdnOvz] [-E limit] [-f archive] ", stderr); (void)fputs("[-s replstr] ... [-U user] ...", stderr); (void)fputs("\n [-G group] ... ", stderr); (void)fputs("[-T [from_date][,to_date]] ... ", stderr); (void)fputs("[pattern ...]\n", stderr); - (void)fputs(" pax -r [-cdiknuvzDYZ] [-E limit] ", stderr); + (void)fputs(" pax -r [-cdiknOuvzDYZ] [-E limit] ", stderr); (void)fputs("[-f archive] [-o options] ... \n", stderr); (void)fputs(" [-p string] ... [-s replstr] ... ", stderr); (void)fputs("[-U user] ... [-G group] ...\n ", stderr); (void)fputs("[-T [from_date][,to_date]] ... ", stderr); (void)fputs(" [pattern ...]\n", stderr); - (void)fputs(" pax -w [-dituvzHLPX] [-b blocksize] ", stderr); + (void)fputs(" pax -w [-dituvzHLOPX] [-b blocksize] ", stderr); (void)fputs("[ [-a] [-f archive] ] [-x format] \n", stderr); (void)fputs(" [-B bytes] [-s replstr] ... ", stderr); (void)fputs("[-o options] ... [-U user] ...", stderr); (void)fputs("\n [-G group] ... ", stderr); (void)fputs("[-T [from_date][,to_date][/[c][m]]] ... ", stderr); (void)fputs("[file ...]\n", stderr); - (void)fputs(" pax -r -w [-diklntuvDHLPXYZ] ", stderr); + (void)fputs(" pax -r -w [-diklntuvDHLOPXYZ] ", stderr); (void)fputs("[-p string] ... [-s replstr] ...", stderr); (void)fputs("\n [-U user] ... [-G group] ... ", stderr); (void)fputs("[-T [from_date][,to_date][/[c][m]]] ... ", stderr); Modified: user/delphij/zfs-arc-rebase/bin/pax/pax.1 ============================================================================== --- user/delphij/zfs-arc-rebase/bin/pax/pax.1 Fri Apr 17 00:16:28 2015 (r281633) +++ user/delphij/zfs-arc-rebase/bin/pax/pax.1 Fri Apr 17 00:28:35 2015 (r281634) @@ -33,7 +33,7 @@ .\" @(#)pax.1 8.4 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" -.Dd December 21, 2013 +.Dd March 17, 2015 .Dt PAX 1 .Os .Sh NAME @@ -41,7 +41,7 @@ .Nd read and write file archives and copy directory hierarchies .Sh SYNOPSIS .Nm -.Op Fl cdnvz +.Op Fl cdnvzO .Bk -words .Op Fl f Ar archive .Ek @@ -68,7 +68,7 @@ .Op Ar pattern ...\& .Nm .Fl r -.Op Fl cdiknuvzDYZ +.Op Fl cdiknuvzDOYZ .Bk -words .Op Fl f Ar archive .Ek @@ -104,7 +104,7 @@ .Op Ar pattern ...\& .Nm .Fl w -.Op Fl dituvzHLPX +.Op Fl dituvzHLOPX .Bk -words .Op Fl b Ar blocksize .Ek @@ -147,7 +147,7 @@ .Nm .Fl r .Fl w -.Op Fl diklntuvDHLPXYZ +.Op Fl diklntuvDHLOPXYZ .Bk -words .Op Fl p Ar string .Ar ...\& @@ -853,6 +853,13 @@ Follow only command line symbolic links system traversal. .It Fl L Follow all symbolic links to perform a logical file system traversal. +.It Fl O +Force the archive to be one volume. +If a volume ends prematurely, +.Nm +will not prompt for a new volume. +This option can be useful for +automated tasks where error recovery cannot be performed by a human. .It Fl P Do not follow symbolic links, perform a physical file system traversal. This is the default mode. @@ -1176,6 +1183,7 @@ The options .Fl G , .Fl H , .Fl L , +.Fl O , .Fl P , .Fl T , .Fl U , Modified: user/delphij/zfs-arc-rebase/bin/pax/pax.c ============================================================================== --- user/delphij/zfs-arc-rebase/bin/pax/pax.c Fri Apr 17 00:16:28 2015 (r281633) +++ user/delphij/zfs-arc-rebase/bin/pax/pax.c Fri Apr 17 00:28:35 2015 (r281634) @@ -85,6 +85,7 @@ int vflag; /* produce verbose output * int Dflag; /* same as uflag except inode change time */ int Hflag; /* follow command line symlinks (write only) */ int Lflag; /* follow symlinks when writing */ +int Oflag; /* limit to single volume */ int Xflag; /* archive files with same device id only */ int Yflag; /* same as Dflg except after name mode */ int Zflag; /* same as uflg except after name mode */ Modified: user/delphij/zfs-arc-rebase/bin/sh/tests/expansion/Makefile ============================================================================== --- user/delphij/zfs-arc-rebase/bin/sh/tests/expansion/Makefile Fri Apr 17 00:16:28 2015 (r281633) +++ user/delphij/zfs-arc-rebase/bin/sh/tests/expansion/Makefile Fri Apr 17 00:28:35 2015 (r281634) @@ -49,6 +49,8 @@ FILES+= ifs2.0 FILES+= ifs3.0 FILES+= ifs4.0 FILES+= ifs5.0 +FILES+= ifs6.0 +FILES+= ifs7.0 FILES+= length1.0 FILES+= length2.0 FILES+= length3.0 Copied: user/delphij/zfs-arc-rebase/bin/sh/tests/expansion/ifs6.0 (from r281633, head/bin/sh/tests/expansion/ifs6.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/delphij/zfs-arc-rebase/bin/sh/tests/expansion/ifs6.0 Fri Apr 17 00:28:35 2015 (r281634, copy of r281633, head/bin/sh/tests/expansion/ifs6.0) @@ -0,0 +1,6 @@ +# $FreeBSD$ + +IFS=': ' +x=': :' +set -- $x +[ "$#|$1|$2|$3" = "2|||" ] Copied: user/delphij/zfs-arc-rebase/bin/sh/tests/expansion/ifs7.0 (from r281633, head/bin/sh/tests/expansion/ifs7.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/delphij/zfs-arc-rebase/bin/sh/tests/expansion/ifs7.0 Fri Apr 17 00:28:35 2015 (r281634, copy of r281633, head/bin/sh/tests/expansion/ifs7.0) @@ -0,0 +1,5 @@ +# $FreeBSD$ + +IFS=2 +set -- $((123)) +[ "$#|$1|$2|$3" = "2|1|3|" ] Modified: user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d ============================================================================== --- user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d Fri Apr 17 00:16:28 2015 (r281633) +++ user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d Fri Apr 17 00:28:35 2015 (r281634) @@ -35,11 +35,11 @@ BEGIN this->b = -2; system("echo %s %d %d", "foo", this->a, this->b); - system("ping localhost"); + system("ping -q -c 1 localhost 2>/dev/null | grep -v '^round-trip '"); system("echo %d", ++this->a); - system("ping localhost"); + system("ping -q -c 1 localhost 2>/dev/null | grep -v '^round-trip '"); system("echo %d", ++this->a); - system("ping localhost"); + system("ping -q -c 1 localhost 2>/dev/null | grep -v '^round-trip '"); system("echo %d", ++this->a); exit(0); } Modified: user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d.out ============================================================================== --- user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d.out Fri Apr 17 00:16:28 2015 (r281633) +++ user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d.out Fri Apr 17 00:28:35 2015 (r281634) @@ -1,8 +1,17 @@ foo 9 -2 -localhost is alive +PING localhost (127.0.0.1): 56 data bytes + +--- localhost ping statistics --- +1 packets transmitted, 1 packets received, 0.0% packet loss 10 -localhost is alive +PING localhost (127.0.0.1): 56 data bytes + +--- localhost ping statistics --- +1 packets transmitted, 1 packets received, 0.0% packet loss 11 -localhost is alive +PING localhost (127.0.0.1): 56 data bytes + +--- localhost ping statistics --- +1 packets transmitted, 1 packets received, 0.0% packet loss 12 Modified: user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localicmp.ksh ============================================================================== --- user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localicmp.ksh Fri Apr 17 00:16:28 2015 (r281633) +++ user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localicmp.ksh Fri Apr 17 00:28:35 2015 (r281634) @@ -45,12 +45,13 @@ fi dtrace=$1 local=127.0.0.1 -$dtrace -c "/sbin/ping $local 3" -qs /dev/stdin <ip_saddr == "$local" && args[2]->ip_daddr == "$local" && args[4]->ipv4_protocol == IPPROTO_ICMP/ { - printf("1 ip:::send ("); + printf("2 ip:::send ("); printf("args[2]: %d %d, ", args[2]->ip_ver, args[2]->ip_plength); printf("args[4]: %d %d %d %d %d)\n", args[4]->ipv4_ver, args[4]->ipv4_length, args[4]->ipv4_flags, @@ -61,7 +62,7 @@ ip:::receive /args[2]->ip_saddr == "$local" && args[2]->ip_daddr == "$local" && args[4]->ipv4_protocol == IPPROTO_ICMP/ { - printf("2 ip:::receive ("); + printf("3 ip:::receive ("); printf("args[2]: %d %d, ", args[2]->ip_ver, args[2]->ip_plength); printf("args[4]: %d %d %d %d %d)\n", args[4]->ipv4_ver, args[4]->ipv4_length, args[4]->ipv4_flags, Modified: user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localicmp.ksh.out ============================================================================== --- user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localicmp.ksh.out Fri Apr 17 00:16:28 2015 (r281633) +++ user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localicmp.ksh.out Fri Apr 17 00:28:35 2015 (r281634) @@ -1,6 +1,8 @@ -1 ip:::send (args[2]: 4 64, args[4]: 4 84 0 0 255) -1 ip:::send (args[2]: 4 64, args[4]: 4 84 0 0 255) -2 ip:::receive (args[2]: 4 64, args[4]: 4 84 0 0 255) -2 ip:::receive (args[2]: 4 64, args[4]: 4 84 0 0 255) -127.0.0.1 is alive + +PING 127.0.0.1 (127.0.0.1): 56 data bytes +1 packets transmitted, 1 packets received, 0.0% packet loss +2 ip:::send (args[2]: 4 64, args[4]: 4 84 0 0 64) +2 ip:::send (args[2]: 4 64, args[4]: 4 84 0 0 64) +3 ip:::receive (args[2]: 4 64, args[4]: 4 84 0 0 64) +3 ip:::receive (args[2]: 4 64, args[4]: 4 84 0 0 64) Modified: user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localtcp.ksh ============================================================================== --- user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localtcp.ksh Fri Apr 17 00:16:28 2015 (r281633) +++ user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localtcp.ksh Fri Apr 17 00:28:35 2015 (r281634) @@ -73,6 +73,7 @@ cat > test.pl <<-EOPERL Timeout => 3); die "Could not connect to host $local port $tcpport" unless \$s; close \$s; + sleep(2); EOPERL $dtrace -c '/usr/bin/perl test.pl' -qs /dev/stdin < test.pl <<-EOPERL Timeout => 3); die "Could not connect to host $dest port $tcpport" unless \$s; close \$s; + sleep(2); EOPERL $dtrace -c '/usr/bin/perl test.pl' -qs /dev/stdin <ip_saddr == "$local" && args[2]->ip_daddr == "$local" && args[5]->ipv6_nexthdr == IPPROTO_ICMPV6/ { - printf("1 ip:::send ("); + printf("2 ip:::send ("); printf("args[2]: %d %d, ", args[2]->ip_ver, args[2]->ip_plength); printf("args[5]: %d %d %d)\n", args[5]->ipv6_ver, args[5]->ipv6_tclass, args[5]->ipv6_plen); @@ -70,7 +71,7 @@ ip:::receive /args[2]->ip_saddr == "$local" && args[2]->ip_daddr == "$local" && args[5]->ipv6_nexthdr == IPPROTO_ICMPV6/ { - printf("2 ip:::receive ("); + printf("3 ip:::receive ("); printf("args[2]: %d %d, ", args[2]->ip_ver, args[2]->ip_plength); printf("args[5]: %d %d %d)\n", args[5]->ipv6_ver, args[5]->ipv6_tclass, args[5]->ipv6_plen); Modified: user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv6localicmp.ksh.out ============================================================================== --- user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv6localicmp.ksh.out Fri Apr 17 00:16:28 2015 (r281633) +++ user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv6localicmp.ksh.out Fri Apr 17 00:28:35 2015 (r281634) @@ -1,6 +1,8 @@ -::1 is alive -1 ip:::send (args[2]: 6 64, args[5]: 6 0 64) -1 ip:::send (args[2]: 6 64, args[5]: 6 0 64) -2 ip:::receive (args[2]: 6 64, args[5]: 6 0 64) -2 ip:::receive (args[2]: 6 64, args[5]: 6 0 64) + +PING6(56=40+8+8 bytes) ::1 --> ::1 +1 packets transmitted, 1 packets received, 0.0% packet loss +2 ip:::send (args[2]: 6 16, args[5]: 6 0 16) +2 ip:::send (args[2]: 6 16, args[5]: 6 0 16) +3 ip:::receive (args[2]: 6 16, args[5]: 6 0 16) +3 ip:::receive (args[2]: 6 16, args[5]: 6 0 16) Modified: user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.localtcpstate.ksh ============================================================================== --- user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.localtcpstate.ksh Fri Apr 17 00:16:28 2015 (r281633) +++ user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.localtcpstate.ksh Fri Apr 17 00:28:35 2015 (r281634) @@ -79,6 +79,7 @@ cat > test.pl <<-EOPERL die "Could not connect to host $local port $tcpport" unless \$s; print \$s "testing state machine transitions"; close \$s; + sleep(2); EOPERL $dtrace -c '/usr/bin/perl test.pl' -qs /dev/stdin < test.pl <<-EOPERL die "Could not connect to host $dest port $tcpport" unless \$s; print \$s "testing state machine transitions"; close \$s; + sleep(2); EOPERL $dtrace -c '/usr/bin/perl test.pl' -qs /dev/stdin <e_type == ET_DYN ? (uintptr_t) lmp->l_addr : 0; +#ifdef __FreeBSD__ + dh.dofhp_pid = getpid(); +#endif if (lmid == 0) { (void) snprintf(dh.dofhp_mod, sizeof (dh.dofhp_mod), @@ -184,7 +187,7 @@ dtrace_dof_init(void) else { dprintf(1, "DTrace ioctl succeeded for DOF at %p\n", dof); #ifdef __FreeBSD__ - gen = dh.gen; + gen = dh.dofhp_gen; #endif } Modified: user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c ============================================================================== --- user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c Fri Apr 17 00:16:28 2015 (r281633) +++ user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c Fri Apr 17 00:28:35 2015 (r281634) @@ -727,8 +727,8 @@ dt_print_packed(dtrace_hdl_t *dtp, FILE utf8 = B_TRUE; } else if ((term = getenv("TERM")) != NULL && (strcmp(term, "sun") == 0 || - strcmp(term, "sun-color") == 0) || - strcmp(term, "dumb") == 0) { + strcmp(term, "sun-color") == 0 || + strcmp(term, "dumb") == 0)) { utf8 = B_FALSE; } else { utf8 = B_TRUE; Modified: user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c ============================================================================== --- user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Fri Apr 17 00:16:28 2015 (r281633) +++ user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Fri Apr 17 00:28:35 2015 (r281634) @@ -1785,11 +1785,17 @@ dtrace_program_link(dtrace_hdl_t *dtp, d "failed to open %s: %s", file, strerror(errno))); } #else - snprintf(tfile, sizeof(tfile), "%s.XXXXXX", file); - if ((fd = mkstemp(tfile)) == -1) - return (dt_link_error(dtp, NULL, -1, NULL, - "failed to create temporary file %s: %s", - tfile, strerror(errno))); + if (dtp->dt_lazyload) { + if ((fd = open(file, O_RDWR | O_CREAT | O_TRUNC, 0666)) < 0) + return (dt_link_error(dtp, NULL, -1, NULL, + "failed to open %s: %s", file, strerror(errno))); + } else { + snprintf(tfile, sizeof(tfile), "%s.XXXXXX", file); + if ((fd = mkstemp(tfile)) == -1) + return (dt_link_error(dtp, NULL, -1, NULL, + "failed to create temporary file %s: %s", + tfile, strerror(errno))); + } #endif /* Modified: user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c ============================================================================== --- user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c Fri Apr 17 00:16:28 2015 (r281633) +++ user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c Fri Apr 17 00:28:35 2015 (r281634) @@ -44,10 +44,15 @@ #include #include #include +#include + #ifndef illumos +#include +#include #include +#include +#include #endif -#include typedef struct dt_pid_probe { dtrace_hdl_t *dpp_dtp; @@ -566,6 +571,12 @@ dt_pid_usdt_mapping(void *data, const pr prsyminfo_t sip; dof_helper_t dh; GElf_Half e_type; +#ifdef __FreeBSD__ + dof_hdr_t hdr; + size_t sz; + uint64_t dofmax; + void *dof; +#endif const char *mname; const char *syms[] = { "___SUNW_dof", "__SUNW_dof" }; int i, fd = -1; @@ -595,17 +606,61 @@ dt_pid_usdt_mapping(void *data, const pr continue; } - dh.dofhp_dof = sym.st_value; +#ifdef __FreeBSD__ dh.dofhp_addr = (e_type == ET_EXEC) ? 0 : pmp->pr_vaddr; + if (Pread(P, &hdr, sizeof (hdr), sym.st_value) != + sizeof (hdr)) { + dt_dprintf("read of DOF header failed\n"); + continue; + } + + sz = sizeof(dofmax); + if (sysctlbyname("kern.dtrace.dof_maxsize", &dofmax, &sz, + NULL, 0) != 0) { + dt_dprintf("failed to read dof_maxsize: %s\n", + strerror(errno)); + continue; + } + if (dofmax < hdr.dofh_loadsz) { + dt_dprintf("DOF load size exceeds maximum\n"); + continue; + } + + if ((dof = malloc(hdr.dofh_loadsz)) == NULL) + return (-1); + + if (Pread(P, dof, hdr.dofh_loadsz, sym.st_value) != + hdr.dofh_loadsz) { + free(dof); + dt_dprintf("read of DOF section failed\n"); + continue; + } + + dh.dofhp_dof = (uintptr_t)dof; + dh.dofhp_pid = proc_getpid(P); dt_pid_objname(dh.dofhp_mod, sizeof (dh.dofhp_mod), -#ifdef illumos sip.prs_lmid, mname); + + if (fd == -1 && + (fd = open("/dev/dtrace/helper", O_RDWR, 0)) < 0) { + dt_dprintf("open of helper device failed: %s\n", + strerror(errno)); + free(dof); + return (-1); /* errno is set for us */ + } + + if (ioctl(fd, DTRACEHIOC_ADDDOF, &dh, sizeof (dh)) < 0) + dt_dprintf("DOF was rejected for %s\n", dh.dofhp_mod); + + free(dof); #else - 0, mname); -#endif + dh.dofhp_dof = sym.st_value; + dh.dofhp_addr = (e_type == ET_EXEC) ? 0 : pmp->pr_vaddr; + + dt_pid_objname(dh.dofhp_mod, sizeof (dh.dofhp_mod), + sip.prs_lmid, mname); -#ifdef illumos if (fd == -1 && (fd = pr_open(P, "/dev/dtrace/helper", O_RDWR, 0)) < 0) { dt_dprintf("pr_open of helper device failed: %s\n", @@ -618,8 +673,10 @@ dt_pid_usdt_mapping(void *data, const pr #endif } -#ifdef illumos if (fd != -1) +#ifdef __FreeBSD__ + (void) close(fd); +#else (void) pr_close(P, fd); #endif @@ -634,7 +691,6 @@ dt_pid_create_usdt_probes(dtrace_probede int ret = 0; assert(DT_MUTEX_HELD(&dpr->dpr_lock)); -#ifdef illumos (void) Pupdate_maps(P); if (Pobject_iter(P, dt_pid_usdt_mapping, P) != 0) { ret = -1; @@ -646,9 +702,6 @@ dt_pid_create_usdt_probes(dtrace_probede (int)proc_getpid(P), strerror(errno)); #endif } -#else - ret = 0; -#endif /* * Put the module name in its canonical form. Modified: user/delphij/zfs-arc-rebase/cddl/lib/libdtrace/libproc_compat.h ============================================================================== --- user/delphij/zfs-arc-rebase/cddl/lib/libdtrace/libproc_compat.h Fri Apr 17 00:16:28 2015 (r281633) +++ user/delphij/zfs-arc-rebase/cddl/lib/libdtrace/libproc_compat.h Fri Apr 17 00:28:35 2015 (r281634) @@ -59,6 +59,6 @@ #define Pstate proc_state #define Psymbol_iter_by_addr proc_iter_symbyaddr #define Punsetflags proc_clearflags -#define Pupdate_maps(p) do { } while (0) +#define Pupdate_maps proc_rdagent #define Pupdate_syms proc_updatesyms #define Pxecbkpt proc_bkptexec Modified: user/delphij/zfs-arc-rebase/cddl/usr.bin/ctfmerge/Makefile ============================================================================== --- user/delphij/zfs-arc-rebase/cddl/usr.bin/ctfmerge/Makefile Fri Apr 17 00:16:28 2015 (r281633) +++ user/delphij/zfs-arc-rebase/cddl/usr.bin/ctfmerge/Makefile Fri Apr 17 00:28:35 2015 (r281634) @@ -33,7 +33,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common -DPADD= ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD} -LDADD= -ldwarf -lelf -lz -lpthread +LIBADD= elf z pthread .include Modified: user/delphij/zfs-arc-rebase/cddl/usr.sbin/dtrace/tests/Makefile ============================================================================== --- user/delphij/zfs-arc-rebase/cddl/usr.sbin/dtrace/tests/Makefile Fri Apr 17 00:16:28 2015 (r281633) +++ user/delphij/zfs-arc-rebase/cddl/usr.sbin/dtrace/tests/Makefile Fri Apr 17 00:28:35 2015 (r281634) @@ -8,10 +8,8 @@ TESTS_SUBDIRS+= common .PATH: ${.CURDIR:H:H:H:H}/tests KYUAFILE= YES -.PATH: ${.CURDIR:H:H:H}/contrib/opensolaris/cmd/dtrace/test/cmd/scripts +.PATH: ${.CURDIR}/tools SCRIPTSDIR= ${TESTSDIR} -SCRIPTS= dtest.pl - -SUBDIR_PARALLEL= +SCRIPTS= dtest.sh .include Modified: user/delphij/zfs-arc-rebase/cddl/usr.sbin/dtrace/tests/Makefile.inc1 ============================================================================== --- user/delphij/zfs-arc-rebase/cddl/usr.sbin/dtrace/tests/Makefile.inc1 Fri Apr 17 00:16:28 2015 (r281633) +++ user/delphij/zfs-arc-rebase/cddl/usr.sbin/dtrace/tests/Makefile.inc1 Fri Apr 17 00:28:35 2015 (r281634) @@ -16,7 +16,6 @@ ${TESTGROUP}EXEDIR= ${TESTSDIR} TESTWRAPPER= t_dtrace_contrib ATF_TESTS_SH+= ${TESTWRAPPER} -TEST_METADATA.t_dtrace_contrib+= required_files="/usr/local/bin/perl" TEST_METADATA.t_dtrace_contrib+= required_files="/usr/local/bin/ksh" TEST_METADATA.t_dtrace_contrib+= required_user="root" Copied: user/delphij/zfs-arc-rebase/cddl/usr.sbin/dtrace/tests/tools/dtest.sh (from r281633, head/cddl/usr.sbin/dtrace/tests/tools/dtest.sh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/delphij/zfs-arc-rebase/cddl/usr.sbin/dtrace/tests/tools/dtest.sh Fri Apr 17 00:28:35 2015 (r281634, copy of r281633, head/cddl/usr.sbin/dtrace/tests/tools/dtest.sh) @@ -0,0 +1,129 @@ +# $FreeBSD$ + +usage() +{ + cat >&2 <<__EOF__ +A harness for test cases in the DTrace test suite. + +usage: $(basename $0) +__EOF__ + exit 1 +} + +gettag() +{ + local tag + + tag=$(basename $1) + tag=${tag#*.} + tag=${tag%%[a-z.]*} + echo $tag +} + +runtest() +{ + local dflags exe exstatus pid retval status + + exstatus=0 + retval=0 + + case $TFILE in + drp.DTRACEDROP_*.d|err.*.d|tst.*.d) + case $TFILE in + drp.DTRACEDROP_*.d) + dflags="-x droptags" + tag=$(gettag "$TFILE") + ;; + err.D_*.d) + exstatus=1 + dflags="-x errtags" + tag=$(gettag "$TFILE") + ;; + err.*.d) + exstatus=1 + ;; + esac + + exe=${TFILE%.*}.exe + if [ -f "$exe" -a -x "$exe" ]; then + ./$exe & + pid=$! + dflags="$dflags ${pid}" + fi *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@FreeBSD.ORG Fri Apr 17 00:38:21 2015 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3EECE99; Fri, 17 Apr 2015 00:38: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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 29EAFF0B; Fri, 17 Apr 2015 00:38:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3H0cLbG087127; Fri, 17 Apr 2015 00:38:21 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3H0cLmg087126; Fri, 17 Apr 2015 00:38:21 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201504170038.t3H0cLmg087126@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Fri, 17 Apr 2015 00:38:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281635 - user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs 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.20 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, 17 Apr 2015 00:38:21 -0000 Author: delphij Date: Fri Apr 17 00:38:20 2015 New Revision: 281635 URL: https://svnweb.freebsd.org/changeset/base/281635 Log: Fixup r281634 by adapting r281026 to the form of r280198 (MFV r280198). Modified: user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Modified: user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c ============================================================================== --- user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Fri Apr 17 00:28:35 2015 (r281634) +++ user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Fri Apr 17 00:38:20 2015 (r281635) @@ -3006,11 +3006,15 @@ arc_available_memory(void) * Above limits know nothing about real level of KVA fragmentation. * Start aggressive reclamation if too little sequential KVA left. */ - if (vmem_size(heap_arena, VMEM_MAXFREE) < zfs_max_recordsize) { + n = vmem_size(heap_arena, VMEM_MAXFREE) - zfs_max_recordsize; + if (n < 0) { DTRACE_PROBE2(arc__reclaim_maxfree, uint64_t, vmem_size(heap_arena, VMEM_MAXFREE), uint64_t, zfs_max_recordsize); - return (1); + if (n < lowest) { + lowest = n; + r = FMR_ZIO_ARENA; + } } #else /* _KERNEL */ From owner-svn-src-user@FreeBSD.ORG Fri Apr 17 01:22:46 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0AA07788; Fri, 17 Apr 2015 01:22:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E83AD671; Fri, 17 Apr 2015 01:22:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3H1Mj61009922; Fri, 17 Apr 2015 01:22:45 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3H1Mh7W009912; Fri, 17 Apr 2015 01:22:43 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201504170122.t3H1Mh7W009912@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Fri, 17 Apr 2015 01:22:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281636 - in user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs: . sys 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.20 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, 17 Apr 2015 01:22:46 -0000 Author: delphij Date: Fri Apr 17 01:22:43 2015 New Revision: 281636 URL: https://svnweb.freebsd.org/changeset/base/281636 Log: MFV r277428: Various improvements the dmu buf user API. Submitted by: Justin Gibbs Submitted by: Will Andrews Sponsored by: Spectra Logic Corporation Collect dmu buf user API support data into a new structure, dmu_buf_user_t. Consumers of this interface must include a dmu_buf_user_t as a member of the user data structure that will be attached to a dmu buffer. This reduces the size of dmu_buf_impl_t by two pointers. Queue dmu buf user eviction processing to a taskq. This prevents FreeBSD witness(4) lock-order reversal warnings, potential deadlocks, and reduces stack depth. Convert objset eviction from a synchronous to an asynchronous process to accommodate the asynchronous invocation, via dmu buf user eviction, of dnode_buf_pageout(). Modify existing users of the dmu buf user API to never access the dbuf to which their data was attached after user eviction has occurred. Accessing the dbuf from the callback is no longer safe now that callbacks occur without the locks that used to protect them. Enforce this in ZFS_DEBUG kernel builds by clearing the user's pointer to the dbuf, if any, at the time of eviction. Callbacks have also been modified to clear their dbuf pointer so most errors are caught even on non ZFS_DEBUG kernels. However, this will not catch accesses from other contexts that occur between the time of eviction and the processing of the callback. Clarify programmer intent and improve readability by providing specialized functions for the common user data update actions "remove" and "replace". Provide code-comment documentation for each API call. Perform runtime validation of proper API usage on ZFS_DEBUG kernels. uts/common/fs/zfs/sys/dbuf.h: uts/common/fs/zfs/dbuf.c: Add dbuf_verify_user() and call it from the dbuf user API and during dbuf eviction processing to verify dbuf user API state. Replace calls to dbuf_set_data(db, NULL) with more explicit db_clear_data(). dbuf_set_data() now asserts that its buffer argument is never NULL. Implement new dmu buf API functions. Add the dmu_evict_taskq for processing dmu buf user evictions. Add dmu_buf_user_evict_wait() which allows spa, dsl pool, and dmu close/fini functions to drain pending user evictions. In dbuf_rele_and_unlock(), immediately evict dbufs with a zero refcount for an objset that is being evicted. This allows the indirect dbufs in a dnode to be evicted asynchronously after the zero refcount dbufs that reference them are cleared via dmu_objset_evict()->dnode_evict_dbufs(). uts/common/fs/zfs/sys/dmu_objset.h: uts/common/fs/zfs/dmu_objset.c: End the practice of including special dnodes in os->os_dnodes. This allows os->os_dnodes to be managed completely by one eviction path: dnode_buf_pageout()->dnode_destroy(). Split objset eviction processing into two pieces. The first marks the objset as evicting, evicts any dbufs that have a refcount of zero, and then queues up the objset for the second phase of eviction. Once os->os_dnodes has been cleared by dnode_buf_pageout()->dnode_destroy(), the second phase is executed. The second phase closes the special dnodes, dequeues the objset from the list of those undergoing eviction, and finally frees the objset. NOTE: Due to asynchronous eviction processing (invocation of dnode_buf_pageout()), it is possible for the meta dnode for the objset to have no holds even though os->os_dnodes is not empty. uts/common/fs/zfs/sys/dnode.h: uts/common/fs/zfs/dnode.c: Collapse the initialization of a dnode from dnode_hold_impl() into dnode_create(). Since we already grab os_lock, use it to provide mutual exclusion for dnh->dnh_dnode and to arbitrate the winner of the initial open race. The only way to unset the handle is to page out an entire set of dnodes, which uses the user eviction mechanism to arbitrate. In dnode_destroy(), invoke final stage of objset eviction if the destroyed dnode is the last regular dnode in the objset. Modify dnode_buf_pageout() so that it doesn't reference the evicted dbuf. uts/common/fs/zfs/dnode_sync.c: In dnode_evict_dbufs(), remove multiple passes over dn->dn_dbufs. This is possible now that objset eviction is asynchronously completed in a different context once dbuf eviction completes. In the case of objset eviction, any dbufs held by children will be evicted via dbuf_rele_and_unlock() once their refcounts go to zero. Even when objset eviction is not active, the ordering of the avl tree guarantees that children will be released before parents, allowing the parent's refcounts to naturally drop to zero before they are inspected in this single loop. In dnode_sync_free(), remove assertion that the dn_bonus of a dnode is NULL when the dnode is freed. This assertion likely wasn't true before this commit (due to races with zfs_obj_to_path()), and is not a requirement for the free to be successful. Now that user eviction is asynchronous it is easy to have evictions for destroyed dsl dirs and datasets still outstanding at the time their dnode is freed. uts/common/fs/zfs/sys/spa.h: uts/common/fs/zfs/sys/spa_impl.h: uts/common/fs/zfs/spa.c: uts/common/fs/zfs/spa_misc.c: Track evicting objsets in the spa. When recording or validating the min spa reference count, wait for objset eviction processing to complete so that the reference count is stable. uts/common/fs/zfs/sys/spa.h: uts/common/fs/zfs/sys/dsl_dir.h: uts/common/fs/zfs/spa_misc.c: uts/common/fs/zfs/dsl_dir.c: Add spa_async_close() and dsl_dir_async_rele(). These APIs are used during the async eviction process of dsl datasets and dirs to indicate that the normal rules for releasing a reference count on the spa do not apply. Async releases occur from a taskq without the namespace lock held and may be for objects contributing to spa_minref (e.g. during pool export). Thus these APIs do not enforce the namespace lock being held or the spa refcount being greater than spa_minref on entry. uts/common/fs/zfs/dsl_deadlist.c: uts/common/fs/zfs/dsl_dataset.c: Modify dsl_dataset_evict() so that it doesn't reference the evicted dbuf to determine if the deadlist needs to be closed. This is achieved by checking ds->ds_deadlist.dl_os instead which is now properly cleared when a deadlist is closed prior to eviction. uts/common/fs/zfs/dsl_pool.c: In dsl_pool_close(), flush the user evictions for any just released dsl dirs with a call to dmu_buf_user_evict_wait(). The dsl dirs have back references to the dsl_pool_t which are accessed during eviction so these must complete before the dsl_pool_t is destroyed. uts/common/fs/zfs/dsl_dir.c: uts/common/fs/zfs/sys/dsl_dir.h: uts/common/fs/zfs/dsl_dataset.c: uts/common/fs/zfs/sys/dsl_dataset.h: uts/common/fs/zfs/dsl_dir.c: uts/common/fs/zfs/dsl_prop.c: uts/common/fs/zfs/sa.c: uts/common/fs/zfs/sys/sa_impl.h: uts/common/fs/zfs/zap.c: uts/common/fs/zfs/sys/zap_impl.h: uts/common/fs/zfs/sys/zap_leaf.h: uts/common/fs/zfs/zap_micro.c: Conform to new dbuf user API. uts/common/fs/zfs/dsl_dir.c: In dsl_dir_hold(), change a dsl_dir_t* variable so it's type isn't confusing: child_ds -> child_dd. uts/common/fs/zfs/sys/dsl_dataset.h: uts/common/fs/zfs/dmu_objset.c: uts/common/fs/zfs/dmu_send.c: uts/common/fs/zfs/dmu_traverse.c uts/common/fs/zfs/dsl_bookmark.c: uts/common/fs/zfs/dsl_dataset.c: uts/common/fs/zfs/dsl_deleg.c: uts/common/fs/zfs/dsl_destroy.c: uts/common/fs/zfs/dsl_prop.c: uts/common/fs/zfs/dsl_scan.c: uts/common/fs/zfs/dsl_userhold.c: uts/common/fs/zfs/zil.c: Record whether or not a dsl dataset is a snapshot in the upon its creation in the ds_is_snapshot field rather than rely on access to the ds_num_children in the dsl_dataset_phys_t. This ensures that the snapshot trait can be determined during eviction processing when the dbuf holding the dsl_dataset_phys_t is no longer available. The conditional snapshot logic in dmu_objset_evict() is currently the only place where a ds_is_snapshot is tested during eviction. uts/common/fs/zfs/sys/dmu.h: Add prototypes, data structures, and code comment documentation for the dmu buf user api. Pull in ASSERT() via zfs_context.h. uts/common/fs/zfs/zfs_sa.c: Use zfs_context.h instead of manual includes of sys/types.h and sys/params.h so this file is compatible with the use of zfs_context.h in sys/dmu.h. Illumos issue: 5056 ZFS deadlock on db_mtx and dn_holds Modified: user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_bookmark.c user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deadlist.c user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/sa.h user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/sa_impl.h user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_sa.c user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c Directory Properties: user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/ (props changed) Modified: user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c ============================================================================== --- user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c Fri Apr 17 00:38:20 2015 (r281635) +++ user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c Fri Apr 17 01:22:43 2015 (r281636) @@ -24,6 +24,7 @@ * Copyright (c) 2012, 2014 by Delphix. All rights reserved. * Copyright (c) 2013 by Saso Kiselkov. All rights reserved. * Copyright (c) 2013, Joyent, Inc. All rights reserved. + * Copyright (c) 2014 Spectra Logic Corporation, All rights reserved. */ #include @@ -54,10 +55,16 @@ static void dbuf_destroy(dmu_buf_impl_t static boolean_t dbuf_undirty(dmu_buf_impl_t *db, dmu_tx_t *tx); static void dbuf_write(dbuf_dirty_record_t *dr, arc_buf_t *data, dmu_tx_t *tx); +#ifndef __lint +extern inline void dmu_buf_init_user(dmu_buf_user_t *dbu, + dmu_buf_evict_func_t *evict_func, dmu_buf_t **clear_on_evict_dbufp); +#endif /* ! __lint */ + /* * Global data structures and functions for the dbuf cache. */ static kmem_cache_t *dbuf_cache; +static taskq_t *dbu_evict_taskq; /* ARGSUSED */ static int @@ -215,17 +222,72 @@ dbuf_hash_remove(dmu_buf_impl_t *db) static arc_evict_func_t dbuf_do_evict; +typedef enum { + DBVU_EVICTING, + DBVU_NOT_EVICTING +} dbvu_verify_type_t; + +static void +dbuf_verify_user(dmu_buf_impl_t *db, dbvu_verify_type_t verify_type) +{ +#ifdef ZFS_DEBUG + int64_t holds; + + if (db->db_user == NULL) + return; + + /* Only data blocks support the attachment of user data. */ + ASSERT(db->db_level == 0); + + /* Clients must resolve a dbuf before attaching user data. */ + ASSERT(db->db.db_data != NULL); + ASSERT3U(db->db_state, ==, DB_CACHED); + + holds = refcount_count(&db->db_holds); + if (verify_type == DBVU_EVICTING) { + /* + * Immediate eviction occurs when holds == dirtycnt. + * For normal eviction buffers, holds is zero on + * eviction, except when dbuf_fix_old_data() calls + * dbuf_clear_data(). However, the hold count can grow + * during eviction even though db_mtx is held (see + * dmu_bonus_hold() for an example), so we can only + * test the generic invariant that holds >= dirtycnt. + */ + ASSERT3U(holds, >=, db->db_dirtycnt); + } else { + if (db->db_immediate_evict == TRUE) + ASSERT3U(holds, >=, db->db_dirtycnt); + else + ASSERT3U(holds, >, 0); + } +#endif +} + static void dbuf_evict_user(dmu_buf_impl_t *db) { + dmu_buf_user_t *dbu = db->db_user; + ASSERT(MUTEX_HELD(&db->db_mtx)); - if (db->db_level != 0 || db->db_evict_func == NULL) + if (dbu == NULL) return; - db->db_evict_func(&db->db, db->db_user_ptr); - db->db_user_ptr = NULL; - db->db_evict_func = NULL; + dbuf_verify_user(db, DBVU_EVICTING); + db->db_user = NULL; + +#ifdef ZFS_DEBUG + if (dbu->dbu_clear_on_evict_dbufp != NULL) + *dbu->dbu_clear_on_evict_dbufp = NULL; +#endif + + /* + * Invoke the callback from a taskq to avoid lock order reversals + * and limit stack depth. + */ + taskq_dispatch_ent(dbu_evict_taskq, dbu->dbu_evict_func, dbu, 0, + &dbu->dbu_tqent); } boolean_t @@ -286,6 +348,12 @@ retry: for (i = 0; i < DBUF_MUTEXES; i++) mutex_init(&h->hash_mutexes[i], NULL, MUTEX_DEFAULT, NULL); + + /* + * All entries are queued via taskq_dispatch_ent(), so min/maxalloc + * configuration is not required. + */ + dbu_evict_taskq = taskq_create("dbu_evict", 1, minclsyspri, 0, 0, 0); } void @@ -298,6 +366,7 @@ dbuf_fini(void) mutex_destroy(&h->hash_mutexes[i]); kmem_free(h->hash_table, (h->hash_table_mask + 1) * sizeof (void *)); kmem_cache_destroy(dbuf_cache); + taskq_destroy(dbu_evict_taskq); } /* @@ -415,21 +484,27 @@ dbuf_verify(dmu_buf_impl_t *db) #endif static void +dbuf_clear_data(dmu_buf_impl_t *db) +{ + ASSERT(MUTEX_HELD(&db->db_mtx)); + dbuf_evict_user(db); + db->db_buf = NULL; + db->db.db_data = NULL; + if (db->db_state != DB_NOFILL) + db->db_state = DB_UNCACHED; +} + +static void dbuf_set_data(dmu_buf_impl_t *db, arc_buf_t *buf) { ASSERT(MUTEX_HELD(&db->db_mtx)); + ASSERT(buf != NULL); + db->db_buf = buf; - if (buf != NULL) { - ASSERT(buf->b_data != NULL); - db->db.db_data = buf->b_data; - if (!arc_released(buf)) - arc_set_callback(buf, dbuf_do_evict, db); - } else { - dbuf_evict_user(db); - db->db.db_data = NULL; - if (db->db_state != DB_NOFILL) - db->db_state = DB_UNCACHED; - } + ASSERT(buf->b_data != NULL); + db->db.db_data = buf->b_data; + if (!arc_released(buf)) + arc_set_callback(buf, dbuf_do_evict, db); } /* @@ -451,7 +526,7 @@ dbuf_loan_arcbuf(dmu_buf_impl_t *db) } else { abuf = db->db_buf; arc_loan_inuse_buf(abuf, db); - dbuf_set_data(db, NULL); + dbuf_clear_data(db); mutex_exit(&db->db_mtx); } return (abuf); @@ -687,7 +762,7 @@ dbuf_noread(dmu_buf_impl_t *db) dbuf_set_data(db, arc_buf_alloc(spa, db->db.db_size, db, type)); db->db_state = DB_FILL; } else if (db->db_state == DB_NOFILL) { - dbuf_set_data(db, NULL); + dbuf_clear_data(db); } else { ASSERT3U(db->db_state, ==, DB_CACHED); } @@ -743,7 +818,7 @@ dbuf_fix_old_data(dmu_buf_impl_t *db, ui dr->dt.dl.dr_data = arc_buf_alloc(spa, size, db, type); bcopy(db->db.db_data, dr->dt.dl.dr_data->b_data, size); } else { - dbuf_set_data(db, NULL); + dbuf_clear_data(db); } } @@ -794,7 +869,8 @@ void dbuf_free_range(dnode_t *dn, uint64_t start_blkid, uint64_t end_blkid, dmu_tx_t *tx) { - dmu_buf_impl_t *db, *db_next, db_search; + dmu_buf_impl_t db_search; + dmu_buf_impl_t *db, *db_next; uint64_t txg = tx->tx_txg; avl_index_t where; @@ -1370,7 +1446,7 @@ dbuf_undirty(dmu_buf_impl_t *db, dmu_tx_ arc_buf_t *buf = db->db_buf; ASSERT(db->db_state == DB_NOFILL || arc_released(buf)); - dbuf_set_data(db, NULL); + dbuf_clear_data(db); VERIFY(arc_buf_remove_ref(buf, db)); dbuf_evict(db); return (B_TRUE); @@ -1710,8 +1786,7 @@ dbuf_create(dnode_t *dn, uint8_t level, db->db_parent = parent; db->db_blkptr = blkptr; - db->db_user_ptr = NULL; - db->db_evict_func = NULL; + db->db_user = NULL; db->db_immediate_evict = 0; db->db_freed_in_flight = 0; @@ -2114,7 +2189,7 @@ dbuf_rele_and_unlock(dmu_buf_impl_t *db, /* * This dbuf has anonymous data associated with it. */ - dbuf_set_data(db, NULL); + dbuf_clear_data(db); VERIFY(arc_buf_remove_ref(buf, db)); dbuf_evict(db); } else { @@ -2147,7 +2222,8 @@ dbuf_rele_and_unlock(dmu_buf_impl_t *db, } else { dbuf_clear(db); } - } else if (arc_buf_eviction_needed(db->db_buf)) { + } else if (db->db_objset->os_evicting || + arc_buf_eviction_needed(db->db_buf)) { dbuf_clear(db); } else { mutex_exit(&db->db_mtx); @@ -2166,51 +2242,57 @@ dbuf_refcount(dmu_buf_impl_t *db) } void * -dmu_buf_set_user(dmu_buf_t *db_fake, void *user_ptr, - dmu_buf_evict_func_t *evict_func) +dmu_buf_replace_user(dmu_buf_t *db_fake, dmu_buf_user_t *old_user, + dmu_buf_user_t *new_user) { - return (dmu_buf_update_user(db_fake, NULL, user_ptr, evict_func)); + dmu_buf_impl_t *db = (dmu_buf_impl_t *)db_fake; + + mutex_enter(&db->db_mtx); + dbuf_verify_user(db, DBVU_NOT_EVICTING); + if (db->db_user == old_user) + db->db_user = new_user; + else + old_user = db->db_user; + dbuf_verify_user(db, DBVU_NOT_EVICTING); + mutex_exit(&db->db_mtx); + + return (old_user); } void * -dmu_buf_set_user_ie(dmu_buf_t *db_fake, void *user_ptr, - dmu_buf_evict_func_t *evict_func) +dmu_buf_set_user(dmu_buf_t *db_fake, dmu_buf_user_t *user) { - dmu_buf_impl_t *db = (dmu_buf_impl_t *)db_fake; - - db->db_immediate_evict = TRUE; - return (dmu_buf_update_user(db_fake, NULL, user_ptr, evict_func)); + return (dmu_buf_replace_user(db_fake, NULL, user)); } void * -dmu_buf_update_user(dmu_buf_t *db_fake, void *old_user_ptr, void *user_ptr, - dmu_buf_evict_func_t *evict_func) +dmu_buf_set_user_ie(dmu_buf_t *db_fake, dmu_buf_user_t *user) { dmu_buf_impl_t *db = (dmu_buf_impl_t *)db_fake; - ASSERT(db->db_level == 0); - - ASSERT((user_ptr == NULL) == (evict_func == NULL)); - - mutex_enter(&db->db_mtx); - if (db->db_user_ptr == old_user_ptr) { - db->db_user_ptr = user_ptr; - db->db_evict_func = evict_func; - } else { - old_user_ptr = db->db_user_ptr; - } + db->db_immediate_evict = TRUE; + return (dmu_buf_set_user(db_fake, user)); +} - mutex_exit(&db->db_mtx); - return (old_user_ptr); +void * +dmu_buf_remove_user(dmu_buf_t *db_fake, dmu_buf_user_t *user) +{ + return (dmu_buf_replace_user(db_fake, user, NULL)); } void * dmu_buf_get_user(dmu_buf_t *db_fake) { dmu_buf_impl_t *db = (dmu_buf_impl_t *)db_fake; - ASSERT(!refcount_is_zero(&db->db_holds)); - return (db->db_user_ptr); + dbuf_verify_user(db, DBVU_NOT_EVICTING); + return (db->db_user); +} + +void +dmu_buf_user_evict_wait() +{ + taskq_wait(dbu_evict_taskq); } boolean_t Modified: user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c ============================================================================== --- user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c Fri Apr 17 00:38:20 2015 (r281635) +++ user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c Fri Apr 17 01:22:43 2015 (r281636) @@ -23,6 +23,7 @@ * Copyright (c) 2012, 2014 by Delphix. All rights reserved. * Copyright (c) 2013 by Saso Kiselkov. All rights reserved. * Copyright (c) 2013, Joyent, Inc. All rights reserved. + * Copyright (c) 2014 Spectra Logic Corporation, All rights reserved. */ /* Portions Copyright 2010 Robert Milkowski */ @@ -355,7 +356,7 @@ dmu_objset_open_impl(spa_t *spa, dsl_dat zfs_prop_to_name(ZFS_PROP_SECONDARYCACHE), secondary_cache_changed_cb, os); } - if (!dsl_dataset_is_snapshot(ds)) { + if (!ds->ds_is_snapshot) { if (err == 0) { err = dsl_prop_register(ds, zfs_prop_to_name(ZFS_PROP_CHECKSUM), @@ -417,7 +418,7 @@ dmu_objset_open_impl(spa_t *spa, dsl_dat os->os_secondary_cache = ZFS_CACHE_ALL; } - if (ds == NULL || !dsl_dataset_is_snapshot(ds)) + if (ds == NULL || !ds->ds_is_snapshot) os->os_zil_header = os->os_phys->os_zil_header; os->os_zil = zil_alloc(os, &os->os_zil_header); @@ -436,16 +437,13 @@ dmu_objset_open_impl(spa_t *spa, dsl_dat mutex_init(&os->os_obj_lock, NULL, MUTEX_DEFAULT, NULL); mutex_init(&os->os_user_ptr_lock, NULL, MUTEX_DEFAULT, NULL); - DMU_META_DNODE(os) = dnode_special_open(os, - &os->os_phys->os_meta_dnode, DMU_META_DNODE_OBJECT, - &os->os_meta_dnode); + dnode_special_open(os, &os->os_phys->os_meta_dnode, + DMU_META_DNODE_OBJECT, &os->os_meta_dnode); if (arc_buf_size(os->os_phys_buf) >= sizeof (objset_phys_t)) { - DMU_USERUSED_DNODE(os) = dnode_special_open(os, - &os->os_phys->os_userused_dnode, DMU_USERUSED_OBJECT, - &os->os_userused_dnode); - DMU_GROUPUSED_DNODE(os) = dnode_special_open(os, - &os->os_phys->os_groupused_dnode, DMU_GROUPUSED_OBJECT, - &os->os_groupused_dnode); + dnode_special_open(os, &os->os_phys->os_userused_dnode, + DMU_USERUSED_OBJECT, &os->os_userused_dnode); + dnode_special_open(os, &os->os_phys->os_groupused_dnode, + DMU_GROUPUSED_OBJECT, &os->os_groupused_dnode); } *osp = os; @@ -533,7 +531,7 @@ dmu_objset_own(const char *name, dmu_obj } else if (type != DMU_OST_ANY && type != (*osp)->os_phys->os_type) { dsl_dataset_disown(ds, tag); return (SET_ERROR(EINVAL)); - } else if (!readonly && dsl_dataset_is_snapshot(ds)) { + } else if (!readonly && ds->ds_is_snapshot) { dsl_dataset_disown(ds, tag); return (SET_ERROR(EROFS)); } @@ -589,41 +587,53 @@ dmu_objset_disown(objset_t *os, void *ta void dmu_objset_evict_dbufs(objset_t *os) { + dnode_t dn_marker; dnode_t *dn; mutex_enter(&os->os_lock); - - /* process the mdn last, since the other dnodes have holds on it */ - list_remove(&os->os_dnodes, DMU_META_DNODE(os)); - list_insert_tail(&os->os_dnodes, DMU_META_DNODE(os)); - - /* - * Find the first dnode with holds. We have to do this dance - * because dnode_add_ref() only works if you already have a - * hold. If there are no holds then it has no dbufs so OK to - * skip. - */ - for (dn = list_head(&os->os_dnodes); - dn && !dnode_add_ref(dn, FTAG); - dn = list_next(&os->os_dnodes, dn)) - continue; - - while (dn) { - dnode_t *next_dn = dn; - - do { - next_dn = list_next(&os->os_dnodes, next_dn); - } while (next_dn && !dnode_add_ref(next_dn, FTAG)); - - mutex_exit(&os->os_lock); - dnode_evict_dbufs(dn); - dnode_rele(dn, FTAG); - mutex_enter(&os->os_lock); - dn = next_dn; + dn = list_head(&os->os_dnodes); + while (dn != NULL) { + /* + * Skip dnodes without holds. We have to do this dance + * because dnode_add_ref() only works if there is already a + * hold. If the dnode has no holds, then it has no dbufs. + */ + if (dnode_add_ref(dn, FTAG)) { + list_insert_after(&os->os_dnodes, dn, &dn_marker); + mutex_exit(&os->os_lock); + + dnode_evict_dbufs(dn); + dnode_rele(dn, FTAG); + + mutex_enter(&os->os_lock); + dn = list_next(&os->os_dnodes, &dn_marker); + list_remove(&os->os_dnodes, &dn_marker); + } else { + dn = list_next(&os->os_dnodes, dn); + } } mutex_exit(&os->os_lock); + + if (DMU_USERUSED_DNODE(os) != NULL) { + dnode_evict_dbufs(DMU_GROUPUSED_DNODE(os)); + dnode_evict_dbufs(DMU_USERUSED_DNODE(os)); + } + dnode_evict_dbufs(DMU_META_DNODE(os)); } +/* + * Objset eviction processing is split into into two pieces. + * The first marks the objset as evicting, evicts any dbufs that + * have a refcount of zero, and then queues up the objset for the + * second phase of eviction. Once os->os_dnodes has been cleared by + * dnode_buf_pageout()->dnode_destroy(), the second phase is executed. + * The second phase closes the special dnodes, dequeues the objset from + * the list of those undergoing eviction, and finally frees the objset. + * + * NOTE: Due to asynchronous eviction processing (invocation of + * dnode_buf_pageout()), it is possible for the meta dnode for the + * objset to have no holds even though os->os_dnodes is not empty. + */ void dmu_objset_evict(objset_t *os) { @@ -633,7 +643,7 @@ dmu_objset_evict(objset_t *os) ASSERT(!dmu_objset_is_dirty(os, t)); if (ds) { - if (!dsl_dataset_is_snapshot(ds)) { + if (!ds->ds_is_snapshot) { VERIFY0(dsl_prop_unregister(ds, zfs_prop_to_name(ZFS_PROP_CHECKSUM), checksum_changed_cb, os)); @@ -670,8 +680,24 @@ dmu_objset_evict(objset_t *os) if (os->os_sa) sa_tear_down(os); + os->os_evicting = B_TRUE; dmu_objset_evict_dbufs(os); + mutex_enter(&os->os_lock); + spa_evicting_os_register(os->os_spa, os); + if (list_is_empty(&os->os_dnodes)) { + mutex_exit(&os->os_lock); + dmu_objset_evict_done(os); + } else { + mutex_exit(&os->os_lock); + } +} + +void +dmu_objset_evict_done(objset_t *os) +{ + ASSERT3P(list_head(&os->os_dnodes), ==, NULL); + dnode_special_close(&os->os_meta_dnode); if (DMU_USERUSED_DNODE(os)) { dnode_special_close(&os->os_userused_dnode); @@ -679,8 +705,6 @@ dmu_objset_evict(objset_t *os) } zil_free(os->os_zil); - ASSERT3P(list_head(&os->os_dnodes), ==, NULL); - VERIFY(arc_buf_remove_ref(os->os_phys_buf, &os->os_phys_buf)); /* @@ -695,6 +719,7 @@ dmu_objset_evict(objset_t *os) mutex_destroy(&os->os_lock); mutex_destroy(&os->os_obj_lock); mutex_destroy(&os->os_user_ptr_lock); + spa_evicting_os_deregister(os->os_spa, os); kmem_free(os, sizeof (objset_t)); } @@ -903,7 +928,7 @@ dmu_objset_clone_check(void *arg, dmu_tx } /* You can only clone snapshots, not the head datasets. */ - if (!dsl_dataset_is_snapshot(origin)) { + if (!origin->ds_is_snapshot) { dsl_dataset_rele(origin, FTAG); return (SET_ERROR(EINVAL)); } @@ -1467,7 +1492,7 @@ int dmu_objset_is_snapshot(objset_t *os) { if (os->os_dsl_dataset != NULL) - return (dsl_dataset_is_snapshot(os->os_dsl_dataset)); + return (os->os_dsl_dataset->ds_is_snapshot); else return (B_FALSE); } Modified: user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c ============================================================================== --- user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c Fri Apr 17 00:38:20 2015 (r281635) +++ user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c Fri Apr 17 01:22:43 2015 (r281636) @@ -636,7 +636,7 @@ dmu_send_impl(void *tag, dsl_pool_t *dp, fromtxg = fromzb->zbm_creation_txg; } dsl_dataset_name(ds, drr->drr_u.drr_begin.drr_toname); - if (!dsl_dataset_is_snapshot(ds)) { + if (!ds->ds_is_snapshot) { (void) strlcat(drr->drr_u.drr_begin.drr_toname, "@--head--", sizeof (drr->drr_u.drr_begin.drr_toname)); } @@ -852,7 +852,7 @@ dmu_send_estimate(dsl_dataset_t *ds, dsl ASSERT(dsl_pool_config_held(dp)); /* tosnap must be a snapshot */ - if (!dsl_dataset_is_snapshot(ds)) + if (!ds->ds_is_snapshot) return (SET_ERROR(EINVAL)); /* @@ -1099,7 +1099,7 @@ dmu_recv_begin_check(void *arg, dmu_tx_t dsl_dataset_rele(ds, FTAG); return (error); } - if (!dsl_dataset_is_snapshot(origin)) { + if (!origin->ds_is_snapshot) { dsl_dataset_rele(origin, FTAG); dsl_dataset_rele(ds, FTAG); return (SET_ERROR(EINVAL)); Modified: user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c ============================================================================== --- user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c Fri Apr 17 00:38:20 2015 (r281635) +++ user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c Fri Apr 17 01:22:43 2015 (r281636) @@ -532,7 +532,7 @@ traverse_impl(spa_t *spa, dsl_dataset_t cv_init(&pd.pd_cv, NULL, CV_DEFAULT, NULL); /* See comment on ZIL traversal in dsl_scan_visitds. */ - if (ds != NULL && !dsl_dataset_is_snapshot(ds) && !BP_IS_HOLE(rootbp)) { + if (ds != NULL && !ds->ds_is_snapshot && !BP_IS_HOLE(rootbp)) { arc_flags_t flags = ARC_FLAG_WAIT; objset_phys_t *osp; arc_buf_t *buf; Modified: user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c ============================================================================== --- user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c Fri Apr 17 00:38:20 2015 (r281635) +++ user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c Fri Apr 17 01:22:43 2015 (r281636) @@ -21,6 +21,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, 2014 by Delphix. All rights reserved. + * Copyright (c) 2014 Spectra Logic Corporation, All rights reserved. */ #include @@ -405,8 +406,9 @@ static dnode_t * dnode_create(objset_t *os, dnode_phys_t *dnp, dmu_buf_impl_t *db, uint64_t object, dnode_handle_t *dnh) { - dnode_t *dn = kmem_cache_alloc(dnode_cache, KM_SLEEP); + dnode_t *dn; + dn = kmem_cache_alloc(dnode_cache, KM_SLEEP); ASSERT(!POINTER_IS_VALID(dn->dn_objset)); dn->dn_moved = 0; @@ -443,13 +445,31 @@ dnode_create(objset_t *os, dnode_phys_t ASSERT(DMU_OT_IS_VALID(dn->dn_phys->dn_type)); mutex_enter(&os->os_lock); - list_insert_head(&os->os_dnodes, dn); + if (dnh->dnh_dnode != NULL) { + /* Lost the allocation race. */ + mutex_exit(&os->os_lock); + kmem_cache_free(dnode_cache, dn); + return (dnh->dnh_dnode); + } + + /* + * Exclude special dnodes from os_dnodes so an empty os_dnodes + * signifies that the special dnodes have no references from + * their children (the entries in os_dnodes). This allows + * dnode_destroy() to easily determine if the last child has + * been removed and then complete eviction of the objset. + */ + if (!DMU_OBJECT_IS_SPECIAL(object)) + list_insert_head(&os->os_dnodes, dn); membar_producer(); + /* - * Everything else must be valid before assigning dn_objset makes the - * dnode eligible for dnode_move(). + * Everything else must be valid before assigning dn_objset + * makes the dnode eligible for dnode_move(). */ dn->dn_objset = os; + + dnh->dnh_dnode = dn; mutex_exit(&os->os_lock); arc_space_consume(sizeof (dnode_t), ARC_SPACE_OTHER); @@ -463,12 +483,18 @@ static void dnode_destroy(dnode_t *dn) { objset_t *os = dn->dn_objset; + boolean_t complete_os_eviction = B_FALSE; ASSERT((dn->dn_id_flags & DN_ID_NEW_EXIST) == 0); mutex_enter(&os->os_lock); POINTER_INVALIDATE(&dn->dn_objset); - list_remove(&os->os_dnodes, dn); + if (!DMU_OBJECT_IS_SPECIAL(dn->dn_object)) { + list_remove(&os->os_dnodes, dn); + complete_os_eviction = + list_is_empty(&os->os_dnodes) && + list_link_active(&os->os_evicting_node); + } mutex_exit(&os->os_lock); /* the dnode can no longer move, so we can release the handle */ @@ -503,6 +529,9 @@ dnode_destroy(dnode_t *dn) dmu_zfetch_rele(&dn->dn_zfetch); kmem_cache_free(dnode_cache, dn); arc_space_return(sizeof (dnode_t), ARC_SPACE_OTHER); + + if (complete_os_eviction) + dmu_objset_evict_done(os); } void @@ -971,33 +1000,32 @@ dnode_special_close(dnode_handle_t *dnh) */ while (refcount_count(&dn->dn_holds) > 0) delay(1); + ASSERT(dn->dn_dbuf == NULL || + dmu_buf_get_user(&dn->dn_dbuf->db) == NULL); zrl_add(&dnh->dnh_zrlock); dnode_destroy(dn); /* implicit zrl_remove() */ zrl_destroy(&dnh->dnh_zrlock); dnh->dnh_dnode = NULL; } -dnode_t * +void dnode_special_open(objset_t *os, dnode_phys_t *dnp, uint64_t object, dnode_handle_t *dnh) { - dnode_t *dn = dnode_create(os, dnp, NULL, object, dnh); - dnh->dnh_dnode = dn; + dnode_t *dn; + + dn = dnode_create(os, dnp, NULL, object, dnh); zrl_init(&dnh->dnh_zrlock); DNODE_VERIFY(dn); - return (dn); } static void -dnode_buf_pageout(dmu_buf_t *db, void *arg) +dnode_buf_pageout(void *dbu) { - dnode_children_t *children_dnodes = arg; + dnode_children_t *children_dnodes = dbu; int i; - int epb = db->db_size >> DNODE_SHIFT; - ASSERT(epb == children_dnodes->dnc_count); - - for (i = 0; i < epb; i++) { + for (i = 0; i < children_dnodes->dnc_count; i++) { dnode_handle_t *dnh = &children_dnodes->dnc_children[i]; dnode_t *dn; @@ -1027,7 +1055,7 @@ dnode_buf_pageout(dmu_buf_t *db, void *a dnh->dnh_dnode = NULL; } kmem_free(children_dnodes, sizeof (dnode_children_t) + - epb * sizeof (dnode_handle_t)); + children_dnodes->dnc_count * sizeof (dnode_handle_t)); } /* @@ -1117,10 +1145,11 @@ dnode_hold_impl(objset_t *os, uint64_t o dnh = &children_dnodes->dnc_children[0]; for (i = 0; i < epb; i++) { zrl_init(&dnh[i].dnh_zrlock); - dnh[i].dnh_dnode = NULL; } - if (winner = dmu_buf_set_user(&db->db, children_dnodes, - dnode_buf_pageout)) { + dmu_buf_init_user(&children_dnodes->dnc_dbu, + dnode_buf_pageout, NULL); + winner = dmu_buf_set_user(&db->db, &children_dnodes->dnc_dbu); + if (winner != NULL) { for (i = 0; i < epb; i++) { zrl_destroy(&dnh[i].dnh_zrlock); @@ -1135,17 +1164,11 @@ dnode_hold_impl(objset_t *os, uint64_t o dnh = &children_dnodes->dnc_children[idx]; zrl_add(&dnh->dnh_zrlock); - if ((dn = dnh->dnh_dnode) == NULL) { + dn = dnh->dnh_dnode; + if (dn == NULL) { dnode_phys_t *phys = (dnode_phys_t *)db->db.db_data+idx; - dnode_t *winner; dn = dnode_create(os, phys, db, object, dnh); - winner = atomic_cas_ptr(&dnh->dnh_dnode, NULL, dn); - if (winner != NULL) { - zrl_add(&dnh->dnh_zrlock); - dnode_destroy(dn); /* implicit zrl_remove() */ - dn = winner; - } } mutex_enter(&dn->dn_mtx); @@ -1159,10 +1182,10 @@ dnode_hold_impl(objset_t *os, uint64_t o dbuf_rele(db, FTAG); return (type == DMU_OT_NONE ? ENOENT : EEXIST); } - mutex_exit(&dn->dn_mtx); - if (refcount_add(&dn->dn_holds, tag) == 1) dbuf_add_ref(db, dnh); + mutex_exit(&dn->dn_mtx); + /* Now we can rely on the hold to prevent the dnode from moving. */ zrl_remove(&dnh->dnh_zrlock); Modified: user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c ============================================================================== --- user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c Fri Apr 17 00:38:20 2015 (r281635) +++ user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c Fri Apr 17 01:22:43 2015 (r281636) @@ -22,6 +22,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, 2014 by Delphix. All rights reserved. + * Copyright (c) 2014 Spectra Logic Corporation, All rights reserved. */ #include @@ -396,49 +397,37 @@ dnode_sync_free_range(void *arg, uint64_ void dnode_evict_dbufs(dnode_t *dn) { - int progress; - int pass = 0; + dmu_buf_impl_t db_marker; + dmu_buf_impl_t *db, *db_next; + + mutex_enter(&dn->dn_dbufs_mtx); + for (db = avl_first(&dn->dn_dbufs); db != NULL; db = db_next) { - do { - dmu_buf_impl_t *db, *db_next; - int evicting = FALSE; - - progress = FALSE; - mutex_enter(&dn->dn_dbufs_mtx); - for (db = avl_first(&dn->dn_dbufs); db != NULL; db = db_next) { - db_next = AVL_NEXT(&dn->dn_dbufs, db); #ifdef DEBUG - DB_DNODE_ENTER(db); - ASSERT3P(DB_DNODE(db), ==, dn); - DB_DNODE_EXIT(db); + DB_DNODE_ENTER(db); + ASSERT3P(DB_DNODE(db), ==, dn); + DB_DNODE_EXIT(db); #endif /* DEBUG */ - mutex_enter(&db->db_mtx); - if (db->db_state == DB_EVICTING) { - progress = TRUE; - evicting = TRUE; - mutex_exit(&db->db_mtx); - } else if (refcount_is_zero(&db->db_holds)) { - progress = TRUE; - dbuf_clear(db); /* exits db_mtx for us */ - } else { - mutex_exit(&db->db_mtx); - } + mutex_enter(&db->db_mtx); + if (db->db_state != DB_EVICTING && + refcount_is_zero(&db->db_holds)) { + db_marker.db_level = db->db_level; + db_marker.db_blkid = db->db_blkid; + db_marker.db_state = DB_SEARCH; + avl_insert_here(&dn->dn_dbufs, &db_marker, db, + AVL_BEFORE); + + dbuf_clear(db); + db_next = AVL_NEXT(&dn->dn_dbufs, &db_marker); + avl_remove(&dn->dn_dbufs, &db_marker); + } else { + mutex_exit(&db->db_mtx); + db_next = AVL_NEXT(&dn->dn_dbufs, db); } - /* - * NB: we need to drop dn_dbufs_mtx between passes so - * that any DB_EVICTING dbufs can make progress. - * Ideally, we would have some cv we could wait on, but - * since we don't, just wait a bit to give the other - * thread a chance to run. - */ - mutex_exit(&dn->dn_dbufs_mtx); - if (evicting) - delay(1); - pass++; - ASSERT(pass < 100); /* sanity check */ - } while (progress); + } + mutex_exit(&dn->dn_dbufs_mtx); rw_enter(&dn->dn_struct_rwlock, RW_WRITER); if (dn->dn_bonus && refcount_is_zero(&dn->dn_bonus->db_holds)) { @@ -497,7 +486,6 @@ dnode_sync_free(dnode_t *dn, dmu_tx_t *t dnode_undirty_dbufs(&dn->dn_dirty_records[txgoff]); dnode_evict_dbufs(dn); ASSERT(avl_is_empty(&dn->dn_dbufs)); - ASSERT3P(dn->dn_bonus, ==, NULL); /* * XXX - It would be nice to assert this, but we may still Modified: user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_bookmark.c ============================================================================== --- user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_bookmark.c Fri Apr 17 00:38:20 2015 (r281635) +++ user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_bookmark.c Fri Apr 17 01:22:43 2015 (r281636) @@ -120,7 +120,7 @@ dsl_bookmark_create_check_impl(dsl_datas int error; zfs_bookmark_phys_t bmark_phys; - if (!dsl_dataset_is_snapshot(snapds)) + if (!snapds->ds_is_snapshot) return (SET_ERROR(EINVAL)); error = dsl_bookmark_hold_ds(dp, bookmark_name, Modified: user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c ============================================================================== --- user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c Fri Apr 17 00:38:20 2015 (r281635) +++ user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c Fri Apr 17 01:22:43 2015 (r281636) @@ -24,6 +24,7 @@ * Copyright (c) 2011, 2014 by Delphix. All rights reserved. * Copyright (c) 2014, Joyent, Inc. All rights reserved. * Copyright (c) 2014 RackTop Systems. + * Copyright (c) 2014 Spectra Logic Corporation, All rights reserved. */ #include @@ -77,7 +78,6 @@ SYSCTL_INT(_vfs_zfs, OID_AUTO, max_recor #define DS_REF_MAX (1ULL << 62) extern inline dsl_dataset_phys_t *dsl_dataset_phys(dsl_dataset_t *ds); -extern inline boolean_t dsl_dataset_is_snapshot(dsl_dataset_t *ds); /* * Figure out how much of this delta should be propogated to the dsl_dir @@ -161,7 +161,7 @@ dsl_dataset_block_kill(dsl_dataset_t *ds } ASSERT3P(tx->tx_pool, ==, ds->ds_dir->dd_pool); - ASSERT(!dsl_dataset_is_snapshot(ds)); + ASSERT(!ds->ds_is_snapshot); dmu_buf_will_dirty(ds->ds_dbuf, tx); if (bp->blk_birth > dsl_dataset_phys(ds)->ds_prev_snap_txg) { @@ -259,14 +259,15 @@ dsl_dataset_block_freeable(dsl_dataset_t return (B_TRUE); } -/* ARGSUSED */ static void -dsl_dataset_evict(dmu_buf_t *db, void *dsv) +dsl_dataset_evict(void *dbu) { - dsl_dataset_t *ds = dsv; + dsl_dataset_t *ds = dbu; ASSERT(ds->ds_owner == NULL); + ds->ds_dbuf = NULL; + unique_remove(ds->ds_fsid_guid); if (ds->ds_objset != NULL) @@ -278,10 +279,10 @@ dsl_dataset_evict(dmu_buf_t *db, void *d } bplist_destroy(&ds->ds_pending_deadlist); - if (dsl_dataset_phys(ds)->ds_deadlist_obj != 0) + if (ds->ds_deadlist.dl_os != NULL) dsl_deadlist_close(&ds->ds_deadlist); if (ds->ds_dir) - dsl_dir_rele(ds->ds_dir, ds); + dsl_dir_async_rele(ds->ds_dir, ds); ASSERT(!list_link_active(&ds->ds_synced_link)); @@ -399,6 +400,7 @@ dsl_dataset_hold_obj(dsl_pool_t *dp, uin ds = kmem_zalloc(sizeof (dsl_dataset_t), KM_SLEEP); ds->ds_dbuf = dbuf; ds->ds_object = dsobj; + ds->ds_is_snapshot = dsl_dataset_phys(ds)->ds_num_children != 0; mutex_init(&ds->ds_lock, NULL, MUTEX_DEFAULT, NULL); mutex_init(&ds->ds_opening_lock, NULL, MUTEX_DEFAULT, NULL); @@ -437,7 +439,7 @@ dsl_dataset_hold_obj(dsl_pool_t *dp, uin return (err); } - if (!dsl_dataset_is_snapshot(ds)) { + if (!ds->ds_is_snapshot) { ds->ds_snapname[0] = '\0'; if (dsl_dataset_phys(ds)->ds_prev_snap_obj != 0) { err = dsl_dataset_hold_obj(dp, @@ -464,7 +466,7 @@ dsl_dataset_hold_obj(dsl_pool_t *dp, uin } } - if (err == 0 && !dsl_dataset_is_snapshot(ds)) { + if (err == 0 && !ds->ds_is_snapshot) { err = dsl_prop_get_int_ds(ds, zfs_prop_to_name(ZFS_PROP_REFRESERVATION), &ds->ds_reserved); @@ -477,8 +479,11 @@ dsl_dataset_hold_obj(dsl_pool_t *dp, uin ds->ds_reserved = ds->ds_quota = 0; } - if (err != 0 || (winner = dmu_buf_set_user_ie(dbuf, ds, - dsl_dataset_evict)) != NULL) { + dmu_buf_init_user(&ds->ds_dbu, dsl_dataset_evict, &ds->ds_dbuf); + if (err == 0) + winner = dmu_buf_set_user_ie(dbuf, &ds->ds_dbu); + + if (err != 0 || winner != NULL) { bplist_destroy(&ds->ds_pending_deadlist); dsl_deadlist_close(&ds->ds_deadlist); if (ds->ds_prev) @@ -900,7 +905,7 @@ dsl_dataset_recalc_head_uniq(dsl_dataset uint64_t mrs_used; uint64_t dlused, dlcomp, dluncomp; - ASSERT(!dsl_dataset_is_snapshot(ds)); + ASSERT(!ds->ds_is_snapshot); if (dsl_dataset_phys(ds)->ds_prev_snap_obj != 0) mrs_used = dsl_dataset_phys(ds->ds_prev)->ds_referenced_bytes; @@ -1656,7 +1661,7 @@ dsl_dataset_stats(dsl_dataset_t *ds, nvl dsl_prop_nvlist_add_uint64(nv, ZFS_PROP_LOGICALREFERENCED, dsl_dataset_phys(ds)->ds_uncompressed_bytes); - if (dsl_dataset_is_snapshot(ds)) { + if (ds->ds_is_snapshot) { dsl_prop_nvlist_add_uint64(nv, ZFS_PROP_COMPRESSRATIO, ratio); dsl_prop_nvlist_add_uint64(nv, ZFS_PROP_USED, dsl_dataset_phys(ds)->ds_unique_bytes); @@ -1724,7 +1729,7 @@ dsl_dataset_fast_stat(dsl_dataset_t *ds, dsl_dataset_phys(ds)->ds_flags & DS_FLAG_INCONSISTENT; stat->dds_guid = dsl_dataset_phys(ds)->ds_guid; stat->dds_origin[0] = '\0'; - if (dsl_dataset_is_snapshot(ds)) { + if (ds->ds_is_snapshot) { stat->dds_is_snapshot = B_TRUE; stat->dds_num_clones = dsl_dataset_phys(ds)->ds_num_children - 1; @@ -2004,7 +2009,7 @@ dsl_dataset_rollback_check(void *arg, dm return (error); /* must not be a snapshot */ - if (dsl_dataset_is_snapshot(ds)) { + if (ds->ds_is_snapshot) { dsl_dataset_rele(ds, FTAG); return (SET_ERROR(EINVAL)); } @@ -2599,7 +2604,7 @@ promote_hold(dsl_dataset_promote_arg_t * *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@FreeBSD.ORG Fri Apr 17 01:36:48 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 903509F1; Fri, 17 Apr 2015 01:36: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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7B8787C9; Fri, 17 Apr 2015 01:36:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3H1amhZ015106; Fri, 17 Apr 2015 01:36:48 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3H1amuO015104; Fri, 17 Apr 2015 01:36:48 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201504170136.t3H1amuO015104@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Fri, 17 Apr 2015 01:36:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281637 - user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/zfs 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.20 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, 17 Apr 2015 01:36:48 -0000 Author: delphij Date: Fri Apr 17 01:36:47 2015 New Revision: 281637 URL: https://svnweb.freebsd.org/changeset/base/281637 Log: MFV r277429: Document -S option in zfs(8). Mention -S option when zfs inherit fails on quota. Illumos issues: 5410 Document -S option to zfs inherit 5412 Mention -S option when zfs inherit fails on quota Modified: user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/zfs/zfs.8 user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Directory Properties: user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/ (props changed) user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/zfs/ (props changed) Modified: user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/zfs/zfs.8 ============================================================================== --- user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Fri Apr 17 01:22:43 2015 (r281636) +++ user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Fri Apr 17 01:36:47 2015 (r281637) @@ -31,7 +31,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 12, 2014 +.Dd April 16, 2015 .Dt ZFS 8 .Os .Sh NAME @@ -2126,7 +2126,8 @@ Property name .It value Property value .It source -Property source. Can either be local, default, temporary, inherited, or none +Property source. Can either be local, default, +temporary, inherited, received, or none (\&-). .El .Pp @@ -2181,7 +2182,7 @@ displays only snapshots. A comma-separated list of sources to display. Those properties coming from a source other than those in this list are ignored. Each source must be one of the following: -.Sy local,default,inherited,temporary,received,none . +.Sy local,default,inherited,received,temporary,none . The default value is all sources. .El .It Xo @@ -2192,8 +2193,10 @@ The default value is all sources. .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot Ns ... .Xc .Pp -Clears the specified property, causing it to be inherited from an ancestor. If -no ancestor has the property set, then the default value is used. See the +Clears the specified property, causing it to be inherited from an ancestor, +restored to default if no ancestor has the property set, or with the +.Fl S +option reverted to the received value if one exists. See the .Qq Sx Properties section for a listing of default values, and details on which properties can be inherited. @@ -3396,6 +3399,16 @@ property from their parent. .Bd -literal -offset 2n .Li # Ic zfs inherit checksum pool/home/bob pool/home/anne .Ed +.Pp +The following command causes +.Em pool/name/bob +to revert to the received +value for the +.Sy quota +property if it exists. +.Bd -literal -offset 2n +.Li # Ic zfs inherit -S quota pool/home/bob +.Ed .It Sy Example 12 No Remotely Replicating Tn ZFS No Data .Pp The following commands send a full stream and then an incremental stream to a Modified: user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c ============================================================================== --- user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Fri Apr 17 01:22:43 2015 (r281636) +++ user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Fri Apr 17 01:36:47 2015 (r281637) @@ -1908,9 +1908,13 @@ zfs_do_inherit(int argc, char **argv) if (prop == ZFS_PROP_QUOTA || prop == ZFS_PROP_RESERVATION || prop == ZFS_PROP_REFQUOTA || - prop == ZFS_PROP_REFRESERVATION) + prop == ZFS_PROP_REFRESERVATION) { (void) fprintf(stderr, gettext("use 'zfs set " "%s=none' to clear\n"), propname); + (void) fprintf(stderr, gettext("use 'zfs " + "inherit -S %s' to revert to received " + "value\n"), propname); + } return (1); } if (received && (prop == ZFS_PROP_VOLSIZE || From owner-svn-src-user@FreeBSD.ORG Fri Apr 17 01:51:06 2015 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1C733BDD; Fri, 17 Apr 2015 01:51:06 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E1526964; Fri, 17 Apr 2015 01:51:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3H1p5YU022649; Fri, 17 Apr 2015 01:51:05 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3H1p5hQ022648; Fri, 17 Apr 2015 01:51:05 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201504170151.t3H1p5hQ022648@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Fri, 17 Apr 2015 01:51:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281638 - user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs 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.20 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, 17 Apr 2015 01:51:06 -0000 Author: delphij Date: Fri Apr 17 01:51:05 2015 New Revision: 281638 URL: https://svnweb.freebsd.org/changeset/base/281638 Log: Revert portion of r265152 which creates unnecessary divergence and was never upstreamed. Modified: user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c Modified: user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c ============================================================================== --- user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c Fri Apr 17 01:36:47 2015 (r281637) +++ user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c Fri Apr 17 01:51:05 2015 (r281638) @@ -587,9 +587,10 @@ vdev_queue_aggregate(vdev_queue_t *vq, z zio_t *first, *last, *aio, *dio, *mandatory, *nio; uint64_t maxgap = 0; uint64_t size; - boolean_t stretch; - avl_tree_t *t; - enum zio_flag flags; + boolean_t stretch = B_FALSE; + vdev_queue_class_t *vqc = &vq->vq_class[zio->io_priority]; + avl_tree_t *t = &vqc->vqc_queued_tree; + enum zio_flag flags = zio->io_flags & ZIO_FLAG_AGG_INHERIT; ASSERT(MUTEX_HELD(&vq->vq_lock)); @@ -629,8 +630,6 @@ vdev_queue_aggregate(vdev_queue_t *vq, z * Walk backwards through sufficiently contiguous I/Os * recording the last non-option I/O. */ - flags = zio->io_flags & ZIO_FLAG_AGG_INHERIT; - t = &vq->vq_class[zio->io_priority].vqc_queued_tree; while ((dio = AVL_PREV(t, first)) != NULL && (dio->io_flags & ZIO_FLAG_AGG_INHERIT) == flags && IO_SPAN(dio, last) <= zfs_vdev_aggregation_limit && @@ -670,7 +669,6 @@ vdev_queue_aggregate(vdev_queue_t *vq, z * non-optional I/O is close enough to make aggregation * worthwhile. */ - stretch = B_FALSE; if (zio->io_type == ZIO_TYPE_WRITE && mandatory != NULL) { zio_t *nio = last; while ((dio = AVL_NEXT(t, nio)) != NULL && From owner-svn-src-user@FreeBSD.ORG Fri Apr 17 19:21:12 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C5A408FA; Fri, 17 Apr 2015 19:21:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B431FF15; Fri, 17 Apr 2015 19:21:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3HJLChs040263; Fri, 17 Apr 2015 19:21:12 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3HJLC09040255; Fri, 17 Apr 2015 19:21:12 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504171921.t3HJLC09040255@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Fri, 17 Apr 2015 19:21:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281662 - user/ngie/fix-progs/contrib/netbsd-tests/lib/libpthread 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.20 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, 17 Apr 2015 19:21:12 -0000 Author: ngie Date: Fri Apr 17 19:21:11 2015 New Revision: 281662 URL: https://svnweb.freebsd.org/changeset/base/281662 Log: Fix the mips tinderbox by #include'ing sys/types.h for register_t It dumbfounds me how every other architectures' header pollution is greater than mips.. Modified: user/ngie/fix-progs/contrib/netbsd-tests/lib/libpthread/t_swapcontext.c Modified: user/ngie/fix-progs/contrib/netbsd-tests/lib/libpthread/t_swapcontext.c ============================================================================== --- user/ngie/fix-progs/contrib/netbsd-tests/lib/libpthread/t_swapcontext.c Fri Apr 17 18:33:59 2015 (r281661) +++ user/ngie/fix-progs/contrib/netbsd-tests/lib/libpthread/t_swapcontext.c Fri Apr 17 19:21:11 2015 (r281662) @@ -28,6 +28,9 @@ #include __RCSID("$NetBSD"); +#ifdef __FreeBSD__ +#include +#endif #include #include #include From owner-svn-src-user@FreeBSD.ORG Fri Apr 17 19:23:51 2015 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2D5BAA14; Fri, 17 Apr 2015 19:23:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1B748FC6; Fri, 17 Apr 2015 19:23:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3HJNojT040771; Fri, 17 Apr 2015 19:23:50 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3HJNoq5040769; Fri, 17 Apr 2015 19:23:50 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504171923.t3HJNoq5040769@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Fri, 17 Apr 2015 19:23:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281663 - in user/ngie/more-tests: contrib/netbsd-tests/lib/libpthread share/mk 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.20 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, 17 Apr 2015 19:23:51 -0000 Author: ngie Date: Fri Apr 17 19:23:50 2015 New Revision: 281663 URL: https://svnweb.freebsd.org/changeset/base/281663 Log: Fix the mips tinderbox by #include'ing sys/types.h for register_t It dumbfounds me how every other architectures' header pollution is greater than mips.. Modified: user/ngie/more-tests/contrib/netbsd-tests/lib/libpthread/t_swapcontext.c user/ngie/more-tests/share/mk/bsd.prog.mk Directory Properties: user/ngie/more-tests/ (props changed) Modified: user/ngie/more-tests/contrib/netbsd-tests/lib/libpthread/t_swapcontext.c ============================================================================== --- user/ngie/more-tests/contrib/netbsd-tests/lib/libpthread/t_swapcontext.c Fri Apr 17 19:21:11 2015 (r281662) +++ user/ngie/more-tests/contrib/netbsd-tests/lib/libpthread/t_swapcontext.c Fri Apr 17 19:23:50 2015 (r281663) @@ -28,6 +28,9 @@ #include __RCSID("$NetBSD"); +#ifdef __FreeBSD__ +#include +#endif #include #include #include Modified: user/ngie/more-tests/share/mk/bsd.prog.mk ============================================================================== --- user/ngie/more-tests/share/mk/bsd.prog.mk Fri Apr 17 19:21:11 2015 (r281662) +++ user/ngie/more-tests/share/mk/bsd.prog.mk Fri Apr 17 19:23:50 2015 (r281663) @@ -4,6 +4,12 @@ .include .include +.ifdef PROG +PROGS:= ${PROG} +.endif + +PROGS:= ${PROGS:O:u} + .SUFFIXES: .out .o .c .cc .cpp .cxx .C .m .y .l .ln .s .S .asm # XXX The use of COPTS in modern makefiles is discouraged. From owner-svn-src-user@FreeBSD.ORG Fri Apr 17 19:25:54 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 14411B29; Fri, 17 Apr 2015 19:25: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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 031B6FDB; Fri, 17 Apr 2015 19:25:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3HJPrPe041131; Fri, 17 Apr 2015 19:25:53 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3HJPrHV041130; Fri, 17 Apr 2015 19:25:53 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504171925.t3HJPrHV041130@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Fri, 17 Apr 2015 19:25:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281664 - user/ngie/more-tests/share/mk 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.20 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, 17 Apr 2015 19:25:54 -0000 Author: ngie Date: Fri Apr 17 19:25:53 2015 New Revision: 281664 URL: https://svnweb.freebsd.org/changeset/base/281664 Log: Did not mean to commit the diff to bsd.prog.mk to this branch... Modified: user/ngie/more-tests/share/mk/bsd.prog.mk Modified: user/ngie/more-tests/share/mk/bsd.prog.mk ============================================================================== --- user/ngie/more-tests/share/mk/bsd.prog.mk Fri Apr 17 19:23:50 2015 (r281663) +++ user/ngie/more-tests/share/mk/bsd.prog.mk Fri Apr 17 19:25:53 2015 (r281664) @@ -4,12 +4,6 @@ .include .include -.ifdef PROG -PROGS:= ${PROG} -.endif - -PROGS:= ${PROGS:O:u} - .SUFFIXES: .out .o .c .cc .cpp .cxx .C .m .y .l .ln .s .S .asm # XXX The use of COPTS in modern makefiles is discouraged. From owner-svn-src-user@FreeBSD.ORG Fri Apr 17 22:16:36 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D7CC6FE2; Fri, 17 Apr 2015 22:16:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C48B376A; Fri, 17 Apr 2015 22:16:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3HMGag1026335; Fri, 17 Apr 2015 22:16:36 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3HMGaLT026329; Fri, 17 Apr 2015 22:16:36 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201504172216.t3HMGaLT026329@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Fri, 17 Apr 2015 22:16:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281668 - in user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs: . sys 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.20 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, 17 Apr 2015 22:16:36 -0000 Author: delphij Date: Fri Apr 17 22:16:35 2015 New Revision: 281668 URL: https://svnweb.freebsd.org/changeset/base/281668 Log: MFV r277430: sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h: Add two offset/lba based AVL trees to the vdev queue object. sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h: Add a second AVL node within each ZIO so that vdev_queue.c can sort ZIOs by both type and priority. sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c: Combine reads and writes, irrespecitve of their priorities into unified, offset sorted, trees. Selection of the ZIO to issue is unchanged, but aggregation now uses the unified tree of the appropriate type so that aggregation across priority classes is possible. Original author: Justin T. Gibbs justing@spectralogic.com Illumos issue: 5313 Allow I/Os to be aggregated across ZIO priority classes Modified: user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c Directory Properties: user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/ (props changed) Modified: user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h ============================================================================== --- user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h Fri Apr 17 21:21:11 2015 (r281667) +++ user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h Fri Apr 17 22:16:35 2015 (r281668) @@ -113,6 +113,8 @@ struct vdev_queue { vdev_t *vq_vdev; vdev_queue_class_t vq_class[ZIO_PRIORITY_NUM_QUEUEABLE]; avl_tree_t vq_active_tree; + avl_tree_t vq_read_offset_tree; + avl_tree_t vq_write_offset_tree; uint64_t vq_last_offset; hrtime_t vq_io_complete_ts; /* time last i/o completed */ kmutex_t vq_lock; Modified: user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h ============================================================================== --- user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h Fri Apr 17 21:21:11 2015 (r281667) +++ user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h Fri Apr 17 22:16:35 2015 (r281668) @@ -454,6 +454,7 @@ struct zio { uint64_t io_offset; hrtime_t io_timestamp; avl_node_t io_queue_node; + avl_node_t io_offset_node; /* Internal pipeline state */ enum zio_flag io_flags; Modified: user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c ============================================================================== --- user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c Fri Apr 17 21:21:11 2015 (r281667) +++ user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c Fri Apr 17 22:16:35 2015 (r281668) @@ -290,6 +290,22 @@ vdev_queue_offset_compare(const void *x1 return (0); } +static inline avl_tree_t * +vdev_queue_class_tree(vdev_queue_t *vq, zio_priority_t p) +{ + return (&vq->vq_class[p].vqc_queued_tree); +} + +static inline avl_tree_t * +vdev_queue_type_tree(vdev_queue_t *vq, zio_type_t t) +{ + ASSERT(t == ZIO_TYPE_READ || t == ZIO_TYPE_WRITE); + if (t == ZIO_TYPE_READ) + return (&vq->vq_read_offset_tree); + else + return (&vq->vq_write_offset_tree); +} + int vdev_queue_timestamp_compare(const void *x1, const void *x2) { @@ -324,19 +340,27 @@ vdev_queue_init(vdev_t *vd) avl_create(&vq->vq_active_tree, vdev_queue_offset_compare, sizeof (zio_t), offsetof(struct zio, io_queue_node)); + avl_create(vdev_queue_type_tree(vq, ZIO_TYPE_READ), + vdev_queue_offset_compare, sizeof (zio_t), + offsetof(struct zio, io_offset_node)); + avl_create(vdev_queue_type_tree(vq, ZIO_TYPE_WRITE), + vdev_queue_offset_compare, sizeof (zio_t), + offsetof(struct zio, io_offset_node)); for (zio_priority_t p = 0; p < ZIO_PRIORITY_NUM_QUEUEABLE; p++) { + int (*compfn) (const void *, const void *); + /* - * The synchronous i/o queues are FIFO rather than LBA ordered. - * This provides more consistent latency for these i/os, and - * they tend to not be tightly clustered anyway so there is - * little to no throughput loss. + * The synchronous i/o queues are dispatched in FIFO rather + * than LBA order. This provides more consistent latency for + * these i/os. */ - boolean_t fifo = (p == ZIO_PRIORITY_SYNC_READ || - p == ZIO_PRIORITY_SYNC_WRITE); - avl_create(&vq->vq_class[p].vqc_queued_tree, - fifo ? vdev_queue_timestamp_compare : - vdev_queue_offset_compare, + if (p == ZIO_PRIORITY_SYNC_READ || p == ZIO_PRIORITY_SYNC_WRITE) + compfn = vdev_queue_timestamp_compare; + else + compfn = vdev_queue_offset_compare; + + avl_create(vdev_queue_class_tree(vq, p), compfn, sizeof (zio_t), offsetof(struct zio, io_queue_node)); } @@ -349,8 +373,10 @@ vdev_queue_fini(vdev_t *vd) vdev_queue_t *vq = &vd->vdev_queue; for (zio_priority_t p = 0; p < ZIO_PRIORITY_NUM_QUEUEABLE; p++) - avl_destroy(&vq->vq_class[p].vqc_queued_tree); + avl_destroy(vdev_queue_class_tree(vq, p)); avl_destroy(&vq->vq_active_tree); + avl_destroy(vdev_queue_type_tree(vq, ZIO_TYPE_READ)); + avl_destroy(vdev_queue_type_tree(vq, ZIO_TYPE_WRITE)); mutex_destroy(&vq->vq_lock); } @@ -361,7 +387,8 @@ vdev_queue_io_add(vdev_queue_t *vq, zio_ spa_t *spa = zio->io_spa; ASSERT(MUTEX_HELD(&vq->vq_lock)); ASSERT3U(zio->io_priority, <, ZIO_PRIORITY_NUM_QUEUEABLE); - avl_add(&vq->vq_class[zio->io_priority].vqc_queued_tree, zio); + avl_add(vdev_queue_class_tree(vq, zio->io_priority), zio); + avl_add(vdev_queue_type_tree(vq, zio->io_type), zio); #ifdef illumos mutex_enter(&spa->spa_iokstat_lock); @@ -378,7 +405,8 @@ vdev_queue_io_remove(vdev_queue_t *vq, z spa_t *spa = zio->io_spa; ASSERT(MUTEX_HELD(&vq->vq_lock)); ASSERT3U(zio->io_priority, <, ZIO_PRIORITY_NUM_QUEUEABLE); - avl_remove(&vq->vq_class[zio->io_priority].vqc_queued_tree, zio); + avl_remove(vdev_queue_class_tree(vq, zio->io_priority), zio); + avl_remove(vdev_queue_type_tree(vq, zio->io_type), zio); #ifdef illumos mutex_enter(&spa->spa_iokstat_lock); @@ -551,7 +579,7 @@ vdev_queue_class_to_issue(vdev_queue_t * /* find a queue that has not reached its minimum # outstanding i/os */ for (p = 0; p < ZIO_PRIORITY_NUM_QUEUEABLE; p++) { - if (avl_numnodes(&vq->vq_class[p].vqc_queued_tree) > 0 && + if (avl_numnodes(vdev_queue_class_tree(vq, p)) > 0 && vq->vq_class[p].vqc_active < vdev_queue_class_min_active(p)) return (p); @@ -562,7 +590,7 @@ vdev_queue_class_to_issue(vdev_queue_t * * maximum # outstanding i/os. */ for (p = 0; p < ZIO_PRIORITY_NUM_QUEUEABLE; p++) { - if (avl_numnodes(&vq->vq_class[p].vqc_queued_tree) > 0 && + if (avl_numnodes(vdev_queue_class_tree(vq, p)) > 0 && vq->vq_class[p].vqc_active < vdev_queue_class_max_active(spa, p)) return (p); @@ -588,8 +616,7 @@ vdev_queue_aggregate(vdev_queue_t *vq, z uint64_t maxgap = 0; uint64_t size; boolean_t stretch = B_FALSE; - vdev_queue_class_t *vqc = &vq->vq_class[zio->io_priority]; - avl_tree_t *t = &vqc->vqc_queued_tree; + avl_tree_t *t = vdev_queue_type_tree(vq, zio->io_type); enum zio_flag flags = zio->io_flags & ZIO_FLAG_AGG_INHERIT; ASSERT(MUTEX_HELD(&vq->vq_lock)); @@ -597,15 +624,6 @@ vdev_queue_aggregate(vdev_queue_t *vq, z if (zio->io_flags & ZIO_FLAG_DONT_AGGREGATE) return (NULL); - /* - * The synchronous i/o queues are not sorted by LBA, so we can't - * find adjacent i/os. These i/os tend to not be tightly clustered, - * or too large to aggregate, so this has little impact on performance. - */ - if (zio->io_priority == ZIO_PRIORITY_SYNC_READ || - zio->io_priority == ZIO_PRIORITY_SYNC_WRITE) - return (NULL); - first = last = zio; if (zio->io_type == ZIO_TYPE_READ) @@ -737,7 +755,7 @@ vdev_queue_io_to_issue(vdev_queue_t *vq) zio_t *zio, *aio; zio_priority_t p; avl_index_t idx; - vdev_queue_class_t *vqc; + avl_tree_t *tree; zio_t search; again: @@ -756,13 +774,13 @@ again: * * For FIFO queues (sync), issue the i/o with the lowest timestamp. */ - vqc = &vq->vq_class[p]; + tree = vdev_queue_class_tree(vq, p); search.io_timestamp = 0; search.io_offset = vq->vq_last_offset + 1; - VERIFY3P(avl_find(&vqc->vqc_queued_tree, &search, &idx), ==, NULL); - zio = avl_nearest(&vqc->vqc_queued_tree, idx, AVL_AFTER); + VERIFY3P(avl_find(tree, &search, &idx), ==, NULL); + zio = avl_nearest(tree, idx, AVL_AFTER); if (zio == NULL) - zio = avl_first(&vqc->vqc_queued_tree); + zio = avl_first(tree); ASSERT3U(zio->io_priority, ==, p); aio = vdev_queue_aggregate(vq, zio); From owner-svn-src-user@FreeBSD.ORG Fri Apr 17 22:44:45 2015 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E0D95935; Fri, 17 Apr 2015 22:44: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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CE57BA2C; Fri, 17 Apr 2015 22:44:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3HMiiKl040837; Fri, 17 Apr 2015 22:44:44 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3HMii6m040836; Fri, 17 Apr 2015 22:44:44 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201504172244.t3HMii6m040836@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Fri, 17 Apr 2015 22:44:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281672 - user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs 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.20 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, 17 Apr 2015 22:44:45 -0000 Author: delphij Date: Fri Apr 17 22:44:44 2015 New Revision: 281672 URL: https://svnweb.freebsd.org/changeset/base/281672 Log: Diff reduction from upstream: - Properly apply Illumos changeset fc98fea5. - Eliminate the following counters: l2_write_spa_mismatch l2_write_in_l2 l2_write_io_in_progress l2_write_not_cacheable Because they would keep increasing and is less meaningful for performance characteristic observation. Modified: user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Modified: user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c ============================================================================== --- user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Fri Apr 17 22:26:04 2015 (r281671) +++ user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Fri Apr 17 22:44:44 2015 (r281672) @@ -82,9 +82,9 @@ * types of locks: 1) the hash table lock array, and 2) the * arc list locks. * - * Buffers do not have their own mutexs, rather they rely on the - * hash table mutexs for the bulk of their protection (i.e. most - * fields in the arc_buf_hdr_t are protected by these mutexs). + * Buffers do not have their own mutexes, rather they rely on the + * hash table mutexes for the bulk of their protection (i.e. most + * fields in the arc_buf_hdr_t are protected by these mutexes). * * buf_hash_find() returns the appropriate mutex (held) when it * locates the requested buffer in the hash table. It returns @@ -531,10 +531,6 @@ typedef struct arc_stats { kstat_named_t arcstat_l2_compress_failures; kstat_named_t arcstat_l2_write_trylock_fail; kstat_named_t arcstat_l2_write_passed_headroom; - kstat_named_t arcstat_l2_write_spa_mismatch; - kstat_named_t arcstat_l2_write_in_l2; - kstat_named_t arcstat_l2_write_hdr_io_in_progress; - kstat_named_t arcstat_l2_write_not_cacheable; kstat_named_t arcstat_l2_write_full; kstat_named_t arcstat_l2_write_buffer_iter; kstat_named_t arcstat_l2_write_pios; @@ -629,10 +625,6 @@ static arc_stats_t arc_stats = { { "l2_compress_failures", KSTAT_DATA_UINT64 }, { "l2_write_trylock_fail", KSTAT_DATA_UINT64 }, { "l2_write_passed_headroom", KSTAT_DATA_UINT64 }, - { "l2_write_spa_mismatch", KSTAT_DATA_UINT64 }, - { "l2_write_in_l2", KSTAT_DATA_UINT64 }, - { "l2_write_io_in_progress", KSTAT_DATA_UINT64 }, - { "l2_write_not_cacheable", KSTAT_DATA_UINT64 }, { "l2_write_full", KSTAT_DATA_UINT64 }, { "l2_write_buffer_iter", KSTAT_DATA_UINT64 }, { "l2_write_pios", KSTAT_DATA_UINT64 }, @@ -5051,22 +5043,9 @@ l2arc_write_eligible(uint64_t spa_guid, * 3. has an I/O in progress (it may be an incomplete read). * 4. is flagged not eligible (zfs property). */ - if (hdr->b_spa != spa_guid) { - ARCSTAT_BUMP(arcstat_l2_write_spa_mismatch); + if (hdr->b_spa != spa_guid || HDR_HAS_L2HDR(hdr) || + HDR_IO_IN_PROGRESS(hdr) || !HDR_L2CACHE(hdr)) return (B_FALSE); - } - if (HDR_HAS_L2HDR(hdr)) { - ARCSTAT_BUMP(arcstat_l2_write_in_l2); - return (B_FALSE); - } - if (HDR_IO_IN_PROGRESS(hdr)) { - ARCSTAT_BUMP(arcstat_l2_write_hdr_io_in_progress); - return (B_FALSE); - } - if (!HDR_L2CACHE(hdr)) { - ARCSTAT_BUMP(arcstat_l2_write_not_cacheable); - return (B_FALSE); - } return (B_TRUE); } From owner-svn-src-user@FreeBSD.ORG Sat Apr 18 00:53:58 2015 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BB020DDF; Sat, 18 Apr 2015 00:53:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A328693C; Sat, 18 Apr 2015 00:53:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3I0rw61004157; Sat, 18 Apr 2015 00:53:58 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3I0rrdL004128; Sat, 18 Apr 2015 00:53:53 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504180053.t3I0rrdL004128@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sat, 18 Apr 2015 00:53:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281676 - in user/ngie/more-tests: . sys/amd64/vmm sys/arm/allwinner sys/arm/arm sys/arm64/arm64 sys/cddl/contrib/opensolaris/uts/common/fs/zfs sys/conf sys/dev/cxgbe/tom sys/dev/usb/vi... 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.20 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, 18 Apr 2015 00:53:58 -0000 Author: ngie Date: Sat Apr 18 00:53:52 2015 New Revision: 281676 URL: https://svnweb.freebsd.org/changeset/base/281676 Log: MFhead @ r281675 Added: user/ngie/more-tests/sys/pc98/pc98/genassym.c - copied unchanged from r281675, head/sys/pc98/pc98/genassym.c Deleted: user/ngie/more-tests/sys/fs/ext2fs/ext2_hash.c user/ngie/more-tests/sys/fs/ext2fs/ext2_htree.c user/ngie/more-tests/sys/net/altq/altqconf.h user/ngie/more-tests/usr.sbin/crunch/crunchide/exec_aout.c Modified: user/ngie/more-tests/Makefile user/ngie/more-tests/Makefile.inc1 user/ngie/more-tests/sys/amd64/vmm/vmm_lapic.c user/ngie/more-tests/sys/arm/allwinner/if_emac.c user/ngie/more-tests/sys/arm/allwinner/if_emacreg.h user/ngie/more-tests/sys/arm/arm/trap-v6.c user/ngie/more-tests/sys/arm/arm/vm_machdep.c user/ngie/more-tests/sys/arm64/arm64/trap.c user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c user/ngie/more-tests/sys/conf/Makefile.pc98 user/ngie/more-tests/sys/conf/kern.pre.mk user/ngie/more-tests/sys/conf/kmod.mk user/ngie/more-tests/sys/dev/cxgbe/tom/t4_listen.c user/ngie/more-tests/sys/dev/usb/video/udl.c user/ngie/more-tests/sys/dev/usb/video/udl.h user/ngie/more-tests/sys/fs/ext2fs/ext2_dir.h user/ngie/more-tests/sys/fs/ext2fs/ext2_extern.h user/ngie/more-tests/sys/fs/ext2fs/ext2_lookup.c user/ngie/more-tests/sys/fs/ext2fs/ext2_vfsops.c user/ngie/more-tests/sys/fs/ext2fs/ext2fs.h user/ngie/more-tests/sys/fs/nfs/nfs.h user/ngie/more-tests/sys/fs/nfs/nfs_commonport.c user/ngie/more-tests/sys/fs/nfs/nfsproto.h user/ngie/more-tests/sys/fs/nfsserver/nfs_nfsdserv.c user/ngie/more-tests/sys/modules/ext2fs/Makefile user/ngie/more-tests/sys/modules/usb/Makefile user/ngie/more-tests/sys/net/altq/altq.h user/ngie/more-tests/sys/net/altq/altq_cbq.c user/ngie/more-tests/sys/net/altq/altq_cdnr.c user/ngie/more-tests/sys/net/altq/altq_classq.h user/ngie/more-tests/sys/net/altq/altq_hfsc.c user/ngie/more-tests/sys/net/altq/altq_priq.c user/ngie/more-tests/sys/net/altq/altq_red.c user/ngie/more-tests/sys/net/altq/altq_rio.c user/ngie/more-tests/sys/net/altq/altq_rmclass.c user/ngie/more-tests/sys/net/altq/altq_rmclass_debug.h user/ngie/more-tests/sys/net/altq/altq_subr.c user/ngie/more-tests/sys/net/altq/altq_var.h user/ngie/more-tests/sys/net/altq/if_altq.h user/ngie/more-tests/sys/net/if_types.h user/ngie/more-tests/sys/netinet/in.c user/ngie/more-tests/sys/netinet/in.h user/ngie/more-tests/sys/netinet6/in6.c user/ngie/more-tests/sys/netinet6/in6.h user/ngie/more-tests/usr.bin/gzip/gzip.c user/ngie/more-tests/usr.bin/w/Makefile user/ngie/more-tests/usr.bin/w/w.c user/ngie/more-tests/usr.sbin/bhyve/pci_ahci.c user/ngie/more-tests/usr.sbin/crunch/crunchide/Makefile user/ngie/more-tests/usr.sbin/crunch/crunchide/crunchide.c user/ngie/more-tests/usr.sbin/crunch/crunchide/exec_elf32.c user/ngie/more-tests/usr.sbin/crunch/crunchide/extern.h Directory Properties: user/ngie/more-tests/ (props changed) user/ngie/more-tests/sys/ (props changed) user/ngie/more-tests/sys/amd64/vmm/ (props changed) user/ngie/more-tests/sys/cddl/contrib/opensolaris/ (props changed) user/ngie/more-tests/sys/conf/ (props changed) user/ngie/more-tests/usr.sbin/bhyve/ (props changed) Modified: user/ngie/more-tests/Makefile ============================================================================== --- user/ngie/more-tests/Makefile Sat Apr 18 00:35:00 2015 (r281675) +++ user/ngie/more-tests/Makefile Sat Apr 18 00:53:52 2015 (r281676) @@ -374,6 +374,17 @@ kernel-toolchains: # .if make(universe) || make(universe_kernels) || make(tinderbox) || make(targets) TARGETS?=amd64 arm i386 mips pc98 powerpc sparc64 +# XXX Add arm64 to universe only if we have an external binutils installed. +# It does not build with the in-tree linnker. +.if exists(/usr/local/aarch64-freebsd/bin/ld) +TARGETS+=arm64 +TARGET_ARCHES_arm64?= aarch64 +.else +universe: universe_arm64_skip +universe_epilogue: universe_arm64_skip +universe_arm64_skip: universe_prologue + @echo ">> arm64 skipped - install aarch64-binutils port or package to build" +.endif TARGET_ARCHES_arm?= arm armeb armv6 armv6hf TARGET_ARCHES_mips?= mipsel mips mips64el mips64 mipsn32 TARGET_ARCHES_powerpc?= powerpc powerpc64 Modified: user/ngie/more-tests/Makefile.inc1 ============================================================================== --- user/ngie/more-tests/Makefile.inc1 Sat Apr 18 00:35:00 2015 (r281675) +++ user/ngie/more-tests/Makefile.inc1 Sat Apr 18 00:53:52 2015 (r281676) @@ -1281,10 +1281,6 @@ _m4= lib/libohash \ ${_bt}-usr.bin/m4: ${_bt}-lib/libohash .endif -.if ${BOOTSTRAPPING} < 1000014 -_crunch= usr.sbin/crunch -.endif - .if ${BOOTSTRAPPING} < 1000026 _nmtree= lib/libnetbsd \ usr.sbin/nmtree @@ -1300,6 +1296,10 @@ _cat= bin/cat _lex= usr.bin/lex .endif +.if ${BOOTSTRAPPING} < 1001507 +_crunch= usr.sbin/crunch +.endif + .if ${BOOTSTRAPPING} >= 900040 && ${BOOTSTRAPPING} < 900041 _awk= usr.bin/awk .endif @@ -1469,12 +1469,9 @@ _btxld= usr.sbin/btxld .endif .endif .if ${TARGET_ARCH} != ${MACHINE_ARCH} -.if ${MK_RESCUE} != "no" || defined(RELEASEDIR) +.if ${MK_RESCUE} != "no" _crunchide= usr.sbin/crunch/crunchide .endif -.if ${TARGET_ARCH} == "i386" && defined(RELEASEDIR) -_kgzip= usr.sbin/kgzip -.endif .endif # If we're given an XAS, don't build binutils. @@ -1520,7 +1517,6 @@ cross-tools: .MAKE ${_cc} \ ${_btxld} \ ${_crunchide} \ - ${_kgzip} \ sys/boot/usb/tools ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ cd ${.CURDIR}/${_tool} && \ Modified: user/ngie/more-tests/sys/amd64/vmm/vmm_lapic.c ============================================================================== --- user/ngie/more-tests/sys/amd64/vmm/vmm_lapic.c Sat Apr 18 00:35:00 2015 (r281675) +++ user/ngie/more-tests/sys/amd64/vmm/vmm_lapic.c Sat Apr 18 00:53:52 2015 (r281676) @@ -57,7 +57,11 @@ lapic_set_intr(struct vm *vm, int cpu, i if (cpu < 0 || cpu >= VM_MAXCPU) return (EINVAL); - if (vector < 32 || vector > 255) + /* + * According to section "Maskable Hardware Interrupts" in Intel SDM + * vectors 16 through 255 can be delivered through the local APIC. + */ + if (vector < 16 || vector > 255) return (EINVAL); vlapic = vm_lapic(vm, cpu); Modified: user/ngie/more-tests/sys/arm/allwinner/if_emac.c ============================================================================== --- user/ngie/more-tests/sys/arm/allwinner/if_emac.c Sat Apr 18 00:35:00 2015 (r281675) +++ user/ngie/more-tests/sys/arm/allwinner/if_emac.c Sat Apr 18 00:53:52 2015 (r281676) @@ -101,6 +101,7 @@ struct emac_softc { int emac_watchdog_timer; int emac_rx_process_limit; int emac_link; + uint32_t emac_fifo_mask; }; static int emac_probe(device_t); @@ -121,7 +122,7 @@ static void emac_intr(void *); static int emac_ioctl(struct ifnet *, u_long, caddr_t); static void emac_rxeof(struct emac_softc *, int); -static void emac_txeof(struct emac_softc *); +static void emac_txeof(struct emac_softc *, uint32_t); static int emac_miibus_readreg(device_t, int, int); static int emac_miibus_writereg(device_t, int, int, int); @@ -253,14 +254,28 @@ emac_reset(struct emac_softc *sc) } static void -emac_txeof(struct emac_softc *sc) +emac_drain_rxfifo(struct emac_softc *sc) +{ + uint32_t data; + + while (EMAC_READ_REG(sc, EMAC_RX_FBC) > 0) + data = EMAC_READ_REG(sc, EMAC_RX_IO_DATA); +} + +static void +emac_txeof(struct emac_softc *sc, uint32_t status) { struct ifnet *ifp; EMAC_ASSERT_LOCKED(sc); ifp = sc->emac_ifp; - if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1); + status &= (EMAC_TX_FIFO0 | EMAC_TX_FIFO1); + sc->emac_fifo_mask &= ~status; + if (status == (EMAC_TX_FIFO0 | EMAC_TX_FIFO1)) + if_inc_counter(ifp, IFCOUNTER_OPACKETS, 2); + else + if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1); ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; /* Unarm watchdog timer if no TX */ @@ -275,7 +290,7 @@ emac_rxeof(struct emac_softc *sc, int co uint32_t reg_val, rxcount; int16_t len; uint16_t status; - int good_packet, i; + int i; ifp = sc->emac_ifp; for (; count > 0 && @@ -327,20 +342,19 @@ emac_rxeof(struct emac_softc *sc, int co return; } - good_packet = 1; - /* Get packet size and status */ reg_val = EMAC_READ_REG(sc, EMAC_RX_IO_DATA); len = reg_val & 0xffff; status = (reg_val >> 16) & 0xffff; - if (len < 64) { - good_packet = 0; + if (len < 64 || (status & EMAC_PKT_OK) == 0) { if (bootverbose) if_printf(ifp, "bad packet: len = %i status = %i\n", len, status); if_inc_counter(ifp, IFCOUNTER_IERRORS, 1); + emac_drain_rxfifo(sc); + continue; } #if 0 if (status & (EMAC_CRCERR | EMAC_LENERR)) { @@ -352,63 +366,58 @@ emac_rxeof(struct emac_softc *sc, int co if_printf(ifp, "length error\n"); } #endif - if (good_packet) { - m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR); - if (m == NULL) - return; - m->m_len = m->m_pkthdr.len = MCLBYTES; + m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR); + if (m == NULL) { + emac_drain_rxfifo(sc); + return; + } + m->m_len = m->m_pkthdr.len = MCLBYTES; - len -= ETHER_CRC_LEN; + /* Copy entire frame to mbuf first. */ + bus_space_read_multi_4(sc->emac_tag, sc->emac_handle, + EMAC_RX_IO_DATA, mtod(m, uint32_t *), roundup2(len, 4) / 4); - /* Copy entire frame to mbuf first. */ - bus_space_read_multi_4(sc->emac_tag, sc->emac_handle, - EMAC_RX_IO_DATA, mtod(m, uint32_t *), - roundup2(len, 4) / 4); - - m->m_pkthdr.rcvif = ifp; - m->m_len = m->m_pkthdr.len = len; - - /* - * Emac controller needs strict aligment, so to avoid - * copying over an entire frame to align, we allocate - * a new mbuf and copy ethernet header + IP header to - * the new mbuf. The new mbuf is prepended into the - * existing mbuf chain. - */ - if (m->m_len <= (MHLEN - ETHER_HDR_LEN)) { - bcopy(m->m_data, m->m_data + ETHER_HDR_LEN, - m->m_len); - m->m_data += ETHER_HDR_LEN; - } else if (m->m_len <= (MCLBYTES - ETHER_HDR_LEN) && - m->m_len > (MHLEN - ETHER_HDR_LEN)) { - MGETHDR(m0, M_NOWAIT, MT_DATA); - if (m0 != NULL) { - len = ETHER_HDR_LEN + - m->m_pkthdr.l2hlen; - bcopy(m->m_data, m0->m_data, len); - m->m_data += len; - m->m_len -= len; - m0->m_len = len; - M_MOVE_PKTHDR(m0, m); - m0->m_next = m; - m = m0; - } else { - if_inc_counter(ifp, IFCOUNTER_IERRORS, 1); - m_freem(m); - m = NULL; - continue; - } - } else if (m->m_len > EMAC_MAC_MAXF) { + m->m_pkthdr.rcvif = ifp; + m->m_len = m->m_pkthdr.len = len - ETHER_CRC_LEN; + + /* + * Emac controller needs strict aligment, so to avoid + * copying over an entire frame to align, we allocate + * a new mbuf and copy ethernet header + IP header to + * the new mbuf. The new mbuf is prepended into the + * existing mbuf chain. + */ + if (m->m_len <= (MHLEN - ETHER_HDR_LEN)) { + bcopy(m->m_data, m->m_data + ETHER_HDR_LEN, m->m_len); + m->m_data += ETHER_HDR_LEN; + } else if (m->m_len <= (MCLBYTES - ETHER_HDR_LEN) && + m->m_len > (MHLEN - ETHER_HDR_LEN)) { + MGETHDR(m0, M_NOWAIT, MT_DATA); + if (m0 != NULL) { + len = ETHER_HDR_LEN + m->m_pkthdr.l2hlen; + bcopy(m->m_data, m0->m_data, len); + m->m_data += len; + m->m_len -= len; + m0->m_len = len; + M_MOVE_PKTHDR(m0, m); + m0->m_next = m; + m = m0; + } else { if_inc_counter(ifp, IFCOUNTER_IERRORS, 1); m_freem(m); m = NULL; continue; } - if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1); - EMAC_UNLOCK(sc); - (*ifp->if_input)(ifp, m); - EMAC_LOCK(sc); + } else if (m->m_len > EMAC_MAC_MAXF) { + if_inc_counter(ifp, IFCOUNTER_IERRORS, 1); + m_freem(m); + m = NULL; + continue; } + if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1); + EMAC_UNLOCK(sc); + (*ifp->if_input)(ifp, m); + EMAC_LOCK(sc); } } @@ -582,11 +591,13 @@ emac_start_locked(struct ifnet *ifp) { struct emac_softc *sc; struct mbuf *m, *m0; - uint32_t reg_val; + uint32_t fifo, reg; sc = ifp->if_softc; if (ifp->if_drv_flags & IFF_DRV_OACTIVE) return; + if (sc->emac_fifo_mask == (EMAC_TX_FIFO0 | EMAC_TX_FIFO1)) + return; if (sc->emac_link == 0) return; IFQ_DRV_DEQUEUE(&ifp->if_snd, m); @@ -594,7 +605,14 @@ emac_start_locked(struct ifnet *ifp) return; /* Select channel */ - EMAC_WRITE_REG(sc, EMAC_TX_INS, 0); + if (sc->emac_fifo_mask & EMAC_TX_FIFO0) + fifo = 1; + else + fifo = 0; + sc->emac_fifo_mask |= (1 << fifo); + if (sc->emac_fifo_mask == (EMAC_TX_FIFO0 | EMAC_TX_FIFO1)) + ifp->if_drv_flags |= IFF_DRV_OACTIVE; + EMAC_WRITE_REG(sc, EMAC_TX_INS, fifo); /* * Emac controller wants 4 byte aligned TX buffers. @@ -615,17 +633,17 @@ emac_start_locked(struct ifnet *ifp) roundup2(m->m_len, 4) / 4); /* Send the data lengh. */ - EMAC_WRITE_REG(sc, EMAC_TX_PL0, m->m_len); + reg = (fifo == 0) ? EMAC_TX_PL0 : EMAC_TX_PL1; + EMAC_WRITE_REG(sc, reg, m->m_len); /* Start translate from fifo to phy. */ - reg_val = EMAC_READ_REG(sc, EMAC_TX_CTL0); - reg_val |= 1; - EMAC_WRITE_REG(sc, EMAC_TX_CTL0, reg_val); + reg = (fifo == 0) ? EMAC_TX_CTL0 : EMAC_TX_CTL1; + EMAC_WRITE_REG(sc, reg, EMAC_READ_REG(sc, reg) | 1); /* Set timeout */ sc->emac_watchdog_timer = 5; - ifp->if_drv_flags |= IFF_DRV_OACTIVE; + /* Data have been sent to hardware, it is okay to free the mbuf now. */ BPF_MTAP(ifp, m); m_freem(m); } @@ -664,9 +682,6 @@ emac_intr(void *arg) sc = (struct emac_softc *)arg; EMAC_LOCK(sc); - ifp = sc->emac_ifp; - if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) - return; /* Disable all interrupts */ EMAC_WRITE_REG(sc, EMAC_INT_CTL, 0); @@ -680,18 +695,17 @@ emac_intr(void *arg) emac_rxeof(sc, sc->emac_rx_process_limit); /* Transmit Interrupt check */ - if (reg_val & EMAC_INT_STA_TX){ - emac_txeof(sc); + if (reg_val & EMAC_INT_STA_TX) { + emac_txeof(sc, reg_val); + ifp = sc->emac_ifp; if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) emac_start_locked(ifp); } - if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) { - /* Re-enable interrupt mask */ - reg_val = EMAC_READ_REG(sc, EMAC_INT_CTL); - reg_val |= EMAC_INT_EN; - EMAC_WRITE_REG(sc, EMAC_INT_CTL, reg_val); - } + /* Re-enable interrupt mask */ + reg_val = EMAC_READ_REG(sc, EMAC_INT_CTL); + reg_val |= EMAC_INT_EN; + EMAC_WRITE_REG(sc, EMAC_INT_CTL, reg_val); EMAC_UNLOCK(sc); } Modified: user/ngie/more-tests/sys/arm/allwinner/if_emacreg.h ============================================================================== --- user/ngie/more-tests/sys/arm/allwinner/if_emacreg.h Sat Apr 18 00:35:00 2015 (r281675) +++ user/ngie/more-tests/sys/arm/allwinner/if_emacreg.h Sat Apr 18 00:53:52 2015 (r281676) @@ -51,6 +51,8 @@ #define EMAC_TX_TSVH0 0x30 #define EMAC_TX_TSVL1 0x34 #define EMAC_TX_TSVH1 0x38 +#define EMAC_TX_FIFO0 (1 << 0) +#define EMAC_TX_FIFO1 (1 << 1) #define EMAC_RX_CTL 0x3C #define EMAC_RX_HASH0 0x40 @@ -61,7 +63,7 @@ #define EMAC_INT_CTL 0x54 #define EMAC_INT_STA 0x58 -#define EMAC_INT_STA_TX (0x01 | 0x02) +#define EMAC_INT_STA_TX (EMAC_TX_FIFO0 | EMAC_TX_FIFO1) #define EMAC_INT_STA_RX 0x100 #define EMAC_INT_EN (0xf << 0) | (1 << 8) @@ -223,6 +225,7 @@ /* Receive status */ #define EMAC_CRCERR (1 << 4) #define EMAC_LENERR (3 << 5) +#define EMAC_PKT_OK (1 << 7) #define EMAC_RX_FLUSH_FIFO (1 << 3) #define EMAC_PHY_RESET (1 << 15) Modified: user/ngie/more-tests/sys/arm/arm/trap-v6.c ============================================================================== --- user/ngie/more-tests/sys/arm/arm/trap-v6.c Sat Apr 18 00:35:00 2015 (r281675) +++ user/ngie/more-tests/sys/arm/arm/trap-v6.c Sat Apr 18 00:53:52 2015 (r281676) @@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include @@ -287,7 +288,11 @@ abort_handler(struct trapframe *tf, int #endif td = curthread; fsr = (prefetch) ? cp15_ifsr_get(): cp15_dfsr_get(); +#if __ARM_ARCH >= 7 + far = (prefetch) ? cp15_ifar_get() : cp15_dfar_get(); +#else far = (prefetch) ? TRAPF_PC(tf) : cp15_dfar_get(); +#endif idx = FSR_TO_FAULT(fsr); usermode = TRAPF_USERMODE(tf); /* Abort came from user mode? */ Modified: user/ngie/more-tests/sys/arm/arm/vm_machdep.c ============================================================================== --- user/ngie/more-tests/sys/arm/arm/vm_machdep.c Sat Apr 18 00:35:00 2015 (r281675) +++ user/ngie/more-tests/sys/arm/arm/vm_machdep.c Sat Apr 18 00:53:52 2015 (r281676) @@ -178,11 +178,7 @@ cpu_set_syscall_retval(struct thread *td * place the returned data into r1. As the lseek and frerebsd6_lseek * syscalls also return an off_t they do not need this fixup. */ -#ifdef __ARM_EABI__ call = frame->tf_r7; -#else - call = *(u_int32_t *)(frame->tf_pc - INSN_SIZE) & 0x000fffff; -#endif if (call == SYS___syscall) { register_t *ap = &frame->tf_r0; register_t code = ap[_QUAD_LOWWORD]; Modified: user/ngie/more-tests/sys/arm64/arm64/trap.c ============================================================================== --- user/ngie/more-tests/sys/arm64/arm64/trap.c Sat Apr 18 00:35:00 2015 (r281675) +++ user/ngie/more-tests/sys/arm64/arm64/trap.c Sat Apr 18 00:53:52 2015 (r281676) @@ -65,7 +65,7 @@ __FBSDID("$FreeBSD$"); #include #endif -extern uintptr_t fsu_intr_fault; +extern register_t fsu_intr_fault; /* Called from exception.S */ void do_el1h_sync(struct trapframe *); @@ -154,7 +154,7 @@ data_abort(struct trapframe *frame, uint * Special case for fuswintr and suswintr. These can't sleep so * handle them early on in the trap handler. */ - if (__predict_false(pcb->pcb_onfault == fsu_intr_fault)) { + if (__predict_false(pcb->pcb_onfault == (vm_offset_t)&fsu_intr_fault)) { frame->tf_elr = pcb->pcb_onfault; return; } Modified: user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c ============================================================================== --- user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Sat Apr 18 00:35:00 2015 (r281675) +++ user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Sat Apr 18 00:53:52 2015 (r281676) @@ -195,11 +195,6 @@ CTASSERT(sizeof(zfs_cmd_t) < IOCPARM_MAX); -static int snapshot_list_prefetch; -SYSCTL_DECL(_vfs_zfs); -SYSCTL_INT(_vfs_zfs, OID_AUTO, snapshot_list_prefetch, CTLFLAG_RWTUN, - &snapshot_list_prefetch, 0, "Prefetch data when listing snapshots"); - static struct cdev *zfsdev; extern void zfs_init(void); Modified: user/ngie/more-tests/sys/conf/Makefile.pc98 ============================================================================== --- user/ngie/more-tests/sys/conf/Makefile.pc98 Sat Apr 18 00:35:00 2015 (r281675) +++ user/ngie/more-tests/sys/conf/Makefile.pc98 Sat Apr 18 00:53:52 2015 (r281676) @@ -28,6 +28,9 @@ S= ./@ S= ../../.. .endif .endif + +LDSCRIPT_NAME?= ldscript.${MACHINE_ARCH} + .include "$S/conf/kern.pre.mk" ASM_CFLAGS.mpboot.s= ${CLANG_NO_IAS34} Modified: user/ngie/more-tests/sys/conf/kern.pre.mk ============================================================================== --- user/ngie/more-tests/sys/conf/kern.pre.mk Sat Apr 18 00:35:00 2015 (r281675) +++ user/ngie/more-tests/sys/conf/kern.pre.mk Sat Apr 18 00:53:52 2015 (r281676) @@ -26,7 +26,7 @@ KODIR?= /boot/${KERNEL} LDSCRIPT_NAME?= ldscript.$M LDSCRIPT?= $S/conf/${LDSCRIPT_NAME} -M= ${MACHINE_CPUARCH} +M= ${MACHINE} AWK?= awk CP?= cp Modified: user/ngie/more-tests/sys/conf/kmod.mk ============================================================================== --- user/ngie/more-tests/sys/conf/kmod.mk Sat Apr 18 00:35:00 2015 (r281675) +++ user/ngie/more-tests/sys/conf/kmod.mk Sat Apr 18 00:53:52 2015 (r281676) @@ -425,10 +425,10 @@ genassym.o: opt_global.h .endif assym.s: ${SYSDIR}/kern/genassym.sh sh ${SYSDIR}/kern/genassym.sh genassym.o > ${.TARGET} -genassym.o: ${SYSDIR}/${MACHINE_CPUARCH}/${MACHINE_CPUARCH}/genassym.c +genassym.o: ${SYSDIR}/${MACHINE}/${MACHINE}/genassym.c genassym.o: ${SRCS:Mopt_*.h} ${CC} -c ${CFLAGS:N-fno-common} \ - ${SYSDIR}/${MACHINE_CPUARCH}/${MACHINE_CPUARCH}/genassym.c + ${SYSDIR}/${MACHINE}/${MACHINE}/genassym.c .endif lint: ${SRCS} Modified: user/ngie/more-tests/sys/dev/cxgbe/tom/t4_listen.c ============================================================================== --- user/ngie/more-tests/sys/dev/cxgbe/tom/t4_listen.c Sat Apr 18 00:35:00 2015 (r281675) +++ user/ngie/more-tests/sys/dev/cxgbe/tom/t4_listen.c Sat Apr 18 00:53:52 2015 (r281676) @@ -1090,35 +1090,6 @@ pass_accept_req_to_protohdrs(const struc } } -static int -ifnet_has_ip6(struct ifnet *ifp, struct in6_addr *ip6) -{ - struct ifaddr *ifa; - struct sockaddr_in6 *sin6; - int found = 0; - struct in6_addr in6 = *ip6; - - /* Just as in ip6_input */ - if (in6_clearscope(&in6) || in6_clearscope(&in6)) - return (0); - in6_setscope(&in6, ifp, NULL); - - if_addr_rlock(ifp); - TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) { - sin6 = (void *)ifa->ifa_addr; - if (sin6->sin6_family != AF_INET6) - continue; - - if (IN6_ARE_ADDR_EQUAL(&sin6->sin6_addr, &in6)) { - found = 1; - break; - } - } - if_addr_runlock(ifp); - - return (found); -} - static struct l2t_entry * get_l2te_for_nexthop(struct port_info *pi, struct ifnet *ifp, struct in_conninfo *inc) @@ -1166,29 +1137,6 @@ get_l2te_for_nexthop(struct port_info *p return (e); } -static int -ifnet_has_ip(struct ifnet *ifp, struct in_addr in) -{ - struct ifaddr *ifa; - struct sockaddr_in *sin; - int found = 0; - - if_addr_rlock(ifp); - TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) { - sin = (void *)ifa->ifa_addr; - if (sin->sin_family != AF_INET) - continue; - - if (sin->sin_addr.s_addr == in.s_addr) { - found = 1; - break; - } - } - if_addr_runlock(ifp); - - return (found); -} - #define REJECT_PASS_ACCEPT() do { \ reject_reason = __LINE__; \ goto reject; \ @@ -1281,7 +1229,7 @@ do_pass_accept_req(struct sge_iq *iq, co * SYN must be directed to an IP6 address on this ifnet. This * is more restrictive than in6_localip. */ - if (!ifnet_has_ip6(ifp, &inc.inc6_laddr)) + if (!in6_ifhasaddr(ifp, &inc.inc6_laddr)) REJECT_PASS_ACCEPT(); } else { @@ -1293,7 +1241,7 @@ do_pass_accept_req(struct sge_iq *iq, co * SYN must be directed to an IP address on this ifnet. This * is more restrictive than in_localip. */ - if (!ifnet_has_ip(ifp, inc.inc_laddr)) + if (!in_ifhasaddr(ifp, inc.inc_laddr)) REJECT_PASS_ACCEPT(); } Modified: user/ngie/more-tests/sys/dev/usb/video/udl.c ============================================================================== --- user/ngie/more-tests/sys/dev/usb/video/udl.c Sat Apr 18 00:35:00 2015 (r281675) +++ user/ngie/more-tests/sys/dev/usb/video/udl.c Sat Apr 18 00:53:52 2015 (r281676) @@ -76,6 +76,11 @@ static int udl_fps = 25; SYSCTL_INT(_hw_usb_udl, OID_AUTO, fps, CTLFLAG_RWTUN, &udl_fps, 0, "Frames Per Second, 1-60"); +static struct mtx udl_buffer_mtx; +static struct udl_buffer_head udl_buffer_head; + +MALLOC_DEFINE(M_USB_DL, "USB", "USB DisplayLink"); + /* * Prototypes. */ @@ -175,6 +180,56 @@ static const STRUCT_USB_HOST_ID udl_devs {USB_VPI(USB_VENDOR_DISPLAYLINK, USB_PRODUCT_DISPLAYLINK_LT1421, DLUNK)} }; +static void +udl_buffer_init(void *arg) +{ + mtx_init(&udl_buffer_mtx, "USB", "UDL", MTX_DEF); + TAILQ_INIT(&udl_buffer_head); +} +SYSINIT(udl_buffer_init, SI_SUB_LOCK, SI_ORDER_FIRST, udl_buffer_init, NULL); + +CTASSERT(sizeof(struct udl_buffer) < PAGE_SIZE); + +static void * +udl_buffer_alloc(uint32_t size) +{ + struct udl_buffer *buf; + mtx_lock(&udl_buffer_mtx); + TAILQ_FOREACH(buf, &udl_buffer_head, entry) { + if (buf->size == size) { + TAILQ_REMOVE(&udl_buffer_head, buf, entry); + break; + } + } + mtx_unlock(&udl_buffer_mtx); + if (buf != NULL) { + /* wipe and recycle buffer */ + memset(buf, 0, size); + return (buf); + } + /* allocate new buffer */ + return (malloc(size, M_USB_DL, M_WAITOK | M_ZERO)); +} + +static void +udl_buffer_free(void *_buf, uint32_t size) +{ + struct udl_buffer *buf; + + buf = (struct udl_buffer *)_buf; + if (buf == NULL) + return; + + /* + * Memory mapped buffers should never be freed. + * Put display buffer into a recycle list. + */ + mtx_lock(&udl_buffer_mtx); + buf->size = size; + TAILQ_INSERT_TAIL(&udl_buffer_head, buf, entry); + mtx_unlock(&udl_buffer_mtx); +} + static uint32_t udl_get_fb_size(struct udl_softc *sc) { @@ -403,11 +458,11 @@ udl_detach(device_t dev) mtx_destroy(&sc->sc_mtx); cv_destroy(&sc->sc_cv); - /* - * Free framebuffer memory, if any. - */ - free(sc->sc_fb_addr, M_DEVBUF); - free(sc->sc_fb_copy, M_DEVBUF); + /* put main framebuffer into a recycle list, if any */ + udl_buffer_free(sc->sc_fb_addr, sc->sc_fb_size); + + /* free shadow framebuffer memory, if any */ + free(sc->sc_fb_copy, M_USB_DL); return (0); } @@ -782,13 +837,15 @@ udl_fbmem_alloc(struct udl_softc *sc) size = udl_get_fb_size(sc); size = round_page(size); - + /* check for zero size */ + if (size == 0) + size = PAGE_SIZE; /* * It is assumed that allocations above PAGE_SIZE bytes will * be PAGE_SIZE aligned for use with mmap() */ - sc->sc_fb_addr = malloc(size, M_DEVBUF, M_WAITOK | M_ZERO); - sc->sc_fb_copy = malloc(size, M_DEVBUF, M_WAITOK | M_ZERO); + sc->sc_fb_addr = udl_buffer_alloc(size); + sc->sc_fb_copy = malloc(size, M_USB_DL, M_WAITOK | M_ZERO); sc->sc_fb_size = size; } Modified: user/ngie/more-tests/sys/dev/usb/video/udl.h ============================================================================== --- user/ngie/more-tests/sys/dev/usb/video/udl.h Sat Apr 18 00:35:00 2015 (r281675) +++ user/ngie/more-tests/sys/dev/usb/video/udl.h Sat Apr 18 00:53:52 2015 (r281676) @@ -34,6 +34,15 @@ #define UDL_FONT_HEIGHT 16 /* pixels */ #define UDL_MAX_MODES 25 /* units */ +MALLOC_DECLARE(M_USB_DL); + +struct udl_buffer { + TAILQ_ENTRY(udl_buffer) entry; + uint32_t size; +}; + +TAILQ_HEAD(udl_buffer_head, udl_buffer); + struct udl_cmd_buf { TAILQ_ENTRY(udl_cmd_buf) entry; uint32_t off; Modified: user/ngie/more-tests/sys/fs/ext2fs/ext2_dir.h ============================================================================== --- user/ngie/more-tests/sys/fs/ext2fs/ext2_dir.h Sat Apr 18 00:35:00 2015 (r281675) +++ user/ngie/more-tests/sys/fs/ext2fs/ext2_dir.h Sat Apr 18 00:53:52 2015 (r281676) @@ -40,21 +40,6 @@ struct ext2fs_direct { uint16_t e2d_namlen; /* length of string in e2d_name */ char e2d_name[EXT2FS_MAXNAMLEN];/* name with length<=EXT2FS_MAXNAMLEN */ }; - -enum slotstatus { - NONE, - COMPACT, - FOUND -}; - -struct ext2fs_searchslot { - enum slotstatus slotstatus; - doff_t slotoffset; /* offset of area with free space */ - int slotsize; /* size of area at slotoffset */ - int slotfreespace; /* amount of space free in slot */ - int slotneeded; /* sizeof the entry we are seeking */ -}; - /* * The new version of the directory entry. Since EXT2 structures are * stored in intel byte order, and the name_len field could never be Modified: user/ngie/more-tests/sys/fs/ext2fs/ext2_extern.h ============================================================================== --- user/ngie/more-tests/sys/fs/ext2fs/ext2_extern.h Sat Apr 18 00:35:00 2015 (r281675) +++ user/ngie/more-tests/sys/fs/ext2fs/ext2_extern.h Sat Apr 18 00:53:52 2015 (r281676) @@ -40,15 +40,12 @@ #define _FS_EXT2FS_EXT2_EXTERN_H_ struct ext2fs_dinode; -struct ext2fs_direct_2; -struct ext2fs_searchslot; struct indir; struct inode; struct mount; struct vfsconf; struct vnode; -int ext2_add_entry(struct vnode *, struct ext2fs_direct_2 *); int ext2_alloc(struct inode *, daddr_t, e4fs_daddr_t, int, struct ucred *, e4fs_daddr_t *); int ext2_balloc(struct inode *, @@ -86,18 +83,6 @@ int ext2_dirempty(struct inode *, ino_t, int ext2_checkpath(struct inode *, struct inode *, struct ucred *); int cg_has_sb(int i); int ext2_inactive(struct vop_inactive_args *); -int ext2_htree_add_entry(struct vnode *, struct ext2fs_direct_2 *, - struct componentname *); -int ext2_htree_create_index(struct vnode *, struct componentname *, - struct ext2fs_direct_2 *); -int ext2_htree_has_idx(struct inode *); -int ext2_htree_hash(const char *, int, uint32_t *, int, uint32_t *, - uint32_t *); -int ext2_htree_lookup(struct inode *, const char *, int, struct buf **, - int *, doff_t *, doff_t *, doff_t *, struct ext2fs_searchslot *); -int ext2_search_dirblock(struct inode *, void *, int *, const char *, int, - int *, doff_t *, doff_t *, doff_t *, struct ext2fs_searchslot *); - /* Flags to low-level allocation routines. * The low 16-bits are reserved for IO_ flags from vnode.h. Modified: user/ngie/more-tests/sys/fs/ext2fs/ext2_lookup.c ============================================================================== --- user/ngie/more-tests/sys/fs/ext2fs/ext2_lookup.c Sat Apr 18 00:35:00 2015 (r281675) +++ user/ngie/more-tests/sys/fs/ext2fs/ext2_lookup.c Sat Apr 18 00:53:52 2015 (r281676) @@ -113,19 +113,9 @@ static u_char dt_to_ext2_ft[] = { static int ext2_dirbadentry(struct vnode *dp, struct ext2fs_direct_2 *de, int entryoffsetinblock); -static int ext2_is_dot_entry(struct componentname *cnp); static int ext2_lookup_ino(struct vnode *vdp, struct vnode **vpp, struct componentname *cnp, ino_t *dd_ino); -static int -ext2_is_dot_entry(struct componentname *cnp) -{ - if (cnp->cn_namelen <= 2 && cnp->cn_nameptr[0] == '.' && - (cnp->cn_nameptr[1] == '.' || cnp->cn_nameptr[1] == '0')) - return (1); - return (0); -} - /* * Vnode op for reading directories. */ @@ -306,9 +296,13 @@ ext2_lookup_ino(struct vnode *vdp, struc struct buf *bp; /* a buffer of directory entries */ struct ext2fs_direct_2 *ep; /* the current directory entry */ int entryoffsetinblock; /* offset of ep in bp's buffer */ - struct ext2fs_searchslot ss; + enum {NONE, COMPACT, FOUND} slotstatus; + doff_t slotoffset; /* offset of area with free space */ doff_t i_diroff; /* cached i_diroff value */ doff_t i_offset; /* cached i_offset value */ + int slotsize; /* size of area at slotoffset */ + int slotfreespace; /* amount of space free in slot */ + int slotneeded; /* size of the entry we're seeking */ int numdirpasses; /* strategy for directory search */ doff_t endsearch; /* offset to end directory search */ doff_t prevoff; /* prev entry dp->i_offset */ @@ -316,13 +310,12 @@ ext2_lookup_ino(struct vnode *vdp, struc struct vnode *tdp; /* returned by VFS_VGET */ doff_t enduseful; /* pointer past last used dir slot */ u_long bmask; /* block offset mask */ - int error; + int namlen, error; struct ucred *cred = cnp->cn_cred; int flags = cnp->cn_flags; int nameiop = cnp->cn_nameiop; ino_t ino, ino1; int ltype; - int entry_found = 0; int DIRBLKSIZ = VTOI(vdp)->i_e2fs->e2fs_bsize; @@ -333,57 +326,31 @@ ext2_lookup_ino(struct vnode *vdp, struc bmask = VFSTOEXT2(vdp->v_mount)->um_mountp->mnt_stat.f_iosize - 1; restart: bp = NULL; - ss.slotoffset = -1; + slotoffset = -1; /* * We now have a segment name to search for, and a directory to search. - * + */ + + /* * Suppress search for slots unless creating * file and at end of pathname, in which case * we watch for a place to put the new file in * case it doesn't already exist. */ i_diroff = dp->i_diroff; - ss.slotstatus = FOUND; - ss.slotfreespace = ss.slotsize = ss.slotneeded = 0; + slotstatus = FOUND; + slotfreespace = slotsize = slotneeded = 0; if ((nameiop == CREATE || nameiop == RENAME) && (flags & ISLASTCN)) { - ss.slotstatus = NONE; - ss.slotneeded = EXT2_DIR_REC_LEN(cnp->cn_namelen); + slotstatus = NONE; + slotneeded = EXT2_DIR_REC_LEN(cnp->cn_namelen); /* was - ss.slotneeded = (sizeof(struct direct) - MAXNAMLEN + + slotneeded = (sizeof(struct direct) - MAXNAMLEN + cnp->cn_namelen + 3) &~ 3; */ } /* - * Try to lookup dir entry using htree directory index. - * - * If we got an error or we want to find '.' or '..' entry, - * we will fall back to linear search. - */ - if (!ext2_is_dot_entry(cnp) && ext2_htree_has_idx(dp)) { - numdirpasses = 1; - entryoffsetinblock = 0; - switch (ext2_htree_lookup(dp, cnp->cn_nameptr, cnp->cn_namelen, - &bp, &entryoffsetinblock, &i_offset, &prevoff, - &enduseful, &ss)) { - case 0: - ep = (struct ext2fs_direct_2 *)((char *)bp->b_data + - (i_offset & bmask)); - goto foundentry; - case ENOENT: - i_offset = roundup2(dp->i_size, DIRBLKSIZ); - goto notfound; - default: - /* - * Something failed; just fallback to do a linear - * search. - */ - break; - } - } - - /* * If there is cached information on a previous search of * this directory, pick up where we last left off. * We cache only lookups as these are the most common @@ -417,38 +384,96 @@ searchloop: /* * If necessary, get the next directory block. */ - if (bp != NULL) - brelse(bp); - error = ext2_blkatoff(vdp, (off_t)i_offset, NULL, &bp); - if (error != 0) - return (error); - entryoffsetinblock = 0; + if ((i_offset & bmask) == 0) { + if (bp != NULL) + brelse(bp); + if ((error = + ext2_blkatoff(vdp, (off_t)i_offset, NULL, + &bp)) != 0) + return (error); + entryoffsetinblock = 0; + } /* * If still looking for a slot, and at a DIRBLKSIZE * boundary, have to start looking for free space again. */ - if (ss.slotstatus == NONE && + if (slotstatus == NONE && (entryoffsetinblock & (DIRBLKSIZ - 1)) == 0) { - ss.slotoffset = -1; - ss.slotfreespace = 0; + slotoffset = -1; + slotfreespace = 0; } - error = ext2_search_dirblock(dp, bp->b_data, &entry_found, - cnp->cn_nameptr, cnp->cn_namelen, - &entryoffsetinblock, &i_offset, &prevoff, - &enduseful, &ss); - if (error != 0) { - brelse(bp); - return (error); + /* + * Get pointer to next entry. + * Full validation checks are slow, so we only check + * enough to insure forward progress through the + * directory. Complete checks can be run by setting + * "vfs.e2fs.dirchk" to be true. + */ + ep = (struct ext2fs_direct_2 *) + ((char *)bp->b_data + entryoffsetinblock); + if (ep->e2d_reclen == 0 || + (dirchk && ext2_dirbadentry(vdp, ep, entryoffsetinblock))) { + int i; + ext2_dirbad(dp, i_offset, "mangled entry"); + i = DIRBLKSIZ - (entryoffsetinblock & (DIRBLKSIZ - 1)); + i_offset += i; + entryoffsetinblock += i; + continue; } - if (entry_found) { - ep = (struct ext2fs_direct_2 *)((char *)bp->b_data + - (entryoffsetinblock & bmask)); -foundentry: - ino = ep->e2d_ino; - goto found; + + /* + * If an appropriate sized slot has not yet been found, + * check to see if one is available. Also accumulate space + * in the current block so that we can determine if + * compaction is viable. + */ + if (slotstatus != FOUND) { + int size = ep->e2d_reclen; + + if (ep->e2d_ino != 0) + size -= EXT2_DIR_REC_LEN(ep->e2d_namlen); + if (size > 0) { + if (size >= slotneeded) { + slotstatus = FOUND; + slotoffset = i_offset; + slotsize = ep->e2d_reclen; + } else if (slotstatus == NONE) { + slotfreespace += size; + if (slotoffset == -1) + slotoffset = i_offset; + if (slotfreespace >= slotneeded) { + slotstatus = COMPACT; + slotsize = i_offset + + ep->e2d_reclen - slotoffset; + } + } + } } + + /* + * Check for a name match. + */ + if (ep->e2d_ino) { + namlen = ep->e2d_namlen; + if (namlen == cnp->cn_namelen && + !bcmp(cnp->cn_nameptr, ep->e2d_name, + (unsigned)namlen)) { + /* + * Save directory entry's inode number and + * reclen in ndp->ni_ufs area, and release + * directory buffer. + */ + ino = ep->e2d_ino; + goto found; + } + } + prevoff = i_offset; + i_offset += ep->e2d_reclen; *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***